Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app
diff --git a/.eslintrc b/.eslintrc
index 276d6ff..12fefa0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -154,7 +154,6 @@
"before": true,
"beforeEach": true,
"onScan": true,
- "html2canvas": true,
"extend_cscript": true,
"localforage": true
}
diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml
index ef38974..ee60bad 100644
--- a/.github/workflows/initiate_release.yml
+++ b/.github/workflows/initiate_release.yml
@@ -9,7 +9,7 @@
workflow_dispatch:
jobs:
- release:
+ stable-release:
name: Release
runs-on: ubuntu-latest
strategy:
@@ -30,3 +30,23 @@
head: version-${{ matrix.version }}-hotfix
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+
+ beta-release:
+ name: Release
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+
+ steps:
+ - uses: octokit/request-action@v2.x
+ with:
+ route: POST /repos/{owner}/{repo}/pulls
+ owner: frappe
+ repo: erpnext
+ title: |-
+ "chore: release v15 beta"
+ body: "Automated beta release."
+ base: version-15-beta
+ head: develop
+ env:
+ GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index d5f0052..aae2928 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -43,14 +43,16 @@
fi
- name: Setup Python
- uses: "gabrielfalcao/pyenv-action@v9"
+ uses: "actions/setup-python@v4"
with:
- versions: 3.10:latest, 3.7:latest
+ python-version: |
+ 3.7
+ 3.10
- name: Setup Node
uses: actions/setup-node@v2
with:
- node-version: 14
+ node-version: 18
check-latest: true
- name: Add to Hosts
@@ -92,7 +94,6 @@
- name: Install
run: |
pip install frappe-bench
- pyenv global $(pyenv versions | grep '3.10')
bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
DB: mariadb
@@ -107,7 +108,6 @@
git -C "apps/frappe" remote set-url upstream https://github.com/frappe/frappe.git
git -C "apps/erpnext" remote set-url upstream https://github.com/frappe/erpnext.git
- pyenv global $(pyenv versions | grep '3.7')
for version in $(seq 12 13)
do
echo "Updating to v$version"
@@ -120,7 +120,7 @@
git -C "apps/erpnext" checkout -q -f $branch_name
rm -rf ~/frappe-bench/env
- bench setup env
+ bench setup env --python python3.7
bench pip install -e ./apps/payments
bench pip install -e ./apps/erpnext
@@ -132,9 +132,8 @@
git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}"
git -C "apps/erpnext" checkout -q -f "$GITHUB_SHA"
- pyenv global $(pyenv versions | grep '3.10')
rm -rf ~/frappe-bench/env
- bench -v setup env
+ bench -v setup env --python python3.10
bench pip install -e ./apps/payments
bench pip install -e ./apps/erpnext
diff --git a/.github/workflows/release_notes.yml b/.github/workflows/release_notes.yml
new file mode 100644
index 0000000..e765a66
--- /dev/null
+++ b/.github/workflows/release_notes.yml
@@ -0,0 +1,38 @@
+# This action:
+#
+# 1. Generates release notes using github API.
+# 2. Strips unnecessary info like chore/style etc from notes.
+# 3. Updates release info.
+
+# This action needs to be maintained on all branches that do releases.
+
+name: 'Release Notes'
+
+on:
+ workflow_dispatch:
+ inputs:
+ tag_name:
+ description: 'Tag of release like v13.0.0'
+ required: true
+ type: string
+ release:
+ types: [released]
+
+permissions:
+ contents: read
+
+jobs:
+ regen-notes:
+ name: 'Regenerate release notes'
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Update notes
+ run: |
+ NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/generate-notes -f tag_name=$RELEASE_TAG | jq -r '.body' | sed -E '/^\* (chore|ci|test|docs|style)/d' )
+ RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/tags/$RELEASE_TAG | jq -r '.id')
+ gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/$RELEASE_ID -f body="$NEW_NOTES"
+
+ env:
+ GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+ RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}
diff --git a/.github/workflows/semantic-commits.yml b/.github/workflows/semantic-commits.yml
index 1744bc3..0e478d5 100644
--- a/.github/workflows/semantic-commits.yml
+++ b/.github/workflows/semantic-commits.yml
@@ -21,7 +21,7 @@
- uses: actions/setup-node@v3
with:
- node-version: 14
+ node-version: 18
check-latest: true
- name: Check commit titles
diff --git a/.github/workflows/server-tests-mariadb.yml b/.github/workflows/server-tests-mariadb.yml
index 8959f7f..9b4db49 100644
--- a/.github/workflows/server-tests-mariadb.yml
+++ b/.github/workflows/server-tests-mariadb.yml
@@ -71,7 +71,7 @@
- name: Setup Node
uses: actions/setup-node@v2
with:
- node-version: 14
+ node-version: 18
check-latest: true
- name: Add to Hosts
diff --git a/.github/workflows/server-tests-postgres.yml b/.github/workflows/server-tests-postgres.yml
index df43801..a688706 100644
--- a/.github/workflows/server-tests-postgres.yml
+++ b/.github/workflows/server-tests-postgres.yml
@@ -59,7 +59,7 @@
- name: Setup Node
uses: actions/setup-node@v2
with:
- node-version: 14
+ node-version: 18
check-latest: true
- name: Add to Hosts
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/__init__.py b/.semgrepignore
similarity index 100%
copy from erpnext/accounts/doctype/cash_flow_mapper/__init__.py
copy to .semgrepignore
diff --git a/CODEOWNERS b/CODEOWNERS
index 7f8c4d1..9077c67 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -5,7 +5,6 @@
erpnext/accounts/ @deepeshgarg007 @ruthra-kumar
erpnext/assets/ @anandbaburajan @deepeshgarg007
-erpnext/loan_management/ @deepeshgarg007
erpnext/regional @deepeshgarg007 @ruthra-kumar
erpnext/selling @deepeshgarg007 @ruthra-kumar
erpnext/support/ @deepeshgarg007
@@ -22,4 +21,4 @@
erpnext/patches/ @deepeshgarg007
.github/ @deepeshgarg007
-pyproject.toml @ankush
+pyproject.toml @phot0n
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index e0f0c98..3e418c4 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -1,8 +1,9 @@
+import functools
import inspect
import frappe
-__version__ = "14.0.0-dev"
+__version__ = "15.0.0-dev"
def get_default_company(user=None):
@@ -120,12 +121,14 @@
You can also set global company flag in `frappe.flags.company`
"""
- if company or frappe.flags.company:
- return frappe.get_cached_value("Company", company or frappe.flags.company, "country")
- elif frappe.flags.country:
- return frappe.flags.country
- else:
- return frappe.get_system_settings("country")
+
+ if not company:
+ company = frappe.local.flags.company
+
+ if company:
+ return frappe.get_cached_value("Company", company, "country")
+
+ return frappe.flags.country or frappe.get_system_settings("country")
def allow_regional(fn):
@@ -136,6 +139,7 @@
def myfunction():
pass"""
+ @functools.wraps(fn)
def caller(*args, **kwargs):
overrides = frappe.get_hooks("regional_overrides", {}).get(get_region())
function_path = f"{inspect.getmodule(fn).__name__}.{fn.__name__}"
diff --git a/erpnext/accounts/deferred_revenue.py b/erpnext/accounts/deferred_revenue.py
index 45e04ee..fb49ef3 100644
--- a/erpnext/accounts/deferred_revenue.py
+++ b/erpnext/accounts/deferred_revenue.py
@@ -136,7 +136,7 @@
send_mail(deferred_process)
-def get_booking_dates(doc, item, posting_date=None):
+def get_booking_dates(doc, item, posting_date=None, prev_posting_date=None):
if not posting_date:
posting_date = add_days(today(), -1)
@@ -146,39 +146,42 @@
"deferred_revenue_account" if doc.doctype == "Sales Invoice" else "deferred_expense_account"
)
- prev_gl_entry = frappe.db.sql(
- """
- select name, posting_date from `tabGL Entry` where company=%s and account=%s and
- voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
- and is_cancelled = 0
- order by posting_date desc limit 1
- """,
- (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
- as_dict=True,
- )
+ if not prev_posting_date:
+ prev_gl_entry = frappe.db.sql(
+ """
+ select name, posting_date from `tabGL Entry` where company=%s and account=%s and
+ voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
+ and is_cancelled = 0
+ order by posting_date desc limit 1
+ """,
+ (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
+ as_dict=True,
+ )
- prev_gl_via_je = frappe.db.sql(
- """
- SELECT p.name, p.posting_date FROM `tabJournal Entry` p, `tabJournal Entry Account` c
- WHERE p.name = c.parent and p.company=%s and c.account=%s
- and c.reference_type=%s and c.reference_name=%s
- and c.reference_detail_no=%s and c.docstatus < 2 order by posting_date desc limit 1
- """,
- (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
- as_dict=True,
- )
+ prev_gl_via_je = frappe.db.sql(
+ """
+ SELECT p.name, p.posting_date FROM `tabJournal Entry` p, `tabJournal Entry Account` c
+ WHERE p.name = c.parent and p.company=%s and c.account=%s
+ and c.reference_type=%s and c.reference_name=%s
+ and c.reference_detail_no=%s and c.docstatus < 2 order by posting_date desc limit 1
+ """,
+ (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
+ as_dict=True,
+ )
- if prev_gl_via_je:
- if (not prev_gl_entry) or (
- prev_gl_entry and prev_gl_entry[0].posting_date < prev_gl_via_je[0].posting_date
- ):
- prev_gl_entry = prev_gl_via_je
+ if prev_gl_via_je:
+ if (not prev_gl_entry) or (
+ prev_gl_entry and prev_gl_entry[0].posting_date < prev_gl_via_je[0].posting_date
+ ):
+ prev_gl_entry = prev_gl_via_je
- if prev_gl_entry:
- start_date = getdate(add_days(prev_gl_entry[0].posting_date, 1))
+ if prev_gl_entry:
+ start_date = getdate(add_days(prev_gl_entry[0].posting_date, 1))
+ else:
+ start_date = item.service_start_date
+
else:
- start_date = item.service_start_date
-
+ start_date = getdate(add_days(prev_posting_date, 1))
end_date = get_last_day(start_date)
if end_date >= item.service_end_date:
end_date = item.service_end_date
@@ -341,9 +344,15 @@
accounts_frozen_upto = frappe.get_cached_value("Accounts Settings", "None", "acc_frozen_upto")
def _book_deferred_revenue_or_expense(
- item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
+ item,
+ via_journal_entry,
+ submit_journal_entry,
+ book_deferred_entries_based_on,
+ prev_posting_date=None,
):
- start_date, end_date, last_gl_entry = get_booking_dates(doc, item, posting_date=posting_date)
+ start_date, end_date, last_gl_entry = get_booking_dates(
+ doc, item, posting_date=posting_date, prev_posting_date=prev_posting_date
+ )
if not (start_date and end_date):
return
@@ -377,9 +386,12 @@
if not amount:
return
+ gl_posting_date = end_date
+ prev_posting_date = None
# check if books nor frozen till endate:
if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
- end_date = get_last_day(add_days(accounts_frozen_upto, 1))
+ gl_posting_date = get_last_day(add_days(accounts_frozen_upto, 1))
+ prev_posting_date = end_date
if via_journal_entry:
book_revenue_via_journal_entry(
@@ -388,7 +400,7 @@
debit_account,
amount,
base_amount,
- end_date,
+ gl_posting_date,
project,
account_currency,
item.cost_center,
@@ -404,7 +416,7 @@
against,
amount,
base_amount,
- end_date,
+ gl_posting_date,
project,
account_currency,
item.cost_center,
@@ -418,7 +430,11 @@
if getdate(end_date) < getdate(posting_date) and not last_gl_entry:
_book_deferred_revenue_or_expense(
- item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
+ item,
+ via_journal_entry,
+ submit_journal_entry,
+ book_deferred_entries_based_on,
+ prev_posting_date,
)
via_journal_entry = cint(
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 0404d1c..e94b7cf 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -204,8 +204,11 @@
)
def validate_account_currency(self):
+ self.currency_explicitly_specified = True
+
if not self.account_currency:
self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
+ self.currency_explicitly_specified = False
gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")
@@ -251,8 +254,10 @@
{
"company": company,
# parent account's currency should be passed down to child account's curreny
- # if it is None, it picks it up from default company currency, which might be unintended
- "account_currency": erpnext.get_company_currency(company),
+ # if currency explicitly specified by user, child will inherit. else, default currency will be used.
+ "account_currency": self.account_currency
+ if self.currency_explicitly_specified
+ else erpnext.get_company_currency(company),
"parent_account": parent_acc_name_map[company],
}
)
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
deleted file mode 100644
index aa7d551..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
+++ /dev/null
@@ -1,3008 +0,0 @@
-{
- "country_code": "co",
- "name": "Colombia - Unique Account Chart - PUC",
- "tree": {
- "ACTIVO": {
- "DEUDORES": {
- "ANTICIPO DE IMPUESTOS Y CONTRIBUCIONES O SALDOS A FAVOR": {
- "ANTICIPO DE IMPUESTOS DE INDUSTRIA Y COMERCIO": {},
- "ANTICIPO DE IMPUESTOS DE RENTA Y COMPLEMENTARIOS": {},
- "CONTRIBUCIONES": {},
- "IMPUESTO A LAS VENTAS RETENIDO": {
- " IMPUESTO A LAS VENTAS RETENIDO": {}
- },
- "IMPUESTO DE INDUSTRIA Y COMERCIO RETENIDO": {},
- "IMPUESTOS DESCONTABLES": {},
- "OTROS": {},
- "RETENCION EN LA FUENTE": {},
- "SOBRANTES EN LIQUIDACION PRIVADA DE IMPUESTOS": {}
- },
- "ANTICIPOS Y AVANCES": {
- "A AGENTES": {
- "A AGENTES": {}
- },
- "A CONCESIONARIOS": {},
- "A CONTRATISTAS": {},
- "A PROVEEDORES": {},
- "A TRABAJADORES": {},
- "AJUSTES POR INFLACION": {},
- "DE ADJUDICACIONES": {},
- "OTROS": {}
- },
- "APORTES POR COBRAR": {},
- "CLIENTES": {
- "DEL EXTERIOR": {},
- "DEUDORES DEL SISTEMA": {},
- "NACIONALES": {
- "DEUDORES CLIENTES NACIONALES": {}
- }
- },
- "CUENTAS CORRIENTES COMERCIALES": {
- "ACCIONISTAS O SOCIOS": {},
- "CASA MATRIZ": {},
- "COMPANIAS VINCULADAS": {},
- "OTRAS": {},
- "PARTICULARES": {}
- },
- "CUENTAS DE OPERACION CONJUNTA": {},
- "CUENTAS POR COBRAR A CASA MATRIZ": {
- "PAGOS A NOMBRE DE CASA MATRIZ": {},
- "PRESTAMOS": {},
- "VALORES RECIBIDOS POR CASA MATRIZ": {},
- "VENTAS": {}
- },
- "CUENTAS POR COBRAR A DIRECTORES": {},
- "CUENTAS POR COBRAR A SOCIOS Y ACCIONISTAS": {
- "A ACCIONISTAS": {
- "ALFONSO SOTO": {},
- "DOUGLAS CANELON": {},
- "LIGIA MARINA CANELON CASTELLANOS": {}
- },
- "A SOCIOS": {
- "A SOCIOS": {}
- }
- },
- "CUENTAS POR COBRAR A TRABAJADORES": {
- "CALAMIDAD DOMESTICA": {},
- "EDUCACION": {},
- "MEDICOS, ODONTOLOGICOS Y SIMILARES": {},
- "OTROS": {},
- "RESPONSABILIDADES": {},
- "VEHICULOS": {},
- "VIVIENDA": {}
- },
- "CUENTAS POR COBRAR A VINCULADOS ECONOMICOS": {
- "FILIALES": {},
- "SUBSIDIARIAS": {},
- "SUCURSALES": {}
- },
- "DEPOSITOS": {
- "EN GARANTIA": {},
- "OTROS": {},
- "PARA ADQUISICION DE ACCIONES, CUOTAS O DERECHOS SOCIALES": {},
- "PARA CONTRATOS": {},
- "PARA IMPORTACIONES": {},
- "PARA JUICIOS EJECUTIVOS": {},
- "PARA RESPONSABILIDADES": {},
- "PARA SERVICIOS": {}
- },
- "DERECHOS DE RECOMPRA DE CARTERA NEGOCIADA": {},
- "DEUDAS DE DIFICIL COBRO": {},
- "DEUDORES VARIOS": {
- "COMISIONISTAS DE BOLSAS": {},
- "CUENTAS POR COBRAR DE TERCEROS": {},
- "DEPOSITARIOS": {},
- "FONDO DE INVERSION": {},
- "FONDOS DE INVERSION SOCIAL": {},
- "OTROS": {},
- "PAGOS POR CUENTA DE TERCEROS": {}
- },
- "INGRESOS POR COBRAR": {
- "ARRENDAMIENTOS": {},
- "CERT POR COBRAR": {},
- "COMISIONES": {},
- "DIVIDENDOS Y/O PARTICIPACIONES": {},
- "HONORARIOS": {},
- "INTERESES": {},
- "OTROS": {
- "Generica a Cobrar": {}
- },
- "SERVICIOS": {}
- },
- "PRESTAMOS A PARTICULARES": {
- "CON GARANTIA PERSONAL": {},
- "CON GARANTIA REAL": {}
- },
- "PROMESAS DE COMPRA VENTA": {
- "DE BIENES RAICES": {},
- "DE FLOTA Y EQUIPO AEREO": {},
- "DE FLOTA Y EQUIPO DE TRANSPORTE": {},
- "DE FLOTA Y EQUIPO FERREO": {},
- "DE FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "DE MAQUINARIA Y EQUIPO": {},
- "DE OTROS BIENES": {},
- "DE SEMOVIENTES": {}
- },
- "PROVISIONES": {
- "ANTICIPOS Y AVANCES": {},
- "CLIENTES": {},
- "CUENTAS CORRIENTES COMERCIALES": {},
- "CUENTAS DE OPERACION CONJUNTA": {},
- "CUENTAS POR COBRAR A CASA MATRIZ": {},
- "CUENTAS POR COBRAR A SOCIOS Y ACCIONISTAS": {},
- "CUENTAS POR COBRAR A TRABAJADORES": {},
- "CUENTAS POR COBRAR A VINCULADOS ECONOMICOS": {},
- "DEPOSITOS": {},
- "DERECHOS DE RECOMPRA DE CARTERA NEGOCIADA": {},
- "DEUDORES VARIOS": {},
- "INGRESOS POR COBRAR": {},
- "PRESTAMOS A PARTICULARES": {},
- "PROMESAS DE COMPRAVENTA": {},
- "RECLAMACIONES": {},
- "RETENCION SOBRE CONTRATOS": {}
- },
- "RECLAMACIONES": {
- "A COMPANIAS ASEGURADORAS": {},
- "A TRANSPORTADORES": {},
- "OTRAS": {},
- "POR TIQUETES AEREOS": {}
- },
- "RETENCION SOBRE CONTRATOS": {
- "DE CONSTRUCCION": {},
- "DE PRESTACION DE SERVICIOS": {},
- "IMPUESTO A LAS VENTAS RETENIDO": {
- "IMPUESTO A LAS VENTAS RETENIDO": {}
- },
- "IMPUESTO DE INDUSTRIA Y COMERCIO RETENIDO": {
- "IMPUESTO DE INDUSTRIA Y COMERCIO RETENIDO": {}
- },
- "OTROS": {
- "OTROS": {}
- },
- "RETEFTE SOBRE COMPRA DE LUBRICANTES": {
- "RETEFTE SOBRE COMPRA DE LUBRICANTES": {}
- }
- }
- },
- "DIFERIDOS": {
- "AMORTIZACION ACUMULADA": {
- "AJUSTES POR INFLACION": {},
- "COSTOS DE EXPLORACION POR AMORTIZAR": {},
- "COSTOS DE EXPLOTACION Y DESARROLLO": {}
- },
- "CARGOS DIFERIDOS": {
- "AJUSTES POR INFLACION": {},
- "CONCURSOS Y LICITACIONES": {},
- "CONTRIBUCIONES Y AFILIACIONES": {},
- "CUBIERTERIA": {},
- "DOTACION Y SUMINISTRO A TRABAJADORES": {},
- "ELEMENTOS DE ASEO Y CAFETERIA": {},
- "ELEMENTOS DE ROPERIA Y LENCERIA": {},
- "ENTRENAMIENTO DE PERSONAL": {},
- "ESTUDIOS, INVESTIGACIONES Y PROYECTOS": {},
- "FERIAS Y EXPOSICIONES": {},
- "IMPUESTO DE RENTA DIFERIDO ?DEBITOS? POR DIFERENCIAS TEMPORALES": {},
- "INSTRUMENTAL QUIRURGICO": {},
- "LICENCIAS": {
- "LICENCIAS": {}
- },
- "LOZA Y CRISTALERIA": {},
- "MEJORAS A PROPIEDADES AJENAS": {},
- "MOLDES Y TROQUELES": {},
- "ORGANIZACION Y PREOPERATIVOS": {},
- "OTROS": {},
- "PLATERIA": {},
- "PROGRAMAS PARA COMPUTADOR (SOFTWARE)": {},
- "PUBLICIDAD, PROPAGANDA Y PROMOCION": {},
- "REMODELACIONES": {},
- "UTILES Y PAPELERIA": {
- "UTILES Y PAPELERIA": {}
- }
- },
- "CARGOS POR CORRECCION MONETARIA DIFERIDA": {},
- "COSTOS DE EXPLORACION POR AMORTIZAR": {
- "AJUSTES POR INFLACION": {},
- "OTROS COSTOS DE EXPLORACION": {},
- "POZOS NO COMERCIALES": {},
- "POZOS SECOS": {}
- },
- "COSTOS DE EXPLOTACION Y DESARROLLO": {
- "AJUSTES POR INFLACION": {},
- "FACILIDADES DE PRODUCCION": {},
- "PERFORACION Y EXPLOTACION": {},
- "PERFORACIONES CAMPOS EN DESARROLLO": {},
- "SERVICIO A POZOS": {}
- },
- "GASTOS PAGADOS POR ANTICIPADO": {
- "ARRENDAMIENTOS": {},
- "BODEGAJES": {},
- "COMISIONES": {},
- "HONORARIOS": {},
- "INTERESES": {},
- "MANTENIMIENTO EQUIPOS": {},
- "OTROS": {},
- "SEGUROS Y FIANZAS": {},
- "SERVICIOS": {},
- "SUSCRIPCIONES": {}
- }
- },
- "DISPONIBLE": {
- "BANCOS": {
- "MONEDA EXTRANJERA": {},
- "MONEDA NACIONAL": {}
- },
- "CAJA": {
- "CAJA GENERAL": {
- "CAJA GENERAL": {}
- },
- "CAJAS MENORES": {
- "CAJAS MENORES": {}
- },
- "MONEDA EXTRANJERA": {}
- },
- "CUENTAS DE AHORRO": {
- "BANCOS": {},
- "CORPORACIONES DE AHORRO Y VIVIENDA": {},
- "ORGANISMOS COOPERATIVOS FINANCIEROS": {}
- },
- "FONDOS": {
- "DE AMORTIZACION MONEDA EXTRANJERA": {},
- "DE AMORTIZACION MONEDA NACIONAL": {},
- "ESPECIALES MONEDA EXTRANJERA": {},
- "ESPECIALES MONEDA NACIONAL": {},
- "ROTATORIOS MONEDA EXTRANJERA": {},
- "ROTATORIOS MONEDA NACIONAL": {}
- },
- "REMESAS EN TRANSITO": {
- "MONEDA EXTRANJERA": {},
- "MONEDA NACIONAL": {}
- }
- },
- "INTANGIBLES": {
- "CONCESIONES Y FRANQUICIAS": {
- "AJUSTES POR INFLACION": {},
- "CONCESIONES": {},
- "FRANQUICIAS": {}
- },
- "CREDITO MERCANTIL": {
- "ADQUIRIDO O COMPRADO": {},
- "AJUSTES POR INFLACION": {},
- "FORMADO O ESTIMADO": {}
- },
- "DEPRECIACION Y/O AMORTIZACION ACUMULADA": {
- "AJUSTES POR INFLACION": {},
- "CONCESIONES Y FRANQUICIAS": {},
- "CREDITO MERCANTIL": {},
- "DERECHOS": {},
- "KNOW HOW": {},
- "LICENCIAS": {},
- "MARCAS": {},
- "PATENTES": {}
- },
- "DERECHOS": {
- "AJUSTES POR INFLACION": {},
- "DE EXHIBICION - PELICULAS": {},
- "DERECHOS DE AUTOR": {},
- "EN BIENES RECIBIDOS EN ARRENDAMIENTO FINANCIERO (LEASING)": {},
- "EN FIDEICOMISOS DE ADMINISTRACION": {},
- "EN FIDEICOMISOS DE GARANTIA": {},
- "EN FIDEICOMISOS INMOBILIARIOS": {},
- "OTROS": {},
- "PUESTO DE BOLSA": {}
- },
- "KNOW HOW": {
- "AJUSTES POR INFLACION": {}
- },
- "LICENCIAS": {
- "AJUSTES POR INFLACION": {}
- },
- "MARCAS": {
- "ADQUIRIDAS": {},
- "AJUSTES POR INFLACION": {},
- "FORMADAS": {}
- },
- "PATENTES": {
- "ADQUIRIDAS": {},
- "AJUSTES POR INFLACION": {},
- "FORMADAS": {}
- },
- "PROVISIONES": {}
- },
- "INVENTARIOS": {
- "BIENES RAICES PARA LA VENTA": {
- "AJUSTES POR INFLACION": {}
- },
- "CONTRATOS EN EJECUCION": {
- "AJUSTES POR INFLACION": {}
- },
- "CULTIVOS EN DESARROLLO": {
- "AJUSTES POR INFLACION": {}
- },
- "ENVASES Y EMPAQUES": {
- "AJUSTES POR INFLACION": {}
- },
- "INVENTARIOS EN TRANSITO": {
- "AJUSTES POR INFLACION": {}
- },
- "MATERIALES, REPUESTOS Y ACCESORIOS": {
- "AJUSTES POR INFLACION": {}
- },
- "MATERIAS PRIMAS": {
- "AJUSTES POR INFLACION": {}
- },
- "MERCANCIAS NO FABRICADAS POR LA EMPRESA": {
- "AJUSTES POR INFLACION": {}
- },
- "OBRAS DE CONSTRUCCION EN CURSO": {
- "AJUSTES POR INFLACION": {}
- },
- "OBRAS DE URBANISMO": {
- "AJUSTES POR INFLACION": {}
- },
- "PLANTACIONES AGRICOLAS": {
- "AJUSTES POR INFLACION": {}
- },
- "PRODUCTOS EN PROCESO": {
- "AJUSTES POR INFLACION": {}
- },
- "PRODUCTOS TERMINADOS": {
- "AJUSTES POR INFLACION": {},
- "PRODUCTOS AGRICOLAS Y FORESTALES": {},
- "PRODUCTOS DE PESCA": {},
- "PRODUCTOS EXTRAIDOS Y/O PROCESADOS": {},
- "PRODUCTOS MANUFACTURADOS": {},
- "SUBPRODUCTOS": {}
- },
- "PROVISIONES": {
- "LIFO": {},
- "PARA DIFERENCIA DE INVENTARIO FISICO": {},
- "PARA OBSOLESCENCIA": {},
- "PARA PERDIDAS DE INVENTARIOS": {}
- },
- "SEMOVIENTES": {
- "AJUSTES POR INFLACION": {}
- },
- "TERRENOS": {
- "AJUSTES POR INFLACION": {},
- "POR URBANIZAR": {},
- "URBANIZADOS POR CONSTRUIR": {}
- }
- },
- "INVERSIONES": {
- "ACCIONES": {
- "ACTIVIDAD FINANCIERA": {},
- "ACTIVIDADES INMOBILIARIAS, EMPRESARIALES Y DE ALQUILER": {},
- "AGRICULTURA, GANADERIA, CAZA Y SILVICULTURA": {},
- "AJUSTES POR INFLACION": {},
- "COMERCIO AL POR MAYOR Y AL POR MENOR": {},
- "CONSTRUCCION": {},
- "ENSENANZA": {},
- "EXPLOTACION DE MINAS Y CANTERAS": {},
- "HOTELES Y RESTAURANTES": {},
- "INDUSTRIA MANUFACTURERA": {},
- "OTRAS ACTIVIDADES DE SERVICIOS COMUNITARIOS, SOCIALES Y PERSONALES": {},
- "PESCA": {},
- "SERVICIOS SOCIALES Y DE SALUD": {},
- "SUMINISTRO DE ELECTRICIDAD, GAS Y AGUA": {},
- "TRANSPORTE, ALMACENAMIENTO Y COMUNICACIONES": {}
- },
- "ACEPTACIONES BANCARIAS O FINANCIERAS": {
- "BANCOS COMERCIALES": {},
- "COMPANIAS DE FINANCIAMIENTO COMERCIAL": {},
- "CORPORACIONES FINANCIERAS": {},
- "OTRAS": {}
- },
- "BONOS": {
- "BONOS CONVERTIBLES EN ACCIONES": {},
- "BONOS ORDINARIOS": {},
- "BONOS PUBLICOS MONEDA EXTRANJERA": {},
- "BONOS PUBLICOS MONEDA NACIONAL": {},
- "OTROS": {}
- },
- "CEDULAS": {
- "CEDULAS DE CAPITALIZACION": {},
- "CEDULAS DE INVERSION": {},
- "CEDULAS HIPOTECARIAS": {},
- "OTRAS": {}
- },
- "CERTIFICADOS": {
- "CERTIFICADOS CAFETEROS VALORIZABLES": {},
- "CERTIFICADOS DE AHORRO DE VALOR CONSTANTE (CAVC)": {},
- "CERTIFICADOS DE CAMBIO": {},
- "CERTIFICADOS DE DEPOSITO A TERMINO (CDT)": {},
- "CERTIFICADOS DE DEPOSITO DE AHORRO": {},
- "CERTIFICADOS DE DESARROLLO TURISTICO": {},
- "CERTIFICADOS DE INVERSION FORESTAL (CIF)": {},
- "CERTIFICADOS DE REEMBOLSO TRIBUTARIO (CERT)": {},
- "CERTIFICADOS ELECTRICOS VALORIZABLES (CEV)": {},
- "OTROS": {}
- },
- "CUENTAS EN PARTICIPACION": {
- "AJUSTES POR INFLACION": {}
- },
- "CUOTAS O PARTES DE INTERES SOCIAL": {
- "ACTIVIDAD FINANCIERA": {},
- "ACTIVIDADES INMOBILIARIAS, EMPRESARIALES Y DE ALQUILER": {},
- "AGRICULTURA, GANADERIA, CAZA Y SILVICULTURA": {},
- "AJUSTES POR INFLACION": {},
- "COMERCIO AL POR MAYOR Y AL POR MENOR": {},
- "CONSTRUCCION": {},
- "ENSENANZA": {},
- "EXPLOTACION DE MINAS Y CANTERAS": {},
- "HOTELES Y RESTAURANTES": {},
- "INDUSTRIA MANUFACTURERA": {},
- "OTRAS ACTIVIDADES DE SERVICIOS COMUNITARIOS, SOCIALES Y PERSONALES": {},
- "PESCA": {},
- "SERVICIOS SOCIALES Y DE SALUD": {},
- "SUMINISTRO DE ELECTRICIDAD, GAS Y AGUA": {},
- "TRANSPORTE, ALMACENAMIENTO Y COMUNICACIONES": {}
- },
- "DERECHOS DE RECOMPRA DE INVERSIONES NEGOCIADAS (REPOS)": {
- "ACCIONES": {},
- "ACEPTACIONES BANCARIAS O FINANCIERAS": {},
- "AJUSTES POR INFLACION": {},
- "BONOS": {},
- "CEDULAS": {},
- "CERTIFICADOS": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "OTROS": {},
- "PAPELES COMERCIALES": {},
- "TITULOS": {}
- },
- "DERECHOS FIDUCIARIOS": {
- "FIDEICOMISOS DE INVERSION MONEDA EXTRANJERA": {},
- "FIDEICOMISOS DE INVERSION MONEDA NACIONAL": {}
- },
- "OBLIGATORIAS": {
- "BONOS DE FINANCIAMIENTO ESPECIAL": {},
- "BONOS DE FINANCIAMIENTO PRESUPUESTAL": {},
- "BONOS PARA DESARROLLO SOCIAL Y SEGURIDAD INTERNA (BDSI)": {},
- "OTRAS": {}
- },
- "OTRAS INVERSIONES": {
- "ACCIONES O DERECHOS EN CLUBES DEPORTIVOS": {},
- "AJUSTES POR INFLACION": {},
- "APORTES EN COOPERATIVAS": {},
- "BONOS EN COLEGIOS": {},
- "DERECHOS EN CLUBES SOCIALES": {},
- "DIVERSAS": {}
- },
- "PAPELES COMERCIALES": {
- "EMPRESAS COMERCIALES": {},
- "EMPRESAS DE SERVICIOS": {},
- "EMPRESAS INDUSTRIALES": {}
- },
- "PROVISIONES": {
- "ACCIONES": {},
- "ACEPTACIONES BANCARIAS O FINANCIERAS": {},
- "BONOS": {},
- "CEDULAS": {},
- "CERTIFICADOS": {},
- "CUENTAS EN PARTICIPACION": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "DERECHOS DE RECOMPRA DE INVERSIONES NEGOCIADAS": {},
- "DERECHOS FIDUCIARIOS": {},
- "OBLIGATORIAS": {},
- "OTRAS INVERSIONES": {},
- "PAPELES COMERCIALES": {},
- "TITULOS": {}
- },
- "TITULOS": {
- "OTROS": {},
- "TESOROS": {},
- "TITULOS CANJEABLES POR CERTIFICADOS DE CAMBIO": {},
- "TITULOS DE AHORRO CAFETERO (TAC)": {},
- "TITULOS DE AHORRO EDUCATIVO (TAE)": {},
- "TITULOS DE AHORRO NACIONAL (TAN)": {},
- "TITULOS DE CREDITO DE FOMENTO": {},
- "TITULOS DE DESARROLLO AGROPECUARIO": {},
- "TITULOS DE DEVOLUCION DE IMPUESTOS NACIONALES (TIDIS)": {},
- "TITULOS DE PARTICIPACION": {},
- "TITULOS DE TESORERIA (TES)": {},
- "TITULOS ENERGETICOS DE RENTABILIDAD CRECIENTE (TER)": {},
- "TITULOS FINANCIEROS AGROINDUSTRIALES (TFA)": {},
- "TITULOS FINANCIEROS INDUSTRIALES Y COMERCIALES": {},
- "TITULOS INMOBILIARIOS": {}
- }
- },
- "OTROS ACTIVOS": {
- "BIENES DE ARTE Y CULTURA": {
- "AJUSTES POR INFLACION": {},
- "BIBLIOTECAS": {},
- "OBRAS DE ARTE": {},
- "OTROS": {}
- },
- "DIVERSOS": {
- "AJUSTES POR INFLACION": {},
- "AMORTIZACION ACUMULADA DE BIENES ENTREGADOS EN COMODATO (CR)": {},
- "BIENES ENTREGADOS EN COMODATO": {},
- "BIENES RECIBIDOS EN PAGO": {},
- "DERECHOS SUCESORALES": {},
- "ESTAMPILLAS": {},
- "MAQUINAS PORTEADORAS": {},
- "OTROS": {
- "OTROS": {}
- }
- },
- "PROVISIONES": {
- "BIENES DE ARTE Y CULTURA": {},
- "DIVERSOS": {}
- }
- },
- "PROPIEDADES, PLANTA Y EQUIPO": {
- "ACUEDUCTOS, PLANTAS Y REDES": {
- "ACUEDUCTO, ACEQUIAS Y CANALIZACIONES": {},
- "AJUSTES POR INFLACION": {},
- "GASODUCTOS": {},
- "INSTALACIONES PARA AGUA Y ENERGIA": {},
- "INSTALACIONES Y EQUIPO DE BOMBEO": {},
- "OLEODUCTOS": {},
- "OTROS": {},
- "PLANTAS DE DISTRIBUCION": {},
- "PLANTAS DE GENERACION A GAS": {},
- "PLANTAS DE GENERACION DIESEL, GASOLINA Y PETROLEO": {},
- "PLANTAS DE GENERACION HIDRAULICA": {},
- "PLANTAS DE GENERACION TERMICA": {},
- "PLANTAS DE TRANSMISION Y SUBESTACIONES": {},
- "PLANTAS DE TRATAMIENTO": {},
- "PLANTAS DESHIDRATADORAS": {},
- "POLIDUCTOS": {},
- "REDES ALIMENTACION DE GAS": {},
- "REDES DE AIRE": {},
- "REDES DE DISTRIBUCION": {},
- "REDES DE DISTRIBUCION DE VAPOR": {},
- "REDES DE RECOLECCION DE AGUAS NEGRAS": {},
- "REDES EXTERNAS DE TELEFONIA": {}
- },
- "AGOTAMIENTO ACUMULADO": {
- "AJUSTES POR INFLACION": {},
- "MINAS Y CANTERAS": {},
- "POZOS ARTESIANOS": {},
- "YACIMIENTOS": {}
- },
- "AMORTIZACION ACUMULADA": {
- "AJUSTES POR INFLACION": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "SEMOVIENTES": {},
- "VIAS DE COMUNICACION": {}
- },
- "ARMAMENTO DE VIGILANCIA": {
- "AJUSTES POR INFLACION": {}
- },
- "CONSTRUCCIONES EN CURSO": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "POZOS ARTESIANOS": {},
- "PROYECTOS DE DESARROLLO": {},
- "PROYECTOS DE EXPLORACION": {},
- "VIAS DE COMUNICACION": {}
- },
- "CONSTRUCCIONES Y EDIFICACIONES": {
- "AJUSTES POR INFLACION": {},
- "ALMACENES": {},
- "BODEGAS": {},
- "CAFETERIA Y CASINOS": {},
- "CASETAS Y CAMPAMENTOS": {},
- "EDIFICIOS": {},
- "FABRICAS Y PLANTAS INDUSTRIALES": {},
- "HANGARES": {},
- "INSTALACIONES AGROPECUARIAS": {},
- "INVERNADEROS": {},
- "OFICINAS": {},
- "OTROS": {},
- "PARQUEADEROS, GARAJES Y DEPOSITOS": {},
- "SALAS DE EXHIBICION Y VENTAS": {},
- "SILOS": {},
- "TERMINAL DE BUSES Y TAXIS": {},
- "TERMINAL FERREO": {},
- "TERMINAL MARITIMO": {},
- "VIVIENDAS PARA EMPLEADOS Y OBREROS": {}
- },
- "DEPRECIACION ACUMULADA": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {}
- },
- "DEPRECIACION DIFERIDA": {
- "AJUSTES POR INFLACION": {},
- "DEFECTO FISCAL SOBRE LA CONTABLE (CR)": {},
- "EXCESO FISCAL SOBRE LA CONTABLE": {}
- },
- "ENVASES Y EMPAQUES": {
- "AJUSTES POR INFLACION": {}
- },
- "EQUIPO DE COMPUTACION Y COMUNICACION": {
- "AJUSTES POR INFLACION": {},
- "EQUIPOS DE PROCESAMIENTO DE DATOS": {
- "EQUIPOS DE PROCESAMIENTO DE DATOS": {}
- },
- "EQUIPOS DE RADIO": {},
- "EQUIPOS DE TELECOMUNICACIONES": {
- "EQUIPOS DE TELECOMUNICACIONES": {}
- },
- "LINEAS TELEFONICAS": {},
- "OTROS": {},
- "SATELITES Y ANTENAS": {}
- },
- "EQUIPO DE HOTELES Y RESTAURANTES": {
- "AJUSTES POR INFLACION": {},
- "DE COMESTIBLES Y BEBIDAS": {},
- "DE HABITACIONES": {},
- "OTROS": {}
- },
- "EQUIPO DE OFICINA": {
- "AJUSTES POR INFLACION": {},
- "EQUIPOS": {
- "EQUIPOS": {}
- },
- "MUEBLES Y ENSERES": {
- "MUEBLES Y ENSERES": {}
- },
- "OTROS": {}
- },
- "EQUIPO MEDICO-CIENTIFICO": {
- "AJUSTES POR INFLACION": {},
- "INSTRUMENTAL": {},
- "LABORATORIO": {},
- "MEDICO": {},
- "ODONTOLOGICO": {},
- "OTROS": {}
- },
- "FLOTA Y EQUIPO AEREO": {
- "AJUSTES POR INFLACION": {},
- "AVIONES": {},
- "AVIONETAS": {},
- "EQUIPOS DE VUELO": {},
- "HELICOPTEROS": {},
- "MANUALES DE ENTRENAMIENTO PERSONAL TECNICO": {},
- "OTROS": {},
- "TURBINAS Y MOTORES": {}
- },
- "FLOTA Y EQUIPO DE TRANSPORTE": {
- "AJUSTES POR INFLACION": {},
- "AUTOS, CAMIONETAS Y CAMPEROS": {},
- "BANDAS TRANSPORTADORAS": {},
- "BICICLETAS": {},
- "BUSES Y BUSETAS": {},
- "CAMIONES, VOLQUETAS Y FURGONES": {},
- "ESTIBAS Y CARRETAS": {},
- "MONTACARGAS": {},
- "MOTOCICLETAS": {},
- "OTROS": {},
- "PALAS Y GRUAS": {},
- "RECOLECTORES Y CONTENEDORES": {},
- "TRACTOMULAS Y REMOLQUES": {}
- },
- "FLOTA Y EQUIPO FERREO": {
- "AJUSTES POR INFLACION": {},
- "LOCOMOTORAS": {},
- "OTROS": {},
- "REDES FERREAS": {},
- "VAGONES": {}
- },
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {
- "AJUSTES POR INFLACION": {},
- "AMARRES": {},
- "BOTES": {},
- "BOYAS": {},
- "BUQUES": {},
- "CONTENEDORES Y CHASISES": {},
- "GABARRAS": {},
- "LANCHAS": {},
- "OTROS": {},
- "REMOLCADORAS": {}
- },
- "MAQUINARIA Y EQUIPO": {
- "AJUSTES POR INFLACION": {}
- },
- "MAQUINARIA Y EQUIPOS EN MONTAJE": {
- "AJUSTES POR INFLACION": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "PLANTAS Y REDES": {}
- },
- "MATERIALES PROYECTOS PETROLEROS": {
- "AJUSTES POR INFLACION": {},
- "COSTOS DE IMPORTACION MATERIALES": {},
- "PROYECTOS DE CONSTRUCCION": {},
- "TUBERIAS Y EQUIPO": {}
- },
- "MINAS Y CANTERAS": {
- "AJUSTES POR INFLACION": {},
- "CANTERAS": {},
- "MINAS": {}
- },
- "PLANTACIONES AGRICOLAS Y FORESTALES": {
- "AJUSTES POR INFLACION": {},
- "CULTIVOS AMORTIZABLES": {},
- "CULTIVOS EN DESARROLLO": {}
- },
- "POZOS ARTESIANOS": {
- "AJUSTES POR INFLACION": {}
- },
- "PROPIEDADES, PLANTA Y EQUIPO EN TRANSITO": {
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "PLANTAS Y REDES": {},
- "SEMOVIENTES": {}
- },
- "PROVISIONES": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES EN CURSO": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA EN MONTAJE": {},
- "MAQUINARIA Y EQUIPO": {},
- "MATERIALES PROYECTOS PETROLEROS": {},
- "MINAS Y CANTERAS": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "POZOS ARTESIANOS": {},
- "PROPIEDADES, PLANTA Y EQUIPO EN TRANSITO": {},
- "SEMOVIENTES": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {},
- "YACIMIENTOS": {}
- },
- "SEMOVIENTES": {
- "AJUSTES POR INFLACION": {}
- },
- "TERRENOS": {
- "AJUSTES POR INFLACION": {},
- "RURALES": {},
- "URBANOS": {}
- },
- "VIAS DE COMUNICACION": {
- "AERODROMOS": {},
- "AJUSTES POR INFLACION": {},
- "CALLES": {},
- "OTROS": {},
- "PAVIMENTACION Y PATIOS": {},
- "PUENTES": {},
- "VIAS": {}
- },
- "YACIMIENTOS": {
- "AJUSTES POR INFLACION": {}
- }
- },
- "VALORIZACIONES": {
- "DE INVERSIONES": {
- "ACCIONES": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "DERECHOS FIDUCIARIOS": {}
- },
- "DE OTROS ACTIVOS": {
- "BIENES DE ARTE Y CULTURA": {},
- "BIENES ENTREGADOS EN COMODATO": {},
- "BIENES RECIBIDOS EN PAGO": {},
- "INVENTARIO DE SEMOVIENTES": {}
- },
- "DE PROPIEDADES, PLANTA Y EQUIPO": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "MATERIALES PROYECTOS PETROLEROS": {},
- "MINAS Y CANTERAS": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "POZOS ARTESIANOS": {},
- "SEMOVIENTES": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {},
- "YACIMIENTOS": {}
- }
- },
- "root_type": "Asset"
- },
- "COSTOS DE PRODUCCION O DE OPERACION": {
- "CONTRATOS DE SERVICIOS": {},
- "COSTOS INDIRECTOS": {},
- "MANO DE OBRA DIRECTA": {},
- "MATERIA PRIMA": {},
- "root_type": "Expense"
- },
- "COSTOS DE VENTAS": {
- "COMPRAS": {
- "COMPRA DE ENERGIA": {
- "AJUSTES POR INFLACION": {}
- },
- "DE MATERIALES INDIRECTOS": {
- "AJUSTES POR INFLACION": {}
- },
- "DE MATERIAS PRIMAS": {
- "AJUSTES POR INFLACION": {}
- },
- "DE MERCANCIAS": {
- "AJUSTES POR INFLACION": {}
- },
- "DEVOLUCIONES EN COMPRAS (CR)": {
- "AJUSTES POR INFLACION": {}
- }
- },
- "COSTO DE VENTAS Y DE PRESTACION DE SERVICIOS": {
- "ACTIVIDAD FINANCIERA": {
- "AJUSTES POR INFLACION": {},
- "DE INVERSIONES": {},
- "DE SERVICIO DE BOLSA": {}
- },
- "ACTIVIDADES INMOBILIARIAS, EMPRESARIALES Y DE ALQUILER": {
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES EMPRESARIALES DE CONSULTORIA": {},
- "AJUSTES POR INFLACION": {},
- "ALQUILER DE EFECTOS PERSONALES Y ENSERES DOMESTICOS": {},
- "ALQUILER EQUIPO DE TRANSPORTE": {},
- "ALQUILER MAQUINARIA Y EQUIPO": {},
- "ARRENDAMIENTOS DE BIENES INMUEBLES": {},
- "CONSULTORIA EN EQUIPO Y PROGRAMAS DE INFORMATICA": {},
- "DOTACION DE PERSONAL": {},
- "ENVASE Y EMPAQUE": {},
- "FOTOCOPIADO": {},
- "FOTOGRAFIA": {},
- "INMOBILIARIAS POR RETRIBUCION O CONTRATA": {},
- "INVESTIGACION Y SEGURIDAD": {},
- "INVESTIGACIONES CIENTIFICAS Y DE DESARROLLO": {},
- "LIMPIEZA DE INMUEBLES": {},
- "MANTENIMIENTO Y REPARACION DE MAQUINARIA DE OFICINA": {},
- "MANTENIMIENTO Y REPARACION DE MAQUINARIA Y EQUIPO": {},
- "PROCESAMIENTO DE DATOS": {},
- "PUBLICIDAD": {}
- },
- "AGRICULTURA, GANADERIA, CAZA Y SILVICULTURA": {
- "ACTIVIDAD DE CAZA": {},
- "ACTIVIDAD DE SILVICULTURA": {},
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "CRIA DE GANADO CABALLAR Y VACUNO": {},
- "CRIA DE OTROS ANIMALES": {},
- "CRIA DE OVEJAS, CABRAS, ASNOS, MULAS Y BURDEGANOS": {},
- "CULTIVO DE ALGODON Y PLANTAS PARA MATERIAL TEXTIL": {},
- "CULTIVO DE BANANO": {},
- "CULTIVO DE CAFE": {},
- "CULTIVO DE CANA DE AZUCAR": {},
- "CULTIVO DE CEREALES": {},
- "CULTIVO DE FLORES": {},
- "CULTIVOS DE FRUTAS, NUECES Y PLANTAS AROMATICAS": {},
- "CULTIVOS DE HORTALIZAS, LEGUMBRES Y PLANTAS ORNAMENTALES": {},
- "OTROS CULTIVOS AGRICOLAS": {},
- "PRODUCCION AVICOLA": {},
- "SERVICIOS AGRICOLAS Y GANADEROS": {}
- },
- "COMERCIO AL POR MAYOR Y AL POR MENOR": {
- "AJUSTES POR INFLACION": {},
- "MANTENIMIENTO, REPARACION Y LAVADO DE VEHICULOS AUTOMOTORES": {},
- "REPARACION DE EFECTOS PERSONALES Y ELECTRODOMESTICOS": {},
- "VENTA A CAMBIO DE RETRIBUCION O POR CONTRATA": {},
- "VENTA DE ANIMALES VIVOS Y CUEROS": {},
- "VENTA DE ARTICULOS EN CACHARRERIAS Y MISCELANEAS": {},
- "VENTA DE ARTICULOS EN CASAS DE EMPENO Y PRENDERIAS": {},
- "VENTA DE ARTICULOS EN RELOJERIAS Y JOYERIAS": {},
- "VENTA DE COMBUSTIBLES SOLIDOS, LIQUIDOS, GASEOSOS": {},
- "VENTA DE CUBIERTOS, VAJILLAS, CRISTALERIA, PORCELANAS, CERAMICAS Y OTROS ARTICULOS DE USO DOMESTICO": {},
- "VENTA DE ELECTRODOMESTICOS Y MUEBLES": {},
- "VENTA DE EMPAQUES": {},
- "VENTA DE EQUIPO FOTOGRAFICO": {},
- "VENTA DE EQUIPO OPTICO Y DE PRECISION": {},
- "VENTA DE EQUIPO PROFESIONAL Y CIENTIFICO": {},
- "VENTA DE HERRAMIENTAS Y ARTICULOS DE FERRETERIA": {},
- "VENTA DE INSTRUMENTOS MUSICALES": {},
- "VENTA DE INSTRUMENTOS QUIRURGICOS Y ORTOPEDICOS": {},
- "VENTA DE INSUMOS, MATERIAS PRIMAS AGROPECUARIAS Y FLORES": {},
- "VENTA DE JUEGOS, JUGUETES Y ARTICULOS DEPORTIVOS": {},
- "VENTA DE LIBROS, REVISTAS, ELEMENTOS DE PAPELERIA, UTILES Y TEXTOS ESCOLARES": {},
- "VENTA DE LOTERIAS, RIFAS, CHANCE, APUESTAS Y SIMILARES": {},
- "VENTA DE LUBRICANTES, ADITIVOS, LLANTAS Y LUJOS PARA AUTOMOTORES": {},
- "VENTA DE MAQUINARIA, EQUIPO DE OFICINA Y PROGRAMAS DE COMPUTADOR": {},
- "VENTA DE MATERIALES DE CONSTRUCCION, FONTANERIA Y CALEFACCION": {},
- "VENTA DE OTROS INSUMOS Y MATERIAS PRIMAS NO AGROPECUARIAS": {},
- "VENTA DE OTROS PRODUCTOS": {},
- "VENTA DE PAPEL Y CARTON": {},
- "VENTA DE PARTES, PIEZAS Y ACCESORIOS DE VEHICULOS AUTOMOTORES": {},
- "VENTA DE PINTURAS Y LACAS": {},
- "VENTA DE PRODUCTOS AGROPECUARIOS": {},
- "VENTA DE PRODUCTOS DE ASEO, FARMACEUTICOS, MEDICINALES Y ARTICULOS DE TOCADOR": {},
- "VENTA DE PRODUCTOS DE VIDRIOS Y MARQUETERIA": {},
- "VENTA DE PRODUCTOS EN ALMACENES NO ESPECIALIZADOS": {},
- "VENTA DE PRODUCTOS INTERMEDIOS, DESPERDICIOS Y DESECHOS": {},
- "VENTA DE PRODUCTOS TEXTILES, DE VESTIR, DE CUERO Y CALZADO": {},
- "VENTA DE QUIMICOS": {},
- "VENTA DE VEHICULOS AUTOMOTORES": {}
- },
- "CONSTRUCCION": {
- "ACONDICIONAMIENTO DE EDIFICIOS": {},
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "ALQUILER DE EQUIPO CON OPERARIO": {},
- "CONSTRUCCION DE EDIFICIOS Y OBRAS DE INGENIERIA CIVIL": {},
- "PREPARACION DE TERRENOS": {},
- "TERMINACION DE EDIFICACIONES": {}
- },
- "ENSENANZA": {
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES RELACIONADAS CON LA EDUCACION": {},
- "AJUSTES POR INFLACION": {}
- },
- "EXPLOTACION DE MINAS Y CANTERAS": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "CARBON": {},
- "GAS NATURAL": {},
- "MINERALES DE HIERRO": {},
- "MINERALES METALIFEROS NO FERROSOS": {},
- "ORO": {},
- "OTRAS MINAS Y CANTERAS": {},
- "PETROLEO CRUDO": {},
- "PIEDRA, ARENA Y ARCILLA": {},
- "PIEDRAS PRECIOSAS": {},
- "PRESTACION DE SERVICIOS SECTOR MINERO": {},
- "SERVICIOS RELACIONADOS CON EXTRACCION DE PETROLEO Y GAS": {}
- },
- "HOTELES Y RESTAURANTES": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "BARES Y CANTINAS": {},
- "CAMPAMENTO Y OTROS TIPOS DE HOSPEDAJE": {},
- "HOTELERIA": {},
- "RESTAURANTES": {}
- },
- "INDUSTRIAS MANUFACTURERAS": {
- "ACABADO DE PRODUCTOS TEXTILES": {},
- "AJUSTES POR INFLACION": {},
- "CORTE, TALLADO Y ACABADO DE LA PIEDRA": {},
- "CURTIDO, ADOBO O PREPARACION DE CUERO": {},
- "EDICIONES Y PUBLICACIONES": {},
- "ELABORACION DE ABONOS Y COMPUESTOS DE NITROGENO": {},
- "ELABORACION DE ACEITES Y GRASAS": {},
- "ELABORACION DE ALIMENTOS PARA ANIMALES": {},
- "ELABORACION DE ALMIDONES Y DERIVADOS": {},
- "ELABORACION DE APARATOS DE USO DOMESTICO": {},
- "ELABORACION DE ARTICULOS DE HORMIGON, CEMENTO Y YESO": {},
- "ELABORACION DE ARTICULOS DE MATERIALES TEXTILES": {},
- "ELABORACION DE AZUCAR Y MELAZAS": {},
- "ELABORACION DE BEBIDAS ALCOHOLICAS Y ALCOHOL ETILICO": {},
- "ELABORACION DE BEBIDAS MALTEADAS Y DE MALTA": {},
- "ELABORACION DE BEBIDAS NO ALCOHOLICAS": {},
- "ELABORACION DE CACAO, CHOCOLATE Y CONFITERIA": {},
- "ELABORACION DE CALZADO": {},
- "ELABORACION DE CEMENTO, CAL Y YESO": {},
- "ELABORACION DE CUERDAS, CORDELES, BRAMANTES Y REDES": {},
- "ELABORACION DE EQUIPO DE ILUMINACION": {},
- "ELABORACION DE EQUIPO DE OFICINA": {},
- "ELABORACION DE FIBRAS": {},
- "ELABORACION DE JABONES, DETERGENTES Y PREPARADOS DE TOCADOR": {},
- "ELABORACION DE MALETAS, BOLSOS Y SIMILARES": {},
- "ELABORACION DE OTROS PRODUCTOS ALIMENTICIOS": {},
- "ELABORACION DE OTROS PRODUCTOS DE CAUCHO": {},
- "ELABORACION DE OTROS PRODUCTOS DE METAL": {},
- "ELABORACION DE OTROS PRODUCTOS MINERALES NO METALICOS": {},
- "ELABORACION DE OTROS PRODUCTOS QUIMICOS": {},
- "ELABORACION DE OTROS PRODUCTOS TEXTILES": {},
- "ELABORACION DE OTROS TIPOS DE EQUIPO ELECTRICO": {},
- "ELABORACION DE PASTA Y PRODUCTOS DE MADERA, PAPEL Y CARTON": {},
- "ELABORACION DE PASTAS Y PRODUCTOS FARINACEOS": {},
- "ELABORACION DE PILAS Y BATERIAS PRIMARIAS": {},
- "ELABORACION DE PINTURAS, TINTAS Y MASILLAS": {},
- "ELABORACION DE PLASTICO Y CAUCHO SINTETICO": {},
- "ELABORACION DE PRENDAS DE VESTIR": {},
- "ELABORACION DE PRODUCTOS DE CAFE": {},
- "ELABORACION DE PRODUCTOS DE CERAMICA, LOZA, PIEDRA, ARCILLA Y PORCELANA": {},
- "ELABORACION DE PRODUCTOS DE HORNO DE COQUE": {},
- "ELABORACION DE PRODUCTOS DE LA REFINACION DE PETROLEO": {},
- "ELABORACION DE PRODUCTOS DE MOLINERIA": {},
- "ELABORACION DE PRODUCTOS DE PLASTICO": {},
- "ELABORACION DE PRODUCTOS DE TABACO": {},
- "ELABORACION DE PRODUCTOS FARMACEUTICOS Y BOTANICOS": {},
- "ELABORACION DE PRODUCTOS LACTEOS": {},
- "ELABORACION DE PRODUCTOS PARA PANADERIA": {},
- "ELABORACION DE PRODUCTOS QUIMICOS DE USO AGROPECUARIO": {},
- "ELABORACION DE SUSTANCIAS QUIMICAS BASICAS": {},
- "ELABORACION DE TAPICES Y ALFOMBRAS": {},
- "ELABORACION DE TEJIDOS": {},
- "ELABORACION DE VIDRIO Y PRODUCTOS DE VIDRIO": {},
- "ELABORACION DE VINOS": {},
- "FABRICACION DE AERONAVES": {},
- "FABRICACION DE APARATOS E INSTRUMENTOS MEDICOS": {},
- "FABRICACION DE ARTICULOS DE FERRETERIA": {},
- "FABRICACION DE ARTICULOS Y EQUIPO PARA DEPORTE": {},
- "FABRICACION DE BICICLETAS Y SILLAS DE RUEDAS": {},
- "FABRICACION DE CARROCERIAS PARA AUTOMOTORES": {},
- "FABRICACION DE EQUIPOS DE ELEVACION Y MANIPULACION": {},
- "FABRICACION DE EQUIPOS DE RADIO, TELEVISION Y COMUNICACIONES": {},
- "FABRICACION DE INSTRUMENTOS DE MEDICION Y CONTROL": {},
- "FABRICACION DE INSTRUMENTOS DE MUSICA": {},
- "FABRICACION DE INSTRUMENTOS DE OPTICA Y EQUIPO FOTOGRAFICO": {},
- "FABRICACION DE JOYAS Y ARTICULOS CONEXOS": {},
- "FABRICACION DE JUEGOS Y JUGUETES": {},
- "FABRICACION DE LOCOMOTORAS Y MATERIAL RODANTE PARA FERROCARRILES": {},
- "FABRICACION DE MAQUINARIA Y EQUIPO": {},
- "FABRICACION DE MOTOCICLETAS": {},
- "FABRICACION DE MUEBLES": {},
- "FABRICACION DE OTROS TIPOS DE TRANSPORTE": {},
- "FABRICACION DE PARTES, PIEZAS Y ACCESORIOS PARA AUTOMOTORES": {},
- "FABRICACION DE PRODUCTOS METALICOS PARA USO ESTRUCTURAL": {},
- "FABRICACION DE RELOJES": {},
- "FABRICACION DE VEHICULOS AUTOMOTORES": {},
- "FABRICACION Y REPARACION DE BUQUES Y OTRAS EMBARCACIONES": {},
- "FORJA, PRENSADO, ESTAMPADO, LAMINADO DE METAL Y PULVIMETALURGIA": {},
- "FUNDICION DE METALES NO FERROSOS": {},
- "IMPRESION": {},
- "INDUSTRIAS BASICAS Y FUNDICION DE HIERRO Y ACERO": {},
- "PREPARACION E HILATURA DE FIBRAS TEXTILES Y TEJEDURIA": {},
- "PREPARACION, ADOBO Y TENIDO DE PIELES": {},
- "PRODUCCION DE MADERA, ARTICULOS DE MADERA Y CORCHO": {},
- "PRODUCCION Y PROCESAMIENTO DE CARNES Y PRODUCTOS CARNICOS": {},
- "PRODUCTOS DE FRUTAS, LEGUMBRES Y HORTALIZAS": {},
- "PRODUCTOS DE OTRAS INDUSTRIAS MANUFACTURERAS": {},
- "PRODUCTOS DE PESCADO": {},
- "PRODUCTOS PRIMARIOS DE METALES PRECIOSOS Y DE METALES NO FERROSOS": {},
- "RECICLAMIENTO DE DESPERDICIOS": {},
- "REPRODUCCION DE GRABACIONES": {},
- "REVESTIMIENTO DE METALES Y OBRAS DE INGENIERIA MECANICA": {},
- "SERVICIOS RELACIONADOS CON LA EDICION Y LA IMPRESION": {}
- },
- "OTRAS ACTIVIDADES DE SERVICIOS COMUNITARIOS, SOCIALES Y PERSONALES": {
- "ACTIVIDAD DE RADIO Y TELEVISION": {},
- "ACTIVIDAD TEATRAL, MUSICAL Y ARTISTICA": {},
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES DE ASOCIACION": {},
- "AGENCIAS DE NOTICIAS": {},
- "AJUSTES POR INFLACION": {},
- "ELIMINACION DE DESPERDICIOS Y AGUAS RESIDUALES": {},
- "ENTRETENIMIENTO Y ESPARCIMIENTO": {},
- "EXHIBICION DE FILMES Y VIDEOCINTAS": {},
- "GRABACION Y PRODUCCION DE DISCOS": {},
- "LAVANDERIAS Y SIMILARES": {},
- "PELUQUERIAS Y SIMILARES": {},
- "PRODUCCION Y DISTRIBUCION DE FILMES Y VIDEOCINTAS": {},
- "SERVICIOS FUNERARIOS": {},
- "ZONAS FRANCAS": {}
- },
- "PESCA": {
- "ACTIVIDAD DE PESCA": {},
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "EXPLOTACION DE CRIADEROS DE PECES": {}
- },
- "SERVICIOS SOCIALES Y DE SALUD": {
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES DE SERVICIOS SOCIALES": {},
- "ACTIVIDADES VETERINARIAS": {},
- "AJUSTES POR INFLACION": {},
- "SERVICIO DE LABORATORIO": {},
- "SERVICIO HOSPITALARIO": {},
- "SERVICIO MEDICO": {},
- "SERVICIO ODONTOLOGICO": {}
- },
- "SUMINISTRO DE ELECTRICIDAD, GAS Y AGUA": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "CAPTACION, DEPURACION Y DISTRIBUCION DE AGUA": {},
- "FABRICACION DE GAS Y DISTRIBUCION DE COMBUSTIBLES GASEOSOS": {},
- "GENERACION, CAPTACION Y DISTRIBUCION DE ENERGIA ELECTRICA": {}
- },
- "TRANSPORTE, ALMACENAMIENTO Y COMUNICACIONES": {
- "ACTIVIDADES CONEXAS": {},
- "AGENCIAS DE VIAJE": {},
- "AJUSTES POR INFLACION": {},
- "ALMACENAMIENTO Y DEPOSITO": {},
- "MANIPULACION DE CARGA": {},
- "OTRAS AGENCIAS DE TRANSPORTE": {},
- "SERVICIO DE RADIO Y TELEVISION POR CABLE": {},
- "SERVICIO DE TELEGRAFO": {},
- "SERVICIO DE TRANSMISION DE DATOS": {},
- "SERVICIO DE TRANSPORTE POR CARRETERA": {},
- "SERVICIO DE TRANSPORTE POR TUBERIAS": {},
- "SERVICIO DE TRANSPORTE POR VIA ACUATICA": {
- "SERVICIO DE TRANSPORTE POR VIA ACUATICA": {}
- },
- "SERVICIO DE TRANSPORTE POR VIA AEREA": {},
- "SERVICIO DE TRANSPORTE POR VIA FERREA": {},
- "SERVICIO POSTAL Y DE CORREO": {},
- "SERVICIO TELEFONICO": {},
- "SERVICIOS COMPLEMENTARIOS PARA EL TRANSPORTE": {},
- "TRANSMISION DE SONIDO E IMAGENES POR CONTRATO": {}
- }
- },
- "root_type": "Expense"
- },
- "CUENTAS DE ORDEN ACREEDORAS": {
- "ACREEDORAS DE CONTROL": {
- "AJUSTES POR INFLACION PATRIMONIO": {
- "CAPITAL SOCIAL": {},
- "DIVIDENDOS O PARTICIPACIONES DECRETADAS EN ACCIONES, CUOTAS O PARTES DE INTERES SOCIAL": {},
- "RESERVAS": {},
- "RESULTADOS DE EJERCICIOS ANTERIORES": {},
- "SUPERAVIT DE CAPITAL": {}
- },
- "CONTRATOS DE ARRENDAMIENTO FINANCIERO": {
- "BIENES INMUEBLES": {},
- "BIENES MUEBLES": {}
- },
- "OTRAS CUENTAS DE ORDEN ACREEDORAS DE CONTROL": {
- "ADJUDICACIONES PENDIENTES DE LEGALIZAR": {},
- "AJUSTES POR INFLACION": {},
- "CONTRATOS DE CONSTRUCCIONES E INSTALACIONES POR EJECUTAR": {},
- "CONVENIOS DE PAGO": {},
- "DIVERSAS": {},
- "DOCUMENTOS POR COBRAR DESCONTADOS": {},
- "RESERVA ARTICULO 3\u00ba LEY 4\u00aa DE 1980": {},
- "RESERVA COSTO REPOSICION SEMOVIENTES": {}
- }
- },
- "ACREEDORAS DE CONTROL POR CONTRA (DB)": {},
- "ACREEDORAS FISCALES": {},
- "ACREEDORAS FISCALES POR CONTRA (DB)": {},
- "RESPONSABILIDADES CONTINGENTES": {
- "BIENES Y VALORES RECIBIDOS DE TERCEROS": {
- "AJUSTES POR INFLACION": {},
- "EN ARRENDAMIENTO": {},
- "EN COMODATO": {},
- "EN CONSIGNACION": {},
- "EN DEPOSITO": {},
- "EN PRESTAMO": {}
- },
- "BIENES Y VALORES RECIBIDOS EN CUSTODIA": {
- "AJUSTES POR INFLACION": {},
- "BIENES MUEBLES": {},
- "VALORES MOBILIARIOS": {}
- },
- "BIENES Y VALORES RECIBIDOS EN GARANTIA": {
- "AJUSTES POR INFLACION": {},
- "BIENES INMUEBLES": {},
- "BIENES MUEBLES": {},
- "CONTRATOS DE GANADO EN PARTICIPACION": {},
- "VALORES MOBILIARIOS": {}
- },
- "CONTRATOS DE ADMINISTRACION DELEGADA": {},
- "CUENTAS EN PARTICIPACION": {},
- "LITIGIOS Y/O DEMANDAS": {
- "ADMINISTRATIVOS O ARBITRALES": {},
- "CIVILES": {},
- "LABORALES": {},
- "TRIBUTARIOS": {}
- },
- "OTRAS RESPONSABILIDADES CONTINGENTES": {},
- "PROMESAS DE COMPRAVENTA": {}
- },
- "RESPONSABILIDADES CONTINGENTES POR CONTRA (DB)": {},
- "root_type": "Liability"
- },
- "CUENTAS DE ORDEN DEUDORAS": {
- "DERECHOS CONTINGENTES": {
- "BIENES Y VALORES EN PODER DE TERCEROS": {
- "AJUSTES POR INFLACION": {},
- "EN ARRENDAMIENTO": {},
- "EN CONSIGNACION": {},
- "EN DEPOSITO": {},
- "EN PRESTAMO": {}
- },
- "BIENES Y VALORES ENTREGADOS EN CUSTODIA": {
- "AJUSTES POR INFLACION": {},
- "BIENES MUEBLES": {},
- "VALORES MOBILIARIOS": {}
- },
- "BIENES Y VALORES ENTREGADOS EN GARANTIA": {
- "AJUSTES POR INFLACION": {},
- "BIENES INMUEBLES": {},
- "BIENES MUEBLES": {},
- "CONTRATOS DE GANADO EN PARTICIPACION": {},
- "VALORES MOBILIARIOS": {}
- },
- "DIVERSAS": {
- "AJUSTES POR INFLACION": {},
- "OTRAS": {},
- "VALORES ADQUIRIDOS POR RECIBIR": {}
- },
- "LITIGIOS Y/O DEMANDAS": {
- "EJECUTIVOS": {},
- "INCUMPLIMIENTO DE CONTRATOS": {}
- },
- "PROMESAS DE COMPRAVENTA": {}
- },
- "DERECHOS CONTINGENTES POR CONTRA (CR)": {},
- "DEUDORAS DE CONTROL": {
- "ACTIVOS CASTIGADOS": {
- "DEUDORES": {},
- "INVERSIONES": {},
- "OTROS ACTIVOS": {}
- },
- "AJUSTES POR INFLACION ACTIVOS": {
- "CARGOS DIFERIDOS": {},
- "INTANGIBLES": {},
- "INVENTARIOS": {},
- "INVERSIONES": {},
- "OTROS ACTIVOS": {},
- "PROPIEDADES, PLANTA Y EQUIPO": {}
- },
- "BIENES RECIBIDOS EN ARRENDAMIENTO FINANCIERO": {
- "AJUSTES POR INFLACION": {},
- "BIENES INMUEBLES": {},
- "BIENES MUEBLES": {}
- },
- "CAPITALIZACION POR REVALORIZACION DE PATRIMONIO": {},
- "CREDITOS A FAVOR NO UTILIZADOS": {
- "EXTERIOR": {},
- "PAIS": {}
- },
- "OTRAS CUENTAS DEUDORAS DE CONTROL": {
- "AJUSTES POR INFLACION": {},
- "BIENES Y VALORES EN FIDEICOMISO": {},
- "CERTIFICADOS DE DEPOSITO A TERMINO": {},
- "CHEQUES DEVUELTOS": {},
- "CHEQUES POSFECHADOS": {},
- "DIVERSAS": {},
- "INTERESES SOBRE DEUDAS VENCIDAS": {}
- },
- "PROPIEDADES, PLANTA Y EQUIPO TOTALMENTE DEPRECIADOS, AGOTADOS Y/O AMORTIZADOS": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "MATERIALES PROYECTOS PETROLEROS": {},
- "MINAS Y CANTERAS": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "POZOS ARTESIANOS": {},
- "SEMOVIENTES": {},
- "VIAS DE COMUNICACION": {},
- "YACIMIENTOS": {}
- },
- "TITULOS DE INVERSION AMORTIZADOS": {
- "BONOS": {},
- "OTROS": {}
- },
- "TITULOS DE INVERSION NO COLOCADOS": {
- "ACCIONES": {},
- "BONOS": {},
- "OTROS": {}
- }
- },
- "DEUDORAS DE CONTROL POR CONTRA (CR)": {},
- "DEUDORAS FISCALES": {},
- "DEUDORAS FISCALES POR CONTRA (CR)": {},
- "root_type": "Asset"
- },
- "GASTOS": {
- "GANANCIAS Y PERDIDAS": {
- "GANANCIAS Y PERDIDAS": {
- "GANANCIAS Y PERDIDAS": {}
- }
- },
- "IMPUESTO DE RENTA Y COMPLEMENTARIOS": {
- "IMPUESTO DE RENTA Y COMPLEMENTARIOS": {
- "IMPUESTO DE RENTA Y COMPLEMENTARIOS": {}
- }
- },
- "NO OPERACIONALES": {
- "FINANCIEROS": {
- "AJUSTES POR INFLACION": {},
- "COMISIONES": {},
- "DESCUENTOS COMERCIALES CONDICIONADOS": {},
- "DIFERENCIA EN CAMBIO": {},
- "GASTOS BANCARIOS": {},
- "GASTOS EN NEGOCIACION CERTIFICADOS DE CAMBIO": {},
- "GASTOS MANEJO Y EMISION DE BONOS": {},
- "INTERESES": {},
- "OTROS": {},
- "PRIMA AMORTIZADA": {},
- "REAJUSTE MONETARIO-UPAC (HOY UVR)": {}
- },
- "GASTOS DIVERSOS": {
- "AJUSTES POR INFLACION": {},
- "AMORTIZACION DE BIENES ENTREGADOS EN COMODATO": {},
- "CONSTITUCION DE GARANTIAS": {},
- "DEMANDAS LABORALES": {},
- "DEMANDAS POR INCUMPLIMIENTO DE CONTRATOS": {},
- "DONACIONES": {},
- "INDEMNIZACIONES": {},
- "MULTAS, SANCIONES Y LITIGIOS": {},
- "OTROS": {
- "OTROS": {}
- }
- },
- "GASTOS EXTRAORDINARIOS": {
- "ACTIVIDADES CULTURALES Y CIVICAS": {},
- "AJUSTES POR INFLACION": {},
- "COSTAS Y PROCESOS JUDICIALES": {},
- "COSTOS Y GASTOS DE EJERCICIOS ANTERIORES": {},
- "IMPUESTOS ASUMIDOS": {},
- "OTROS": {}
- },
- "PERDIDA EN VENTA Y RETIRO DE BIENES": {
- "AJUSTES POR INFLACION": {},
- "OTROS": {},
- "PERDIDAS POR SINIESTROS": {},
- "RETIRO DE OTROS ACTIVOS": {},
- "RETIRO DE PROPIEDADES, PLANTA Y EQUIPO": {},
- "VENTA DE CARTERA": {},
- "VENTA DE INTANGIBLES": {},
- "VENTA DE INVERSIONES": {},
- "VENTA DE OTROS ACTIVOS": {},
- "VENTA DE PROPIEDADES, PLANTA Y EQUIPO": {}
- },
- "PERDIDAS METODO DE PARTICIPACION": {
- "DE SOCIEDADES ANONIMAS Y/O ASIMILADAS": {},
- "DE SOCIEDADES LIMITADAS Y/O ASIMILADAS": {}
- }
- },
- "OPERACIONALES DE ADMINISTRACION": {
- "ADECUACION E INSTALACION": {
- "AJUSTES POR INFLACION": {},
- "ARREGLOS ORNAMENTALES": {},
- "INSTALACIONES ELECTRICAS": {},
- "OTROS": {
- "OTROS": {}
- },
- "REPARACIONES LOCATIVAS": {
- "REPARACIONES LOCATIVAS": {}
- }
- },
- "AMORTIZACIONES": {
- "AJUSTES POR INFLACION": {},
- "CARGOS DIFERIDOS": {},
- "INTANGIBLES": {},
- "OTRAS": {},
- "VIAS DE COMUNICACION": {}
- },
- "ARRENDAMIENTOS": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AERODROMOS": {},
- "AJUSTES POR INFLACION": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {
- "CONSTRUCCIONES Y EDIFICACIONES": {}
- },
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "OTROS": {},
- "SEMOVIENTES": {},
- "TERRENOS": {}
- },
- "CONTRIBUCIONES Y AFILIACIONES": {
- "AFILIACIONES Y SOSTENIMIENTO": {},
- "AJUSTES POR INFLACION": {},
- "CONTRIBUCIONES": {}
- },
- "DEPRECIACIONES": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {}
- },
- "DIVERSOS": {
- "AJUSTES POR INFLACION": {},
- "CASINO Y RESTAURANTE": {},
- "COMBUSTIBLES Y LUBRICANTES": {},
- "COMISIONES": {
- "COMISIONES": {}
- },
- "ELEMENTOS DE ASEO Y CAFETERIA": {
- "ELEMENTOS DE ASEO Y CAFETERIA": {}
- },
- "ENVASES Y EMPAQUES": {},
- "ESTAMPILLAS": {},
- "GASTOS DE REPRESENTACION Y RELACIONES PUBLICAS": {},
- "INDEMNIZACION POR DANOS A TERCEROS": {},
- "LIBROS, SUSCRIPCIONES, PERIODICOS Y REVISTAS": {
- "LIBROS, SUSCRIPCIONES, PERIODICOS Y REVISTAS": {}
- },
- "MICROFILMACION": {},
- "MUSICA AMBIENTAL": {},
- "OTROS": {
- "OTROS": {}
- },
- "PARQUEADEROS": {},
- "POLVORA Y SIMILARES": {},
- "TAXIS Y BUSES": {},
- "UTILES, PAPELERIA Y FOTOCOPIAS": {
- "UTILES, PAPELERIA Y FOTOCOPIAS": {}
- }
- },
- "GASTOS DE PERSONAL": {
- "AJUSTES POR INFLACION": {},
- "AMORTIZACION BONOS PENSIONALES": {},
- "AMORTIZACION CALCULO ACTUARIAL PENSIONES DE JUBILACION": {},
- "AMORTIZACION TITULOS PENSIONALES": {},
- "APORTES A ADMINISTRADORAS DE RIESGOS PROFESIONALES, ARP": {},
- "APORTES A ENTIDADES PROMOTORAS DE SALUD, EPS": {},
- "APORTES A FONDOS DE PENSIONES Y/O CESANTIAS": {},
- "APORTES CAJAS DE COMPENSACION FAMILIAR": {},
- "APORTES ICBF": {},
- "APORTES SINDICALES": {},
- "AUXILIO DE TRANSPORTE": {
- "EMPLEADOS": {}
- },
- "AUXILIOS": {},
- "BONIFICACIONES": {},
- "CAPACITACION AL PERSONAL": {},
- "CESANTIAS": {
- "EMPLEADOS": {}
- },
- "COMISIONES": {},
- "CUOTAS PARTES PENSIONES DE JUBILACION": {},
- "DOTACION Y SUMINISTRO A TRABAJADORES": {},
- "GASTOS DEPORTIVOS Y DE RECREACION": {},
- "GASTOS MEDICOS Y DROGAS": {},
- "HORAS EXTRAS Y RECARGOS": {},
- "INCAPACIDADES": {},
- "INDEMNIZACIONES LABORALES": {},
- "INTERESES SOBRE CESANTIAS": {
- "EMPLEADOS": {}
- },
- "JORNALES": {},
- "OTROS": {},
- "PENSIONES DE JUBILACION": {},
- "PRIMA DE SERVICIOS": {
- "EMPLEADOS": {}
- },
- "PRIMAS EXTRALEGALES": {},
- "SALARIO INTEGRAL": {},
- "SEGUROS": {},
- "SENA": {},
- "SUELDOS": {
- "EMPLEADOS": {}
- },
- "VACACIONES": {
- "EMPLEADOS": {}
- },
- "VIATICOS": {}
- },
- "GASTOS DE VIAJE": {
- "AJUSTES POR INFLACION": {},
- "ALOJAMIENTO Y MANUTENCION": {},
- "OTROS": {},
- "PASAJES AEREOS": {},
- "PASAJES FERREOS": {},
- "PASAJES FLUVIALES Y/O MARITIMOS": {},
- "PASAJES TERRESTRES": {}
- },
- "GASTOS LEGALES": {
- "ADUANEROS": {},
- "AJUSTES POR INFLACION": {},
- "CONSULARES": {},
- "NOTARIALES": {
- "NOTARIALES": {}
- },
- "OTROS": {},
- "REGISTRO MERCANTIL": {
- "REGISTRO MERCANTIL": {}
- },
- "TRAMITES Y LICENCIAS": {}
- },
- "HONORARIOS": {
- "AJUSTES POR INFLACION": {},
- "ASESORIA FINANCIERA": {},
- "ASESORIA JURIDICA": {
- "ASESORIA JURIDICA": {}
- },
- "ASESORIA TECNICA": {},
- "AUDITORIA EXTERNA": {},
- "AVALUOS": {},
- "JUNTA DIRECTIVA": {},
- "OTROS": {},
- "REVISORIA FISCAL": {}
- },
- "IMPUESTOS": {
- "A LA PROPIEDAD RAIZ": {},
- "AJUSTES POR INFLACION": {},
- "CUOTAS DE FOMENTO": {
- "GRAVAMEN MOVIMIENTOS FINANCIEROS": {}
- },
- "DE ESPECTACULOS PUBLICOS": {},
- "DE TIMBRES": {},
- "DE TURISMO": {},
- "DE VALORIZACION": {},
- "DE VEHICULOS": {},
- "DERECHOS SOBRE INSTRUMENTOS PUBLICOS": {},
- "INDUSTRIA Y COMERCIO": {},
- "IVA DESCONTABLE": {},
- "OTROS": {},
- "TASA POR UTILIZACION DE PUERTOS": {}
- },
- "MANTENIMIENTO Y REPARACIONES": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {
- "CONSTRUCCIONES Y EDIFICACIONES": {}
- },
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {}
- },
- "PROVISIONES": {
- "AJUSTES POR INFLACION": {},
- "DEUDORES": {},
- "INVERSIONES": {},
- "OTROS ACTIVOS": {},
- "PROPIEDADES, PLANTA Y EQUIPO": {}
- },
- "SEGUROS": {
- "AJUSTES POR INFLACION": {},
- "CORRIENTE DEBIL": {},
- "CUMPLIMIENTO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "INCENDIO": {},
- "LUCRO CESANTE": {},
- "MANEJO": {},
- "OBLIGATORIO ACCIDENTE DE TRANSITO": {},
- "OTROS": {},
- "RESPONSABILIDAD CIVIL Y EXTRACONTRACTUAL": {},
- "ROTURA DE MAQUINARIA": {},
- "SUSTRACCION Y HURTO": {},
- "TERREMOTO": {},
- "TRANSPORTE DE MERCANCIA": {},
- "VIDA COLECTIVA": {},
- "VUELO": {}
- },
- "SERVICIOS": {
- "ACUEDUCTO Y ALCANTARILLADO": {
- "ACUEDUCTO Y ALCANTARILLADO": {}
- },
- "AJUSTES POR INFLACION": {},
- "ASEO Y VIGILANCIA": {
- "ASEO Y VIGILANCIA": {}
- },
- "ASISTENCIA TECNICA": {},
- "CORREO, PORTES Y TELEGRAMAS": {},
- "ENERGIA ELECTRICA": {},
- "FAX Y TELEX": {},
- "GAS": {},
- "OTROS": {
- "OTROS": {}
- },
- "PROCESAMIENTO ELECTRONICO DE DATOS": {
- "PROCESAMIENTO ELECTRONICO DE DATOS": {}
- },
- "TELEFONO": {
- "TELEFONO": {}
- },
- "TEMPORALES": {
- "TEMPORALES": {}
- },
- "TRANSPORTE, FLETES Y ACARREOS": {}
- }
- },
- "OPERACIONALES DE VENTAS": {
- "ADECUACION E INSTALACION": {
- "AJUSTES POR INFLACION": {},
- "ARREGLOS ORNAMENTALES": {},
- "INSTALACIONES ELECTRICAS": {},
- "OTROS": {},
- "REPARACIONES LOCATIVAS": {}
- },
- "AMORTIZACIONES": {
- "AJUSTES POR INFLACION": {},
- "CARGOS DIFERIDOS": {},
- "INTANGIBLES": {},
- "OTRAS": {},
- "VIAS DE COMUNICACION": {}
- },
- "ARRENDAMIENTOS": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AERODROMOS": {},
- "AJUSTES POR INFLACION": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "OTROS": {},
- "SEMOVIENTES": {},
- "TERRENOS": {}
- },
- "CONTRIBUCIONES Y AFILIACIONES": {
- "AFILIACIONES Y SOSTENIMIENTO": {},
- "AJUSTES POR INFLACION": {},
- "CONTRIBUCIONES": {}
- },
- "DEPRECIACIONES": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {}
- },
- "DIVERSOS": {
- "AJUSTES POR INFLACION": {},
- "CASINO Y RESTAURANTE": {},
- "COMBUSTIBLES Y LUBRICANTES": {},
- "COMISIONES": {},
- "ELEMENTOS DE ASEO Y CAFETERIA": {},
- "ENVASES Y EMPAQUES": {},
- "ESTAMPILLAS": {},
- "GASTOS DE REPRESENTACION Y RELACIONES PUBLICAS": {},
- "INDEMNIZACION POR DANOS A TERCEROS": {},
- "LIBROS, SUSCRIPCIONES, PERIODICOS Y REVISTAS": {},
- "MICROFILMACION": {},
- "MUSICA AMBIENTAL": {},
- "OTROS": {
- "Otros Gastos": {}
- },
- "PARQUEADEROS": {},
- "POLVORA Y SIMILARES": {},
- "TAXIS Y BUSES": {},
- "UTILES, PAPELERIA Y FOTOCOPIAS": {}
- },
- "FINANCIEROS-REAJUSTE DEL SISTEMA": {
- "AJUSTES POR INFLACION": {}
- },
- "GASTOS DE PERSONAL": {
- "AJUSTES POR INFLACION": {},
- "AMORTIZACION BONOS PENSIONALES": {},
- "AMORTIZACION CALCULO ACTUARIAL PENSIONES DE JUBILACION": {},
- "AMORTIZACION TITULOS PENSIONALES": {},
- "APORTES A ADMINISTRADORAS DE RIESGOS PROFESIONALES, ARP": {},
- "APORTES A ENTIDADES PROMOTORAS DE SALUD, EPS": {},
- "APORTES A FONDOS DE PENSIONES Y/O CESANTIAS": {},
- "APORTES CAJAS DE COMPENSACION FAMILIAR": {},
- "APORTES ICBF": {},
- "APORTES SINDICALES": {},
- "AUXILIO DE TRANSPORTE": {},
- "AUXILIOS": {},
- "BONIFICACIONES": {},
- "CAPACITACION AL PERSONAL": {},
- "CESANTIAS": {},
- "COMISIONES": {},
- "CUOTAS PARTES PENSIONES DE JUBILACION": {},
- "DOTACION Y SUMINISTRO A TRABAJADORES": {},
- "GASTOS DEPORTIVOS Y DE RECREACION": {},
- "GASTOS MEDICOS Y DROGAS": {},
- "HORAS EXTRAS Y RECARGOS": {},
- "INCAPACIDADES": {},
- "INDEMNIZACIONES LABORALES": {},
- "INTERESES SOBRE CESANTIAS": {},
- "JORNALES": {},
- "OTROS": {},
- "PENSIONES DE JUBILACION": {},
- "PRIMA DE SERVICIOS": {},
- "PRIMAS EXTRALEGALES": {},
- "SALARIO INTEGRAL": {},
- "SEGUROS": {},
- "SENA": {},
- "SUELDOS": {},
- "VACACIONES": {},
- "VIATICOS": {}
- },
- "GASTOS DE VIAJE": {
- "AJUSTES POR INFLACION": {},
- "ALOJAMIENTO Y MANUTENCION": {},
- "OTROS": {},
- "PASAJES AEREOS": {},
- "PASAJES FERREOS": {},
- "PASAJES FLUVIALES Y/O MARITIMOS": {},
- "PASAJES TERRESTRES": {}
- },
- "GASTOS LEGALES": {
- "ADUANEROS": {},
- "AJUSTES POR INFLACION": {},
- "CONSULARES": {},
- "NOTARIALES": {},
- "OTROS": {},
- "REGISTRO MERCANTIL": {},
- "TRAMITES Y LICENCIAS": {}
- },
- "HONORARIOS": {
- "AJUSTES POR INFLACION": {},
- "ASESORIA FINANCIERA": {},
- "ASESORIA JURIDICA": {},
- "ASESORIA TECNICA": {},
- "AUDITORIA EXTERNA": {},
- "AVALUOS": {},
- "JUNTA DIRECTIVA": {},
- "OTROS": {},
- "REVISORIA FISCAL": {}
- },
- "IMPUESTOS": {
- "A LA PROPIEDAD RAIZ": {},
- "AJUSTES POR INFLACION": {},
- "CERVEZAS": {},
- "CIGARRILLOS": {},
- "CUOTAS DE FOMENTO": {},
- "DE ESPECTACULOS PUBLICOS": {},
- "DE TIMBRES": {},
- "DE TURISMO": {},
- "DE VALORIZACION": {},
- "DE VEHICULOS": {},
- "DERECHOS SOBRE INSTRUMENTOS PUBLICOS": {},
- "INDUSTRIA Y COMERCIO": {},
- "IVA DESCONTABLE": {},
- "LICORES": {},
- "OTROS": {},
- "TASA POR UTILIZACION DE PUERTOS": {}
- },
- "MANTENIMIENTO Y REPARACIONES": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {}
- },
- "PERDIDAS METODO DE PARTICIPACION": {
- "DE SOCIEDADES ANONIMAS Y/O ASIMILADAS": {},
- "DE SOCIEDADES LIMITADAS Y/O ASIMILADAS": {}
- },
- "PROVISIONES": {
- "AJUSTES POR INFLACION": {},
- "DEUDORES": {},
- "INVENTARIOS": {},
- "INVERSIONES": {},
- "OTROS ACTIVOS": {},
- "PROPIEDADES, PLANTA Y EQUIPO": {}
- },
- "SEGUROS": {
- "AJUSTES POR INFLACION": {},
- "CORRIENTE DEBIL": {},
- "CUMPLIMIENTO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "INCENDIO": {},
- "LUCRO CESANTE": {},
- "MANEJO": {},
- "OBLIGATORIO ACCIDENTE DE TRANSITO": {},
- "OTROS": {},
- "RESPONSABILIDAD CIVIL Y EXTRACONTRACTUAL": {},
- "ROTURA DE MAQUINARIA": {},
- "SUSTRACCION Y HURTO": {},
- "TERREMOTO": {},
- "VIDA COLECTIVA": {},
- "VUELO": {}
- },
- "SERVICIOS": {
- "ACUEDUCTO Y ALCANTARILLADO": {},
- "AJUSTES POR INFLACION": {},
- "ASEO Y VIGILANCIA": {},
- "ASISTENCIA TECNICA": {},
- "CORREO, PORTES Y TELEGRAMAS": {},
- "ENERGIA ELECTRICA": {},
- "FAX Y TELEX": {},
- "GAS": {},
- "OTROS": {},
- "PROCESAMIENTO ELECTRONICO DE DATOS": {},
- "PUBLICIDAD, PROPAGANDA Y PROMOCION": {},
- "TELEFONO": {},
- "TEMPORALES": {},
- "TRANSPORTE, FLETES Y ACARREOS": {}
- }
- },
- "root_type": "Expense"
- },
- "INGRESOS": {
- "AJUSTES POR INFLACION": {
- "CORRECCION MONETARIA": {
- "ACTIVOS DIFERIDOS": {},
- "AGOTAMIENTO ACUMULADO (DB)": {},
- "AMORTIZACION ACUMULADA (DB)": {},
- "COMPRAS (CR)": {},
- "COSTO DE VENTAS (CR)": {},
- "COSTOS DE PRODUCCION O DE OPERACION (CR)": {},
- "DEPRECIACION ACUMULADA (DB)": {},
- "DEPRECIACION DIFERIDA (CR)": {},
- "DEVOLUCIONES EN COMPRAS (DB)": {},
- "DEVOLUCIONES EN VENTAS (CR)": {},
- "GASTOS NO OPERACIONALES (CR)": {},
- "GASTOS OPERACIONALES DE ADMINISTRACION (CR)": {},
- "GASTOS OPERACIONALES DE VENTAS (CR)": {},
- "INGRESOS NO OPERACIONALES (DB)": {},
- "INGRESOS OPERACIONALES (DB)": {},
- "INTANGIBLES (CR)": {},
- "INVENTARIOS (CR)": {},
- "INVERSIONES (CR)": {},
- "OTROS ACTIVOS (CR)": {},
- "PASIVOS SUJETOS DE AJUSTE": {},
- "PATRIMONIO": {},
- "PROPIEDADES, PLANTA Y EQUIPO (CR)": {}
- }
- },
- "NO OPERACIONALES": {
- "ARRENDAMIENTOS": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AERODROMOS": {},
- "AJUSTES POR INFLACION": {},
- "CONSTRUCCIONES Y EDIFICIOS": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "SEMOVIENTES": {},
- "TERRENOS": {}
- },
- "COMISIONES": {
- "AJUSTES POR INFLACION": {},
- "DE ACTIVIDADES FINANCIERAS": {},
- "DE CONCESIONARIOS": {},
- "DERECHOS DE AUTOR": {},
- "DERECHOS DE PROGRAMACION": {},
- "POR DISTRIBUCION DE PELICULAS": {},
- "POR INGRESOS PARA TERCEROS": {},
- "POR VENTA DE SEGUROS": {},
- "POR VENTA DE SERVICIOS DE TALLER": {},
- "SOBRE INVERSIONES": {}
- },
- "DEVOLUCIONES EN OTRAS VENTAS (DB)": {
- "AJUSTES POR INFLACION": {}
- },
- "DIVERSOS": {
- "AJUSTE AL PESO": {},
- "AJUSTES POR INFLACION": {},
- "APROVECHAMIENTOS": {
- "APROVECHAMIENTOS": {}
- },
- "AUXILIOS": {},
- "BONIFICACIONES": {},
- "CAPACITACION DISTRIBUIDORES": {},
- "CERT": {},
- "DE ESCRITURACION": {},
- "DE LA ACTIVIDAD GANADERA": {},
- "DECORACIONES": {},
- "DERECHOS Y LICITACIONES": {},
- "DERIVADOS DE LAS EXPORTACIONES": {},
- "EXCEDENTES": {},
- "HISTORIA CLINICA": {},
- "INGRESOS POR ELEMENTOS PERDIDOS": {},
- "INGRESOS POR INVESTIGACION Y DESARROLLO": {},
- "LLAMADAS TELEFONICAS": {},
- "MANEJO DE CARGA": {},
- "MULTAS Y RECARGOS": {},
- "OTROS": {},
- "OTROS INGRESOS DE EXPLOTACION": {},
- "POR TRABAJOS EJECUTADOS": {},
- "PREAVISOS DESCONTADOS": {},
- "PREMIOS": {},
- "PRODUCTOS DESCONTADOS": {},
- "RECLAMOS": {},
- "RECOBRO DE DANOS": {},
- "RECONOCIMIENTOS ISS": {},
- "REGALIAS": {},
- "REGISTRO PROMESAS DE VENTA": {},
- "RESULTADOS, MATRICULAS Y TRASPASOS": {},
- "SOBRANTES DE CAJA": {},
- "SOBRANTES EN LIQUIDACION FLETES": {},
- "SUBSIDIOS ESTATALES": {},
- "SUBVENCIONES": {},
- "UTILES, PAPELERIA Y FOTOCOPIAS": {
- "UTILES, PAPELERIA Y FOTOCOPIAS": {}
- }
- },
- "DIVIDENDOS Y PARTICIPACIONES": {
- "AJUSTES POR INFLACION": {},
- "DE SOCIEDADES ANONIMAS Y/O ASIMILADAS": {},
- "DE SOCIEDADES LIMITADAS Y/O ASIMILADAS": {}
- },
- "FINANCIEROS": {
- "ACEPTACIONES BANCARIAS": {},
- "AJUSTES POR INFLACION": {},
- "COMISIONES CHEQUES DE OTRAS PLAZAS": {},
- "DESCUENTOS AMORTIZADOS": {},
- "DESCUENTOS BANCARIOS": {},
- "DESCUENTOS COMERCIALES CONDICIONADOS": {},
- "DIFERENCIA EN CAMBIO": {},
- "FINANCIACION SISTEMAS DE VIAJES": {},
- "FINANCIACION VEHICULOS": {},
- "INTERESES": {},
- "MULTAS Y RECARGOS": {},
- "OTROS": {},
- "REAJUSTE MONETARIO-UPAC (HOY UVR)": {},
- "SANCIONES CHEQUES DEVUELTOS": {}
- },
- "HONORARIOS": {
- "ADMINISTRACION DE VINCULADAS": {},
- "AJUSTES POR INFLACION": {},
- "ASESORIAS": {},
- "ASISTENCIA TECNICA": {}
- },
- "INDEMNIZACIONES": {
- "AJUSTES POR INFLACION": {},
- "DANO EMERGENTE COMPANIAS DE SEGUROS": {},
- "DE TERCEROS": {},
- "LUCRO CESANTE COMPANIAS DE SEGUROS": {},
- "OTRAS": {},
- "POR INCAPACIDADES ISS": {},
- "POR INCUMPLIMIENTO DE CONTRATOS": {},
- "POR PERDIDA DE MERCANCIA": {},
- "POR SINIESTRO": {},
- "POR SUMINISTROS": {}
- },
- "INGRESOS DE EJERCICIOS ANTERIORES": {
- "AJUSTES POR INFLACION": {}
- },
- "INGRESOS METODO DE PARTICIPACION": {
- "DE SOCIEDADES ANONIMAS Y/O ASIMILADAS": {},
- "DE SOCIEDADES LIMITADAS Y/O ASIMILADAS": {}
- },
- "OTRAS VENTAS": {
- "AJUSTES POR INFLACION": {},
- "COMBUSTIBLES Y LUBRICANTES": {},
- "DE PROPAGANDA": {},
- "ENVASES Y EMPAQUES": {},
- "EXCEDENTES DE EXPORTACION": {},
- "MATERIA PRIMA": {},
- "MATERIAL DE DESECHO": {},
- "MATERIALES VARIOS": {},
- "PRODUCTOS AGRICOLAS": {},
- "PRODUCTOS DE DIVERSIFICACION": {},
- "PRODUCTOS EN REMATE": {}
- },
- "PARTICIPACIONES EN CONCESIONES": {
- "AJUSTES POR INFLACION": {}
- },
- "RECUPERACIONES": {
- "AJUSTES POR INFLACION": {},
- "DE DEPRECIACION": {},
- "DE PROVISIONES": {},
- "DESCUENTOS CONCEDIDOS": {},
- "DEUDAS MALAS": {},
- "GASTOS BANCARIOS": {},
- "RECLAMOS": {},
- "REINTEGRO DE OTROS COSTOS Y GASTOS": {},
- "REINTEGRO GARANTIAS": {},
- "REINTEGRO POR PERSONAL EN COMISION": {},
- "SEGUROS": {}
- },
- "SERVICIOS": {
- "ADMINISTRATIVOS": {},
- "AJUSTES POR INFLACION": {},
- "AL PERSONAL": {},
- "DE BASCULA": {},
- "DE CASINO": {},
- "DE COMPUTACION": {},
- "DE MANTENIMIENTO": {},
- "DE PRENSA": {},
- "DE RECEPCION DE AERONAVES": {},
- "DE TELEFAX": {},
- "DE TRANSPORTE": {},
- "DE TRANSPORTE PROGRAMA GAS NATURAL": {},
- "DE TRILLA": {},
- "ENTRE COMPANIAS": {},
- "FLETES": {},
- "OTROS": {},
- "POR CONTRATOS": {},
- "TALLER DE VEHICULOS": {},
- "TECNICOS": {}
- },
- "UTILIDAD EN VENTA DE INVERSIONES": {
- "ACCIONES": {},
- "AJUSTES POR INFLACION": {},
- "BONOS": {},
- "CEDULAS": {},
- "CERTIFICADOS": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "DERECHOS FIDUCIARIOS": {},
- "OBLIGATORIAS": {},
- "OTRAS": {},
- "PAPELES COMERCIALES": {},
- "TITULOS": {}
- },
- "UTILIDAD EN VENTA DE OTROS BIENES": {
- "AJUSTES POR INFLACION": {},
- "INTANGIBLES": {},
- "OTROS ACTIVOS": {}
- },
- "UTILIDAD EN VENTA DE PROPIEDADES, PLANTA Y EQUIPO": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "AJUSTES POR INFLACION": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES EN CURSO": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA EN MONTAJE": {},
- "MAQUINARIA Y EQUIPO": {},
- "MATERIALES INDUSTRIA PETROLERA": {},
- "MINAS Y CANTERAS": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "POZOS ARTESIANOS": {},
- "SEMOVIENTES": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {},
- "YACIMIENTOS": {}
- }
- },
- "OPERACIONALES": {
- "ACTIVIDAD FINANCIERA": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "COMISIONES": {},
- "CUOTAS DE ADMINISTRACION-CONSORCIOS": {},
- "CUOTAS DE INGRESO O RETIRO-SOCIEDAD ADMINISTRADORA": {},
- "CUOTAS DE INSCRIPCION-CONSORCIOS": {},
- "DIVIDENDOS DE SOCIEDADES ANONIMAS Y/O ASIMILADAS": {},
- "ELIMINACION DE SUSCRIPTORES-CONSORCIOS": {},
- "INGRESOS METODO DE PARTICIPACION": {},
- "INSCRIPCIONES Y CUOTAS": {},
- "INTERESES": {},
- "OPERACIONES DE DESCUENTO": {},
- "PARTICIPACIONES DE SOCIEDADES LIMITADAS Y/O ASIMILADAS": {},
- "REAJUSTE DEL SISTEMA-CONSORCIOS": {},
- "REAJUSTE MONETARIO-UPAC (HOY UVR)": {},
- "RECUPERACION DE GARANTIAS": {},
- "SERVICIOS A COMISIONISTAS": {},
- "VENTA DE INVERSIONES": {}
- },
- "ACTIVIDADES INMOBILIARIAS, EMPRESARIALES Y DE ALQUILER": {
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES EMPRESARIALES DE CONSULTORIA": {},
- "AJUSTES POR INFLACION": {},
- "ALQUILER DE EFECTOS PERSONALES Y ENSERES DOMESTICOS": {},
- "ALQUILER EQUIPO DE TRANSPORTE": {},
- "ALQUILER MAQUINARIA Y EQUIPO": {},
- "ARRENDAMIENTOS DE BIENES INMUEBLES": {},
- "CONSULTORIA EN EQUIPO Y PROGRAMAS DE INFORMATICA": {},
- "DOTACION DE PERSONAL": {},
- "ENVASE Y EMPAQUE": {},
- "FOTOCOPIADO": {},
- "FOTOGRAFIA": {},
- "INMOBILIARIAS POR RETRIBUCION O CONTRATA": {},
- "INVESTIGACION Y SEGURIDAD": {},
- "INVESTIGACIONES CIENTIFICAS Y DE DESARROLLO": {},
- "LIMPIEZA DE INMUEBLES": {},
- "MANTENIMIENTO Y REPARACION DE MAQUINARIA DE OFICINA": {},
- "MANTENIMIENTO Y REPARACION DE MAQUINARIA Y EQUIPO": {},
- "PROCESAMIENTO DE DATOS": {},
- "PUBLICIDAD": {}
- },
- "AGRICULTURA, GANADERIA, CAZA Y SILVICULTURA": {
- "ACTIVIDAD DE CAZA": {},
- "ACTIVIDAD DE SILVICULTURA": {},
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "CRIA DE GANADO CABALLAR Y VACUNO": {},
- "CRIA DE OTROS ANIMALES": {},
- "CRIA DE OVEJAS, CABRAS, ASNOS, MULAS Y BURDEGANOS": {},
- "CULTIVO DE ALGODON Y PLANTAS PARA MATERIAL TEXTIL": {},
- "CULTIVO DE BANANO": {},
- "CULTIVO DE CAFE": {},
- "CULTIVO DE CANA DE AZUCAR": {},
- "CULTIVO DE CEREALES": {},
- "CULTIVO DE FLORES": {},
- "CULTIVOS DE FRUTAS, NUECES Y PLANTAS AROMATICAS": {},
- "CULTIVOS DE HORTALIZAS, LEGUMBRES Y PLANTAS ORNAMENTALES": {},
- "OTROS CULTIVOS AGRICOLAS": {},
- "PRODUCCION AVICOLA": {},
- "SERVICIOS AGRICOLAS Y GANADEROS": {}
- },
- "COMERCIO AL POR MAYOR Y AL POR MENOR": {
- "AJUSTES POR INFLACION": {},
- "MANTENIMIENTO, REPARACION Y LAVADO DE VEHICULOS AUTOMOTORES": {},
- "REPARACION DE EFECTOS PERSONALES Y ELECTRODOMESTICOS": {},
- "VENTA A CAMBIO DE RETRIBUCION O POR CONTRATA": {},
- "VENTA DE ANIMALES VIVOS Y CUEROS": {},
- "VENTA DE ARTICULOS EN CACHARRERIAS Y MISCELANEAS": {},
- "VENTA DE ARTICULOS EN CASAS DE EMPENO Y PRENDERIAS": {},
- "VENTA DE ARTICULOS EN RELOJERIAS Y JOYERIAS": {},
- "VENTA DE COMBUSTIBLES SOLIDOS, LIQUIDOS, GASEOSOS": {},
- "VENTA DE CUBIERTOS, VAJILLAS, CRISTALERIA, PORCELANAS, CERAMICAS Y OTROS ARTICULOS DE USO DOMESTICO": {},
- "VENTA DE ELECTRODOMESTICOS Y MUEBLES": {},
- "VENTA DE EMPAQUES": {},
- "VENTA DE EQUIPO FOTOGRAFICO": {},
- "VENTA DE EQUIPO OPTICO Y DE PRECISION": {},
- "VENTA DE EQUIPO PROFESIONAL Y CIENTIFICO": {},
- "VENTA DE HERRAMIENTAS Y ARTICULOS DE FERRETERIA": {},
- "VENTA DE INSTRUMENTOS MUSICALES": {},
- "VENTA DE INSTRUMENTOS QUIRURGICOS Y ORTOPEDICOS": {},
- "VENTA DE INSUMOS, MATERIAS PRIMAS AGROPECUARIAS Y FLORES": {},
- "VENTA DE JUEGOS, JUGUETES Y ARTICULOS DEPORTIVOS": {},
- "VENTA DE LIBROS, REVISTAS, ELEMENTOS DE PAPELERIA, UTILES Y TEXTOS ESCOLARES": {},
- "VENTA DE LOTERIAS, RIFAS, CHANCE, APUESTAS Y SIMILARES": {},
- "VENTA DE LUBRICANTES, ADITIVOS, LLANTAS Y LUJOS PARA AUTOMOTORES": {},
- "VENTA DE MAQUINARIA, EQUIPO DE OFICINA Y PROGRAMAS DE COMPUTADOR": {},
- "VENTA DE MATERIALES DE CONSTRUCCION, FONTANERIA Y CALEFACCION": {},
- "VENTA DE OTROS INSUMOS Y MATERIAS PRIMAS NO AGROPECUARIAS": {},
- "VENTA DE OTROS PRODUCTOS": {
- "Ingresos Generales": {}
- },
- "VENTA DE PAPEL Y CARTON": {},
- "VENTA DE PARTES, PIEZAS Y ACCESORIOS DE VEHICULOS AUTOMOTORES": {},
- "VENTA DE PINTURAS Y LACAS": {},
- "VENTA DE PRODUCTOS AGROPECUARIOS": {},
- "VENTA DE PRODUCTOS DE ASEO, FARMACEUTICOS, MEDICINALES, Y ARTICULOS DE TOCADOR": {},
- "VENTA DE PRODUCTOS DE VIDRIOS Y MARQUETERIA": {},
- "VENTA DE PRODUCTOS EN ALMACENES NO ESPECIALIZADOS": {},
- "VENTA DE PRODUCTOS INTERMEDIOS, DESPERDICIOS Y DESECHOS": {},
- "VENTA DE PRODUCTOS TEXTILES, DE VESTIR, DE CUERO Y CALZADO": {},
- "VENTA DE QUIMICOS": {},
- "VENTA DE VEHICULOS AUTOMOTORES": {}
- },
- "CONSTRUCCION": {
- "ACONDICIONAMIENTO DE EDIFICIOS": {},
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "ALQUILER DE EQUIPO CON OPERARIOS": {},
- "CONSTRUCCION DE EDIFICIOS Y OBRAS DE INGENIERIA CIVIL": {},
- "PREPARACION DE TERRENOS": {},
- "TERMINACION DE EDIFICACIONES": {}
- },
- "DEVOLUCIONES EN VENTAS (DB)": {
- "AJUSTES POR INFLACION": {}
- },
- "ENSENANZA": {
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES RELACIONADAS CON LA EDUCACION": {},
- "AJUSTES POR INFLACION": {}
- },
- "EXPLOTACION DE MINAS Y CANTERAS": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "CARBON": {},
- "GAS NATURAL": {},
- "MINERALES DE HIERRO": {},
- "MINERALES METALIFEROS NO FERROSOS": {},
- "ORO": {},
- "OTRAS MINAS Y CANTERAS": {},
- "PETROLEO CRUDO": {},
- "PIEDRA, ARENA Y ARCILLA": {},
- "PIEDRAS PRECIOSAS": {},
- "PRESTACION DE SERVICIOS SECTOR MINERO": {},
- "SERVICIOS RELACIONADOS CON EXTRACCION DE PETROLEO Y GAS": {}
- },
- "HOTELES Y RESTAURANTES": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "BARES Y CANTINAS": {},
- "CAMPAMENTO Y OTROS TIPOS DE HOSPEDAJE": {},
- "HOTELERIA": {},
- "RESTAURANTES": {}
- },
- "INDUSTRIAS MANUFACTURERAS": {
- "ACABADO DE PRODUCTOS TEXTILES": {},
- "AJUSTES POR INFLACION": {},
- "CORTE, TALLADO Y ACABADO DE LA PIEDRA": {},
- "CURTIDO, ADOBO O PREPARACION DE CUERO": {},
- "EDICIONES Y PUBLICACIONES": {},
- "ELABORACION DE ABONOS Y COMPUESTOS DE NITROGENO": {},
- "ELABORACION DE ACEITES Y GRASAS": {},
- "ELABORACION DE ALIMENTOS PARA ANIMALES": {},
- "ELABORACION DE ALMIDONES Y DERIVADOS": {},
- "ELABORACION DE APARATOS DE USO DOMESTICO": {},
- "ELABORACION DE ARTICULOS DE HORMIGON, CEMENTO Y YESO": {},
- "ELABORACION DE ARTICULOS DE MATERIALES TEXTILES": {},
- "ELABORACION DE AZUCAR Y MELAZAS": {},
- "ELABORACION DE BEBIDAS ALCOHOLICAS Y ALCOHOL ETILICO": {},
- "ELABORACION DE BEBIDAS MALTEADAS Y DE MALTA": {},
- "ELABORACION DE BEBIDAS NO ALCOHOLICAS": {},
- "ELABORACION DE CACAO, CHOCOLATE Y CONFITERIA": {},
- "ELABORACION DE CALZADO": {},
- "ELABORACION DE CEMENTO, CAL Y YESO": {},
- "ELABORACION DE CUERDAS, CORDELES, BRAMANTES Y REDES": {},
- "ELABORACION DE EQUIPO DE ILUMINACION": {},
- "ELABORACION DE EQUIPO DE OFICINA": {},
- "ELABORACION DE FIBRAS": {},
- "ELABORACION DE JABONES, DETERGENTES Y PREPARADOS DE TOCADOR": {},
- "ELABORACION DE MALETAS, BOLSOS Y SIMILARES": {},
- "ELABORACION DE OTROS PRODUCTOS ALIMENTICIOS": {},
- "ELABORACION DE OTROS PRODUCTOS DE CAUCHO": {},
- "ELABORACION DE OTROS PRODUCTOS DE METAL": {},
- "ELABORACION DE OTROS PRODUCTOS MINERALES NO METALICOS": {},
- "ELABORACION DE OTROS PRODUCTOS QUIMICOS": {},
- "ELABORACION DE OTROS PRODUCTOS TEXTILES": {},
- "ELABORACION DE OTROS TIPOS DE EQUIPO ELECTRICO": {},
- "ELABORACION DE PASTA Y PRODUCTOS DE MADERA, PAPEL Y CARTON": {},
- "ELABORACION DE PASTAS Y PRODUCTOS FARINACEOS": {},
- "ELABORACION DE PILAS Y BATERIAS PRIMARIAS": {},
- "ELABORACION DE PINTURAS, TINTAS Y MASILLAS": {},
- "ELABORACION DE PLASTICO Y CAUCHO SINTETICO": {},
- "ELABORACION DE PRENDAS DE VESTIR": {},
- "ELABORACION DE PRODUCTOS DE CAFE": {},
- "ELABORACION DE PRODUCTOS DE CERAMICA, LOZA, PIEDRA, ARCILLA Y PORCELANA": {},
- "ELABORACION DE PRODUCTOS DE HORNO DE COQUE": {},
- "ELABORACION DE PRODUCTOS DE LA REFINACION DE PETROLEO": {},
- "ELABORACION DE PRODUCTOS DE MOLINERIA": {},
- "ELABORACION DE PRODUCTOS DE PLASTICO": {},
- "ELABORACION DE PRODUCTOS DE TABACO": {},
- "ELABORACION DE PRODUCTOS FARMACEUTICOS Y BOTANICOS": {},
- "ELABORACION DE PRODUCTOS LACTEOS": {},
- "ELABORACION DE PRODUCTOS PARA PANADERIA": {},
- "ELABORACION DE PRODUCTOS QUIMICOS DE USO AGROPECUARIO": {},
- "ELABORACION DE SUSTANCIAS QUIMICAS BASICAS": {},
- "ELABORACION DE TAPICES Y ALFOMBRAS": {},
- "ELABORACION DE TEJIDOS": {},
- "ELABORACION DE VIDRIO Y PRODUCTOS DE VIDRIO": {},
- "ELABORACION DE VINOS": {},
- "FABRICACION DE AERONAVES": {},
- "FABRICACION DE APARATOS E INSTRUMENTOS MEDICOS": {},
- "FABRICACION DE ARTICULOS DE FERRETERIA": {},
- "FABRICACION DE ARTICULOS Y EQUIPO PARA DEPORTE": {},
- "FABRICACION DE BICICLETAS Y SILLAS DE RUEDAS": {},
- "FABRICACION DE CARROCERIAS PARA AUTOMOTORES": {},
- "FABRICACION DE EQUIPOS DE ELEVACION Y MANIPULACION": {},
- "FABRICACION DE EQUIPOS DE RADIO, TELEVISION Y COMUNICACIONES": {},
- "FABRICACION DE INSTRUMENTOS DE MEDICION Y CONTROL": {},
- "FABRICACION DE INSTRUMENTOS DE MUSICA": {},
- "FABRICACION DE INSTRUMENTOS DE OPTICA Y EQUIPO FOTOGRAFICO": {},
- "FABRICACION DE JOYAS Y ARTICULOS CONEXOS": {},
- "FABRICACION DE JUEGOS Y JUGUETES": {},
- "FABRICACION DE LOCOMOTORAS Y MATERIAL RODANTE PARA FERROCARRILES": {},
- "FABRICACION DE MAQUINARIA Y EQUIPO": {},
- "FABRICACION DE MOTOCICLETAS": {},
- "FABRICACION DE MUEBLES": {},
- "FABRICACION DE OTROS TIPOS DE TRANSPORTE": {},
- "FABRICACION DE PARTES PIEZAS Y ACCESORIOS PARA AUTOMOTORES": {},
- "FABRICACION DE PRODUCTOS METALICOS PARA USO ESTRUCTURAL": {},
- "FABRICACION DE RELOJES": {},
- "FABRICACION DE VEHICULOS AUTOMOTORES": {},
- "FABRICACION Y REPARACION DE BUQUES Y OTRAS EMBARCACIONES": {},
- "FORJA, PRENSADO, ESTAMPADO, LAMINADO DE METAL Y PULVIMETALURGIA": {},
- "FUNDICION DE METALES NO FERROSOS": {},
- "IMPRESION": {},
- "INDUSTRIAS BASICAS Y FUNDICION DE HIERRO Y ACERO": {},
- "PREPARACION E HILATURA DE FIBRAS TEXTILES Y TEJEDURIA": {},
- "PREPARACION, ADOBO Y TENIDO DE PIELES": {},
- "PRODUCCION DE MADERA, ARTICULOS DE MADERA Y CORCHO": {},
- "PRODUCCION Y PROCESAMIENTO DE CARNES Y PRODUCTOS CARNICOS": {},
- "PRODUCTOS DE FRUTAS, LEGUMBRES Y HORTALIZAS": {},
- "PRODUCTOS DE OTRAS INDUSTRIAS MANUFACTURERAS": {},
- "PRODUCTOS DE PESCADO": {},
- "PRODUCTOS PRIMARIOS DE METALES PRECIOSOS Y DE METALES NO FERROSOS": {},
- "RECICLAMIENTO DE DESPERDICIOS": {},
- "REPRODUCCION DE GRABACIONES": {},
- "REVESTIMIENTO DE METALES Y OBRAS DE INGENIERIA MECANICA": {},
- "SERVICIOS RELACIONADOS CON LA EDICION Y LA IMPRESION": {}
- },
- "OTRAS ACTIVIDADES DE SERVICIOS COMUNITARIOS, SOCIALES Y PERSONALES": {
- "ACTIVIDAD DE RADIO Y TELEVISION": {},
- "ACTIVIDAD TEATRAL, MUSICAL Y ARTISTICA": {},
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES DE ASOCIACION": {},
- "AGENCIAS DE NOTICIAS": {},
- "AJUSTES POR INFLACION": {},
- "ELIMINACION DE DESPERDICIOS Y AGUAS RESIDUALES": {},
- "ENTRETENIMIENTO Y ESPARCIMIENTO": {},
- "EXHIBICION DE FILMES Y VIDEOCINTAS": {},
- "GRABACION Y PRODUCCION DE DISCOS": {},
- "LAVANDERIAS Y SIMILARES": {},
- "PELUQUERIAS Y SIMILARES": {},
- "PRODUCCION Y DISTRIBUCION DE FILMES Y VIDEOCINTAS": {},
- "SERVICIOS FUNERARIOS": {},
- "ZONAS FRANCAS": {}
- },
- "PESCA": {
- "ACTIVIDAD DE PESCA": {},
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "EXPLOTACION DE CRIADEROS DE PECES": {}
- },
- "SERVICIOS SOCIALES Y DE SALUD": {
- "ACTIVIDADES CONEXAS": {},
- "ACTIVIDADES DE SERVICIOS SOCIALES": {},
- "ACTIVIDADES VETERINARIAS": {},
- "AJUSTES POR INFLACION": {},
- "SERVICIO DE LABORATORIO": {},
- "SERVICIO HOSPITALARIO": {},
- "SERVICIO MEDICO": {},
- "SERVICIO ODONTOLOGICO": {}
- },
- "SUMINISTRO DE ELECTRICIDAD, GAS Y AGUA": {
- "ACTIVIDADES CONEXAS": {},
- "AJUSTES POR INFLACION": {},
- "CAPTACION, DEPURACION Y DISTRIBUCION DE AGUA": {},
- "FABRICACION DE GAS Y DISTRIBUCION DE COMBUSTIBLES GASEOSOS": {},
- "GENERACION, CAPTACION Y DISTRIBUCION DE ENERGIA ELECTRICA": {}
- },
- "TRANSPORTE, ALMACENAMIENTO Y COMUNICACIONES": {
- "ACTIVIDADES CONEXAS": {},
- "AGENCIAS DE VIAJE": {},
- "AJUSTES POR INFLACION": {},
- "ALMACENAMIENTO Y DEPOSITO": {},
- "MANIPULACION DE CARGA": {},
- "OTRAS AGENCIAS DE TRANSPORTE": {},
- "SERVICIO DE RADIO Y TELEVISION POR CABLE": {},
- "SERVICIO DE TELEGRAFO": {},
- "SERVICIO DE TRANSMISION DE DATOS": {},
- "SERVICIO DE TRANSPORTE POR CARRETERA": {},
- "SERVICIO DE TRANSPORTE POR TUBERIAS": {},
- "SERVICIO DE TRANSPORTE POR VIA ACUATICA": {},
- "SERVICIO DE TRANSPORTE POR VIA AEREA": {},
- "SERVICIO DE TRANSPORTE POR VIA FERREA": {},
- "SERVICIO POSTAL Y DE CORREO": {},
- "SERVICIO TELEFONICO": {},
- "SERVICIOS COMPLEMENTARIOS PARA EL TRANSPORTE": {},
- "TRANSMISION DE SONIDO E IMAGENES POR CONTRATO": {}
- }
- },
- "root_type": "Income"
- },
- "PASIVO": {
- "BONOS Y PAPELES COMERCIALES": {
- "BONOS EN CIRCULACION": {},
- "BONOS OBLIGATORIAMENTE CONVERTIBLES EN ACCIONES": {},
- "BONOS PENSIONALES": {
- "BONOS PENSIONALES POR AMORTIZAR (DB)": {},
- "INTERESES CAUSADOS SOBRE BONOS PENSIONALES": {},
- "VALOR BONOS PENSIONALES": {}
- },
- "PAPELES COMERCIALES": {},
- "TITULOS PENSIONALES": {
- "INTERESES CAUSADOS SOBRE TITULOS PENSIONALES": {},
- "TITULOS PENSIONALES POR AMORTIZAR (DB)": {},
- "VALOR TITULOS PENSIONALES": {}
- }
- },
- "CUENTAS POR PAGAR": {
- "A CASA MATRIZ": {},
- "A COMPANIAS VINCULADAS": {},
- "A CONTRATISTAS": {},
- "ACREEDORES OFICIALES": {},
- "ACREEDORES VARIOS": {
- "COMISIONISTAS DE BOLSAS": {},
- "DEPOSITARIOS": {},
- "DONACIONES ASIGNADAS POR PAGAR": {},
- "FONDO DE PERSEVERANCIA": {},
- "FONDOS DE CESANTIAS Y/O PENSIONES": {},
- "OTROS": {
- "Generica a Pagarr": {}
- },
- "REINTEGROS POR PAGAR": {},
- "SOCIEDAD ADMINISTRADORA-FONDOS DE INVERSION": {}
- },
- "COSTOS Y GASTOS POR PAGAR": {
- "ARRENDAMIENTOS": {},
- "COMISIONES": {},
- "GASTOS DE REPRESENTACION Y RELACIONES PUBLICAS": {},
- "GASTOS DE VIAJE": {},
- "GASTOS FINANCIEROS": {},
- "GASTOS LEGALES": {},
- "HONORARIOS": {},
- "LIBROS, SUSCRIPCIONES, PERIODICOS Y REVISTAS": {},
- "OTROS": {},
- "SEGUROS": {},
- "SERVICIOS ADUANEROS": {},
- "SERVICIOS DE MANTENIMIENTO": {},
- "SERVICIOS PUBLICOS": {},
- "SERVICIOS TECNICOS": {},
- "TRANSPORTES, FLETES Y ACARREOS": {}
- },
- "CUENTAS CORRIENTES COMERCIALES": {},
- "CUOTAS POR DEVOLVER": {},
- "DEUDAS CON ACCIONISTAS O SOCIOS": {
- "ACCIONISTAS": {},
- "SOCIOS": {}
- },
- "DEUDAS CON DIRECTORES": {},
- "DIVIDENDOS O PARTICIPACIONES POR PAGAR": {
- "DIVIDENDOS": {
- "LIGINA MARINA CANELON CASTELLANOS": {}
- },
- "PARTICIPACIONES": {}
- },
- "IMPUESTO A LAS VENTAS RETENIDO": {
- "IMPUESTO A LAS VENTAS RETENIDO": {
- "IMPUESTO A LAS VENTAS RETENIDO": {}
- }
- },
- "IMPUESTO DE INDUSTRIA Y COMERCIO RETENIDO": {
- "IMPUESTO DE INDUSTRIA Y COMERCIO RETENIDO": {
- "IMPUESTO DE INDUSTRIA Y COMERCIO RETENIDO": {}
- }
- },
- "INSTALAMENTOS POR PAGAR": {},
- "ORDENES DE COMPRA POR UTILIZAR": {},
- "REGALIAS POR PAGAR": {},
- "RETENCION EN LA FUENTE": {
- "ARRENDAMIENTOS": {
- "ARRENDAMIENTOS BIENES INMUEBLES": {}
- },
- "AUTORRETENCIONES": {},
- "COMISIONES": {
- "COMISIONES": {}
- },
- "COMPRAS": {
- "COMPRAS GRAL": {}
- },
- "DIVIDENDOS Y/O PARTICIPACIONES": {},
- "ENAJENACION PROPIEDADES PLANTA Y EQUIPO, PERSONAS NATURALES": {},
- "HONORARIOS": {
- "RETEFTE HONORARIOS 10%": {},
- "RETEFTE HONORARIOS 11%": {}
- },
- "LOTERIAS, RIFAS, APUESTAS Y SIMILARES": {},
- "OTRAS RETENCIONES Y PATRIMONIO": {
- "OTRAS RETENCIONES Y PATRIMONIO": {}
- },
- "PAGO DIAN RETENCIONES": {
- "PAGO DIAN RETENCIONES": {}
- },
- "POR IMPUESTO DE TIMBRE": {},
- "POR INGRESOS OBTENIDOS EN EL EXTERIOR": {},
- "POR PAGOS AL EXTERIOR": {},
- "RENDIMIENTOS FINANCIEROS": {},
- "SALARIOS Y PAGOS LABORALES": {
- "SALARIOS Y PAGOS LABORALES": {}
- },
- "SERVICIOS": {
- "ASEO Y/O VIGILANCIA": {},
- "DE HOTEL, RESTAURANTE Y HOSPEDAJE": {},
- "SERVICIOS GRAL DECLARANTES": {},
- "SERVICIOS GRAL NO DECLARANTES": {},
- "SERVICIOS TEMPORALES": {},
- "TRANSPORTE DE CARGA": {},
- "TRANSPORTE DE PASAJEROS TERRESTRE": {}
- }
- },
- "RETENCIONES Y APORTES DE NOMINA": {
- "APORTES A ADMINISTRADORAS DE RIESGOS PROFESIONALES, ARP": {},
- "APORTES A ENTIDADES PROMOTORAS DE SALUD, EPS": {},
- "APORTES AL FIC": {},
- "APORTES AL ICBF, SENA Y CAJAS DE COMPENSACION": {},
- "COOPERATIVAS": {},
- "EMBARGOS JUDICIALES": {},
- "FONDOS": {},
- "LIBRANZAS": {},
- "OTROS": {},
- "SINDICATOS": {}
- }
- },
- "DIFERIDOS": {
- "ABONOS DIFERIDOS": {
- "REAJUSTE DEL SISTEMA": {}
- },
- "CREDITO POR CORRECCION MONETARIA DIFERIDA": {},
- "IMPUESTOS DIFERIDOS": {
- "AJUSTES POR INFLACION": {},
- "DIVERSOS": {},
- "POR DEPRECIACION FLEXIBLE": {}
- },
- "INGRESOS RECIBIDOS POR ANTICIPADO": {
- "ARRENDAMIENTOS": {},
- "COMISIONES": {},
- "CUOTAS DE ADMINISTRACION": {},
- "DE SUSCRIPTORES": {},
- "HONORARIOS": {},
- "INTERESES": {},
- "MATRICULAS Y PENSIONES": {},
- "MERCANCIA EN TRANSITO YA VENDIDA": {},
- "OTROS": {},
- "SERVICIOS TECNICOS": {},
- "TRANSPORTES, FLETES Y ACARREOS": {}
- },
- "UTILIDAD DIFERIDA EN VENTAS A PLAZOS": {}
- },
- "IMPUESTOS, GRAVAMENES Y TASAS": {
- "A LA PROPIEDAD RAIZ": {},
- "A LAS EXPORTACIONES CAFETERAS": {},
- "A LAS IMPORTACIONES": {},
- "AL AZAR Y JUEGOS": {},
- "AL SACRIFICIO DE GANADO": {},
- "CUOTAS DE FOMENTO": {},
- "DE ESPECTACULOS PUBLICOS": {},
- "DE HIDROCARBUROS Y MINAS": {
- "DE HIDROCARBUROS": {},
- "DE MINAS": {}
- },
- "DE INDUSTRIA Y COMERCIO": {
- "VIGENCIA FISCAL CORRIENTE": {
- "IMPUESTO GENERADO": {},
- "IMPUESTOS DESCOTABLES": {},
- "IMPUESTOS RETENIDOS": {},
- "PAGOS SECRETARIA DE HACIENDA DISTRITAL": {}
- },
- "VIGENCIAS FISCALES ANTERIORES": {}
- },
- "DE LICORES, CERVEZAS Y CIGARRILLOS": {
- "DE CERVEZAS": {},
- "DE CIGARRILLOS": {},
- "DE LICORES": {}
- },
- "DE RENTA Y COMPLEMENTARIOS": {
- "VIGENCIA FISCAL CORRIENTE": {},
- "VIGENCIAS FISCALES ANTERIORES": {}
- },
- "DE TURISMO": {},
- "DE VALORIZACION": {
- "VIGENCIA FISCAL CORRIENTE": {},
- "VIGENCIAS FISCALES ANTERIORES": {}
- },
- "DE VEHICULOS": {
- "VIGENCIA FISCAL CORRIENTE": {},
- "VIGENCIAS FISCALES ANTERIORES": {}
- },
- "DERECHOS SOBRE INSTRUMENTOS PUBLICOS": {},
- "GRAVAMENES Y REGALIAS POR UTILIZACION DEL SUELO": {},
- "IMPUESTO SOBRE LAS VENTAS POR PAGAR": {
- "IVA DESCONTABLE": {
- "IVA DESCONTABLE": {}
- },
- "IVA GENERADO": {
- "IVA GENERADO": {}
- },
- "IVA RETENIDO": {
- "IVA RETENIDO": {}
- },
- "PAGOS DIAN": {
- "PAGOS DIAN": {}
- }
- },
- "OTROS": {},
- "REGALIAS E IMPUESTOS A LA PEQUENA Y MEDIANA MINERIA": {},
- "TASA POR UTILIZACION DE PUERTOS": {}
- },
- "OBLIGACIONES FINANCIERAS": {
- "BANCOS DEL EXTERIOR": {
- "ACEPTACIONES BANCARIAS": {},
- "CARTAS DE CREDITO": {},
- "PAGARES": {},
- "SOBREGIROS": {}
- },
- "BANCOS NACIONALES": {
- "ACEPTACIONES BANCARIAS": {},
- "CARTAS DE CREDITO": {},
- "PAGARES": {
- "BANCOLOMBIA MORATO": {}
- },
- "SOBREGIROS": {}
- },
- "COMPANIAS DE FINANCIAMIENTO COMERCIAL": {
- "ACEPTACIONES FINANCIERAS": {},
- "CONTRATOS DE ARRENDAMIENTO FINANCIERO (LEASING)": {},
- "PAGARES": {}
- },
- "COMPROMISOS DE RECOMPRA DE CARTERA NEGOCIADA": {},
- "COMPROMISOS DE RECOMPRA DE INVERSIONES NEGOCIADAS": {
- "ACCIONES": {},
- "ACEPTACIONES BANCARIAS O FINANCIERAS": {},
- "BONOS": {},
- "CEDULAS": {},
- "CERTIFICADOS": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "OTROS": {},
- "PAPELES COMERCIALES": {},
- "TITULOS": {}
- },
- "CORPORACIONES DE AHORRO Y VIVIENDA": {
- "HIPOTECARIAS": {},
- "PAGARES": {},
- "SOBREGIROS": {}
- },
- "CORPORACIONES FINANCIERAS": {
- "ACEPTACIONES FINANCIERAS": {},
- "CARTAS DE CREDITO": {},
- "CONTRATOS DE ARRENDAMIENTO FINANCIERO (LEASING)": {},
- "PAGARES": {}
- },
- "ENTIDADES FINANCIERAS DEL EXTERIOR": {},
- "OBLIGACIONES GUBERNAMENTALES": {
- "ENTIDADES OFICIALES": {},
- "GOBIERNO NACIONAL": {}
- },
- "OTRAS OBLIGACIONES": {
- "CASA MATRIZ": {},
- "COMPANIAS VINCULADAS": {},
- "DIRECTORES": {},
- "FONDOS Y COOPERATIVAS": {},
- "OTRAS": {},
- "PARTICULARES": {
- "PARTICULARES": {}
- },
- "SOCIOS O ACCIONISTAS": {}
- }
- },
- "OBLIGACIONES LABORALES": {
- "CESANTIAS CONSOLIDADAS": {
- "LEY 50 DE 1990 Y NORMAS POSTERIORES": {},
- "LEY LABORAL ANTERIOR": {}
- },
- "CUOTAS PARTES PENSIONES DE JUBILACION": {},
- "INDEMNIZACIONES LABORALES": {},
- "INTERESES SOBRE CESANTIAS": {},
- "PENSIONES POR PAGAR": {},
- "PRESTACIONES EXTRALEGALES": {
- "AUXILIOS": {},
- "BONIFICACIONES": {},
- "DOTACION Y SUMINISTRO A TRABAJADORES": {},
- "OTRAS": {},
- "PRIMAS": {},
- "SEGUROS": {}
- },
- "PRIMA DE SERVICIOS": {},
- "SALARIOS POR PAGAR": {},
- "VACACIONES CONSOLIDADAS": {}
- },
- "OTROS PASIVOS": {
- "ACREEDORES DEL SISTEMA": {
- "CUOTAS NETAS": {},
- "GRUPOS EN FORMACION": {}
- },
- "ANTICIPOS Y AVANCES RECIBIDOS": {
- "DE CLIENTES": {},
- "OTROS": {},
- "PARA OBRAS EN PROCESO": {},
- "SOBRE CONTRATOS": {}
- },
- "CUENTAS DE OPERACION CONJUNTA": {},
- "CUENTAS EN PARTICIPACION": {},
- "DEPOSITOS RECIBIDOS": {
- "DE LICITACIONES": {},
- "DE MANEJO DE BIENES": {},
- "FONDO DE RESERVA": {},
- "OTROS": {},
- "PARA FUTURA SUSCRIPCION DE ACCIONES": {},
- "PARA FUTURO PAGO DE CUOTAS O DERECHOS SOCIALES": {},
- "PARA GARANTIA DE CONTRATOS": {},
- "PARA GARANTIA EN LA PRESTACION DE SERVICIOS": {}
- },
- "DIVERSOS": {
- "PRESTAMOS DE PRODUCTOS": {},
- "PROGRAMA DE EXTENSION AGROPECUARIA": {},
- "REEMBOLSO DE COSTOS EXPLORATORIOS": {}
- },
- "EMBARGOS JUDICIALES": {
- "DEPOSITOS JUDICIALES": {},
- "INDEMNIZACIONES": {}
- },
- "INGRESOS RECIBIDOS PARA TERCEROS": {
- "VALORES RECIBIDOS PARA TERCEROS": {},
- "VENTA POR CUENTA DE TERCEROS": {}
- },
- "RETENCIONES A TERCEROS SOBRE CONTRATOS": {
- "CUMPLIMIENTO OBLIGACIONES LABORALES": {},
- "GARANTIA CUMPLIMIENTO DE CONTRATOS": {},
- "PARA ESTABILIDAD DE OBRA": {}
- }
- },
- "PASIVOS ESTIMADOS Y PROVISIONES": {
- "PARA CONTINGENCIAS": {
- "ADMINISTRATIVOS": {},
- "CIVILES": {},
- "COMERCIALES": {},
- "INTERESES POR MULTAS Y SANCIONES": {},
- "LABORALES": {},
- "MULTAS Y SANCIONES AUTORIDADES ADMINISTRATIVAS": {},
- "OTRAS": {},
- "PENALES": {},
- "RECLAMOS": {}
- },
- "PARA COSTOS Y GASTOS": {
- "COMISIONES": {},
- "GARANTIAS": {},
- "GASTOS DE VIAJE": {},
- "HONORARIOS": {},
- "INTERESES": {},
- "MATERIALES Y REPUESTOS": {},
- "OTROS": {},
- "REGALIAS": {},
- "SERVICIOS PUBLICOS": {},
- "SERVICIOS TECNICOS": {},
- "TRANSPORTES, FLETES Y ACARREOS": {}
- },
- "PARA MANTENIMIENTO Y REPARACIONES": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "OTROS": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "POZOS ARTESIANOS": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {}
- },
- "PARA OBLIGACIONES DE GARANTIAS": {},
- "PARA OBLIGACIONES FISCALES": {
- "DE HIDROCARBUROS Y MINAS": {},
- "DE INDUSTRIA Y COMERCIO": {},
- "DE RENTA Y COMPLEMENTARIOS": {},
- "DE VEHICULOS": {},
- "OTROS": {},
- "TASA POR UTILIZACION DE PUERTOS": {}
- },
- "PARA OBLIGACIONES LABORALES": {
- "CESANTIAS": {},
- "INTERESES SOBRE CESANTIAS": {},
- "OTRAS": {},
- "PRESTACIONES EXTRALEGALES": {},
- "PRIMA DE SERVICIOS": {},
- "VACACIONES": {},
- "VIATICOS": {}
- },
- "PARA OBRAS DE URBANISMO": {
- "ACUEDUCTO Y ALCANTARILLADO": {},
- "ENERGIA ELECTRICA": {},
- "OTROS": {},
- "TELEFONOS": {}
- },
- "PENSIONES DE JUBILACION": {
- "CALCULO ACTUARIAL PENSIONES DE JUBILACION": {},
- "PENSIONES DE JUBILACION POR AMORTIZAR (DB)": {}
- },
- "PROVISIONES DIVERSAS": {
- "AUTOSEGURO": {},
- "OTRAS": {},
- "PARA AJUSTES EN REDENCION DE UNIDADES": {},
- "PARA BENEFICENCIA": {},
- "PARA COMUNICACIONES": {},
- "PARA OPERACION": {},
- "PARA PERDIDA EN TRANSPORTE": {},
- "PARA PROTECCION DE BIENES AGOTABLES": {},
- "PLANES Y PROGRAMAS DE REFORESTACION Y ELECTRIFICACION": {}
- }
- },
- "PROVEEDORES": {
- "CASA MATRIZ": {},
- "COMPANIAS VINCULADAS": {},
- "CUENTAS CORRIENTES COMERCIALES": {},
- "DEL EXTERIOR": {
- "PROVEEDORES EXTRANJEROS CXP": {
- "PROVEEDORES EXTRANJEROS CXP": {}
- }
- },
- "NACIONALES": {
- "PROVEEDORES NACIONALES CXP": {
- "PROVEEDORES NACIONALES CXP": {}
- }
- }
- },
- "root_type": "Liability"
- },
- "PATRIMONIO": {
- "CAPITAL SOCIAL": {
- "APORTES DEL ESTADO": {},
- "APORTES SOCIALES": {
- "APORTES DE SOCIOS-FONDO MUTUO DE INVERSION": {},
- "CONTRIBUCION DE LA EMPRESA-FONDO MUTUO DE INVERSION": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "SUSCRIPCIONES DEL PUBLICO": {}
- },
- "CAPITAL ASIGNADO": {},
- "CAPITAL DE PERSONAS NATURALES": {},
- "CAPITAL SUSCRITO Y PAGADO": {
- "CAPITAL AUTORIZADO": {},
- "CAPITAL POR SUSCRIBIR (DB)": {},
- "CAPITAL SUSCRITO POR COBRAR (DB)": {},
- "CAPITAL SUSCRITO Y PAGADO": {
- "CAPITAL SUSCRITO Y PAGADO": {}
- }
- },
- "FONDO SOCIAL": {},
- "INVERSION SUPLEMENTARIA AL CAPITAL ASIGNADO": {}
- },
- "DIVIDENDOS O PARTICIPACIONES DECRETADOS EN ACCIONES, CUOTAS O PARTES DE INTERES SOCIAL": {
- "DIVIDENDOS DECRETADOS EN ACCIONES": {},
- "PARTICIPACIONES DECRETADAS EN CUOTAS O PARTES DE INTERES SOCIAL": {}
- },
- "RESERVAS": {
- "RESERVAS ESTATUTARIAS": {
- "OTRAS": {},
- "PARA FUTURAS CAPITALIZACIONES": {},
- "PARA FUTUROS ENSANCHES": {},
- "PARA REPOSICION DE ACTIVOS": {}
- },
- "RESERVAS OBLIGATORIAS": {
- "ACCIONES PROPIAS READQUIRIDAS (DB)": {},
- "CUOTAS O PARTES DE INTERES SOCIAL PROPIAS READQUIRIDAS (DB)": {},
- "OTRAS": {},
- "RESERVA LEGAL": {},
- "RESERVA LEY 4\u00aa DE 1980": {},
- "RESERVA LEY 7\u00aa DE 1990": {},
- "RESERVA PARA EXTENSION AGROPECUARIA": {},
- "RESERVA PARA READQUISICION DE ACCIONES": {},
- "RESERVA PARA READQUISICION DE CUOTAS O PARTES DE INTERES SOCIAL": {},
- "RESERVA PARA REPOSICION DE SEMOVIENTES": {},
- "RESERVAS POR DISPOSICIONES FISCALES": {}
- },
- "RESERVAS OCASIONALES": {
- "A DISPOSICION DEL MAXIMO ORGANO SOCIAL": {},
- "OTRAS": {},
- "PARA ADQUISICION O REPOSICION DE PROPIEDADES, PLANTA Y EQUIPO": {},
- "PARA BENEFICENCIA Y CIVISMO": {},
- "PARA CAPITAL DE TRABAJO": {},
- "PARA ESTABILIZACION DE RENDIMIENTOS": {},
- "PARA FOMENTO ECONOMICO": {},
- "PARA FUTURAS CAPITALIZACIONES": {},
- "PARA FUTUROS ENSANCHES": {},
- "PARA INVESTIGACIONES Y DESARROLLO": {}
- }
- },
- "RESULTADOS DE EJERCICIOS ANTERIORES": {
- "PERDIDAS ACUMULADAS": {},
- "UTILIDADES ACUMULADAS": {}
- },
- "RESULTADOS DEL EJERCICIO": {
- "PERDIDA DEL EJERCICIO": {},
- "UTILIDAD DEL EJERCICIO": {
- "UTILIDAD DEL EJERCICIO": {
- "UTILIDAD DEL EJERCICIO": {}
- }
- }
- },
- "REVALORIZACION DEL PATRIMONIO": {
- "AJUSTES POR INFLACION": {
- "DE ACTIVOS EN PERIODO IMPRODUCTIVO": {},
- "DE AJUSTES DECRETO 3019 DE 1989": {},
- "DE CAPITAL SOCIAL": {},
- "DE DIVIDENDOS Y PARTICIPACIONES DECRETADAS EN ACCIONES, CUOTAS O PARTES DE INTERES SOCIAL": {},
- "DE RESERVAS": {},
- "DE RESULTADOS DE EJERCICIOS ANTERIORES": {},
- "DE SANEAMIENTO FISCAL": {},
- "DE SUPERAVIT DE CAPITAL": {},
- "SUPERAVIT METODO DE PARTICIPACION": {}
- },
- "AJUSTES POR INFLACION DECRETO 3019 DE 1989": {},
- "SANEAMIENTO FISCAL": {}
- },
- "SUPERAVIT DE CAPITAL": {
- "CREDITO MERCANTIL": {},
- "DONACIONES": {
- "EN BIENES INMUEBLES": {},
- "EN BIENES MUEBLES": {},
- "EN DINERO": {},
- "EN INTANGIBLES": {},
- "EN VALORES MOBILIARIOS": {}
- },
- "KNOW HOW": {},
- "PRIMA EN COLOCACION DE ACCIONES, CUOTAS O PARTES DE INTERES SOCIAL": {
- "PRIMA EN COLOCACION DE ACCIONES": {},
- "PRIMA EN COLOCACION DE ACCIONES POR COBRAR (DB)": {},
- "PRIMA EN COLOCACION DE CUOTAS O PARTES DE INTERES SOCIAL": {}
- },
- "SUPERAVIT METODO DE PARTICIPACION": {
- "DE ACCIONES": {},
- "DE CUOTAS O PARTES DE INTERES SOCIAL": {}
- }
- },
- "SUPERAVIT POR VALORIZACIONES": {
- "DE INVERSIONES": {
- "ACCIONES": {},
- "CUOTAS O PARTES DE INTERES SOCIAL": {},
- "DERECHOS FIDUCIARIOS": {}
- },
- "DE OTROS ACTIVOS": {
- "BIENES DE ARTE Y CULTURA": {},
- "BIENES ENTREGADOS EN COMODATO": {},
- "BIENES RECIBIDOS EN PAGO": {},
- "INVENTARIO DE SEMOVIENTES": {}
- },
- "DE PROPIEDADES, PLANTA Y EQUIPO": {
- "ACUEDUCTOS, PLANTAS Y REDES": {},
- "ARMAMENTO DE VIGILANCIA": {},
- "CONSTRUCCIONES Y EDIFICACIONES": {},
- "ENVASES Y EMPAQUES": {},
- "EQUIPO DE COMPUTACION Y COMUNICACION": {},
- "EQUIPO DE HOTELES Y RESTAURANTES": {},
- "EQUIPO DE OFICINA": {},
- "EQUIPO MEDICO-CIENTIFICO": {},
- "FLOTA Y EQUIPO AEREO": {},
- "FLOTA Y EQUIPO DE TRANSPORTE": {},
- "FLOTA Y EQUIPO FERREO": {},
- "FLOTA Y EQUIPO FLUVIAL Y/O MARITIMO": {},
- "MAQUINARIA Y EQUIPO": {},
- "MATERIALES PROYECTOS PETROLEROS": {},
- "MINAS Y CANTERAS": {},
- "PLANTACIONES AGRICOLAS Y FORESTALES": {},
- "POZOS ARTESIANOS": {},
- "SEMOVIENTES": {},
- "TERRENOS": {},
- "VIAS DE COMUNICACION": {},
- "YACIMIENTOS": {}
- }
- },
- "root_type": "Asset"
- }
- }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/co_plan_unico_de_cuentas.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/co_plan_unico_de_cuentas.json
new file mode 100644
index 0000000..622f4b6
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/co_plan_unico_de_cuentas.json
@@ -0,0 +1,9400 @@
+{
+ "country_code": "co",
+ "name": "Colombia PUC",
+ "tree": {
+ "Activo": {
+ "account_number": "1",
+ "root_type": "Asset",
+ "Disponible": {
+ "account_number": "11",
+ "Caja": {
+ "account_number": "1105",
+ "account_type": "Cash",
+ "Caja general": {
+ "account_number": "110505",
+ "account_type": "Cash"
+ },
+ "Cajas menores": {
+ "account_number": "110510",
+ "account_type": "Cash"
+ },
+ "Moneda extranjera": {
+ "account_number": "110515",
+ "account_type": "Cash"
+ }
+ },
+ "Bancos": {
+ "account_number": "1110",
+ "account_type": "Bank",
+ "Moneda nacional": {
+ "account_number": "111005",
+ "account_type": "Bank"
+ },
+ "Moneda extranjera": {
+ "account_number": "111010",
+ "account_type": "Bank"
+ }
+ },
+ "Remesas en tr\u00e1nsito": {
+ "account_number": "1115",
+ "Moneda nacional": {
+ "account_number": "111505"
+ },
+ "Moneda extranjera": {
+ "account_number": "111510"
+ }
+ },
+ "Cuentas de ahorro": {
+ "account_number": "1120",
+ "Bancos": {
+ "account_number": "112005"
+ },
+ "Corporaciones de ahorro y vivienda": {
+ "account_number": "112010"
+ },
+ "Organismos cooperativos financieros": {
+ "account_number": "112015"
+ }
+ },
+ "Fondos": {
+ "account_number": "1125",
+ "Rotatorios moneda nacional": {
+ "account_number": "112505"
+ },
+ "Rotatorios moneda extranjera": {
+ "account_number": "112510"
+ },
+ "Especiales moneda nacional": {
+ "account_number": "112515"
+ },
+ "Especiales moneda extranjera": {
+ "account_number": "112520"
+ },
+ "De amortizaci\u00f3n moneda nacional": {
+ "account_number": "112525"
+ },
+ "De amortizaci\u00f3n moneda extranjera": {
+ "account_number": "112530"
+ }
+ }
+ },
+ "Inversiones": {
+ "account_number": "12",
+ "Acciones": {
+ "account_number": "1205",
+ "Agricultura, ganader\u00eda, caza y silvicultura": {
+ "account_number": "120505"
+ },
+ "Pesca": {
+ "account_number": "120510"
+ },
+ "Explotaci\u00f3n de minas y canteras": {
+ "account_number": "120515"
+ },
+ "Industria manufacturera": {
+ "account_number": "120520"
+ },
+ "Suministro de electricidad, gas y agua": {
+ "account_number": "120525"
+ },
+ "Construcci\u00f3n": {
+ "account_number": "120530"
+ },
+ "Comercio al por mayor y al por menor": {
+ "account_number": "120535"
+ },
+ "Hoteles y restaurantes": {
+ "account_number": "120540"
+ },
+ "Transporte, almacenamiento y comunicaciones": {
+ "account_number": "120545"
+ },
+ "Actividad financiera": {
+ "account_number": "120550"
+ },
+ "Actividades inmobiliarias, empresariales y de alquiler": {
+ "account_number": "120555"
+ },
+ "Ense\u00f1anza": {
+ "account_number": "120560"
+ },
+ "Servicios sociales y de salud": {
+ "account_number": "120565"
+ },
+ "Otras actividades de servicios comunitarios, sociales y personales": {
+ "account_number": "120570"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "120599"
+ }
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "1210",
+ "Agricultura, ganader\u00eda, caza y silvicultura": {
+ "account_number": "121005"
+ },
+ "Pesca": {
+ "account_number": "121010"
+ },
+ "Explotaci\u00f3n de minas y canteras": {
+ "account_number": "121015"
+ },
+ "Industria manufacturera": {
+ "account_number": "121020"
+ },
+ "Suministro de electricidad, gas y agua": {
+ "account_number": "121025"
+ },
+ "Construcci\u00f3n": {
+ "account_number": "121030"
+ },
+ "Comercio al por mayor y al por menor": {
+ "account_number": "121035"
+ },
+ "Hoteles y restaurantes": {
+ "account_number": "121040"
+ },
+ "Transporte, almacenamiento y comunicaciones": {
+ "account_number": "121045"
+ },
+ "Actividad financiera": {
+ "account_number": "121050"
+ },
+ "Actividades inmobiliarias, empresariales y de alquiler": {
+ "account_number": "121055"
+ },
+ "Ense\u00f1anza": {
+ "account_number": "121060"
+ },
+ "Servicios sociales y de salud": {
+ "account_number": "121065"
+ },
+ "Otras actividades de servicios comunitarios, sociales y personales": {
+ "account_number": "121070"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "121099"
+ }
+ },
+ "Bonos": {
+ "account_number": "1215",
+ "Bonos p\u00fablicos moneda nacional": {
+ "account_number": "121505"
+ },
+ "Bonos p\u00fablicos moneda extranjera": {
+ "account_number": "121510"
+ },
+ "Bonos ordinarios": {
+ "account_number": "121515"
+ },
+ "Bonos convertibles en acciones": {
+ "account_number": "121520"
+ },
+ "Otros": {
+ "account_number": "121595"
+ }
+ },
+ "C\u00e9dulas": {
+ "account_number": "1220",
+ "C\u00e9dulas de capitalizaci\u00f3n": {
+ "account_number": "122005"
+ },
+ "C\u00e9dulas hipotecarias": {
+ "account_number": "122010"
+ },
+ "C\u00e9dulas de inversi\u00f3n": {
+ "account_number": "122015"
+ },
+ "Otras": {
+ "account_number": "122095"
+ }
+ },
+ "Certificados": {
+ "account_number": "1225",
+ "Certificados de dep\u00f3sito a t\u00e9rmino (CDT)": {
+ "account_number": "122505"
+ },
+ "Certificados de dep\u00f3sito de ahorro": {
+ "account_number": "122510"
+ },
+ "Certificados de ahorro de valor constante (CAVC)": {
+ "account_number": "122515"
+ },
+ "Certificados de cambio": {
+ "account_number": "122520"
+ },
+ "Certificados cafeteros valorizables": {
+ "account_number": "122525"
+ },
+ "Certificados el\u00e9ctricos valorizables (CEV)": {
+ "account_number": "122530"
+ },
+ "Certificados de reembolso tributario (CERT)": {
+ "account_number": "122535"
+ },
+ "Certificados de desarrollo tur\u00edstico": {
+ "account_number": "122540"
+ },
+ "Certificados de inversi\u00f3n forestal (CIF)": {
+ "account_number": "122545"
+ },
+ "Otros": {
+ "account_number": "122595"
+ }
+ },
+ "Papeles comerciales": {
+ "account_number": "1230",
+ "Empresas comerciales": {
+ "account_number": "123005"
+ },
+ "Empresas industriales": {
+ "account_number": "123010"
+ },
+ "Empresas de servicios": {
+ "account_number": "123015"
+ }
+ },
+ "T\u00edtulos": {
+ "account_number": "1235",
+ "T\u00edtulos de desarrollo agropecuario": {
+ "account_number": "123505"
+ },
+ "T\u00edtulos canjeables por certificados de cambio": {
+ "account_number": "123510"
+ },
+ "T\u00edtulos de tesorer\u00eda (TES)": {
+ "account_number": "123515"
+ },
+ "T\u00edtulos de participaci\u00f3n": {
+ "account_number": "123520"
+ },
+ "T\u00edtulos de cr\u00e9dito de fomento": {
+ "account_number": "123525"
+ },
+ "T\u00edtulos financieros agroindustriales (TFA)": {
+ "account_number": "123530"
+ },
+ "T\u00edtulos de ahorro cafetero (TAC)": {
+ "account_number": "123535"
+ },
+ "T\u00edtulos de ahorro nacional (TAN)": {
+ "account_number": "123540"
+ },
+ "T\u00edtulos energ\u00e9ticos de rentabilidad creciente (TER)": {
+ "account_number": "123545"
+ },
+ "T\u00edtulos de ahorro educativo (TAE)": {
+ "account_number": "123550"
+ },
+ "T\u00edtulos financieros industriales y comerciales": {
+ "account_number": "123555"
+ },
+ "Tesoros": {
+ "account_number": "123560"
+ },
+ "T\u00edtulos de devoluci\u00f3n de impuestos nacionales (TIDIS)": {
+ "account_number": "123565"
+ },
+ "T\u00edtulos inmobiliarios": {
+ "account_number": "123570"
+ },
+ "Otros": {
+ "account_number": "123595"
+ }
+ },
+ "Aceptaciones bancarias o financieras": {
+ "account_number": "1240",
+ "Bancos comerciales": {
+ "account_number": "124005"
+ },
+ "Compa\u00f1\u00edas de financiamiento comercial": {
+ "account_number": "124010"
+ },
+ "Corporaciones financieras": {
+ "account_number": "124015"
+ },
+ "Otras": {
+ "account_number": "124095"
+ }
+ },
+ "Derechos fiduciarios": {
+ "account_number": "1245",
+ "Fideicomisos de inversi\u00f3n moneda nacional": {
+ "account_number": "124505"
+ },
+ "Fideicomisos de inversi\u00f3n moneda extranjera": {
+ "account_number": "124510"
+ }
+ },
+ "Derechos de recompra de inversiones negociadas (repos)": {
+ "account_number": "1250",
+ "Acciones": {
+ "account_number": "125005"
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "125010"
+ },
+ "Bonos": {
+ "account_number": "125015"
+ },
+ "C\u00e9dulas": {
+ "account_number": "125020"
+ },
+ "Certificados": {
+ "account_number": "125025"
+ },
+ "Papeles comerciales": {
+ "account_number": "125030"
+ },
+ "T\u00edtulos": {
+ "account_number": "125035"
+ },
+ "Aceptaciones bancarias o financieras": {
+ "account_number": "125040"
+ },
+ "Otros": {
+ "account_number": "125095"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "125099"
+ }
+ },
+ "Obligatorias": {
+ "account_number": "1255",
+ "Bonos de financiamiento especial": {
+ "account_number": "125505"
+ },
+ "Bonos de financiamiento presupuestal": {
+ "account_number": "125510"
+ },
+ "Bonos para desarrollo social y seguridad interna (BDSI)": {
+ "account_number": "125515"
+ },
+ "Otras": {
+ "account_number": "125595"
+ }
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "1260",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "126099"
+ }
+ },
+ "Otras inversiones": {
+ "account_number": "1295",
+ "Aportes en cooperativas": {
+ "account_number": "129505"
+ },
+ "Derechos en clubes sociales": {
+ "account_number": "129510"
+ },
+ "Acciones o derechos en clubes deportivos": {
+ "account_number": "129515"
+ },
+ "Bonos en colegios": {
+ "account_number": "129520"
+ },
+ "Diversas": {
+ "account_number": "129595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "129599"
+ }
+ },
+ "Provisiones": {
+ "account_number": "1299",
+ "Acciones": {
+ "account_number": "129905"
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "129910"
+ },
+ "Bonos": {
+ "account_number": "129915"
+ },
+ "C\u00e9dulas": {
+ "account_number": "129920"
+ },
+ "Certificados": {
+ "account_number": "129925"
+ },
+ "Papeles comerciales": {
+ "account_number": "129930"
+ },
+ "T\u00edtulos": {
+ "account_number": "129935"
+ },
+ "Aceptaciones bancarias o financieras": {
+ "account_number": "129940"
+ },
+ "Derechos fiduciarios": {
+ "account_number": "129945"
+ },
+ "Derechos de recompra de inversiones negociadas": {
+ "account_number": "129950"
+ },
+ "Obligatorias": {
+ "account_number": "129955"
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "129960"
+ },
+ "Otras inversiones": {
+ "account_number": "129995"
+ }
+ }
+ },
+ "Deudores": {
+ "account_number": "13",
+ "account_type": "Receivable",
+ "Clientes": {
+ "account_number": "1305",
+ "account_type": "Receivable",
+ "Nacionales": {
+ "account_number": "130505",
+ "account_type": "Receivable"
+ },
+ "Del exterior": {
+ "account_number": "130510",
+ "account_type": "Receivable"
+ },
+ "Deudores del sistema": {
+ "account_number": "130515",
+ "account_type": "Receivable"
+ }
+ },
+ "Cuentas corrientes comerciales": {
+ "account_number": "1310",
+ "account_type": "Receivable",
+ "Casa matriz": {
+ "account_number": "131005",
+ "account_type": "Receivable"
+ },
+ "Compa\u00f1\u00edas vinculadas": {
+ "account_number": "131010",
+ "account_type": "Receivable"
+ },
+ "Accionistas o socios": {
+ "account_number": "131015",
+ "account_type": "Receivable"
+ },
+ "Particulares": {
+ "account_number": "131020",
+ "account_type": "Receivable"
+ },
+ "Otras": {
+ "account_number": "131095",
+ "account_type": "Receivable"
+ }
+ },
+ "Cuentas por cobrar a casa matriz": {
+ "account_number": "1315",
+ "account_type": "Receivable",
+ "Ventas": {
+ "account_number": "131505",
+ "account_type": "Receivable"
+ },
+ "Pagos a nombre de casa matriz": {
+ "account_number": "131510",
+ "account_type": "Receivable"
+ },
+ "Valores recibidos por casa matriz": {
+ "account_number": "131515",
+ "account_type": "Receivable"
+ },
+ "Pr\u00e9stamos": {
+ "account_number": "131520",
+ "account_type": "Receivable"
+ }
+ },
+ "Cuentas por cobrar a vinculados econ\u00f3micos": {
+ "account_number": "1320",
+ "account_type": "Receivable",
+ "Filiales": {
+ "account_number": "132005",
+ "account_type": "Receivable"
+ },
+ "Subsidiarias": {
+ "account_number": "132010",
+ "account_type": "Receivable"
+ },
+ "Sucursales": {
+ "account_number": "132015",
+ "account_type": "Receivable"
+ }
+ },
+ "Cuentas por cobrar a directores": {
+ "account_number": "1323",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar a socios y accionistas": {
+ "account_number": "1325",
+ "account_type": "Receivable",
+ "A socios": {
+ "account_number": "132505",
+ "account_type": "Receivable"
+ },
+ "A accionistas": {
+ "account_number": "132510",
+ "account_type": "Receivable"
+ }
+ },
+ "Aportes por cobrar": {
+ "account_number": "1328",
+ "account_type": "Receivable"
+ },
+ "Anticipos y avances": {
+ "account_number": "1330",
+ "account_type": "Receivable",
+ "A proveedores": {
+ "account_number": "133005",
+ "account_type": "Receivable"
+ },
+ "A contratistas": {
+ "account_number": "133010",
+ "account_type": "Receivable"
+ },
+ "A trabajadores": {
+ "account_number": "133015",
+ "account_type": "Receivable"
+ },
+ "A agentes": {
+ "account_number": "133020",
+ "account_type": "Receivable"
+ },
+ "A concesionarios": {
+ "account_number": "133025",
+ "account_type": "Receivable"
+ },
+ "De adjudicaciones": {
+ "account_number": "133030",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "133095",
+ "account_type": "Receivable"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "133099",
+ "account_type": "Receivable"
+ }
+ },
+ "Cuentas de operaci\u00f3n conjunta": {
+ "account_number": "1332",
+ "account_type": "Receivable"
+ },
+ "Dep\u00f3sitos": {
+ "account_number": "1335",
+ "account_type": "Receivable",
+ "Para importaciones": {
+ "account_number": "133505",
+ "account_type": "Receivable"
+ },
+ "Para servicios": {
+ "account_number": "133510",
+ "account_type": "Receivable"
+ },
+ "Para contratos": {
+ "account_number": "133515",
+ "account_type": "Receivable"
+ },
+ "Para responsabilidades": {
+ "account_number": "133520",
+ "account_type": "Receivable"
+ },
+ "Para juicios ejecutivos": {
+ "account_number": "133525",
+ "account_type": "Receivable"
+ },
+ "Para adquisici\u00f3n de acciones, cuotas o derechos sociales": {
+ "account_number": "133530",
+ "account_type": "Receivable"
+ },
+ "En garant\u00eda": {
+ "account_number": "133535",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "133595",
+ "account_type": "Receivable"
+ }
+ },
+ "Promesas de compra venta": {
+ "account_number": "1340",
+ "account_type": "Receivable",
+ "De bienes ra\u00edces": {
+ "account_number": "134005",
+ "account_type": "Receivable"
+ },
+ "De maquinaria y equipo": {
+ "account_number": "134010",
+ "account_type": "Receivable"
+ },
+ "De flota y equipo de transporte": {
+ "account_number": "134015",
+ "account_type": "Receivable"
+ },
+ "De flota y equipo a\u00e9reo": {
+ "account_number": "134020",
+ "account_type": "Receivable"
+ },
+ "De flota y equipo f\u00e9rreo": {
+ "account_number": "134025",
+ "account_type": "Receivable"
+ },
+ "De flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "134030",
+ "account_type": "Receivable"
+ },
+ "De semovientes": {
+ "account_number": "134035",
+ "account_type": "Receivable"
+ },
+ "De otros bienes": {
+ "account_number": "134095",
+ "account_type": "Receivable"
+ }
+ },
+ "Ingresos por cobrar": {
+ "account_number": "1345",
+ "account_type": "Receivable",
+ "Dividendos y/o participaciones": {
+ "account_number": "134505",
+ "account_type": "Receivable"
+ },
+ "Intereses": {
+ "account_number": "134510",
+ "account_type": "Receivable"
+ },
+ "Comisiones": {
+ "account_number": "134515",
+ "account_type": "Receivable"
+ },
+ "Honorarios": {
+ "account_number": "134520",
+ "account_type": "Receivable"
+ },
+ "Servicios": {
+ "account_number": "134525",
+ "account_type": "Receivable"
+ },
+ "Arrendamientos": {
+ "account_number": "134530",
+ "account_type": "Receivable"
+ },
+ "CERT por cobrar": {
+ "account_number": "134535",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "134595",
+ "account_type": "Receivable"
+ }
+ },
+ "Retenci\u00f3n sobre contratos": {
+ "account_number": "1350",
+ "account_type": "Receivable",
+ "De construcci\u00f3n": {
+ "account_number": "135005",
+ "account_type": "Receivable"
+ },
+ "De prestaci\u00f3n de servicios": {
+ "account_number": "135010",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "135095",
+ "account_type": "Receivable"
+ }
+ },
+ "Anticipo de impuestos y contribuciones o saldos a favor": {
+ "account_number": "1355",
+ "account_type": "Receivable",
+ "Anticipo de impuestos de renta y complementarios": {
+ "account_number": "135505",
+ "account_type": "Receivable"
+ },
+ "Anticipo de impuestos de industria y comercio": {
+ "account_number": "135510",
+ "account_type": "Receivable"
+ },
+ "Retenci\u00f3n en la fuente": {
+ "account_number": "135515",
+ "account_type": "Receivable"
+ },
+ "Impuesto a las ventas retenido": {
+ "account_number": "135517",
+ "account_type": "Receivable"
+ },
+ "Impuesto de industria y comercio retenido": {
+ "account_number": "135518",
+ "account_type": "Receivable"
+ },
+ "Sobrantes en liquidaci\u00f3n privada de impuestos": {
+ "account_number": "135520",
+ "account_type": "Receivable"
+ },
+ "Contribuciones": {
+ "account_number": "135525",
+ "account_type": "Receivable"
+ },
+ "Impuestos descontables": {
+ "account_number": "135530",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "135595",
+ "account_type": "Receivable"
+ }
+ },
+ "Reclamaciones": {
+ "account_number": "1360",
+ "account_type": "Receivable",
+ "A compa\u00f1\u00edas aseguradoras": {
+ "account_number": "136005",
+ "account_type": "Receivable"
+ },
+ "A transportadores": {
+ "account_number": "136010",
+ "account_type": "Receivable"
+ },
+ "Por tiquetes a\u00e9reos": {
+ "account_number": "136015",
+ "account_type": "Receivable"
+ },
+ "Otras": {
+ "account_number": "136095",
+ "account_type": "Receivable"
+ }
+ },
+ "Cuentas por cobrar a trabajadores": {
+ "account_number": "1365",
+ "account_type": "Receivable",
+ "Vivienda": {
+ "account_number": "136505",
+ "account_type": "Receivable"
+ },
+ "Veh\u00edculos": {
+ "account_number": "136510",
+ "account_type": "Receivable"
+ },
+ "Educaci\u00f3n": {
+ "account_number": "136515",
+ "account_type": "Receivable"
+ },
+ "M\u00e9dicos, odontol\u00f3gicos y similares": {
+ "account_number": "136520",
+ "account_type": "Receivable"
+ },
+ "Calamidad dom\u00e9stica": {
+ "account_number": "136525",
+ "account_type": "Receivable"
+ },
+ "Responsabilidades": {
+ "account_number": "136530",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "136595",
+ "account_type": "Receivable"
+ }
+ },
+ "Pr\u00e9stamos a particulares": {
+ "account_number": "1370",
+ "account_type": "Receivable",
+ "Con garant\u00eda real": {
+ "account_number": "137005",
+ "account_type": "Receivable"
+ },
+ "Con garant\u00eda personal": {
+ "account_number": "137010",
+ "account_type": "Receivable"
+ }
+ },
+ "Deudores varios": {
+ "account_number": "1380",
+ "account_type": "Receivable",
+ "Depositarios": {
+ "account_number": "138005",
+ "account_type": "Receivable"
+ },
+ "Comisionistas de bolsas": {
+ "account_number": "138010",
+ "account_type": "Receivable"
+ },
+ "Fondo de inversi\u00f3n": {
+ "account_number": "138015",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar de terceros": {
+ "account_number": "138020",
+ "account_type": "Receivable"
+ },
+ "Pagos por cuenta de terceros": {
+ "account_number": "138025",
+ "account_type": "Receivable"
+ },
+ "Fondos de inversi\u00f3n social": {
+ "account_number": "138030",
+ "account_type": "Receivable"
+ },
+ "Otros": {
+ "account_number": "138095",
+ "account_type": "Receivable"
+ }
+ },
+ "Derechos de recompra de cartera negociada": {
+ "account_number": "1385",
+ "account_type": "Receivable"
+ },
+ "Deudas de dif\u00edcil cobro": {
+ "account_number": "1390",
+ "account_type": "Receivable"
+ },
+ "Provisiones": {
+ "account_number": "1399",
+ "account_type": "Receivable",
+ "Clientes": {
+ "account_number": "139905",
+ "account_type": "Receivable"
+ },
+ "Cuentas corrientes comerciales": {
+ "account_number": "139910",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar a casa matriz": {
+ "account_number": "139915",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar a vinculados econ\u00f3micos": {
+ "account_number": "139920",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar a socios y accionistas": {
+ "account_number": "139925",
+ "account_type": "Receivable"
+ },
+ "Anticipos y avances": {
+ "account_number": "139930",
+ "account_type": "Receivable"
+ },
+ "Cuentas de operaci\u00f3n conjunta": {
+ "account_number": "139932",
+ "account_type": "Receivable"
+ },
+ "Dep\u00f3sitos": {
+ "account_number": "139935",
+ "account_type": "Receivable"
+ },
+ "Promesas de compraventa": {
+ "account_number": "139940",
+ "account_type": "Receivable"
+ },
+ "Ingresos por cobrar": {
+ "account_number": "139945",
+ "account_type": "Receivable"
+ },
+ "Retenci\u00f3n sobre contratos": {
+ "account_number": "139950",
+ "account_type": "Receivable"
+ },
+ "Reclamaciones": {
+ "account_number": "139955",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar a trabajadores": {
+ "account_number": "139960",
+ "account_type": "Receivable"
+ },
+ "Pr\u00e9stamos a particulares": {
+ "account_number": "139965",
+ "account_type": "Receivable"
+ },
+ "Deudores varios": {
+ "account_number": "139975",
+ "account_type": "Receivable"
+ },
+ "Derechos de recompra de cartera negociada": {
+ "account_number": "139980",
+ "account_type": "Receivable"
+ }
+ }
+ },
+ "Inventarios": {
+ "account_number": "14",
+ "account_type": "Stock",
+ "Materias primas": {
+ "account_number": "1405",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "140599",
+ "account_type": "Stock"
+ }
+ },
+ "Productos en proceso": {
+ "account_number": "1410",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "141099",
+ "account_type": "Stock"
+ }
+ },
+ "Obras de construcci\u00f3n en curso": {
+ "account_number": "1415",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "141599",
+ "account_type": "Stock"
+ }
+ },
+ "Obras de urbanismo": {
+ "account_number": "1417",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "141799",
+ "account_type": "Stock"
+ }
+ },
+ "Contratos en ejecuci\u00f3n": {
+ "account_number": "1420",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "142099",
+ "account_type": "Stock"
+ }
+ },
+ "Cultivos en desarrollo": {
+ "account_number": "1425",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "142599",
+ "account_type": "Stock"
+ }
+ },
+ "Plantaciones agr\u00edcolas": {
+ "account_number": "1428",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "142899",
+ "account_type": "Stock"
+ }
+ },
+ "Productos terminados": {
+ "account_number": "1430",
+ "account_type": "Stock",
+ "Productos manufacturados": {
+ "account_number": "143005",
+ "account_type": "Stock"
+ },
+ "Productos extra\u00eddos y/o procesados": {
+ "account_number": "143010",
+ "account_type": "Stock"
+ },
+ "Productos agr\u00edcolas y forestales": {
+ "account_number": "143015",
+ "account_type": "Stock"
+ },
+ "Subproductos": {
+ "account_number": "143020",
+ "account_type": "Stock"
+ },
+ "Productos de pesca": {
+ "account_number": "143025",
+ "account_type": "Stock"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "143099",
+ "account_type": "Stock"
+ }
+ },
+ "Mercanc\u00edas no fabricadas por la empresa": {
+ "account_number": "1435",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "143599",
+ "account_type": "Stock"
+ }
+ },
+ "Bienes ra\u00edces para la venta": {
+ "account_number": "1440",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "144099",
+ "account_type": "Stock"
+ }
+ },
+ "Semovientes": {
+ "account_number": "1445",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "144599",
+ "account_type": "Stock"
+ }
+ },
+ "Terrenos": {
+ "account_number": "1450",
+ "account_type": "Stock",
+ "Por urbanizar": {
+ "account_number": "145005",
+ "account_type": "Stock"
+ },
+ "Urbanizados por construir": {
+ "account_number": "145010",
+ "account_type": "Stock"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "145099",
+ "account_type": "Stock"
+ }
+ },
+ "Materiales, repuestos y accesorios": {
+ "account_number": "1455",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "145599",
+ "account_type": "Stock"
+ }
+ },
+ "Envases y empaques": {
+ "account_number": "1460",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "146099",
+ "account_type": "Stock"
+ }
+ },
+ "Inventarios en tr\u00e1nsito": {
+ "account_number": "1465",
+ "account_type": "Stock",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "146599",
+ "account_type": "Stock"
+ }
+ },
+ "Provisiones": {
+ "account_number": "1499",
+ "account_type": "Stock",
+ "Para obsolescencia": {
+ "account_number": "149905",
+ "account_type": "Stock"
+ },
+ "Para diferencia de inventario f\u00edsico": {
+ "account_number": "149910",
+ "account_type": "Stock"
+ },
+ "Para p\u00e9rdidas de inventarios": {
+ "account_number": "149915",
+ "account_type": "Stock"
+ },
+ "Lifo": {
+ "account_number": "149920",
+ "account_type": "Stock"
+ }
+ }
+ },
+ "Propiedades, planta y equipo": {
+ "account_number": "15",
+ "account_type": "Fixed Asset",
+ "Terrenos": {
+ "account_number": "1504",
+ "account_type": "Fixed Asset",
+ "Urbanos": {
+ "account_number": "150405",
+ "account_type": "Fixed Asset"
+ },
+ "Rurales": {
+ "account_number": "150410",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "150499",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Materiales proyectos petroleros": {
+ "account_number": "1506",
+ "account_type": "Fixed Asset",
+ "Tuber\u00edas y equipo": {
+ "account_number": "150605",
+ "account_type": "Fixed Asset"
+ },
+ "Costos de importaci\u00f3n materiales": {
+ "account_number": "150610",
+ "account_type": "Fixed Asset"
+ },
+ "Proyectos de construcci\u00f3n": {
+ "account_number": "150615",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "150699",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Construcciones en curso": {
+ "account_number": "1508",
+ "account_type": "Fixed Asset",
+ "Construcciones y edificaciones": {
+ "account_number": "150805",
+ "account_type": "Fixed Asset"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "150810",
+ "account_type": "Fixed Asset"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "150815",
+ "account_type": "Fixed Asset"
+ },
+ "Pozos artesianos": {
+ "account_number": "150820",
+ "account_type": "Fixed Asset"
+ },
+ "Proyectos de exploraci\u00f3n": {
+ "account_number": "150825",
+ "account_type": "Fixed Asset"
+ },
+ "Proyectos de desarrollo": {
+ "account_number": "150830",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "150899",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Maquinaria y equipos en montaje": {
+ "account_number": "1512",
+ "account_type": "Fixed Asset",
+ "Maquinaria y equipo": {
+ "account_number": "151205",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de oficina": {
+ "account_number": "151210",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "151215",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "151220",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "151225",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "151230",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "151235",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "151240",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "151245",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas y redes": {
+ "account_number": "151250",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "151299",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "1516",
+ "account_type": "Fixed Asset",
+ "Edificios": {
+ "account_number": "151605",
+ "account_type": "Fixed Asset"
+ },
+ "Oficinas": {
+ "account_number": "151610",
+ "account_type": "Fixed Asset"
+ },
+ "Almacenes": {
+ "account_number": "151615",
+ "account_type": "Fixed Asset"
+ },
+ "F\u00e1bricas y plantas industriales": {
+ "account_number": "151620",
+ "account_type": "Fixed Asset"
+ },
+ "Salas de exhibici\u00f3n y ventas": {
+ "account_number": "151625",
+ "account_type": "Fixed Asset"
+ },
+ "Cafeter\u00eda y casinos": {
+ "account_number": "151630",
+ "account_type": "Fixed Asset"
+ },
+ "Silos": {
+ "account_number": "151635",
+ "account_type": "Fixed Asset"
+ },
+ "Invernaderos": {
+ "account_number": "151640",
+ "account_type": "Fixed Asset"
+ },
+ "Casetas y campamentos": {
+ "account_number": "151645",
+ "account_type": "Fixed Asset"
+ },
+ "Instalaciones agropecuarias": {
+ "account_number": "151650",
+ "account_type": "Fixed Asset"
+ },
+ "Viviendas para empleados y obreros": {
+ "account_number": "151655",
+ "account_type": "Fixed Asset"
+ },
+ "Terminal de buses y taxis": {
+ "account_number": "151660",
+ "account_type": "Fixed Asset"
+ },
+ "Terminal mar\u00edtimo": {
+ "account_number": "151663",
+ "account_type": "Fixed Asset"
+ },
+ "Terminal f\u00e9rreo": {
+ "account_number": "151665",
+ "account_type": "Fixed Asset"
+ },
+ "Parqueaderos, garajes y dep\u00f3sitos": {
+ "account_number": "151670",
+ "account_type": "Fixed Asset"
+ },
+ "Hangares": {
+ "account_number": "151675",
+ "account_type": "Fixed Asset"
+ },
+ "Bodegas": {
+ "account_number": "151680",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "151695",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "151699",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Maquinaria y equipo": {
+ "account_number": "1520",
+ "account_type": "Fixed Asset",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "152099",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Equipo de oficina": {
+ "account_number": "1524",
+ "account_type": "Fixed Asset",
+ "Muebles y enseres": {
+ "account_number": "152405",
+ "account_type": "Fixed Asset"
+ },
+ "Equipos": {
+ "account_number": "152410",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "152495",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "152499",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "1528",
+ "account_type": "Fixed Asset",
+ "Equipos de procesamiento de datos": {
+ "account_number": "152805",
+ "account_type": "Fixed Asset"
+ },
+ "Equipos de telecomunicaciones": {
+ "account_number": "152810",
+ "account_type": "Fixed Asset"
+ },
+ "Equipos de radio": {
+ "account_number": "152815",
+ "account_type": "Fixed Asset"
+ },
+ "Sat\u00e9lites y antenas": {
+ "account_number": "152820",
+ "account_type": "Fixed Asset"
+ },
+ "L\u00edneas telef\u00f3nicas": {
+ "account_number": "152825",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "152895",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "152899",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "1532",
+ "account_type": "Fixed Asset",
+ "M\u00e9dico": {
+ "account_number": "153205",
+ "account_type": "Fixed Asset"
+ },
+ "Odontol\u00f3gico": {
+ "account_number": "153210",
+ "account_type": "Fixed Asset"
+ },
+ "Laboratorio": {
+ "account_number": "153215",
+ "account_type": "Fixed Asset"
+ },
+ "Instrumental": {
+ "account_number": "153220",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "153295",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "153299",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "1536",
+ "account_type": "Fixed Asset",
+ "De habitaciones": {
+ "account_number": "153605",
+ "account_type": "Fixed Asset"
+ },
+ "De comestibles y bebidas": {
+ "account_number": "153610",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "153695",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "153699",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "1540",
+ "account_type": "Fixed Asset",
+ "Autos, camionetas y camperos": {
+ "account_number": "154005",
+ "account_type": "Fixed Asset"
+ },
+ "Camiones, volquetas y furgones": {
+ "account_number": "154008",
+ "account_type": "Fixed Asset"
+ },
+ "Tractomulas y remolques": {
+ "account_number": "154010",
+ "account_type": "Fixed Asset"
+ },
+ "Buses y busetas": {
+ "account_number": "154015",
+ "account_type": "Fixed Asset"
+ },
+ "Recolectores y contenedores": {
+ "account_number": "154017",
+ "account_type": "Fixed Asset"
+ },
+ "Montacargas": {
+ "account_number": "154020",
+ "account_type": "Fixed Asset"
+ },
+ "Palas y gr\u00faas": {
+ "account_number": "154025",
+ "account_type": "Fixed Asset"
+ },
+ "Motocicletas": {
+ "account_number": "154030",
+ "account_type": "Fixed Asset"
+ },
+ "Bicicletas": {
+ "account_number": "154035",
+ "account_type": "Fixed Asset"
+ },
+ "Estibas y carretas": {
+ "account_number": "154040",
+ "account_type": "Fixed Asset"
+ },
+ "Bandas transportadoras": {
+ "account_number": "154045",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "154095",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "154099",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "1544",
+ "account_type": "Fixed Asset",
+ "Buques": {
+ "account_number": "154405",
+ "account_type": "Fixed Asset"
+ },
+ "Lanchas": {
+ "account_number": "154410",
+ "account_type": "Fixed Asset"
+ },
+ "Remolcadoras": {
+ "account_number": "154415",
+ "account_type": "Fixed Asset"
+ },
+ "Botes": {
+ "account_number": "154420",
+ "account_type": "Fixed Asset"
+ },
+ "Boyas": {
+ "account_number": "154425",
+ "account_type": "Fixed Asset"
+ },
+ "Amarres": {
+ "account_number": "154430",
+ "account_type": "Fixed Asset"
+ },
+ "Contenedores y chasises": {
+ "account_number": "154435",
+ "account_type": "Fixed Asset"
+ },
+ "Gabarras": {
+ "account_number": "154440",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "154495",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "154499",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "1548",
+ "account_type": "Fixed Asset",
+ "Aviones": {
+ "account_number": "154805",
+ "account_type": "Fixed Asset"
+ },
+ "Avionetas": {
+ "account_number": "154810",
+ "account_type": "Fixed Asset"
+ },
+ "Helic\u00f3pteros": {
+ "account_number": "154815",
+ "account_type": "Fixed Asset"
+ },
+ "Turbinas y motores": {
+ "account_number": "154820",
+ "account_type": "Fixed Asset"
+ },
+ "Manuales de entrenamiento personal t\u00e9cnico": {
+ "account_number": "154825",
+ "account_type": "Fixed Asset"
+ },
+ "Equipos de vuelo": {
+ "account_number": "154830",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "154895",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "154899",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "1552",
+ "account_type": "Fixed Asset",
+ "Locomotoras": {
+ "account_number": "155205",
+ "account_type": "Fixed Asset"
+ },
+ "Vagones": {
+ "account_number": "155210",
+ "account_type": "Fixed Asset"
+ },
+ "Redes f\u00e9rreas": {
+ "account_number": "155215",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "155295",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "155299",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "1556",
+ "account_type": "Fixed Asset",
+ "Instalaciones para agua y energ\u00eda": {
+ "account_number": "155605",
+ "account_type": "Fixed Asset"
+ },
+ "Acueducto, acequias y canalizaciones": {
+ "account_number": "155610",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de generaci\u00f3n hidr\u00e1ulica": {
+ "account_number": "155615",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de generaci\u00f3n t\u00e9rmica": {
+ "account_number": "155620",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de generaci\u00f3n a gas": {
+ "account_number": "155625",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de generaci\u00f3n diesel, gasolina y petr\u00f3leo": {
+ "account_number": "155628",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de distribuci\u00f3n": {
+ "account_number": "155630",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de transmisi\u00f3n y subestaciones": {
+ "account_number": "155635",
+ "account_type": "Fixed Asset"
+ },
+ "Oleoductos": {
+ "account_number": "155640",
+ "account_type": "Fixed Asset"
+ },
+ "Gasoductos": {
+ "account_number": "155645",
+ "account_type": "Fixed Asset"
+ },
+ "Poliductos": {
+ "account_number": "155647",
+ "account_type": "Fixed Asset"
+ },
+ "Redes de distribuci\u00f3n": {
+ "account_number": "155650",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas de tratamiento": {
+ "account_number": "155655",
+ "account_type": "Fixed Asset"
+ },
+ "Redes de recolecci\u00f3n de aguas negras": {
+ "account_number": "155660",
+ "account_type": "Fixed Asset"
+ },
+ "Instalaciones y equipo de bombeo": {
+ "account_number": "155665",
+ "account_type": "Fixed Asset"
+ },
+ "Redes de distribuci\u00f3n de vapor": {
+ "account_number": "155670",
+ "account_type": "Fixed Asset"
+ },
+ "Redes de aire": {
+ "account_number": "155675",
+ "account_type": "Fixed Asset"
+ },
+ "Redes alimentaci\u00f3n de gas": {
+ "account_number": "155680",
+ "account_type": "Fixed Asset"
+ },
+ "Redes externas de telefon\u00eda": {
+ "account_number": "155682",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas deshidratadoras": {
+ "account_number": "155685",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "155695",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "155699",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Armamento de vigilancia": {
+ "account_number": "1560",
+ "account_type": "Fixed Asset",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "156099",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Envases y empaques": {
+ "account_number": "1562",
+ "account_type": "Fixed Asset",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "156299",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "1564",
+ "account_type": "Fixed Asset",
+ "Cultivos en desarrollo": {
+ "account_number": "156405",
+ "account_type": "Fixed Asset"
+ },
+ "Cultivos amortizables": {
+ "account_number": "156410",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "156499",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "1568",
+ "account_type": "Fixed Asset",
+ "Pavimentaci\u00f3n y patios": {
+ "account_number": "156805",
+ "account_type": "Fixed Asset"
+ },
+ "V\u00edas": {
+ "account_number": "156810",
+ "account_type": "Fixed Asset"
+ },
+ "Puentes": {
+ "account_number": "156815",
+ "account_type": "Fixed Asset"
+ },
+ "Calles": {
+ "account_number": "156820",
+ "account_type": "Fixed Asset"
+ },
+ "Aer\u00f3dromos": {
+ "account_number": "156825",
+ "account_type": "Fixed Asset"
+ },
+ "Otros": {
+ "account_number": "156895",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "156899",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Minas y canteras": {
+ "account_number": "1572",
+ "account_type": "Fixed Asset",
+ "Minas": {
+ "account_number": "157205",
+ "account_type": "Fixed Asset"
+ },
+ "Canteras": {
+ "account_number": "157210",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "157299",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Pozos artesianos": {
+ "account_number": "1576",
+ "account_type": "Fixed Asset",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "157699",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Yacimientos": {
+ "account_number": "1580",
+ "account_type": "Fixed Asset",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "158099",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Semovientes": {
+ "account_number": "1584",
+ "account_type": "Fixed Asset",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "158499",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Propiedades, planta y equipo en tr\u00e1nsito": {
+ "account_number": "1588",
+ "account_type": "Fixed Asset",
+ "Maquinaria y equipo": {
+ "account_number": "158805",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de oficina": {
+ "account_number": "158810",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "158815",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "158820",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "158825",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "158830",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "158835",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "158840",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "158845",
+ "account_type": "Fixed Asset"
+ },
+ "Plantas y redes": {
+ "account_number": "158850",
+ "account_type": "Fixed Asset"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "158855",
+ "account_type": "Fixed Asset"
+ },
+ "Semovientes": {
+ "account_number": "158860",
+ "account_type": "Fixed Asset"
+ },
+ "Envases y empaques": {
+ "account_number": "158865",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "158899",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Depreciaci\u00f3n acumulada": {
+ "account_number": "1592",
+ "account_type": "Fixed Asset",
+ "Construcciones y edificaciones": {
+ "account_number": "159205",
+ "account_type": "Fixed Asset"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "159210",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de oficina": {
+ "account_number": "159215",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "159220",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "159225",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "159230",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "159235",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "159240",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "159245",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "159250",
+ "account_type": "Fixed Asset"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "159255",
+ "account_type": "Fixed Asset"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "159260",
+ "account_type": "Fixed Asset"
+ },
+ "Envases y empaques": {
+ "account_number": "159265",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "159299",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Depreciaci\u00f3n diferida": {
+ "account_number": "1596",
+ "account_type": "Fixed Asset",
+ "Exceso fiscal sobre la contable": {
+ "account_number": "159605",
+ "account_type": "Fixed Asset"
+ },
+ "Defecto fiscal sobre la contable (CR)": {
+ "account_number": "159610",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "159699",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Amortizaci\u00f3n acumulada": {
+ "account_number": "1597",
+ "account_type": "Fixed Asset",
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "159705",
+ "account_type": "Fixed Asset"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "159710",
+ "account_type": "Fixed Asset"
+ },
+ "Semovientes": {
+ "account_number": "159715",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "159799",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Agotamiento acumulado": {
+ "account_number": "1598",
+ "account_type": "Fixed Asset",
+ "Minas y canteras": {
+ "account_number": "159805",
+ "account_type": "Fixed Asset"
+ },
+ "Pozos artesianos": {
+ "account_number": "159815",
+ "account_type": "Fixed Asset"
+ },
+ "Yacimientos": {
+ "account_number": "159820",
+ "account_type": "Fixed Asset"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "159899",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Provisiones": {
+ "account_number": "1599",
+ "account_type": "Fixed Asset",
+ "Terrenos": {
+ "account_number": "159904",
+ "account_type": "Fixed Asset"
+ },
+ "Materiales proyectos petroleros": {
+ "account_number": "159906",
+ "account_type": "Fixed Asset"
+ },
+ "Construcciones en curso": {
+ "account_number": "159908",
+ "account_type": "Fixed Asset"
+ },
+ "Maquinaria en montaje": {
+ "account_number": "159912",
+ "account_type": "Fixed Asset"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "159916",
+ "account_type": "Fixed Asset"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "159920",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de oficina": {
+ "account_number": "159924",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "159928",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "159932",
+ "account_type": "Fixed Asset"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "159936",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "159940",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "159944",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "159948",
+ "account_type": "Fixed Asset"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "159952",
+ "account_type": "Fixed Asset"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "159956",
+ "account_type": "Fixed Asset"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "159960",
+ "account_type": "Fixed Asset"
+ },
+ "Envases y empaques": {
+ "account_number": "159962",
+ "account_type": "Fixed Asset"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "159964",
+ "account_type": "Fixed Asset"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "159968",
+ "account_type": "Fixed Asset"
+ },
+ "Minas y canteras": {
+ "account_number": "159972",
+ "account_type": "Fixed Asset"
+ },
+ "Pozos artesianos": {
+ "account_number": "159980",
+ "account_type": "Fixed Asset"
+ },
+ "Yacimientos": {
+ "account_number": "159984",
+ "account_type": "Fixed Asset"
+ },
+ "Semovientes": {
+ "account_number": "159988",
+ "account_type": "Fixed Asset"
+ },
+ "Propiedades, planta y equipo en tr\u00e1nsito": {
+ "account_number": "159992",
+ "account_type": "Fixed Asset"
+ }
+ }
+ },
+ "Intangibles": {
+ "account_number": "16",
+ "Cr\u00e9dito mercantil": {
+ "account_number": "1605",
+ "Formado o estimado": {
+ "account_number": "160505"
+ },
+ "Adquirido o comprado": {
+ "account_number": "160510"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "160599"
+ }
+ },
+ "Marcas": {
+ "account_number": "1610",
+ "Adquiridas": {
+ "account_number": "161005"
+ },
+ "Formadas": {
+ "account_number": "161010"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "161099"
+ }
+ },
+ "Patentes": {
+ "account_number": "1615",
+ "Adquiridas": {
+ "account_number": "161505"
+ },
+ "Formadas": {
+ "account_number": "161510"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "161599"
+ }
+ },
+ "Concesiones y franquicias": {
+ "account_number": "1620",
+ "Concesiones": {
+ "account_number": "162005"
+ },
+ "Franquicias": {
+ "account_number": "162010"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "162099"
+ }
+ },
+ "Derechos": {
+ "account_number": "1625",
+ "Derechos de autor": {
+ "account_number": "162505"
+ },
+ "Puesto de bolsa": {
+ "account_number": "162510"
+ },
+ "En fideicomisos inmobiliarios": {
+ "account_number": "162515"
+ },
+ "En fideicomisos de garant\u00eda": {
+ "account_number": "162520"
+ },
+ "En fideicomisos de administraci\u00f3n": {
+ "account_number": "162525"
+ },
+ "De exhibici\u00f3n - pel\u00edculas": {
+ "account_number": "162530"
+ },
+ "En bienes recibidos en arrendamiento financiero (leasing)": {
+ "account_number": "162535"
+ },
+ "Otros": {
+ "account_number": "162595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "162599"
+ }
+ },
+ "Know how": {
+ "account_number": "1630",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "163099"
+ }
+ },
+ "Licencias": {
+ "account_number": "1635",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "163599"
+ }
+ },
+ "Depreciaci\u00f3n y/o amortizaci\u00f3n acumulada": {
+ "account_number": "1698",
+ "Cr\u00e9dito mercantil": {
+ "account_number": "169805"
+ },
+ "Marcas": {
+ "account_number": "169810"
+ },
+ "Patentes": {
+ "account_number": "169815"
+ },
+ "Concesiones y franquicias": {
+ "account_number": "169820"
+ },
+ "Derechos": {
+ "account_number": "169830"
+ },
+ "Know how": {
+ "account_number": "169835"
+ },
+ "Licencias": {
+ "account_number": "169840"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "169899"
+ }
+ },
+ "Provisiones": {
+ "account_number": "1699",
+ "account_type": "Accumulated Depreciation"
+ }
+ },
+ "Diferidos": {
+ "account_number": "17",
+ "Gastos pagados por anticipado": {
+ "account_number": "1705",
+ "Intereses": {
+ "account_number": "170505"
+ },
+ "Honorarios": {
+ "account_number": "170510"
+ },
+ "Comisiones": {
+ "account_number": "170515"
+ },
+ "Seguros y fianzas": {
+ "account_number": "170520"
+ },
+ "Arrendamientos": {
+ "account_number": "170525"
+ },
+ "Bodegajes": {
+ "account_number": "170530"
+ },
+ "Mantenimiento equipos": {
+ "account_number": "170535"
+ },
+ "Servicios": {
+ "account_number": "170540"
+ },
+ "Suscripciones": {
+ "account_number": "170545"
+ },
+ "Otros": {
+ "account_number": "170595"
+ }
+ },
+ "Cargos diferidos": {
+ "account_number": "1710",
+ "Organizaci\u00f3n y preoperativos": {
+ "account_number": "171004"
+ },
+ "Remodelaciones": {
+ "account_number": "171008"
+ },
+ "Estudios, investigaciones y proyectos": {
+ "account_number": "171012"
+ },
+ "Programas para computador (software)": {
+ "account_number": "171016"
+ },
+ "\u00datiles y papeler\u00eda": {
+ "account_number": "171020"
+ },
+ "Mejoras a propiedades ajenas": {
+ "account_number": "171024"
+ },
+ "Contribuciones y afiliaciones": {
+ "account_number": "171028"
+ },
+ "Entrenamiento de personal": {
+ "account_number": "171032"
+ },
+ "Ferias y exposiciones": {
+ "account_number": "171036"
+ },
+ "Licencias": {
+ "account_number": "171040"
+ },
+ "Publicidad, propaganda y promoci\u00f3n": {
+ "account_number": "171044"
+ },
+ "Elementos de aseo y cafeter\u00eda": {
+ "account_number": "171048"
+ },
+ "Moldes y troqueles": {
+ "account_number": "171052"
+ },
+ "Instrumental quir\u00fargico": {
+ "account_number": "171056"
+ },
+ "Dotaci\u00f3n y suministro a trabajadores": {
+ "account_number": "171060"
+ },
+ "Elementos de roper\u00eda y lencer\u00eda": {
+ "account_number": "171064"
+ },
+ "Loza y cristaler\u00eda": {
+ "account_number": "171068"
+ },
+ "Plater\u00eda": {
+ "account_number": "171069"
+ },
+ "Cubierter\u00eda": {
+ "account_number": "171070"
+ },
+ "Impuesto de renta diferido ?d\u00e9bitos? por diferencias temporales": {
+ "account_number": "171076"
+ },
+ "Concursos y licitaciones": {
+ "account_number": "171080"
+ },
+ "Otros": {
+ "account_number": "171095"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "171099"
+ }
+ },
+ "Costos de exploraci\u00f3n por amortizar": {
+ "account_number": "1715",
+ "Pozos secos": {
+ "account_number": "171505"
+ },
+ "Pozos no comerciales": {
+ "account_number": "171510"
+ },
+ "Otros costos de exploraci\u00f3n": {
+ "account_number": "171515"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "171599"
+ }
+ },
+ "Costos de explotaci\u00f3n y desarrollo": {
+ "account_number": "1720",
+ "Perforaci\u00f3n y explotaci\u00f3n": {
+ "account_number": "172005"
+ },
+ "Perforaciones campos en desarrollo": {
+ "account_number": "172010"
+ },
+ "Facilidades de producci\u00f3n": {
+ "account_number": "172015"
+ },
+ "Servicio a pozos": {
+ "account_number": "172020"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "172099"
+ }
+ },
+ "Cargos por correcci\u00f3n monetaria diferida": {
+ "account_number": "1730"
+ },
+ "Amortizaci\u00f3n acumulada": {
+ "account_number": "1798",
+ "account_type": "Accumulated Depreciation",
+ "Costos de exploraci\u00f3n por amortizar": {
+ "account_number": "179805",
+ "account_type": "Accumulated Depreciation"
+ },
+ "Costos de explotaci\u00f3n y desarrollo": {
+ "account_number": "179810",
+ "account_type": "Accumulated Depreciation"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "179899",
+ "account_type": "Accumulated Depreciation"
+ }
+ }
+ },
+ "Otros activos": {
+ "account_number": "18",
+ "Bienes de arte y cultura": {
+ "account_number": "1805",
+ "Obras de arte": {
+ "account_number": "180505"
+ },
+ "Bibliotecas": {
+ "account_number": "180510"
+ },
+ "Otros": {
+ "account_number": "180595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "180599"
+ }
+ },
+ "Diversos": {
+ "account_number": "1895",
+ "M\u00e1quinas porteadoras": {
+ "account_number": "189505"
+ },
+ "Bienes entregados en comodato": {
+ "account_number": "189510"
+ },
+ "Amortizaci\u00f3n acumulada de bienes entregados en comodato (CR)": {
+ "account_number": "189515"
+ },
+ "Bienes recibidos en pago": {
+ "account_number": "189520"
+ },
+ "Derechos sucesorales": {
+ "account_number": "189525"
+ },
+ "Estampillas": {
+ "account_number": "189530"
+ },
+ "Otros": {
+ "account_number": "189595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "189599"
+ }
+ },
+ "Provisiones": {
+ "account_number": "1899",
+ "Bienes de arte y cultura": {
+ "account_number": "189905"
+ },
+ "Diversos": {
+ "account_number": "189995"
+ }
+ }
+ },
+ "Valorizaciones": {
+ "account_number": "19",
+ "De inversiones": {
+ "account_number": "1905",
+ "Acciones": {
+ "account_number": "190505"
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "190510"
+ },
+ "Derechos fiduciarios": {
+ "account_number": "190515"
+ }
+ },
+ "De propiedades, planta y equipo": {
+ "account_number": "1910",
+ "Terrenos": {
+ "account_number": "191004"
+ },
+ "Materiales proyectos petroleros": {
+ "account_number": "191006"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "191008"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "191012"
+ },
+ "Equipo de oficina": {
+ "account_number": "191016"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "191020"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "191024"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "191028"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "191032"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "191036"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "191040"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "191044"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "191048"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "191052"
+ },
+ "Envases y empaques": {
+ "account_number": "191056"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "191060"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "191064"
+ },
+ "Minas y canteras": {
+ "account_number": "191068"
+ },
+ "Pozos artesianos": {
+ "account_number": "191072"
+ },
+ "Yacimientos": {
+ "account_number": "191076"
+ },
+ "Semovientes": {
+ "account_number": "191080"
+ }
+ },
+ "De otros activos": {
+ "account_number": "1995",
+ "Bienes de arte y cultura": {
+ "account_number": "199505"
+ },
+ "Bienes entregados en comodato": {
+ "account_number": "199510"
+ },
+ "Bienes recibidos en pago": {
+ "account_number": "199515"
+ },
+ "Inventario de semovientes": {
+ "account_number": "199520"
+ }
+ }
+ }
+ },
+ "Pasivo": {
+ "account_number": "2",
+ "root_type": "Liability",
+ "Obligaciones financieras": {
+ "account_number": "21",
+ "Bancos nacionales": {
+ "account_number": "2105",
+ "Sobregiros": {
+ "account_number": "210505"
+ },
+ "Pagar\u00e9s": {
+ "account_number": "210510"
+ },
+ "Cartas de cr\u00e9dito": {
+ "account_number": "210515"
+ },
+ "Aceptaciones bancarias": {
+ "account_number": "210520"
+ }
+ },
+ "Bancos del exterior": {
+ "account_number": "2110",
+ "Sobregiros": {
+ "account_number": "211005"
+ },
+ "Pagar\u00e9s": {
+ "account_number": "211010"
+ },
+ "Cartas de cr\u00e9dito": {
+ "account_number": "211015"
+ },
+ "Aceptaciones bancarias": {
+ "account_number": "211020"
+ }
+ },
+ "Corporaciones financieras": {
+ "account_number": "2115",
+ "Pagar\u00e9s": {
+ "account_number": "211505"
+ },
+ "Aceptaciones financieras": {
+ "account_number": "211510"
+ },
+ "Cartas de cr\u00e9dito": {
+ "account_number": "211515"
+ },
+ "Contratos de arrendamiento financiero (leasing)": {
+ "account_number": "211520"
+ }
+ },
+ "Compa\u00f1\u00edas de financiamiento comercial": {
+ "account_number": "2120",
+ "Pagar\u00e9s": {
+ "account_number": "212005"
+ },
+ "Aceptaciones financieras": {
+ "account_number": "212010"
+ },
+ "Contratos de arrendamiento financiero (leasing)": {
+ "account_number": "212020"
+ }
+ },
+ "Corporaciones de ahorro y vivienda": {
+ "account_number": "2125",
+ "Sobregiros": {
+ "account_number": "212505"
+ },
+ "Pagar\u00e9s": {
+ "account_number": "212510"
+ },
+ "Hipotecarias": {
+ "account_number": "212515"
+ }
+ },
+ "Entidades financieras del exterior": {
+ "account_number": "2130"
+ },
+ "Compromisos de recompra de inversiones negociadas": {
+ "account_number": "2135",
+ "Acciones": {
+ "account_number": "213505"
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "213510"
+ },
+ "Bonos": {
+ "account_number": "213515"
+ },
+ "C\u00e9dulas": {
+ "account_number": "213520"
+ },
+ "Certificados": {
+ "account_number": "213525"
+ },
+ "Papeles comerciales": {
+ "account_number": "213530"
+ },
+ "T\u00edtulos": {
+ "account_number": "213535"
+ },
+ "Aceptaciones bancarias o financieras": {
+ "account_number": "213540"
+ },
+ "Otros": {
+ "account_number": "213595"
+ }
+ },
+ "Compromisos de recompra de cartera negociada": {
+ "account_number": "2140"
+ },
+ "Obligaciones gubernamentales": {
+ "account_number": "2145",
+ "Gobierno Nacional": {
+ "account_number": "214505"
+ },
+ "Entidades oficiales": {
+ "account_number": "214510"
+ }
+ },
+ "Otras obligaciones": {
+ "account_number": "2195",
+ "Particulares": {
+ "account_number": "219505"
+ },
+ "Compa\u00f1\u00edas vinculadas": {
+ "account_number": "219510"
+ },
+ "Casa matriz": {
+ "account_number": "219515"
+ },
+ "Socios o accionistas": {
+ "account_number": "219520"
+ },
+ "Fondos y cooperativas": {
+ "account_number": "219525"
+ },
+ "Directores": {
+ "account_number": "219530"
+ },
+ "Otras": {
+ "account_number": "219595"
+ }
+ }
+ },
+ "Proveedores": {
+ "account_number": "22",
+ "account_type": "Payable",
+ "Nacionales": {
+ "account_number": "2205",
+ "account_type": "Payable"
+ },
+ "Del exterior": {
+ "account_number": "2210",
+ "account_type": "Payable"
+ },
+ "Cuentas corrientes comerciales": {
+ "account_number": "2215",
+ "account_type": "Payable"
+ },
+ "Casa matriz": {
+ "account_number": "2220",
+ "account_type": "Payable"
+ },
+ "Compa\u00f1\u00edas vinculadas": {
+ "account_number": "2225",
+ "account_type": "Payable"
+ }
+ },
+ "Cuentas por pagar": {
+ "account_number": "23",
+ "account_type": "Payable",
+ "Cuentas corrientes comerciales": {
+ "account_number": "2305",
+ "account_type": "Payable"
+ },
+ "A casa matriz": {
+ "account_number": "2310",
+ "account_type": "Payable"
+ },
+ "A compa\u00f1\u00edas vinculadas": {
+ "account_number": "2315",
+ "account_type": "Payable"
+ },
+ "A contratistas": {
+ "account_number": "2320",
+ "account_type": "Payable"
+ },
+ "\u00d3rdenes de compra por utilizar": {
+ "account_number": "2330",
+ "account_type": "Payable"
+ },
+ "Costos y gastos por pagar": {
+ "account_number": "2335",
+ "account_type": "Payable",
+ "Gastos financieros": {
+ "account_number": "233505",
+ "account_type": "Payable"
+ },
+ "Gastos legales": {
+ "account_number": "233510",
+ "account_type": "Payable"
+ },
+ "Libros, suscripciones, peri\u00f3dicos y revistas": {
+ "account_number": "233515",
+ "account_type": "Payable"
+ },
+ "Comisiones": {
+ "account_number": "233520",
+ "account_type": "Payable"
+ },
+ "Honorarios": {
+ "account_number": "233525",
+ "account_type": "Payable"
+ },
+ "Servicios t\u00e9cnicos": {
+ "account_number": "233530",
+ "account_type": "Payable"
+ },
+ "Servicios de mantenimiento": {
+ "account_number": "233535",
+ "account_type": "Payable"
+ },
+ "Arrendamientos": {
+ "account_number": "233540",
+ "account_type": "Payable"
+ },
+ "Transportes, fletes y acarreos": {
+ "account_number": "233545",
+ "account_type": "Payable"
+ },
+ "Servicios p\u00fablicos": {
+ "account_number": "233550",
+ "account_type": "Payable"
+ },
+ "Seguros": {
+ "account_number": "233555",
+ "account_type": "Payable"
+ },
+ "Gastos de viaje": {
+ "account_number": "233560",
+ "account_type": "Payable"
+ },
+ "Gastos de representaci\u00f3n y relaciones p\u00fablicas": {
+ "account_number": "233565",
+ "account_type": "Payable"
+ },
+ "Servicios aduaneros": {
+ "account_number": "233570",
+ "account_type": "Payable"
+ },
+ "Otros": {
+ "account_number": "233595",
+ "account_type": "Payable"
+ }
+ },
+ "Instalamentos por pagar": {
+ "account_number": "2340",
+ "account_type": "Payable"
+ },
+ "Acreedores oficiales": {
+ "account_number": "2345",
+ "account_type": "Payable"
+ },
+ "Regal\u00edas por pagar": {
+ "account_number": "2350",
+ "account_type": "Payable"
+ },
+ "Deudas con accionistas o socios": {
+ "account_number": "2355",
+ "account_type": "Payable",
+ "Accionistas": {
+ "account_number": "235505",
+ "account_type": "Payable"
+ },
+ "Socios": {
+ "account_number": "235510",
+ "account_type": "Payable"
+ }
+ },
+ "Deudas con directores": {
+ "account_number": "2357",
+ "account_type": "Payable"
+ },
+ "Dividendos o participaciones por pagar": {
+ "account_number": "2360",
+ "account_type": "Payable",
+ "Dividendos": {
+ "account_number": "236005",
+ "account_type": "Payable"
+ },
+ "Participaciones": {
+ "account_number": "236010",
+ "account_type": "Payable"
+ }
+ },
+ "Retenci\u00f3n en la fuente": {
+ "account_number": "2365",
+ "account_type": "Payable",
+ "Salarios y pagos laborales": {
+ "account_number": "236505",
+ "account_type": "Payable"
+ },
+ "Dividendos y/o participaciones": {
+ "account_number": "236510",
+ "account_type": "Payable"
+ },
+ "Honorarios": {
+ "account_number": "236515",
+ "account_type": "Payable"
+ },
+ "Comisiones": {
+ "account_number": "236520",
+ "account_type": "Payable"
+ },
+ "Servicios": {
+ "account_number": "236525",
+ "account_type": "Payable"
+ },
+ "Arrendamientos": {
+ "account_number": "236530",
+ "account_type": "Payable"
+ },
+ "Rendimientos financieros": {
+ "account_number": "236535",
+ "account_type": "Payable"
+ },
+ "Compras": {
+ "account_number": "236540",
+ "account_type": "Payable"
+ },
+ "Loter\u00edas, rifas, apuestas y similares": {
+ "account_number": "236545",
+ "account_type": "Payable"
+ },
+ "Por pagos al exterior": {
+ "account_number": "236550",
+ "account_type": "Payable"
+ },
+ "Por ingresos obtenidos en el exterior": {
+ "account_number": "236555",
+ "account_type": "Payable"
+ },
+ "Enajenaci\u00f3n propiedades planta y equipo, personas naturales": {
+ "account_number": "236560",
+ "account_type": "Payable"
+ },
+ "Por impuesto de timbre": {
+ "account_number": "236565",
+ "account_type": "Payable"
+ },
+ "Otras retenciones y patrimonio": {
+ "account_number": "236570",
+ "account_type": "Payable"
+ },
+ "Autorretenciones": {
+ "account_number": "236575",
+ "account_type": "Payable"
+ }
+ },
+ "Impuesto a las ventas retenido": {
+ "account_number": "2367",
+ "account_type": "Payable"
+ },
+ "Impuesto de industria y comercio retenido": {
+ "account_number": "2368",
+ "account_type": "Payable"
+ },
+ "Retenciones y aportes de n\u00f3mina": {
+ "account_number": "2370",
+ "account_type": "Payable",
+ "Aportes a entidades promotoras de salud, EPS": {
+ "account_number": "237005",
+ "account_type": "Payable"
+ },
+ "Aportes a administradoras de riesgos profesionales, ARP": {
+ "account_number": "237006",
+ "account_type": "Payable"
+ },
+ "Aportes al ICBF, SENA y cajas de compensaci\u00f3n": {
+ "account_number": "237010",
+ "account_type": "Payable"
+ },
+ "Aportes al FIC": {
+ "account_number": "237015",
+ "account_type": "Payable"
+ },
+ "Embargos judiciales": {
+ "account_number": "237025",
+ "account_type": "Payable"
+ },
+ "Libranzas": {
+ "account_number": "237030",
+ "account_type": "Payable"
+ },
+ "Sindicatos": {
+ "account_number": "237035",
+ "account_type": "Payable"
+ },
+ "Cooperativas": {
+ "account_number": "237040",
+ "account_type": "Payable"
+ },
+ "Fondos": {
+ "account_number": "237045",
+ "account_type": "Payable"
+ },
+ "Otros": {
+ "account_number": "237095",
+ "account_type": "Payable"
+ }
+ },
+ "Cuotas por devolver": {
+ "account_number": "2375",
+ "account_type": "Payable"
+ },
+ "Acreedores varios": {
+ "account_number": "2380",
+ "account_type": "Payable",
+ "Depositarios": {
+ "account_number": "238005",
+ "account_type": "Payable"
+ },
+ "Comisionistas de bolsas": {
+ "account_number": "238010",
+ "account_type": "Payable"
+ },
+ "Sociedad administradora-Fondos de inversi\u00f3n": {
+ "account_number": "238015",
+ "account_type": "Payable"
+ },
+ "Reintegros por pagar": {
+ "account_number": "238020",
+ "account_type": "Payable"
+ },
+ "Fondo de perseverancia": {
+ "account_number": "238025",
+ "account_type": "Payable"
+ },
+ "Fondos de cesant\u00edas y/o pensiones": {
+ "account_number": "238030",
+ "account_type": "Payable"
+ },
+ "Donaciones asignadas por pagar": {
+ "account_number": "238035",
+ "account_type": "Payable"
+ },
+ "Otros": {
+ "account_number": "238095",
+ "account_type": "Payable"
+ }
+ }
+ },
+ "Impuestos, grav\u00e1menes y tasas": {
+ "account_number": "24",
+ "account_type": "Tax",
+ "De renta y complementarios": {
+ "account_number": "2404",
+ "account_type": "Tax",
+ "Vigencia fiscal corriente": {
+ "account_number": "240405",
+ "account_type": "Tax"
+ },
+ "Vigencias fiscales anteriores": {
+ "account_number": "240410",
+ "account_type": "Tax"
+ }
+ },
+ "Impuesto sobre las ventas por pagar": {
+ "account_number": "2408",
+ "account_type": "Tax"
+ },
+ "De industria y comercio": {
+ "account_number": "2412",
+ "account_type": "Tax",
+ "Vigencia fiscal corriente": {
+ "account_number": "241205",
+ "account_type": "Tax"
+ },
+ "Vigencias fiscales anteriores": {
+ "account_number": "241210",
+ "account_type": "Tax"
+ }
+ },
+ "A la propiedad ra\u00edz": {
+ "account_number": "2416",
+ "account_type": "Tax"
+ },
+ "Derechos sobre instrumentos p\u00fablicos": {
+ "account_number": "2420",
+ "account_type": "Tax"
+ },
+ "De valorizaci\u00f3n": {
+ "account_number": "2424",
+ "account_type": "Tax",
+ "Vigencia fiscal corriente": {
+ "account_number": "242405",
+ "account_type": "Tax"
+ },
+ "Vigencias fiscales anteriores": {
+ "account_number": "242410",
+ "account_type": "Tax"
+ }
+ },
+ "De turismo": {
+ "account_number": "2428",
+ "account_type": "Tax"
+ },
+ "Tasa por utilizaci\u00f3n de puertos": {
+ "account_number": "2432",
+ "account_type": "Tax"
+ },
+ "De veh\u00edculos": {
+ "account_number": "2436",
+ "account_type": "Tax",
+ "Vigencia fiscal corriente": {
+ "account_number": "243605",
+ "account_type": "Tax"
+ },
+ "Vigencias fiscales anteriores": {
+ "account_number": "243610",
+ "account_type": "Tax"
+ }
+ },
+ "De espect\u00e1culos p\u00fablicos": {
+ "account_number": "2440",
+ "account_type": "Tax"
+ },
+ "De hidrocarburos y minas": {
+ "account_number": "2444",
+ "account_type": "Tax",
+ "De hidrocarburos": {
+ "account_number": "244405",
+ "account_type": "Tax"
+ },
+ "De minas": {
+ "account_number": "244410",
+ "account_type": "Tax"
+ }
+ },
+ "Regal\u00edas e impuestos a la peque\u00f1a y mediana miner\u00eda": {
+ "account_number": "2448",
+ "account_type": "Tax"
+ },
+ "A las exportaciones cafeteras": {
+ "account_number": "2452",
+ "account_type": "Tax"
+ },
+ "A las importaciones": {
+ "account_number": "2456",
+ "account_type": "Tax"
+ },
+ "Cuotas de fomento": {
+ "account_number": "2460",
+ "account_type": "Tax"
+ },
+ "De licores, cervezas y cigarrillos": {
+ "account_number": "2464",
+ "account_type": "Tax",
+ "De licores": {
+ "account_number": "246405",
+ "account_type": "Tax"
+ },
+ "De cervezas": {
+ "account_number": "246410",
+ "account_type": "Tax"
+ },
+ "De cigarrillos": {
+ "account_number": "246415",
+ "account_type": "Tax"
+ }
+ },
+ "Al sacrificio de ganado": {
+ "account_number": "2468",
+ "account_type": "Tax"
+ },
+ "Al azar y juegos": {
+ "account_number": "2472",
+ "account_type": "Tax"
+ },
+ "Grav\u00e1menes y regal\u00edas por utilizaci\u00f3n del suelo": {
+ "account_number": "2476",
+ "account_type": "Tax"
+ },
+ "Otros": {
+ "account_number": "2495",
+ "account_type": "Tax"
+ }
+ },
+ "Obligaciones laborales": {
+ "account_number": "25",
+ "Salarios por pagar": {
+ "account_number": "2505"
+ },
+ "Cesant\u00edas consolidadas": {
+ "account_number": "2510",
+ "Ley laboral anterior": {
+ "account_number": "251005"
+ },
+ "Ley 50 de 1990 y normas posteriores": {
+ "account_number": "251010"
+ }
+ },
+ "Intereses sobre cesant\u00edas": {
+ "account_number": "2515"
+ },
+ "Prima de servicios": {
+ "account_number": "2520"
+ },
+ "Vacaciones consolidadas": {
+ "account_number": "2525"
+ },
+ "Prestaciones extralegales": {
+ "account_number": "2530",
+ "Primas": {
+ "account_number": "253005"
+ },
+ "Auxilios": {
+ "account_number": "253010"
+ },
+ "Dotaci\u00f3n y suministro a trabajadores": {
+ "account_number": "253015"
+ },
+ "Bonificaciones": {
+ "account_number": "253020"
+ },
+ "Seguros": {
+ "account_number": "253025"
+ },
+ "Otras": {
+ "account_number": "253095"
+ }
+ },
+ "Pensiones por pagar": {
+ "account_number": "2532"
+ },
+ "Cuotas partes pensiones de jubilaci\u00f3n": {
+ "account_number": "2535"
+ },
+ "Indemnizaciones laborales": {
+ "account_number": "2540"
+ }
+ },
+ "Pasivos estimados y provisiones": {
+ "account_number": "26",
+ "Para costos y gastos": {
+ "account_number": "2605",
+ "Intereses": {
+ "account_number": "260505"
+ },
+ "Comisiones": {
+ "account_number": "260510"
+ },
+ "Honorarios": {
+ "account_number": "260515"
+ },
+ "Servicios t\u00e9cnicos": {
+ "account_number": "260520"
+ },
+ "Transportes, fletes y acarreos": {
+ "account_number": "260525"
+ },
+ "Gastos de viaje": {
+ "account_number": "260530"
+ },
+ "Servicios p\u00fablicos": {
+ "account_number": "260535"
+ },
+ "Regal\u00edas": {
+ "account_number": "260540"
+ },
+ "Garant\u00edas": {
+ "account_number": "260545"
+ },
+ "Materiales y repuestos": {
+ "account_number": "260550"
+ },
+ "Otros": {
+ "account_number": "260595"
+ }
+ },
+ "Para obligaciones laborales": {
+ "account_number": "2610",
+ "Cesant\u00edas": {
+ "account_number": "261005"
+ },
+ "Intereses sobre cesant\u00edas": {
+ "account_number": "261010"
+ },
+ "Vacaciones": {
+ "account_number": "261015"
+ },
+ "Prima de servicios": {
+ "account_number": "261020"
+ },
+ "Prestaciones extralegales": {
+ "account_number": "261025"
+ },
+ "Vi\u00e1ticos": {
+ "account_number": "261030"
+ },
+ "Otras": {
+ "account_number": "261095"
+ }
+ },
+ "Para obligaciones fiscales": {
+ "account_number": "2615",
+ "De renta y complementarios": {
+ "account_number": "261505"
+ },
+ "De industria y comercio": {
+ "account_number": "261510"
+ },
+ "Tasa por utilizaci\u00f3n de puertos": {
+ "account_number": "261515"
+ },
+ "De veh\u00edculos": {
+ "account_number": "261520"
+ },
+ "De hidrocarburos y minas": {
+ "account_number": "261525"
+ },
+ "Otros": {
+ "account_number": "261595"
+ }
+ },
+ "Pensiones de jubilaci\u00f3n": {
+ "account_number": "2620",
+ "C\u00e1lculo actuarial pensiones de jubilaci\u00f3n": {
+ "account_number": "262005"
+ },
+ "Pensiones de jubilaci\u00f3n por amortizar (DB)": {
+ "account_number": "262010"
+ }
+ },
+ "Para obras de urbanismo": {
+ "account_number": "2625",
+ "Acueducto y alcantarillado": {
+ "account_number": "262505"
+ },
+ "Energ\u00eda el\u00e9ctrica": {
+ "account_number": "262510"
+ },
+ "Tel\u00e9fonos": {
+ "account_number": "262515"
+ },
+ "Otros": {
+ "account_number": "262595"
+ }
+ },
+ "Para mantenimiento y reparaciones": {
+ "account_number": "2630",
+ "Terrenos": {
+ "account_number": "263005"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "263010"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "263015"
+ },
+ "Equipo de oficina": {
+ "account_number": "263020"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "263025"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "263030"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "263035"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "263040"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "263045"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "263050"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "263055"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "263060"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "263065"
+ },
+ "Envases y empaques": {
+ "account_number": "263070"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "263075"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "263080"
+ },
+ "Pozos artesianos": {
+ "account_number": "263085"
+ },
+ "Otros": {
+ "account_number": "263095"
+ }
+ },
+ "Para contingencias": {
+ "account_number": "2635",
+ "Multas y sanciones autoridades administrativas": {
+ "account_number": "263505"
+ },
+ "Intereses por multas y sanciones": {
+ "account_number": "263510"
+ },
+ "Reclamos": {
+ "account_number": "263515"
+ },
+ "Laborales": {
+ "account_number": "263520"
+ },
+ "Civiles": {
+ "account_number": "263525"
+ },
+ "Penales": {
+ "account_number": "263530"
+ },
+ "Administrativos": {
+ "account_number": "263535"
+ },
+ "Comerciales": {
+ "account_number": "263540"
+ },
+ "Otras": {
+ "account_number": "263595"
+ }
+ },
+ "Para obligaciones de garant\u00edas": {
+ "account_number": "2640"
+ },
+ "Provisiones diversas": {
+ "account_number": "2695",
+ "Para beneficencia": {
+ "account_number": "269505"
+ },
+ "Para comunicaciones": {
+ "account_number": "269510"
+ },
+ "Para p\u00e9rdida en transporte": {
+ "account_number": "269515"
+ },
+ "Para operaci\u00f3n": {
+ "account_number": "269520"
+ },
+ "Para protecci\u00f3n de bienes agotables": {
+ "account_number": "269525"
+ },
+ "Para ajustes en redenci\u00f3n de unidades": {
+ "account_number": "269530"
+ },
+ "Autoseguro": {
+ "account_number": "269535"
+ },
+ "Planes y programas de reforestaci\u00f3n y electrificaci\u00f3n": {
+ "account_number": "269540"
+ },
+ "Otras": {
+ "account_number": "269595"
+ }
+ }
+ },
+ "Diferidos": {
+ "account_number": "27",
+ "Ingresos recibidos por anticipado": {
+ "account_number": "2705",
+ "Intereses": {
+ "account_number": "270505"
+ },
+ "Comisiones": {
+ "account_number": "270510"
+ },
+ "Arrendamientos": {
+ "account_number": "270515"
+ },
+ "Honorarios": {
+ "account_number": "270520"
+ },
+ "Servicios t\u00e9cnicos": {
+ "account_number": "270525"
+ },
+ "De suscriptores": {
+ "account_number": "270530"
+ },
+ "Transportes, fletes y acarreos": {
+ "account_number": "270535"
+ },
+ "Mercanc\u00eda en tr\u00e1nsito ya vendida": {
+ "account_number": "270540"
+ },
+ "Matr\u00edculas y pensiones": {
+ "account_number": "270545"
+ },
+ "Cuotas de administraci\u00f3n": {
+ "account_number": "270550"
+ },
+ "Otros": {
+ "account_number": "270595"
+ }
+ },
+ "Abonos diferidos": {
+ "account_number": "2710",
+ "Reajuste del sistema": {
+ "account_number": "271005"
+ }
+ },
+ "Utilidad diferida en ventas a plazos": {
+ "account_number": "2715"
+ },
+ "Cr\u00e9dito por correcci\u00f3n monetaria diferida": {
+ "account_number": "2720"
+ },
+ "Impuestos diferidos": {
+ "account_number": "2725",
+ "Por depreciaci\u00f3n flexible": {
+ "account_number": "272505"
+ },
+ "Diversos": {
+ "account_number": "272595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "272599"
+ }
+ }
+ },
+ "Otros pasivos": {
+ "account_number": "28",
+ "Anticipos y avances recibidos": {
+ "account_number": "2805",
+ "De clientes": {
+ "account_number": "280505"
+ },
+ "Sobre contratos": {
+ "account_number": "280510"
+ },
+ "Para obras en proceso": {
+ "account_number": "280515"
+ },
+ "Otros": {
+ "account_number": "280595"
+ }
+ },
+ "Dep\u00f3sitos recibidos": {
+ "account_number": "2810",
+ "Para futura suscripci\u00f3n de acciones": {
+ "account_number": "281005"
+ },
+ "Para futuro pago de cuotas o derechos sociales": {
+ "account_number": "281010"
+ },
+ "Para garant\u00eda en la prestaci\u00f3n de servicios": {
+ "account_number": "281015"
+ },
+ "Para garant\u00eda de contratos": {
+ "account_number": "281020"
+ },
+ "De licitaciones": {
+ "account_number": "281025"
+ },
+ "De manejo de bienes": {
+ "account_number": "281030"
+ },
+ "Fondo de reserva": {
+ "account_number": "281035"
+ },
+ "Otros": {
+ "account_number": "281095"
+ }
+ },
+ "Ingresos recibidos para terceros": {
+ "account_number": "2815",
+ "Valores recibidos para terceros": {
+ "account_number": "281505"
+ },
+ "Venta por cuenta de terceros": {
+ "account_number": "281510"
+ }
+ },
+ "Cuentas de operaci\u00f3n conjunta": {
+ "account_number": "2820"
+ },
+ "Retenciones a terceros sobre contratos": {
+ "account_number": "2825",
+ "Cumplimiento obligaciones laborales": {
+ "account_number": "282505"
+ },
+ "Para estabilidad de obra": {
+ "account_number": "282510"
+ },
+ "Garant\u00eda cumplimiento de contratos": {
+ "account_number": "282515"
+ }
+ },
+ "Embargos judiciales": {
+ "account_number": "2830",
+ "Indemnizaciones": {
+ "account_number": "283005"
+ },
+ "Dep\u00f3sitos judiciales": {
+ "account_number": "283010"
+ }
+ },
+ "Acreedores del sistema": {
+ "account_number": "2835",
+ "Cuotas netas": {
+ "account_number": "283505"
+ },
+ "Grupos en formaci\u00f3n": {
+ "account_number": "283510"
+ }
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "2840"
+ },
+ "Diversos": {
+ "account_number": "2895",
+ "Pr\u00e9stamos de productos": {
+ "account_number": "289505"
+ },
+ "Reembolso de costos exploratorios": {
+ "account_number": "289510"
+ },
+ "Programa de extensi\u00f3n agropecuaria": {
+ "account_number": "289515"
+ }
+ }
+ },
+ "Bonos y papeles comerciales": {
+ "account_number": "29",
+ "Bonos en circulaci\u00f3n": {
+ "account_number": "2905"
+ },
+ "Bonos obligatoriamente convertibles en acciones": {
+ "account_number": "2910"
+ },
+ "Papeles comerciales": {
+ "account_number": "2915"
+ },
+ "Bonos pensionales": {
+ "account_number": "2920",
+ "Valor bonos pensionales": {
+ "account_number": "292005"
+ },
+ "Bonos pensionales por amortizar (DB)": {
+ "account_number": "292010"
+ },
+ "Intereses causados sobre bonos pensionales": {
+ "account_number": "292015"
+ }
+ },
+ "T\u00edtulos pensionales": {
+ "account_number": "2925",
+ "Valor t\u00edtulos pensionales": {
+ "account_number": "292505"
+ },
+ "T\u00edtulos pensionales por amortizar (DB)": {
+ "account_number": "292510"
+ },
+ "Intereses causados sobre t\u00edtulos pensionales": {
+ "account_number": "292515"
+ }
+ }
+ }
+ },
+ "Patrimonio": {
+ "account_number": "3",
+ "account_type": "Equity",
+ "root_type": "Equity",
+ "Capital social": {
+ "account_number": "31",
+ "account_type": "Equity",
+ "Capital suscrito y pagado": {
+ "account_number": "3105",
+ "account_type": "Equity",
+ "Capital autorizado": {
+ "account_number": "310505",
+ "account_type": "Equity"
+ },
+ "Capital por suscribir (DB)": {
+ "account_number": "310510",
+ "account_type": "Equity"
+ },
+ "Capital suscrito por cobrar (DB)": {
+ "account_number": "310515",
+ "account_type": "Equity"
+ }
+ },
+ "Aportes sociales": {
+ "account_number": "3115",
+ "account_type": "Equity",
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "311505",
+ "account_type": "Equity"
+ },
+ "Aportes de socios-fondo mutuo de inversi\u00f3n": {
+ "account_number": "311510",
+ "account_type": "Equity"
+ },
+ "Contribuci\u00f3n de la empresa-fondo mutuo de inversi\u00f3n": {
+ "account_number": "311515",
+ "account_type": "Equity"
+ },
+ "Suscripciones del p\u00fablico": {
+ "account_number": "311520",
+ "account_type": "Equity"
+ }
+ },
+ "Capital asignado": {
+ "account_number": "3120",
+ "account_type": "Equity"
+ },
+ "Inversi\u00f3n suplementaria al capital asignado": {
+ "account_number": "3125",
+ "account_type": "Equity"
+ },
+ "Capital de personas naturales": {
+ "account_number": "3130",
+ "account_type": "Equity"
+ },
+ "Aportes del Estado": {
+ "account_number": "3135",
+ "account_type": "Equity"
+ },
+ "Fondo social": {
+ "account_number": "3140",
+ "account_type": "Equity"
+ }
+ },
+ "Super\u00e1vit de capital": {
+ "account_number": "32",
+ "account_type": "Equity",
+ "Prima en colocaci\u00f3n de acciones, cuotas o partes de inter\u00e9s social": {
+ "account_number": "3205",
+ "account_type": "Equity",
+ "Prima en colocaci\u00f3n de acciones": {
+ "account_number": "320505",
+ "account_type": "Equity"
+ },
+ "Prima en colocaci\u00f3n de acciones por cobrar (DB)": {
+ "account_number": "320510",
+ "account_type": "Equity"
+ },
+ "Prima en colocaci\u00f3n de cuotas o partes de inter\u00e9s social": {
+ "account_number": "320515",
+ "account_type": "Equity"
+ }
+ },
+ "Donaciones": {
+ "account_number": "3210",
+ "account_type": "Equity",
+ "En dinero": {
+ "account_number": "321005",
+ "account_type": "Equity"
+ },
+ "En valores mobiliarios": {
+ "account_number": "321010",
+ "account_type": "Equity"
+ },
+ "En bienes muebles": {
+ "account_number": "321015",
+ "account_type": "Equity"
+ },
+ "En bienes inmuebles": {
+ "account_number": "321020",
+ "account_type": "Equity"
+ },
+ "En intangibles": {
+ "account_number": "321025",
+ "account_type": "Equity"
+ }
+ },
+ "Cr\u00e9dito mercantil": {
+ "account_number": "3215",
+ "account_type": "Equity"
+ },
+ "Know how": {
+ "account_number": "3220",
+ "account_type": "Equity"
+ },
+ "Super\u00e1vit m\u00e9todo de participaci\u00f3n": {
+ "account_number": "3225",
+ "account_type": "Equity",
+ "De acciones": {
+ "account_number": "322505",
+ "account_type": "Equity"
+ },
+ "De cuotas o partes de inter\u00e9s social": {
+ "account_number": "322510",
+ "account_type": "Equity"
+ }
+ }
+ },
+ "Reservas": {
+ "account_number": "33",
+ "account_type": "Equity",
+ "Reservas obligatorias": {
+ "account_number": "3305",
+ "account_type": "Equity",
+ "Reserva legal": {
+ "account_number": "330505",
+ "account_type": "Equity"
+ },
+ "Reservas por disposiciones fiscales": {
+ "account_number": "330510",
+ "account_type": "Equity"
+ },
+ "Reserva para readquisici\u00f3n de acciones": {
+ "account_number": "330515",
+ "account_type": "Equity"
+ },
+ "Acciones propias readquiridas (DB)": {
+ "account_number": "330516",
+ "account_type": "Equity"
+ },
+ "Reserva para readquisici\u00f3n de cuotas o partes de inter\u00e9s social": {
+ "account_number": "330517",
+ "account_type": "Equity"
+ },
+ "Cuotas o partes de inter\u00e9s social propias readquiridas (DB)": {
+ "account_number": "330518",
+ "account_type": "Equity"
+ },
+ "Reserva para extensi\u00f3n agropecuaria": {
+ "account_number": "330520",
+ "account_type": "Equity"
+ },
+ "Reserva Ley 7\u00aa de 1990": {
+ "account_number": "330525",
+ "account_type": "Equity"
+ },
+ "Reserva para reposici\u00f3n de semovientes": {
+ "account_number": "330530",
+ "account_type": "Equity"
+ },
+ "Reserva Ley 4\u00aa de 1980": {
+ "account_number": "330535",
+ "account_type": "Equity"
+ },
+ "Otras": {
+ "account_number": "330595",
+ "account_type": "Equity"
+ }
+ },
+ "Reservas estatutarias": {
+ "account_number": "3310",
+ "account_type": "Equity",
+ "Para futuras capitalizaciones": {
+ "account_number": "331005",
+ "account_type": "Equity"
+ },
+ "Para reposici\u00f3n de activos": {
+ "account_number": "331010",
+ "account_type": "Equity"
+ },
+ "Para futuros ensanches": {
+ "account_number": "331015",
+ "account_type": "Equity"
+ },
+ "Otras": {
+ "account_number": "331095",
+ "account_type": "Equity"
+ }
+ },
+ "Reservas ocasionales": {
+ "account_number": "3315",
+ "account_type": "Equity",
+ "Para beneficencia y civismo": {
+ "account_number": "331505",
+ "account_type": "Equity"
+ },
+ "Para futuras capitalizaciones": {
+ "account_number": "331510",
+ "account_type": "Equity"
+ },
+ "Para futuros ensanches": {
+ "account_number": "331515",
+ "account_type": "Equity"
+ },
+ "Para adquisici\u00f3n o reposici\u00f3n de propiedades, planta y equipo": {
+ "account_number": "331520",
+ "account_type": "Equity"
+ },
+ "Para investigaciones y desarrollo": {
+ "account_number": "331525",
+ "account_type": "Equity"
+ },
+ "Para fomento econ\u00f3mico": {
+ "account_number": "331530",
+ "account_type": "Equity"
+ },
+ "Para capital de trabajo": {
+ "account_number": "331535",
+ "account_type": "Equity"
+ },
+ "Para estabilizaci\u00f3n de rendimientos": {
+ "account_number": "331540",
+ "account_type": "Equity"
+ },
+ "A disposici\u00f3n del m\u00e1ximo \u00f3rgano social": {
+ "account_number": "331545",
+ "account_type": "Equity"
+ },
+ "Otras": {
+ "account_number": "331595",
+ "account_type": "Equity"
+ }
+ }
+ },
+ "Revalorizaci\u00f3n del patrimonio": {
+ "account_number": "34",
+ "account_type": "Equity",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "3405",
+ "account_type": "Equity",
+ "De capital social": {
+ "account_number": "340505",
+ "account_type": "Equity"
+ },
+ "De super\u00e1vit de capital": {
+ "account_number": "340510",
+ "account_type": "Equity"
+ },
+ "De reservas": {
+ "account_number": "340515",
+ "account_type": "Equity"
+ },
+ "De resultados de ejercicios anteriores": {
+ "account_number": "340520",
+ "account_type": "Equity"
+ },
+ "De activos en per\u00edodo improductivo": {
+ "account_number": "340525",
+ "account_type": "Equity"
+ },
+ "De saneamiento fiscal": {
+ "account_number": "340530",
+ "account_type": "Equity"
+ },
+ "De ajustes Decreto 3019 de 1989": {
+ "account_number": "340535",
+ "account_type": "Equity"
+ },
+ "De dividendos y participaciones decretadas en acciones, cuotas o partes de inter\u00e9s social": {
+ "account_number": "340540",
+ "account_type": "Equity"
+ },
+ "Super\u00e1vit m\u00e9todo de participaci\u00f3n": {
+ "account_number": "340545",
+ "account_type": "Equity"
+ }
+ },
+ "Saneamiento fiscal": {
+ "account_number": "3410",
+ "account_type": "Equity"
+ },
+ "Ajustes por inflaci\u00f3n Decreto 3019 de 1989": {
+ "account_number": "3415",
+ "account_type": "Equity"
+ }
+ },
+ "Dividendos o participaciones decretados en acciones, cuotas o partes de inter\u00e9s social": {
+ "account_number": "35",
+ "account_type": "Equity",
+ "Dividendos decretados en acciones": {
+ "account_number": "3505",
+ "account_type": "Equity"
+ },
+ "Participaciones decretadas en cuotas o partes de inter\u00e9s social": {
+ "account_number": "3510",
+ "account_type": "Equity"
+ }
+ },
+ "Resultados del ejercicio": {
+ "account_number": "36",
+ "account_type": "Equity",
+ "Utilidad del ejercicio": {
+ "account_number": "3605",
+ "account_type": "Equity"
+ },
+ "P\u00e9rdida del ejercicio": {
+ "account_number": "3610",
+ "account_type": "Equity"
+ }
+ },
+ "Resultados de ejercicios anteriores": {
+ "account_number": "37",
+ "account_type": "Equity",
+ "Utilidades acumuladas": {
+ "account_number": "3705",
+ "account_type": "Equity"
+ },
+ "P\u00e9rdidas acumuladas": {
+ "account_number": "3710",
+ "account_type": "Equity"
+ }
+ },
+ "Super\u00e1vit por valorizaciones": {
+ "account_number": "38",
+ "account_type": "Equity",
+ "De inversiones": {
+ "account_number": "3805",
+ "account_type": "Equity",
+ "Acciones": {
+ "account_number": "380505",
+ "account_type": "Equity"
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "380510",
+ "account_type": "Equity"
+ },
+ "Derechos fiduciarios": {
+ "account_number": "380515",
+ "account_type": "Equity"
+ }
+ },
+ "De propiedades, planta y equipo": {
+ "account_number": "3810",
+ "account_type": "Equity",
+ "Terrenos": {
+ "account_number": "381004",
+ "account_type": "Equity"
+ },
+ "Materiales proyectos petroleros": {
+ "account_number": "381006",
+ "account_type": "Equity"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "381008",
+ "account_type": "Equity"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "381012",
+ "account_type": "Equity"
+ },
+ "Equipo de oficina": {
+ "account_number": "381016",
+ "account_type": "Equity"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "381020",
+ "account_type": "Equity"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "381024",
+ "account_type": "Equity"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "381028",
+ "account_type": "Equity"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "381032",
+ "account_type": "Equity"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "381036",
+ "account_type": "Equity"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "381040",
+ "account_type": "Equity"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "381044",
+ "account_type": "Equity"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "381048",
+ "account_type": "Equity"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "381052",
+ "account_type": "Equity"
+ },
+ "Envases y empaques": {
+ "account_number": "381056",
+ "account_type": "Equity"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "381060",
+ "account_type": "Equity"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "381064",
+ "account_type": "Equity"
+ },
+ "Minas y canteras": {
+ "account_number": "381068",
+ "account_type": "Equity"
+ },
+ "Pozos artesianos": {
+ "account_number": "381072",
+ "account_type": "Equity"
+ },
+ "Yacimientos": {
+ "account_number": "381076",
+ "account_type": "Equity"
+ },
+ "Semovientes": {
+ "account_number": "381080",
+ "account_type": "Equity"
+ }
+ },
+ "De otros activos": {
+ "account_number": "3895",
+ "account_type": "Equity",
+ "Bienes de arte y cultura": {
+ "account_number": "389505",
+ "account_type": "Equity"
+ },
+ "Bienes entregados en comodato": {
+ "account_number": "389510",
+ "account_type": "Equity"
+ },
+ "Bienes recibidos en pago": {
+ "account_number": "389515",
+ "account_type": "Equity"
+ },
+ "Inventario de semovientes": {
+ "account_number": "389520",
+ "account_type": "Equity"
+ }
+ }
+ }
+ },
+ "Ingresos": {
+ "account_number": "4",
+ "account_type": "Income Account",
+ "root_type": "Income",
+ "Operacionales": {
+ "account_number": "41",
+ "account_type": "Income Account",
+ "Agricultura, ganader\u00eda, caza y silvicultura": {
+ "account_number": "4105",
+ "account_type": "Income Account",
+ "Cultivo de cereales": {
+ "account_number": "410505",
+ "account_type": "Income Account"
+ },
+ "Cultivos de hortalizas, legumbres y plantas ornamentales": {
+ "account_number": "410510",
+ "account_type": "Income Account"
+ },
+ "Cultivos de frutas, nueces y plantas arom\u00e1ticas": {
+ "account_number": "410515",
+ "account_type": "Income Account"
+ },
+ "Cultivo de caf\u00e9": {
+ "account_number": "410520",
+ "account_type": "Income Account"
+ },
+ "Cultivo de flores": {
+ "account_number": "410525",
+ "account_type": "Income Account"
+ },
+ "Cultivo de ca\u00f1a de az\u00facar": {
+ "account_number": "410530",
+ "account_type": "Income Account"
+ },
+ "Cultivo de algod\u00f3n y plantas para material textil": {
+ "account_number": "410535",
+ "account_type": "Income Account"
+ },
+ "Cultivo de banano": {
+ "account_number": "410540",
+ "account_type": "Income Account"
+ },
+ "Otros cultivos agr\u00edcolas": {
+ "account_number": "410545",
+ "account_type": "Income Account"
+ },
+ "Cr\u00eda de ovejas, cabras, asnos, mulas y burd\u00e9ganos": {
+ "account_number": "410550",
+ "account_type": "Income Account"
+ },
+ "Cr\u00eda de ganado caballar y vacuno": {
+ "account_number": "410555",
+ "account_type": "Income Account"
+ },
+ "Producci\u00f3n av\u00edcola": {
+ "account_number": "410560",
+ "account_type": "Income Account"
+ },
+ "Cr\u00eda de otros animales": {
+ "account_number": "410565",
+ "account_type": "Income Account"
+ },
+ "Servicios agr\u00edcolas y ganaderos": {
+ "account_number": "410570",
+ "account_type": "Income Account"
+ },
+ "Actividad de caza": {
+ "account_number": "410575",
+ "account_type": "Income Account"
+ },
+ "Actividad de silvicultura": {
+ "account_number": "410580",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "410595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "410599",
+ "account_type": "Income Account"
+ }
+ },
+ "Pesca": {
+ "account_number": "4110",
+ "account_type": "Income Account",
+ "Actividad de pesca": {
+ "account_number": "411005",
+ "account_type": "Income Account"
+ },
+ "Explotaci\u00f3n de criaderos de peces": {
+ "account_number": "411010",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "411095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "411099",
+ "account_type": "Income Account"
+ }
+ },
+ "Explotaci\u00f3n de minas y canteras": {
+ "account_number": "4115",
+ "account_type": "Income Account",
+ "Carb\u00f3n": {
+ "account_number": "411505",
+ "account_type": "Income Account"
+ },
+ "Petr\u00f3leo crudo": {
+ "account_number": "411510",
+ "account_type": "Income Account"
+ },
+ "Gas natural": {
+ "account_number": "411512",
+ "account_type": "Income Account"
+ },
+ "Servicios relacionados con extracci\u00f3n de petr\u00f3leo y gas": {
+ "account_number": "411514",
+ "account_type": "Income Account"
+ },
+ "Minerales de hierro": {
+ "account_number": "411515",
+ "account_type": "Income Account"
+ },
+ "Minerales metal\u00edferos no ferrosos": {
+ "account_number": "411520",
+ "account_type": "Income Account"
+ },
+ "Piedra, arena y arcilla": {
+ "account_number": "411525",
+ "account_type": "Income Account"
+ },
+ "Piedras preciosas": {
+ "account_number": "411527",
+ "account_type": "Income Account"
+ },
+ "Oro": {
+ "account_number": "411528",
+ "account_type": "Income Account"
+ },
+ "Otras minas y canteras": {
+ "account_number": "411530",
+ "account_type": "Income Account"
+ },
+ "Prestaci\u00f3n de servicios sector minero": {
+ "account_number": "411532",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "411595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "411599",
+ "account_type": "Income Account"
+ }
+ },
+ "Industrias manufactureras": {
+ "account_number": "4120",
+ "account_type": "Income Account",
+ "Producci\u00f3n y procesamiento de carnes y productos c\u00e1rnicos": {
+ "account_number": "412001",
+ "account_type": "Income Account"
+ },
+ "Productos de pescado": {
+ "account_number": "412002",
+ "account_type": "Income Account"
+ },
+ "Productos de frutas, legumbres y hortalizas": {
+ "account_number": "412003",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de aceites y grasas": {
+ "account_number": "412004",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos l\u00e1cteos": {
+ "account_number": "412005",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de moliner\u00eda": {
+ "account_number": "412006",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de almidones y derivados": {
+ "account_number": "412007",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de alimentos para animales": {
+ "account_number": "412008",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos para panader\u00eda": {
+ "account_number": "412009",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de az\u00facar y melazas": {
+ "account_number": "412010",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de cacao, chocolate y confiter\u00eda": {
+ "account_number": "412011",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de pastas y productos farin\u00e1ceos": {
+ "account_number": "412012",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de caf\u00e9": {
+ "account_number": "412013",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros productos alimenticios": {
+ "account_number": "412014",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de bebidas alcoh\u00f3licas y alcohol et\u00edlico": {
+ "account_number": "412015",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de vinos": {
+ "account_number": "412016",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de bebidas malteadas y de malta": {
+ "account_number": "412017",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de bebidas no alcoh\u00f3licas": {
+ "account_number": "412018",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de tabaco": {
+ "account_number": "412019",
+ "account_type": "Income Account"
+ },
+ "Preparaci\u00f3n e hilatura de fibras textiles y tejedur\u00eda": {
+ "account_number": "412020",
+ "account_type": "Income Account"
+ },
+ "Acabado de productos textiles": {
+ "account_number": "412021",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de art\u00edculos de materiales textiles": {
+ "account_number": "412022",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de tapices y alfombras": {
+ "account_number": "412023",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de cuerdas, cordeles, bramantes y redes": {
+ "account_number": "412024",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros productos textiles": {
+ "account_number": "412025",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de tejidos": {
+ "account_number": "412026",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de prendas de vestir": {
+ "account_number": "412027",
+ "account_type": "Income Account"
+ },
+ "Preparaci\u00f3n, adobo y te\u00f1ido de pieles": {
+ "account_number": "412028",
+ "account_type": "Income Account"
+ },
+ "Curtido, adobo o preparaci\u00f3n de cuero": {
+ "account_number": "412029",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de maletas, bolsos y similares": {
+ "account_number": "412030",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de calzado": {
+ "account_number": "412031",
+ "account_type": "Income Account"
+ },
+ "Producci\u00f3n de madera, art\u00edculos de madera y corcho": {
+ "account_number": "412032",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de pasta y productos de madera, papel y cart\u00f3n": {
+ "account_number": "412033",
+ "account_type": "Income Account"
+ },
+ "Ediciones y publicaciones": {
+ "account_number": "412034",
+ "account_type": "Income Account"
+ },
+ "Impresi\u00f3n": {
+ "account_number": "412035",
+ "account_type": "Income Account"
+ },
+ "Servicios relacionados con la edici\u00f3n y la impresi\u00f3n": {
+ "account_number": "412036",
+ "account_type": "Income Account"
+ },
+ "Reproducci\u00f3n de grabaciones": {
+ "account_number": "412037",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de horno de coque": {
+ "account_number": "412038",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de la refinaci\u00f3n de petr\u00f3leo": {
+ "account_number": "412039",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de sustancias qu\u00edmicas b\u00e1sicas": {
+ "account_number": "412040",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de abonos y compuestos de nitr\u00f3geno": {
+ "account_number": "412041",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de pl\u00e1stico y caucho sint\u00e9tico": {
+ "account_number": "412042",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos qu\u00edmicos de uso agropecuario": {
+ "account_number": "412043",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de pinturas, tintas y masillas": {
+ "account_number": "412044",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos farmac\u00e9uticos y bot\u00e1nicos": {
+ "account_number": "412045",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de jabones, detergentes y preparados de tocador": {
+ "account_number": "412046",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros productos qu\u00edmicos": {
+ "account_number": "412047",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de fibras": {
+ "account_number": "412048",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros productos de caucho": {
+ "account_number": "412049",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de pl\u00e1stico": {
+ "account_number": "412050",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de vidrio y productos de vidrio": {
+ "account_number": "412051",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de productos de cer\u00e1mica, loza, piedra, arcilla y porcelana": {
+ "account_number": "412052",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de cemento, cal y yeso": {
+ "account_number": "412053",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de art\u00edculos de hormig\u00f3n, cemento y yeso": {
+ "account_number": "412054",
+ "account_type": "Income Account"
+ },
+ "Corte, tallado y acabado de la piedra": {
+ "account_number": "412055",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros productos minerales no met\u00e1licos": {
+ "account_number": "412056",
+ "account_type": "Income Account"
+ },
+ "Industrias b\u00e1sicas y fundici\u00f3n de hierro y acero": {
+ "account_number": "412057",
+ "account_type": "Income Account"
+ },
+ "Productos primarios de metales preciosos y de metales no ferrosos": {
+ "account_number": "412058",
+ "account_type": "Income Account"
+ },
+ "Fundici\u00f3n de metales no ferrosos": {
+ "account_number": "412059",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de productos met\u00e1licos para uso estructural": {
+ "account_number": "412060",
+ "account_type": "Income Account"
+ },
+ "Forja, prensado, estampado, laminado de metal y pulvimetalurgia": {
+ "account_number": "412061",
+ "account_type": "Income Account"
+ },
+ "Revestimiento de metales y obras de ingenier\u00eda mec\u00e1nica": {
+ "account_number": "412062",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de art\u00edculos de ferreter\u00eda": {
+ "account_number": "412063",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros productos de metal": {
+ "account_number": "412064",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de maquinaria y equipo": {
+ "account_number": "412065",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de equipos de elevaci\u00f3n y manipulaci\u00f3n": {
+ "account_number": "412066",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de aparatos de uso dom\u00e9stico": {
+ "account_number": "412067",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de equipo de oficina": {
+ "account_number": "412068",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de pilas y bater\u00edas primarias": {
+ "account_number": "412069",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de equipo de iluminaci\u00f3n": {
+ "account_number": "412070",
+ "account_type": "Income Account"
+ },
+ "Elaboraci\u00f3n de otros tipos de equipo el\u00e9ctrico": {
+ "account_number": "412071",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de equipos de radio, televisi\u00f3n y comunicaciones": {
+ "account_number": "412072",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de aparatos e instrumentos m\u00e9dicos": {
+ "account_number": "412073",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de instrumentos de medici\u00f3n y control": {
+ "account_number": "412074",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de instrumentos de \u00f3ptica y equipo fotogr\u00e1fico": {
+ "account_number": "412075",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de relojes": {
+ "account_number": "412076",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de veh\u00edculos automotores": {
+ "account_number": "412077",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de carrocer\u00edas para automotores": {
+ "account_number": "412078",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de partes piezas y accesorios para automotores": {
+ "account_number": "412079",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n y reparaci\u00f3n de buques y otras embarcaciones": {
+ "account_number": "412080",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de locomotoras y material rodante para ferrocarriles": {
+ "account_number": "412081",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de aeronaves": {
+ "account_number": "412082",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de motocicletas": {
+ "account_number": "412083",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de bicicletas y sillas de ruedas": {
+ "account_number": "412084",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de otros tipos de transporte": {
+ "account_number": "412085",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de muebles": {
+ "account_number": "412086",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de joyas y art\u00edculos conexos": {
+ "account_number": "412087",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de instrumentos de m\u00fasica": {
+ "account_number": "412088",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de art\u00edculos y equipo para deporte": {
+ "account_number": "412089",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de juegos y juguetes": {
+ "account_number": "412090",
+ "account_type": "Income Account"
+ },
+ "Reciclamiento de desperdicios": {
+ "account_number": "412091",
+ "account_type": "Income Account"
+ },
+ "Productos de otras industrias manufactureras": {
+ "account_number": "412095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "412099",
+ "account_type": "Income Account"
+ }
+ },
+ "Suministro de electricidad, gas y agua": {
+ "account_number": "4125",
+ "account_type": "Income Account",
+ "Generaci\u00f3n, captaci\u00f3n y distribuci\u00f3n de energ\u00eda el\u00e9ctrica": {
+ "account_number": "412505",
+ "account_type": "Income Account"
+ },
+ "Fabricaci\u00f3n de gas y distribuci\u00f3n de combustibles gaseosos": {
+ "account_number": "412510",
+ "account_type": "Income Account"
+ },
+ "Captaci\u00f3n, depuraci\u00f3n y distribuci\u00f3n de agua": {
+ "account_number": "412515",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "412595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "412599",
+ "account_type": "Income Account"
+ }
+ },
+ "Construcci\u00f3n": {
+ "account_number": "4130",
+ "account_type": "Income Account",
+ "Preparaci\u00f3n de terrenos": {
+ "account_number": "413005",
+ "account_type": "Income Account"
+ },
+ "Construcci\u00f3n de edificios y obras de ingenier\u00eda civil": {
+ "account_number": "413010",
+ "account_type": "Income Account"
+ },
+ "Acondicionamiento de edificios": {
+ "account_number": "413015",
+ "account_type": "Income Account"
+ },
+ "Terminaci\u00f3n de edificaciones": {
+ "account_number": "413020",
+ "account_type": "Income Account"
+ },
+ "Alquiler de equipo con operarios": {
+ "account_number": "413025",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "413095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "413099",
+ "account_type": "Income Account"
+ }
+ },
+ "Comercio al por mayor y al por menor": {
+ "account_number": "4135",
+ "account_type": "Income Account",
+ "Venta de veh\u00edculos automotores": {
+ "account_number": "413502",
+ "account_type": "Income Account"
+ },
+ "Mantenimiento, reparaci\u00f3n y lavado de veh\u00edculos automotores": {
+ "account_number": "413504",
+ "account_type": "Income Account"
+ },
+ "Venta de partes, piezas y accesorios de veh\u00edculos automotores": {
+ "account_number": "413506",
+ "account_type": "Income Account"
+ },
+ "Venta de combustibles s\u00f3lidos, l\u00edquidos, gaseosos": {
+ "account_number": "413508",
+ "account_type": "Income Account"
+ },
+ "Venta de lubricantes, aditivos, llantas y lujos para automotores": {
+ "account_number": "413510",
+ "account_type": "Income Account"
+ },
+ "Venta a cambio de retribuci\u00f3n o por contrata": {
+ "account_number": "413512",
+ "account_type": "Income Account"
+ },
+ "Venta de insumos, materias primas agropecuarias y flores": {
+ "account_number": "413514",
+ "account_type": "Income Account"
+ },
+ "Venta de otros insumos y materias primas no agropecuarias": {
+ "account_number": "413516",
+ "account_type": "Income Account"
+ },
+ "Venta de animales vivos y cueros": {
+ "account_number": "413518",
+ "account_type": "Income Account"
+ },
+ "Venta de productos en almacenes no especializados": {
+ "account_number": "413520",
+ "account_type": "Income Account"
+ },
+ "Venta de productos agropecuarios": {
+ "account_number": "413522",
+ "account_type": "Income Account"
+ },
+ "Venta de productos textiles, de vestir, de cuero y calzado": {
+ "account_number": "413524",
+ "account_type": "Income Account"
+ },
+ "Venta de papel y cart\u00f3n": {
+ "account_number": "413526",
+ "account_type": "Income Account"
+ },
+ "Venta de libros, revistas, elementos de papeler\u00eda, \u00fatiles y textos escolares": {
+ "account_number": "413528",
+ "account_type": "Income Account"
+ },
+ "Venta de juegos, juguetes y art\u00edculos deportivos": {
+ "account_number": "413530",
+ "account_type": "Income Account"
+ },
+ "Venta de instrumentos quir\u00fargicos y ortop\u00e9dicos": {
+ "account_number": "413532",
+ "account_type": "Income Account"
+ },
+ "Venta de art\u00edculos en relojer\u00edas y joyer\u00edas": {
+ "account_number": "413534",
+ "account_type": "Income Account"
+ },
+ "Venta de electrodom\u00e9sticos y muebles": {
+ "account_number": "413536",
+ "account_type": "Income Account"
+ },
+ "Venta de productos de aseo, farmac\u00e9uticos, medicinales, y art\u00edculos de tocador": {
+ "account_number": "413538",
+ "account_type": "Income Account"
+ },
+ "Venta de cubiertos, vajillas, cristaler\u00eda, porcelanas, cer\u00e1micas y otros art\u00edculos de uso dom\u00e9stico": {
+ "account_number": "413540",
+ "account_type": "Income Account"
+ },
+ "Venta de materiales de construcci\u00f3n, fontaner\u00eda y calefacci\u00f3n": {
+ "account_number": "413542",
+ "account_type": "Income Account"
+ },
+ "Venta de pinturas y lacas": {
+ "account_number": "413544",
+ "account_type": "Income Account"
+ },
+ "Venta de productos de vidrios y marqueter\u00eda": {
+ "account_number": "413546",
+ "account_type": "Income Account"
+ },
+ "Venta de herramientas y art\u00edculos de ferreter\u00eda": {
+ "account_number": "413548",
+ "account_type": "Income Account"
+ },
+ "Venta de qu\u00edmicos": {
+ "account_number": "413550",
+ "account_type": "Income Account"
+ },
+ "Venta de productos intermedios, desperdicios y desechos": {
+ "account_number": "413552",
+ "account_type": "Income Account"
+ },
+ "Venta de maquinaria, equipo de oficina y programas de computador": {
+ "account_number": "413554",
+ "account_type": "Income Account"
+ },
+ "Venta de art\u00edculos en cacharrer\u00edas y miscel\u00e1neas": {
+ "account_number": "413556",
+ "account_type": "Income Account"
+ },
+ "Venta de instrumentos musicales": {
+ "account_number": "413558",
+ "account_type": "Income Account"
+ },
+ "Venta de art\u00edculos en casas de empe\u00f1o y prender\u00edas": {
+ "account_number": "413560",
+ "account_type": "Income Account"
+ },
+ "Venta de equipo fotogr\u00e1fico": {
+ "account_number": "413562",
+ "account_type": "Income Account"
+ },
+ "Venta de equipo \u00f3ptico y de precisi\u00f3n": {
+ "account_number": "413564",
+ "account_type": "Income Account"
+ },
+ "Venta de empaques": {
+ "account_number": "413566",
+ "account_type": "Income Account"
+ },
+ "Venta de equipo profesional y cient\u00edfico": {
+ "account_number": "413568",
+ "account_type": "Income Account"
+ },
+ "Venta de loter\u00edas, rifas, chance, apuestas y similares": {
+ "account_number": "413570",
+ "account_type": "Income Account"
+ },
+ "Reparaci\u00f3n de efectos personales y electrodom\u00e9sticos": {
+ "account_number": "413572",
+ "account_type": "Income Account"
+ },
+ "Venta de otros productos": {
+ "account_number": "413595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "413599",
+ "account_type": "Income Account"
+ }
+ },
+ "Hoteles y restaurantes": {
+ "account_number": "4140",
+ "account_type": "Income Account",
+ "Hoteler\u00eda": {
+ "account_number": "414005",
+ "account_type": "Income Account"
+ },
+ "Campamento y otros tipos de hospedaje": {
+ "account_number": "414010",
+ "account_type": "Income Account"
+ },
+ "Restaurantes": {
+ "account_number": "414015",
+ "account_type": "Income Account"
+ },
+ "Bares y cantinas": {
+ "account_number": "414020",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "414095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "414099",
+ "account_type": "Income Account"
+ }
+ },
+ "Transporte, almacenamiento y comunicaciones": {
+ "account_number": "4145",
+ "account_type": "Income Account",
+ "Servicio de transporte por carretera": {
+ "account_number": "414505",
+ "account_type": "Income Account"
+ },
+ "Servicio de transporte por v\u00eda f\u00e9rrea": {
+ "account_number": "414510",
+ "account_type": "Income Account"
+ },
+ "Servicio de transporte por v\u00eda acu\u00e1tica": {
+ "account_number": "414515",
+ "account_type": "Income Account"
+ },
+ "Servicio de transporte por v\u00eda a\u00e9rea": {
+ "account_number": "414520",
+ "account_type": "Income Account"
+ },
+ "Servicio de transporte por tuber\u00edas": {
+ "account_number": "414525",
+ "account_type": "Income Account"
+ },
+ "Manipulaci\u00f3n de carga": {
+ "account_number": "414530",
+ "account_type": "Income Account"
+ },
+ "Almacenamiento y dep\u00f3sito": {
+ "account_number": "414535",
+ "account_type": "Income Account"
+ },
+ "Servicios complementarios para el transporte": {
+ "account_number": "414540",
+ "account_type": "Income Account"
+ },
+ "Agencias de viaje": {
+ "account_number": "414545",
+ "account_type": "Income Account"
+ },
+ "Otras agencias de transporte": {
+ "account_number": "414550",
+ "account_type": "Income Account"
+ },
+ "Servicio postal y de correo": {
+ "account_number": "414555",
+ "account_type": "Income Account"
+ },
+ "Servicio telef\u00f3nico": {
+ "account_number": "414560",
+ "account_type": "Income Account"
+ },
+ "Servicio de tel\u00e9grafo": {
+ "account_number": "414565",
+ "account_type": "Income Account"
+ },
+ "Servicio de transmisi\u00f3n de datos": {
+ "account_number": "414570",
+ "account_type": "Income Account"
+ },
+ "Servicio de radio y televisi\u00f3n por cable": {
+ "account_number": "414575",
+ "account_type": "Income Account"
+ },
+ "Transmisi\u00f3n de sonido e im\u00e1genes por contrato": {
+ "account_number": "414580",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "414595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "414599",
+ "account_type": "Income Account"
+ }
+ },
+ "Actividad financiera": {
+ "account_number": "4150",
+ "account_type": "Income Account",
+ "Venta de inversiones": {
+ "account_number": "415005",
+ "account_type": "Income Account"
+ },
+ "Dividendos de sociedades an\u00f3nimas y/o asimiladas": {
+ "account_number": "415010",
+ "account_type": "Income Account"
+ },
+ "Participaciones de sociedades limitadas y/o asimiladas": {
+ "account_number": "415015",
+ "account_type": "Income Account"
+ },
+ "Intereses": {
+ "account_number": "415020",
+ "account_type": "Income Account"
+ },
+ "Reajuste monetario-UPAC (hoy UVR)": {
+ "account_number": "415025",
+ "account_type": "Income Account"
+ },
+ "Comisiones": {
+ "account_number": "415030",
+ "account_type": "Income Account"
+ },
+ "Operaciones de descuento": {
+ "account_number": "415035",
+ "account_type": "Income Account"
+ },
+ "Cuotas de inscripci\u00f3n-consorcios": {
+ "account_number": "415040",
+ "account_type": "Income Account"
+ },
+ "Cuotas de administraci\u00f3n-consorcios": {
+ "account_number": "415045",
+ "account_type": "Income Account"
+ },
+ "Reajuste del sistema-consorcios": {
+ "account_number": "415050",
+ "account_type": "Income Account"
+ },
+ "Eliminaci\u00f3n de suscriptores-consorcios": {
+ "account_number": "415055",
+ "account_type": "Income Account"
+ },
+ "Cuotas de ingreso o retiro-sociedad administradora": {
+ "account_number": "415060",
+ "account_type": "Income Account"
+ },
+ "Servicios a comisionistas": {
+ "account_number": "415065",
+ "account_type": "Income Account"
+ },
+ "Inscripciones y cuotas": {
+ "account_number": "415070",
+ "account_type": "Income Account"
+ },
+ "Recuperaci\u00f3n de garant\u00edas": {
+ "account_number": "415075",
+ "account_type": "Income Account"
+ },
+ "Ingresos m\u00e9todo de participaci\u00f3n": {
+ "account_number": "415080",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "415095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "415099",
+ "account_type": "Income Account"
+ }
+ },
+ "Actividades inmobiliarias, empresariales y de alquiler": {
+ "account_number": "4155",
+ "account_type": "Income Account",
+ "Arrendamientos de bienes inmuebles": {
+ "account_number": "415505",
+ "account_type": "Income Account"
+ },
+ "Inmobiliarias por retribuci\u00f3n o contrata": {
+ "account_number": "415510",
+ "account_type": "Income Account"
+ },
+ "Alquiler equipo de transporte": {
+ "account_number": "415515",
+ "account_type": "Income Account"
+ },
+ "Alquiler maquinaria y equipo": {
+ "account_number": "415520",
+ "account_type": "Income Account"
+ },
+ "Alquiler de efectos personales y enseres dom\u00e9sticos": {
+ "account_number": "415525",
+ "account_type": "Income Account"
+ },
+ "Consultor\u00eda en equipo y programas de inform\u00e1tica": {
+ "account_number": "415530",
+ "account_type": "Income Account"
+ },
+ "Procesamiento de datos": {
+ "account_number": "415535",
+ "account_type": "Income Account"
+ },
+ "Mantenimiento y reparaci\u00f3n de maquinaria de oficina": {
+ "account_number": "415540",
+ "account_type": "Income Account"
+ },
+ "Investigaciones cient\u00edficas y de desarrollo": {
+ "account_number": "415545",
+ "account_type": "Income Account"
+ },
+ "Actividades empresariales de consultor\u00eda": {
+ "account_number": "415550",
+ "account_type": "Income Account"
+ },
+ "Publicidad": {
+ "account_number": "415555",
+ "account_type": "Income Account"
+ },
+ "Dotaci\u00f3n de personal": {
+ "account_number": "415560",
+ "account_type": "Income Account"
+ },
+ "Investigaci\u00f3n y seguridad": {
+ "account_number": "415565",
+ "account_type": "Income Account"
+ },
+ "Limpieza de inmuebles": {
+ "account_number": "415570",
+ "account_type": "Income Account"
+ },
+ "Fotograf\u00eda": {
+ "account_number": "415575",
+ "account_type": "Income Account"
+ },
+ "Envase y empaque": {
+ "account_number": "415580",
+ "account_type": "Income Account"
+ },
+ "Fotocopiado": {
+ "account_number": "415585",
+ "account_type": "Income Account"
+ },
+ "Mantenimiento y reparaci\u00f3n de maquinaria y equipo": {
+ "account_number": "415590",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "415595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "415599",
+ "account_type": "Income Account"
+ }
+ },
+ "Ense\u00f1anza": {
+ "account_number": "4160",
+ "account_type": "Income Account",
+ "Actividades relacionadas con la educaci\u00f3n": {
+ "account_number": "416005",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "416095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "416099",
+ "account_type": "Income Account"
+ }
+ },
+ "Servicios sociales y de salud": {
+ "account_number": "4165",
+ "account_type": "Income Account",
+ "Servicio hospitalario": {
+ "account_number": "416505",
+ "account_type": "Income Account"
+ },
+ "Servicio m\u00e9dico": {
+ "account_number": "416510",
+ "account_type": "Income Account"
+ },
+ "Servicio odontol\u00f3gico": {
+ "account_number": "416515",
+ "account_type": "Income Account"
+ },
+ "Servicio de laboratorio": {
+ "account_number": "416520",
+ "account_type": "Income Account"
+ },
+ "Actividades veterinarias": {
+ "account_number": "416525",
+ "account_type": "Income Account"
+ },
+ "Actividades de servicios sociales": {
+ "account_number": "416530",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "416595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "416599",
+ "account_type": "Income Account"
+ }
+ },
+ "Otras actividades de servicios comunitarios, sociales y personales": {
+ "account_number": "4170",
+ "account_type": "Income Account",
+ "Eliminaci\u00f3n de desperdicios y aguas residuales": {
+ "account_number": "417005",
+ "account_type": "Income Account"
+ },
+ "Actividades de asociaci\u00f3n": {
+ "account_number": "417010",
+ "account_type": "Income Account"
+ },
+ "Producci\u00f3n y distribuci\u00f3n de filmes y videocintas": {
+ "account_number": "417015",
+ "account_type": "Income Account"
+ },
+ "Exhibici\u00f3n de filmes y videocintas": {
+ "account_number": "417020",
+ "account_type": "Income Account"
+ },
+ "Actividad de radio y televisi\u00f3n": {
+ "account_number": "417025",
+ "account_type": "Income Account"
+ },
+ "Actividad teatral, musical y art\u00edstica": {
+ "account_number": "417030",
+ "account_type": "Income Account"
+ },
+ "Grabaci\u00f3n y producci\u00f3n de discos": {
+ "account_number": "417035",
+ "account_type": "Income Account"
+ },
+ "Entretenimiento y esparcimiento": {
+ "account_number": "417040",
+ "account_type": "Income Account"
+ },
+ "Agencias de noticias": {
+ "account_number": "417045",
+ "account_type": "Income Account"
+ },
+ "Lavander\u00edas y similares": {
+ "account_number": "417050",
+ "account_type": "Income Account"
+ },
+ "Peluquer\u00edas y similares": {
+ "account_number": "417055",
+ "account_type": "Income Account"
+ },
+ "Servicios funerarios": {
+ "account_number": "417060",
+ "account_type": "Income Account"
+ },
+ "Zonas francas": {
+ "account_number": "417065",
+ "account_type": "Income Account"
+ },
+ "Actividades conexas": {
+ "account_number": "417095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "417099",
+ "account_type": "Income Account"
+ }
+ },
+ "Devoluciones en ventas (DB)": {
+ "account_number": "4175",
+ "account_type": "Income Account",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "417599",
+ "account_type": "Income Account"
+ }
+ }
+ },
+ "No operacionales": {
+ "account_number": "42",
+ "account_type": "Income Account",
+ "Otras ventas": {
+ "account_number": "4205",
+ "account_type": "Income Account",
+ "Materia prima": {
+ "account_number": "420505",
+ "account_type": "Income Account"
+ },
+ "Material de desecho": {
+ "account_number": "420510",
+ "account_type": "Income Account"
+ },
+ "Materiales varios": {
+ "account_number": "420515",
+ "account_type": "Income Account"
+ },
+ "Productos de diversificaci\u00f3n": {
+ "account_number": "420520",
+ "account_type": "Income Account"
+ },
+ "Excedentes de exportaci\u00f3n": {
+ "account_number": "420525",
+ "account_type": "Income Account"
+ },
+ "Envases y empaques": {
+ "account_number": "420530",
+ "account_type": "Income Account"
+ },
+ "Productos agr\u00edcolas": {
+ "account_number": "420535",
+ "account_type": "Income Account"
+ },
+ "De propaganda": {
+ "account_number": "420540",
+ "account_type": "Income Account"
+ },
+ "Productos en remate": {
+ "account_number": "420545",
+ "account_type": "Income Account"
+ },
+ "Combustibles y lubricantes": {
+ "account_number": "420550",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "420599",
+ "account_type": "Income Account"
+ }
+ },
+ "Financieros": {
+ "account_number": "4210",
+ "account_type": "Income Account",
+ "Intereses": {
+ "account_number": "421005",
+ "account_type": "Income Account"
+ },
+ "Reajuste monetario-UPAC (hoy UVR)": {
+ "account_number": "421010",
+ "account_type": "Income Account"
+ },
+ "Descuentos amortizados": {
+ "account_number": "421015",
+ "account_type": "Income Account"
+ },
+ "Diferencia en cambio": {
+ "account_number": "421020",
+ "account_type": "Income Account"
+ },
+ "Financiaci\u00f3n veh\u00edculos": {
+ "account_number": "421025",
+ "account_type": "Income Account"
+ },
+ "Financiaci\u00f3n sistemas de viajes": {
+ "account_number": "421030",
+ "account_type": "Income Account"
+ },
+ "Aceptaciones bancarias": {
+ "account_number": "421035",
+ "account_type": "Income Account"
+ },
+ "Descuentos comerciales condicionados": {
+ "account_number": "421040",
+ "account_type": "Income Account"
+ },
+ "Descuentos bancarios": {
+ "account_number": "421045",
+ "account_type": "Income Account"
+ },
+ "Comisiones cheques de otras plazas": {
+ "account_number": "421050",
+ "account_type": "Income Account"
+ },
+ "Multas y recargos": {
+ "account_number": "421055",
+ "account_type": "Income Account"
+ },
+ "Sanciones cheques devueltos": {
+ "account_number": "421060",
+ "account_type": "Income Account"
+ },
+ "Otros": {
+ "account_number": "421095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "421099",
+ "account_type": "Income Account"
+ }
+ },
+ "Dividendos y participaciones": {
+ "account_number": "4215",
+ "account_type": "Income Account",
+ "De sociedades an\u00f3nimas y/o asimiladas": {
+ "account_number": "421505",
+ "account_type": "Income Account"
+ },
+ "De sociedades limitadas y/o asimiladas": {
+ "account_number": "421510",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "421599",
+ "account_type": "Income Account"
+ }
+ },
+ "Ingresos m\u00e9todo de participaci\u00f3n": {
+ "account_number": "4218",
+ "account_type": "Income Account",
+ "De sociedades an\u00f3nimas y/o asimiladas": {
+ "account_number": "421805",
+ "account_type": "Income Account"
+ },
+ "De sociedades limitadas y/o asimiladas": {
+ "account_number": "421810",
+ "account_type": "Income Account"
+ }
+ },
+ "Arrendamientos": {
+ "account_number": "4220",
+ "account_type": "Income Account",
+ "Terrenos": {
+ "account_number": "422005",
+ "account_type": "Income Account"
+ },
+ "Construcciones y edificios": {
+ "account_number": "422010",
+ "account_type": "Income Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "422015",
+ "account_type": "Income Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "422020",
+ "account_type": "Income Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "422025",
+ "account_type": "Income Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "422030",
+ "account_type": "Income Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "422035",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "422040",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "422045",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "422050",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "422055",
+ "account_type": "Income Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "422060",
+ "account_type": "Income Account"
+ },
+ "Envases y empaques": {
+ "account_number": "422062",
+ "account_type": "Income Account"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "422065",
+ "account_type": "Income Account"
+ },
+ "Aer\u00f3dromos": {
+ "account_number": "422070",
+ "account_type": "Income Account"
+ },
+ "Semovientes": {
+ "account_number": "422075",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "422099",
+ "account_type": "Income Account"
+ }
+ },
+ "Comisiones": {
+ "account_number": "4225",
+ "account_type": "Income Account",
+ "Sobre inversiones": {
+ "account_number": "422505",
+ "account_type": "Income Account"
+ },
+ "De concesionarios": {
+ "account_number": "422510",
+ "account_type": "Income Account"
+ },
+ "De actividades financieras": {
+ "account_number": "422515",
+ "account_type": "Income Account"
+ },
+ "Por venta de servicios de taller": {
+ "account_number": "422520",
+ "account_type": "Income Account"
+ },
+ "Por venta de seguros": {
+ "account_number": "422525",
+ "account_type": "Income Account"
+ },
+ "Por ingresos para terceros": {
+ "account_number": "422530",
+ "account_type": "Income Account"
+ },
+ "Por distribuci\u00f3n de pel\u00edculas": {
+ "account_number": "422535",
+ "account_type": "Income Account"
+ },
+ "Derechos de autor": {
+ "account_number": "422540",
+ "account_type": "Income Account"
+ },
+ "Derechos de programaci\u00f3n": {
+ "account_number": "422545",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "422599",
+ "account_type": "Income Account"
+ }
+ },
+ "Honorarios": {
+ "account_number": "4230",
+ "account_type": "Income Account",
+ "Asesor\u00edas": {
+ "account_number": "423005",
+ "account_type": "Income Account"
+ },
+ "Asistencia t\u00e9cnica": {
+ "account_number": "423010",
+ "account_type": "Income Account"
+ },
+ "Administraci\u00f3n de vinculadas": {
+ "account_number": "423015",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "423099",
+ "account_type": "Income Account"
+ }
+ },
+ "Servicios": {
+ "account_number": "4235",
+ "account_type": "Income Account",
+ "De b\u00e1scula": {
+ "account_number": "423505",
+ "account_type": "Income Account"
+ },
+ "De transporte": {
+ "account_number": "423510",
+ "account_type": "Income Account"
+ },
+ "De prensa": {
+ "account_number": "423515",
+ "account_type": "Income Account"
+ },
+ "Administrativos": {
+ "account_number": "423520",
+ "account_type": "Income Account"
+ },
+ "T\u00e9cnicos": {
+ "account_number": "423525",
+ "account_type": "Income Account"
+ },
+ "De computaci\u00f3n": {
+ "account_number": "423530",
+ "account_type": "Income Account"
+ },
+ "De telefax": {
+ "account_number": "423535",
+ "account_type": "Income Account"
+ },
+ "Taller de veh\u00edculos": {
+ "account_number": "423540",
+ "account_type": "Income Account"
+ },
+ "De recepci\u00f3n de aeronaves": {
+ "account_number": "423545",
+ "account_type": "Income Account"
+ },
+ "De transporte programa gas natural": {
+ "account_number": "423550",
+ "account_type": "Income Account"
+ },
+ "Por contratos": {
+ "account_number": "423555",
+ "account_type": "Income Account"
+ },
+ "De trilla": {
+ "account_number": "423560",
+ "account_type": "Income Account"
+ },
+ "De mantenimiento": {
+ "account_number": "423565",
+ "account_type": "Income Account"
+ },
+ "Al personal": {
+ "account_number": "423570",
+ "account_type": "Income Account"
+ },
+ "De casino": {
+ "account_number": "423575",
+ "account_type": "Income Account"
+ },
+ "Fletes": {
+ "account_number": "423580",
+ "account_type": "Income Account"
+ },
+ "Entre compa\u00f1\u00edas": {
+ "account_number": "423585",
+ "account_type": "Income Account"
+ },
+ "Otros": {
+ "account_number": "423595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "423599",
+ "account_type": "Income Account"
+ }
+ },
+ "Utilidad en venta de inversiones": {
+ "account_number": "4240",
+ "account_type": "Income Account",
+ "Acciones": {
+ "account_number": "424005",
+ "account_type": "Income Account"
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "424010",
+ "account_type": "Income Account"
+ },
+ "Bonos": {
+ "account_number": "424015",
+ "account_type": "Income Account"
+ },
+ "C\u00e9dulas": {
+ "account_number": "424020",
+ "account_type": "Income Account"
+ },
+ "Certificados": {
+ "account_number": "424025",
+ "account_type": "Income Account"
+ },
+ "Papeles comerciales": {
+ "account_number": "424030",
+ "account_type": "Income Account"
+ },
+ "T\u00edtulos": {
+ "account_number": "424035",
+ "account_type": "Income Account"
+ },
+ "Derechos fiduciarios": {
+ "account_number": "424045",
+ "account_type": "Income Account"
+ },
+ "Obligatorias": {
+ "account_number": "424050",
+ "account_type": "Income Account"
+ },
+ "Otras": {
+ "account_number": "424095",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "424099",
+ "account_type": "Income Account"
+ }
+ },
+ "Utilidad en venta de propiedades, planta y equipo": {
+ "account_number": "4245",
+ "account_type": "Income Account",
+ "Terrenos": {
+ "account_number": "424504",
+ "account_type": "Income Account"
+ },
+ "Materiales industria petrolera": {
+ "account_number": "424506",
+ "account_type": "Income Account"
+ },
+ "Construcciones en curso": {
+ "account_number": "424508",
+ "account_type": "Income Account"
+ },
+ "Maquinaria en montaje": {
+ "account_number": "424512",
+ "account_type": "Income Account"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "424516",
+ "account_type": "Income Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "424520",
+ "account_type": "Income Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "424524",
+ "account_type": "Income Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "424528",
+ "account_type": "Income Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "424532",
+ "account_type": "Income Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "424536",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "424540",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "424544",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "424548",
+ "account_type": "Income Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "424552",
+ "account_type": "Income Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "424556",
+ "account_type": "Income Account"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "424560",
+ "account_type": "Income Account"
+ },
+ "Envases y empaques": {
+ "account_number": "424562",
+ "account_type": "Income Account"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "424564",
+ "account_type": "Income Account"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "424568",
+ "account_type": "Income Account"
+ },
+ "Minas y Canteras": {
+ "account_number": "424572",
+ "account_type": "Income Account"
+ },
+ "Pozos artesianos": {
+ "account_number": "424580",
+ "account_type": "Income Account"
+ },
+ "Yacimientos": {
+ "account_number": "424584",
+ "account_type": "Income Account"
+ },
+ "Semovientes": {
+ "account_number": "424588",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "424599",
+ "account_type": "Income Account"
+ }
+ },
+ "Utilidad en venta de otros bienes": {
+ "account_number": "4248",
+ "account_type": "Income Account",
+ "Intangibles": {
+ "account_number": "424805",
+ "account_type": "Income Account"
+ },
+ "Otros activos": {
+ "account_number": "424810",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "424899",
+ "account_type": "Income Account"
+ }
+ },
+ "Recuperaciones": {
+ "account_number": "4250",
+ "account_type": "Income Account",
+ "Deudas malas": {
+ "account_number": "425005",
+ "account_type": "Income Account"
+ },
+ "Seguros": {
+ "account_number": "425010",
+ "account_type": "Income Account"
+ },
+ "Reclamos": {
+ "account_number": "425015",
+ "account_type": "Income Account"
+ },
+ "Reintegro por personal en comisi\u00f3n": {
+ "account_number": "425020",
+ "account_type": "Income Account"
+ },
+ "Reintegro garant\u00edas": {
+ "account_number": "425025",
+ "account_type": "Income Account"
+ },
+ "Descuentos concedidos": {
+ "account_number": "425030",
+ "account_type": "Income Account"
+ },
+ "De provisiones": {
+ "account_number": "425035",
+ "account_type": "Income Account"
+ },
+ "Gastos bancarios": {
+ "account_number": "425040",
+ "account_type": "Income Account"
+ },
+ "De depreciaci\u00f3n": {
+ "account_number": "425045",
+ "account_type": "Income Account"
+ },
+ "Reintegro de otros costos y gastos": {
+ "account_number": "425050",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "425099",
+ "account_type": "Income Account"
+ }
+ },
+ "Indemnizaciones": {
+ "account_number": "4255",
+ "account_type": "Income Account",
+ "Por siniestro": {
+ "account_number": "425505",
+ "account_type": "Income Account"
+ },
+ "Por suministros": {
+ "account_number": "425510",
+ "account_type": "Income Account"
+ },
+ "Lucro cesante compa\u00f1\u00edas de seguros": {
+ "account_number": "425515",
+ "account_type": "Income Account"
+ },
+ "Da\u00f1o emergente compa\u00f1\u00edas de seguros": {
+ "account_number": "425520",
+ "account_type": "Income Account"
+ },
+ "Por p\u00e9rdida de mercanc\u00eda": {
+ "account_number": "425525",
+ "account_type": "Income Account"
+ },
+ "Por incumplimiento de contratos": {
+ "account_number": "425530",
+ "account_type": "Income Account"
+ },
+ "De terceros": {
+ "account_number": "425535",
+ "account_type": "Income Account"
+ },
+ "Por incapacidades ISS": {
+ "account_number": "425540",
+ "account_type": "Income Account"
+ },
+ "Otras": {
+ "account_number": "425595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "425599",
+ "account_type": "Income Account"
+ }
+ },
+ "Participaciones en concesiones": {
+ "account_number": "4260",
+ "account_type": "Income Account",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "426099",
+ "account_type": "Income Account"
+ }
+ },
+ "Ingresos de ejercicios anteriores": {
+ "account_number": "4265",
+ "account_type": "Income Account",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "426599",
+ "account_type": "Income Account"
+ }
+ },
+ "Devoluciones en otras ventas (DB)": {
+ "account_number": "4275",
+ "account_type": "Income Account",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "427599",
+ "account_type": "Income Account"
+ }
+ },
+ "Diversos": {
+ "account_number": "4295",
+ "account_type": "Income Account",
+ "CERT": {
+ "account_number": "429503",
+ "account_type": "Income Account"
+ },
+ "Aprovechamientos": {
+ "account_number": "429505",
+ "account_type": "Income Account"
+ },
+ "Auxilios": {
+ "account_number": "429507",
+ "account_type": "Income Account"
+ },
+ "Subvenciones": {
+ "account_number": "429509",
+ "account_type": "Income Account"
+ },
+ "Ingresos por investigaci\u00f3n y desarrollo": {
+ "account_number": "429511",
+ "account_type": "Income Account"
+ },
+ "Por trabajos ejecutados": {
+ "account_number": "429513",
+ "account_type": "Income Account"
+ },
+ "Regal\u00edas": {
+ "account_number": "429515",
+ "account_type": "Income Account"
+ },
+ "Derivados de las exportaciones": {
+ "account_number": "429517",
+ "account_type": "Income Account"
+ },
+ "Otros ingresos de explotaci\u00f3n": {
+ "account_number": "429519",
+ "account_type": "Income Account"
+ },
+ "De la actividad ganadera": {
+ "account_number": "429521",
+ "account_type": "Income Account"
+ },
+ "Derechos y licitaciones": {
+ "account_number": "429525",
+ "account_type": "Income Account"
+ },
+ "Ingresos por elementos perdidos": {
+ "account_number": "429530",
+ "account_type": "Income Account"
+ },
+ "Multas y recargos": {
+ "account_number": "429533",
+ "account_type": "Income Account"
+ },
+ "Preavisos descontados": {
+ "account_number": "429535",
+ "account_type": "Income Account"
+ },
+ "Reclamos": {
+ "account_number": "429537",
+ "account_type": "Income Account"
+ },
+ "Recobro de da\u00f1os": {
+ "account_number": "429540",
+ "account_type": "Income Account"
+ },
+ "Premios": {
+ "account_number": "429543",
+ "account_type": "Income Account"
+ },
+ "Bonificaciones": {
+ "account_number": "429545",
+ "account_type": "Income Account"
+ },
+ "Productos descontados": {
+ "account_number": "429547",
+ "account_type": "Income Account"
+ },
+ "Reconocimientos ISS": {
+ "account_number": "429549",
+ "account_type": "Income Account"
+ },
+ "Excedentes": {
+ "account_number": "429551",
+ "account_type": "Income Account"
+ },
+ "Sobrantes de caja": {
+ "account_number": "429553",
+ "account_type": "Income Account"
+ },
+ "Sobrantes en liquidaci\u00f3n fletes": {
+ "account_number": "429555",
+ "account_type": "Income Account"
+ },
+ "Subsidios estatales": {
+ "account_number": "429557",
+ "account_type": "Income Account"
+ },
+ "Capacitaci\u00f3n distribuidores": {
+ "account_number": "429559",
+ "account_type": "Income Account"
+ },
+ "De escrituraci\u00f3n": {
+ "account_number": "429561",
+ "account_type": "Income Account"
+ },
+ "Registro promesas de venta": {
+ "account_number": "429563",
+ "account_type": "Income Account"
+ },
+ "\u00datiles, papeler\u00eda y fotocopias": {
+ "account_number": "429567",
+ "account_type": "Income Account"
+ },
+ "Resultados, matr\u00edculas y traspasos": {
+ "account_number": "429571",
+ "account_type": "Income Account"
+ },
+ "Decoraciones": {
+ "account_number": "429573",
+ "account_type": "Income Account"
+ },
+ "Manejo de carga": {
+ "account_number": "429575",
+ "account_type": "Income Account"
+ },
+ "Historia cl\u00ednica": {
+ "account_number": "429579",
+ "account_type": "Income Account"
+ },
+ "Ajuste al peso": {
+ "account_number": "429581",
+ "account_type": "Income Account"
+ },
+ "Llamadas telef\u00f3nicas": {
+ "account_number": "429583",
+ "account_type": "Income Account"
+ },
+ "Otros": {
+ "account_number": "429595",
+ "account_type": "Income Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "429599",
+ "account_type": "Income Account"
+ }
+ }
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "47",
+ "account_type": "Income Account",
+ "Correcci\u00f3n monetaria": {
+ "account_number": "4705",
+ "account_type": "Income Account",
+ "Inversiones (CR)": {
+ "account_number": "470505",
+ "account_type": "Income Account"
+ },
+ "Inventarios (CR)": {
+ "account_number": "470510",
+ "account_type": "Income Account"
+ },
+ "Propiedades, planta y equipo (CR)": {
+ "account_number": "470515",
+ "account_type": "Income Account"
+ },
+ "Intangibles (CR)": {
+ "account_number": "470520",
+ "account_type": "Income Account"
+ },
+ "Activos diferidos": {
+ "account_number": "470525",
+ "account_type": "Income Account"
+ },
+ "Otros activos (CR)": {
+ "account_number": "470530",
+ "account_type": "Income Account"
+ },
+ "Pasivos sujetos de ajuste": {
+ "account_number": "470535",
+ "account_type": "Income Account"
+ },
+ "Patrimonio": {
+ "account_number": "470540",
+ "account_type": "Income Account"
+ },
+ "Depreciaci\u00f3n acumulada (DB)": {
+ "account_number": "470545",
+ "account_type": "Income Account"
+ },
+ "Depreciaci\u00f3n diferida (CR)": {
+ "account_number": "470550",
+ "account_type": "Income Account"
+ },
+ "Agotamiento acumulado (DB)": {
+ "account_number": "470555",
+ "account_type": "Income Account"
+ },
+ "Amortizaci\u00f3n acumulada (DB)": {
+ "account_number": "470560",
+ "account_type": "Income Account"
+ },
+ "Ingresos operacionales (DB)": {
+ "account_number": "470565",
+ "account_type": "Income Account"
+ },
+ "Devoluciones en ventas (CR)": {
+ "account_number": "470568",
+ "account_type": "Income Account"
+ },
+ "Ingresos no operacionales (DB)": {
+ "account_number": "470570",
+ "account_type": "Income Account"
+ },
+ "Gastos operacionales de administraci\u00f3n (CR)": {
+ "account_number": "470575",
+ "account_type": "Income Account"
+ },
+ "Gastos operacionales de ventas (CR)": {
+ "account_number": "470580",
+ "account_type": "Income Account"
+ },
+ "Gastos no operacionales (CR)": {
+ "account_number": "470585",
+ "account_type": "Income Account"
+ },
+ "Compras (CR)": {
+ "account_number": "470590",
+ "account_type": "Income Account"
+ },
+ "Devoluciones en compras (DB)": {
+ "account_number": "470591",
+ "account_type": "Income Account"
+ },
+ "Costo de ventas (CR)": {
+ "account_number": "470592",
+ "account_type": "Income Account"
+ },
+ "Costos de producci\u00f3n o de operaci\u00f3n (CR)": {
+ "account_number": "470594",
+ "account_type": "Income Account"
+ }
+ }
+ }
+ },
+ "Gastos": {
+ "account_number": "5",
+ "account_type": "Expense Account",
+ "root_type": "Expense",
+ "Operacionales de administraci\u00f3n": {
+ "account_number": "51",
+ "account_type": "Expense Account",
+ "Gastos de personal": {
+ "account_number": "5105",
+ "account_type": "Expense Account",
+ "Salario integral": {
+ "account_number": "510503",
+ "account_type": "Expense Account"
+ },
+ "Sueldos": {
+ "account_number": "510506",
+ "account_type": "Expense Account"
+ },
+ "Jornales": {
+ "account_number": "510512",
+ "account_type": "Expense Account"
+ },
+ "Horas extras y recargos": {
+ "account_number": "510515",
+ "account_type": "Expense Account"
+ },
+ "Comisiones": {
+ "account_number": "510518",
+ "account_type": "Expense Account"
+ },
+ "Vi\u00e1ticos": {
+ "account_number": "510521",
+ "account_type": "Expense Account"
+ },
+ "Incapacidades": {
+ "account_number": "510524",
+ "account_type": "Expense Account"
+ },
+ "Auxilio de transporte": {
+ "account_number": "510527",
+ "account_type": "Expense Account"
+ },
+ "Cesant\u00edas": {
+ "account_number": "510530",
+ "account_type": "Expense Account"
+ },
+ "Intereses sobre cesant\u00edas": {
+ "account_number": "510533",
+ "account_type": "Expense Account"
+ },
+ "Prima de servicios": {
+ "account_number": "510536",
+ "account_type": "Expense Account"
+ },
+ "Vacaciones": {
+ "account_number": "510539",
+ "account_type": "Expense Account"
+ },
+ "Primas extralegales": {
+ "account_number": "510542",
+ "account_type": "Expense Account"
+ },
+ "Auxilios": {
+ "account_number": "510545",
+ "account_type": "Expense Account"
+ },
+ "Bonificaciones": {
+ "account_number": "510548",
+ "account_type": "Expense Account"
+ },
+ "Dotaci\u00f3n y suministro a trabajadores": {
+ "account_number": "510551",
+ "account_type": "Expense Account"
+ },
+ "Seguros": {
+ "account_number": "510554",
+ "account_type": "Expense Account"
+ },
+ "Cuotas partes pensiones de jubilaci\u00f3n": {
+ "account_number": "510557",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n c\u00e1lculo actuarial pensiones de jubilaci\u00f3n": {
+ "account_number": "510558",
+ "account_type": "Expense Account"
+ },
+ "Pensiones de jubilaci\u00f3n": {
+ "account_number": "510559",
+ "account_type": "Expense Account"
+ },
+ "Indemnizaciones laborales": {
+ "account_number": "510560",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n bonos pensionales": {
+ "account_number": "510561",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n t\u00edtulos pensionales": {
+ "account_number": "510562",
+ "account_type": "Expense Account"
+ },
+ "Capacitaci\u00f3n al personal": {
+ "account_number": "510563",
+ "account_type": "Expense Account"
+ },
+ "Gastos deportivos y de recreaci\u00f3n": {
+ "account_number": "510566",
+ "account_type": "Expense Account"
+ },
+ "Aportes a administradoras de riesgos profesionales, ARP": {
+ "account_number": "510568",
+ "account_type": "Expense Account"
+ },
+ "Aportes a entidades promotoras de salud, EPS": {
+ "account_number": "510569",
+ "account_type": "Expense Account"
+ },
+ "Aportes a fondos de pensiones y/o cesant\u00edas": {
+ "account_number": "510570",
+ "account_type": "Expense Account"
+ },
+ "Aportes cajas de compensaci\u00f3n familiar": {
+ "account_number": "510572",
+ "account_type": "Expense Account"
+ },
+ "Aportes ICBF": {
+ "account_number": "510575",
+ "account_type": "Expense Account"
+ },
+ "SENA": {
+ "account_number": "510578",
+ "account_type": "Expense Account"
+ },
+ "Aportes sindicales": {
+ "account_number": "510581",
+ "account_type": "Expense Account"
+ },
+ "Gastos m\u00e9dicos y drogas": {
+ "account_number": "510584",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "510595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "510599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Honorarios": {
+ "account_number": "5110",
+ "account_type": "Expense Account",
+ "Junta directiva": {
+ "account_number": "511005",
+ "account_type": "Expense Account"
+ },
+ "Revisor\u00eda fiscal": {
+ "account_number": "511010",
+ "account_type": "Expense Account"
+ },
+ "Auditor\u00eda externa": {
+ "account_number": "511015",
+ "account_type": "Expense Account"
+ },
+ "Aval\u00faos": {
+ "account_number": "511020",
+ "account_type": "Expense Account"
+ },
+ "Asesor\u00eda jur\u00eddica": {
+ "account_number": "511025",
+ "account_type": "Expense Account"
+ },
+ "Asesor\u00eda financiera": {
+ "account_number": "511030",
+ "account_type": "Expense Account"
+ },
+ "Asesor\u00eda t\u00e9cnica": {
+ "account_number": "511035",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "511095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "511099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Impuestos": {
+ "account_number": "5115",
+ "account_type": "Expense Account",
+ "Industria y comercio": {
+ "account_number": "511505",
+ "account_type": "Expense Account"
+ },
+ "De timbres": {
+ "account_number": "511510",
+ "account_type": "Expense Account"
+ },
+ "A la propiedad ra\u00edz": {
+ "account_number": "511515",
+ "account_type": "Expense Account"
+ },
+ "Derechos sobre instrumentos p\u00fablicos": {
+ "account_number": "511520",
+ "account_type": "Expense Account"
+ },
+ "De valorizaci\u00f3n": {
+ "account_number": "511525",
+ "account_type": "Expense Account"
+ },
+ "De turismo": {
+ "account_number": "511530",
+ "account_type": "Expense Account"
+ },
+ "Tasa por utilizaci\u00f3n de puertos": {
+ "account_number": "511535",
+ "account_type": "Expense Account"
+ },
+ "De veh\u00edculos": {
+ "account_number": "511540",
+ "account_type": "Expense Account"
+ },
+ "De espect\u00e1culos p\u00fablicos": {
+ "account_number": "511545",
+ "account_type": "Expense Account"
+ },
+ "Cuotas de fomento": {
+ "account_number": "511550",
+ "account_type": "Expense Account"
+ },
+ "IVA descontable": {
+ "account_number": "511570",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "511595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "511599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Arrendamientos": {
+ "account_number": "5120",
+ "account_type": "Expense Account",
+ "Terrenos": {
+ "account_number": "512005",
+ "account_type": "Expense Account"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "512010",
+ "account_type": "Expense Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "512015",
+ "account_type": "Expense Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "512020",
+ "account_type": "Expense Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "512025",
+ "account_type": "Expense Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "512030",
+ "account_type": "Expense Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "512035",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "512040",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "512045",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "512050",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "512055",
+ "account_type": "Expense Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "512060",
+ "account_type": "Expense Account"
+ },
+ "Aer\u00f3dromos": {
+ "account_number": "512065",
+ "account_type": "Expense Account"
+ },
+ "Semovientes": {
+ "account_number": "512070",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "512095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "512099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Contribuciones y afiliaciones": {
+ "account_number": "5125",
+ "account_type": "Expense Account",
+ "Contribuciones": {
+ "account_number": "512505",
+ "account_type": "Expense Account"
+ },
+ "Afiliaciones y sostenimiento": {
+ "account_number": "512510",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "512599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Seguros": {
+ "account_number": "5130",
+ "account_type": "Expense Account",
+ "Manejo": {
+ "account_number": "513005",
+ "account_type": "Expense Account"
+ },
+ "Cumplimiento": {
+ "account_number": "513010",
+ "account_type": "Expense Account"
+ },
+ "Corriente d\u00e9bil": {
+ "account_number": "513015",
+ "account_type": "Expense Account"
+ },
+ "Vida colectiva": {
+ "account_number": "513020",
+ "account_type": "Expense Account"
+ },
+ "Incendio": {
+ "account_number": "513025",
+ "account_type": "Expense Account"
+ },
+ "Terremoto": {
+ "account_number": "513030",
+ "account_type": "Expense Account"
+ },
+ "Sustracci\u00f3n y hurto": {
+ "account_number": "513035",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "513040",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "513045",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "513050",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "513055",
+ "account_type": "Expense Account"
+ },
+ "Responsabilidad civil y extracontractual": {
+ "account_number": "513060",
+ "account_type": "Expense Account"
+ },
+ "Vuelo": {
+ "account_number": "513065",
+ "account_type": "Expense Account"
+ },
+ "Rotura de maquinaria": {
+ "account_number": "513070",
+ "account_type": "Expense Account"
+ },
+ "Obligatorio accidente de tr\u00e1nsito": {
+ "account_number": "513075",
+ "account_type": "Expense Account"
+ },
+ "Lucro cesante": {
+ "account_number": "513080",
+ "account_type": "Expense Account"
+ },
+ "Transporte de mercanc\u00eda": {
+ "account_number": "513085",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "513095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "513099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Servicios": {
+ "account_number": "5135",
+ "account_type": "Expense Account",
+ "Aseo y vigilancia": {
+ "account_number": "513505",
+ "account_type": "Expense Account"
+ },
+ "Temporales": {
+ "account_number": "513510",
+ "account_type": "Expense Account"
+ },
+ "Asistencia t\u00e9cnica": {
+ "account_number": "513515",
+ "account_type": "Expense Account"
+ },
+ "Procesamiento electr\u00f3nico de datos": {
+ "account_number": "513520",
+ "account_type": "Expense Account"
+ },
+ "Acueducto y alcantarillado": {
+ "account_number": "513525",
+ "account_type": "Expense Account"
+ },
+ "Energ\u00eda el\u00e9ctrica": {
+ "account_number": "513530",
+ "account_type": "Expense Account"
+ },
+ "Tel\u00e9fono": {
+ "account_number": "513535",
+ "account_type": "Expense Account"
+ },
+ "Correo, portes y telegramas": {
+ "account_number": "513540",
+ "account_type": "Expense Account"
+ },
+ "Fax y t\u00e9lex": {
+ "account_number": "513545",
+ "account_type": "Expense Account"
+ },
+ "Transporte, fletes y acarreos": {
+ "account_number": "513550",
+ "account_type": "Expense Account"
+ },
+ "Gas": {
+ "account_number": "513555",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "513595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "513599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Gastos legales": {
+ "account_number": "5140",
+ "account_type": "Expense Account",
+ "Notariales": {
+ "account_number": "514005",
+ "account_type": "Expense Account"
+ },
+ "Registro mercantil": {
+ "account_number": "514010",
+ "account_type": "Expense Account"
+ },
+ "Tr\u00e1mites y licencias": {
+ "account_number": "514015",
+ "account_type": "Expense Account"
+ },
+ "Aduaneros": {
+ "account_number": "514020",
+ "account_type": "Expense Account"
+ },
+ "Consulares": {
+ "account_number": "514025",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "514095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "514099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Mantenimiento y reparaciones": {
+ "account_number": "5145",
+ "account_type": "Expense Account",
+ "Terrenos": {
+ "account_number": "514505",
+ "account_type": "Expense Account"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "514510",
+ "account_type": "Expense Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "514515",
+ "account_type": "Expense Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "514520",
+ "account_type": "Expense Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "514525",
+ "account_type": "Expense Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "514530",
+ "account_type": "Expense Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "514535",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "514540",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "514545",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "514550",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "514555",
+ "account_type": "Expense Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "514560",
+ "account_type": "Expense Account"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "514565",
+ "account_type": "Expense Account"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "514570",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "514599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Adecuaci\u00f3n e instalaci\u00f3n": {
+ "account_number": "5150",
+ "account_type": "Expense Account",
+ "Instalaciones el\u00e9ctricas": {
+ "account_number": "515005",
+ "account_type": "Expense Account"
+ },
+ "Arreglos ornamentales": {
+ "account_number": "515010",
+ "account_type": "Expense Account"
+ },
+ "Reparaciones locativas": {
+ "account_number": "515015",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "515095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "515099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Gastos de viaje": {
+ "account_number": "5155",
+ "account_type": "Expense Account",
+ "Alojamiento y manutenci\u00f3n": {
+ "account_number": "515505",
+ "account_type": "Expense Account"
+ },
+ "Pasajes fluviales y/o mar\u00edtimos": {
+ "account_number": "515510",
+ "account_type": "Expense Account"
+ },
+ "Pasajes a\u00e9reos": {
+ "account_number": "515515",
+ "account_type": "Expense Account"
+ },
+ "Pasajes terrestres": {
+ "account_number": "515520",
+ "account_type": "Expense Account"
+ },
+ "Pasajes f\u00e9rreos": {
+ "account_number": "515525",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "515595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "515599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Depreciaciones": {
+ "account_number": "5160",
+ "account_type": "Expense Account",
+ "Construcciones y edificaciones": {
+ "account_number": "516005",
+ "account_type": "Expense Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "516010",
+ "account_type": "Expense Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "516015",
+ "account_type": "Expense Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "516020",
+ "account_type": "Expense Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "516025",
+ "account_type": "Expense Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "516030",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "516035",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "516040",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "516045",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "516050",
+ "account_type": "Expense Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "516055",
+ "account_type": "Expense Account"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "516060",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "516099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Amortizaciones": {
+ "account_number": "5165",
+ "account_type": "Expense Account",
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "516505",
+ "account_type": "Expense Account"
+ },
+ "Intangibles": {
+ "account_number": "516510",
+ "account_type": "Expense Account"
+ },
+ "Cargos diferidos": {
+ "account_number": "516515",
+ "account_type": "Expense Account"
+ },
+ "Otras": {
+ "account_number": "516595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "516599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Diversos": {
+ "account_number": "5195",
+ "account_type": "Expense Account",
+ "Comisiones": {
+ "account_number": "519505",
+ "account_type": "Expense Account"
+ },
+ "Libros, suscripciones, peri\u00f3dicos y revistas": {
+ "account_number": "519510",
+ "account_type": "Expense Account"
+ },
+ "M\u00fasica ambiental": {
+ "account_number": "519515",
+ "account_type": "Expense Account"
+ },
+ "Gastos de representaci\u00f3n y relaciones p\u00fablicas": {
+ "account_number": "519520",
+ "account_type": "Expense Account"
+ },
+ "Elementos de aseo y cafeter\u00eda": {
+ "account_number": "519525",
+ "account_type": "Expense Account"
+ },
+ "\u00datiles, papeler\u00eda y fotocopias": {
+ "account_number": "519530",
+ "account_type": "Expense Account"
+ },
+ "Combustibles y lubricantes": {
+ "account_number": "519535",
+ "account_type": "Expense Account"
+ },
+ "Envases y empaques": {
+ "account_number": "519540",
+ "account_type": "Expense Account"
+ },
+ "Taxis y buses": {
+ "account_number": "519545",
+ "account_type": "Expense Account"
+ },
+ "Estampillas": {
+ "account_number": "519550",
+ "account_type": "Expense Account"
+ },
+ "Microfilmaci\u00f3n": {
+ "account_number": "519555",
+ "account_type": "Expense Account"
+ },
+ "Casino y restaurante": {
+ "account_number": "519560",
+ "account_type": "Expense Account"
+ },
+ "Parqueaderos": {
+ "account_number": "519565",
+ "account_type": "Expense Account"
+ },
+ "Indemnizaci\u00f3n por da\u00f1os a terceros": {
+ "account_number": "519570",
+ "account_type": "Expense Account"
+ },
+ "P\u00f3lvora y similares": {
+ "account_number": "519575",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "519595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "519599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Provisiones": {
+ "account_number": "5199",
+ "account_type": "Expense Account",
+ "Inversiones": {
+ "account_number": "519905",
+ "account_type": "Expense Account"
+ },
+ "Deudores": {
+ "account_number": "519910",
+ "account_type": "Expense Account"
+ },
+ "Propiedades, planta y equipo": {
+ "account_number": "519915",
+ "account_type": "Expense Account"
+ },
+ "Otros activos": {
+ "account_number": "519995",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "519999",
+ "account_type": "Expense Account"
+ }
+ }
+ },
+ "Operacionales de ventas": {
+ "account_number": "52",
+ "account_type": "Expense Account",
+ "Gastos de personal": {
+ "account_number": "5205",
+ "account_type": "Expense Account",
+ "Salario integral": {
+ "account_number": "520503",
+ "account_type": "Expense Account"
+ },
+ "Sueldos": {
+ "account_number": "520506",
+ "account_type": "Expense Account"
+ },
+ "Jornales": {
+ "account_number": "520512",
+ "account_type": "Expense Account"
+ },
+ "Horas extras y recargos": {
+ "account_number": "520515",
+ "account_type": "Expense Account"
+ },
+ "Comisiones": {
+ "account_number": "520518",
+ "account_type": "Expense Account"
+ },
+ "Vi\u00e1ticos": {
+ "account_number": "520521",
+ "account_type": "Expense Account"
+ },
+ "Incapacidades": {
+ "account_number": "520524",
+ "account_type": "Expense Account"
+ },
+ "Auxilio de transporte": {
+ "account_number": "520527",
+ "account_type": "Expense Account"
+ },
+ "Cesant\u00edas": {
+ "account_number": "520530",
+ "account_type": "Expense Account"
+ },
+ "Intereses sobre cesant\u00edas": {
+ "account_number": "520533",
+ "account_type": "Expense Account"
+ },
+ "Prima de servicios": {
+ "account_number": "520536",
+ "account_type": "Expense Account"
+ },
+ "Vacaciones": {
+ "account_number": "520539",
+ "account_type": "Expense Account"
+ },
+ "Primas extralegales": {
+ "account_number": "520542",
+ "account_type": "Expense Account"
+ },
+ "Auxilios": {
+ "account_number": "520545",
+ "account_type": "Expense Account"
+ },
+ "Bonificaciones": {
+ "account_number": "520548",
+ "account_type": "Expense Account"
+ },
+ "Dotaci\u00f3n y suministro a trabajadores": {
+ "account_number": "520551",
+ "account_type": "Expense Account"
+ },
+ "Seguros": {
+ "account_number": "520554",
+ "account_type": "Expense Account"
+ },
+ "Cuotas partes pensiones de jubilaci\u00f3n": {
+ "account_number": "520557",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n c\u00e1lculo actuarial pensiones de jubilaci\u00f3n": {
+ "account_number": "520558",
+ "account_type": "Expense Account"
+ },
+ "Pensiones de jubilaci\u00f3n": {
+ "account_number": "520559",
+ "account_type": "Expense Account"
+ },
+ "Indemnizaciones laborales": {
+ "account_number": "520560",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n bonos pensionales": {
+ "account_number": "520561",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n t\u00edtulos pensionales": {
+ "account_number": "520562",
+ "account_type": "Expense Account"
+ },
+ "Capacitaci\u00f3n al personal": {
+ "account_number": "520563",
+ "account_type": "Expense Account"
+ },
+ "Gastos deportivos y de recreaci\u00f3n": {
+ "account_number": "520566",
+ "account_type": "Expense Account"
+ },
+ "Aportes a administradoras de riesgos profesionales, ARP": {
+ "account_number": "520568",
+ "account_type": "Expense Account"
+ },
+ "Aportes a entidades promotoras de salud, EPS": {
+ "account_number": "520569",
+ "account_type": "Expense Account"
+ },
+ "Aportes a fondos de pensiones y/o cesant\u00edas": {
+ "account_number": "520570",
+ "account_type": "Expense Account"
+ },
+ "Aportes cajas de compensaci\u00f3n familiar": {
+ "account_number": "520572",
+ "account_type": "Expense Account"
+ },
+ "Aportes ICBF": {
+ "account_number": "520575",
+ "account_type": "Expense Account"
+ },
+ "SENA": {
+ "account_number": "520578",
+ "account_type": "Expense Account"
+ },
+ "Aportes sindicales": {
+ "account_number": "520581",
+ "account_type": "Expense Account"
+ },
+ "Gastos m\u00e9dicos y drogas": {
+ "account_number": "520584",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "520595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "520599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Honorarios": {
+ "account_number": "5210",
+ "account_type": "Expense Account",
+ "Junta directiva": {
+ "account_number": "521005",
+ "account_type": "Expense Account"
+ },
+ "Revisor\u00eda fiscal": {
+ "account_number": "521010",
+ "account_type": "Expense Account"
+ },
+ "Auditor\u00eda externa": {
+ "account_number": "521015",
+ "account_type": "Expense Account"
+ },
+ "Aval\u00faos": {
+ "account_number": "521020",
+ "account_type": "Expense Account"
+ },
+ "Asesor\u00eda jur\u00eddica": {
+ "account_number": "521025",
+ "account_type": "Expense Account"
+ },
+ "Asesor\u00eda financiera": {
+ "account_number": "521030",
+ "account_type": "Expense Account"
+ },
+ "Asesor\u00eda t\u00e9cnica": {
+ "account_number": "521035",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "521095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "521099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Impuestos": {
+ "account_number": "5215",
+ "account_type": "Expense Account",
+ "Industria y comercio": {
+ "account_number": "521505",
+ "account_type": "Expense Account"
+ },
+ "De timbres": {
+ "account_number": "521510",
+ "account_type": "Expense Account"
+ },
+ "A la propiedad ra\u00edz": {
+ "account_number": "521515",
+ "account_type": "Expense Account"
+ },
+ "Derechos sobre instrumentos p\u00fablicos": {
+ "account_number": "521520",
+ "account_type": "Expense Account"
+ },
+ "De valorizaci\u00f3n": {
+ "account_number": "521525",
+ "account_type": "Expense Account"
+ },
+ "De turismo": {
+ "account_number": "521530",
+ "account_type": "Expense Account"
+ },
+ "Tasa por utilizaci\u00f3n de puertos": {
+ "account_number": "521535",
+ "account_type": "Expense Account"
+ },
+ "De veh\u00edculos": {
+ "account_number": "521540",
+ "account_type": "Expense Account"
+ },
+ "De espect\u00e1culos p\u00fablicos": {
+ "account_number": "521545",
+ "account_type": "Expense Account"
+ },
+ "Cuotas de fomento": {
+ "account_number": "521550",
+ "account_type": "Expense Account"
+ },
+ "Licores": {
+ "account_number": "521555",
+ "account_type": "Expense Account"
+ },
+ "Cervezas": {
+ "account_number": "521560",
+ "account_type": "Expense Account"
+ },
+ "Cigarrillos": {
+ "account_number": "521565",
+ "account_type": "Expense Account"
+ },
+ "IVA descontable": {
+ "account_number": "521570",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "521595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "521599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Arrendamientos": {
+ "account_number": "5220",
+ "account_type": "Expense Account",
+ "Terrenos": {
+ "account_number": "522005",
+ "account_type": "Expense Account"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "522010",
+ "account_type": "Expense Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "522015",
+ "account_type": "Expense Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "522020",
+ "account_type": "Expense Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "522025",
+ "account_type": "Expense Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "522030",
+ "account_type": "Expense Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "522035",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "522040",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "522045",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "522050",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "522055",
+ "account_type": "Expense Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "522060",
+ "account_type": "Expense Account"
+ },
+ "Aer\u00f3dromos": {
+ "account_number": "522065",
+ "account_type": "Expense Account"
+ },
+ "Semovientes": {
+ "account_number": "522070",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "522095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "522099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Contribuciones y afiliaciones": {
+ "account_number": "5225",
+ "account_type": "Expense Account",
+ "Contribuciones": {
+ "account_number": "522505",
+ "account_type": "Expense Account"
+ },
+ "Afiliaciones y sostenimiento": {
+ "account_number": "522510",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "522599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Seguros": {
+ "account_number": "5230",
+ "account_type": "Expense Account",
+ "Manejo": {
+ "account_number": "523005",
+ "account_type": "Expense Account"
+ },
+ "Cumplimiento": {
+ "account_number": "523010",
+ "account_type": "Expense Account"
+ },
+ "Corriente d\u00e9bil": {
+ "account_number": "523015",
+ "account_type": "Expense Account"
+ },
+ "Vida colectiva": {
+ "account_number": "523020",
+ "account_type": "Expense Account"
+ },
+ "Incendio": {
+ "account_number": "523025",
+ "account_type": "Expense Account"
+ },
+ "Terremoto": {
+ "account_number": "523030",
+ "account_type": "Expense Account"
+ },
+ "Sustracci\u00f3n y hurto": {
+ "account_number": "523035",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "523040",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "523045",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "523050",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "523055",
+ "account_type": "Expense Account"
+ },
+ "Responsabilidad civil y extracontractual": {
+ "account_number": "523060",
+ "account_type": "Expense Account"
+ },
+ "Vuelo": {
+ "account_number": "523065",
+ "account_type": "Expense Account"
+ },
+ "Rotura de maquinaria": {
+ "account_number": "523070",
+ "account_type": "Expense Account"
+ },
+ "Obligatorio accidente de tr\u00e1nsito": {
+ "account_number": "523075",
+ "account_type": "Expense Account"
+ },
+ "Lucro cesante": {
+ "account_number": "523080",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "523095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "523099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Servicios": {
+ "account_number": "5235",
+ "account_type": "Expense Account",
+ "Aseo y vigilancia": {
+ "account_number": "523505",
+ "account_type": "Expense Account"
+ },
+ "Temporales": {
+ "account_number": "523510",
+ "account_type": "Expense Account"
+ },
+ "Asistencia t\u00e9cnica": {
+ "account_number": "523515",
+ "account_type": "Expense Account"
+ },
+ "Procesamiento electr\u00f3nico de datos": {
+ "account_number": "523520",
+ "account_type": "Expense Account"
+ },
+ "Acueducto y alcantarillado": {
+ "account_number": "523525",
+ "account_type": "Expense Account"
+ },
+ "Energ\u00eda el\u00e9ctrica": {
+ "account_number": "523530",
+ "account_type": "Expense Account"
+ },
+ "Tel\u00e9fono": {
+ "account_number": "523535",
+ "account_type": "Expense Account"
+ },
+ "Correo, portes y telegramas": {
+ "account_number": "523540",
+ "account_type": "Expense Account"
+ },
+ "Fax y t\u00e9lex": {
+ "account_number": "523545",
+ "account_type": "Expense Account"
+ },
+ "Transporte, fletes y acarreos": {
+ "account_number": "523550",
+ "account_type": "Expense Account"
+ },
+ "Gas": {
+ "account_number": "523555",
+ "account_type": "Expense Account"
+ },
+ "Publicidad, propaganda y promoci\u00f3n": {
+ "account_number": "523560",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "523595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "523599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Gastos legales": {
+ "account_number": "5240",
+ "account_type": "Expense Account",
+ "Notariales": {
+ "account_number": "524005",
+ "account_type": "Expense Account"
+ },
+ "Registro mercantil": {
+ "account_number": "524010",
+ "account_type": "Expense Account"
+ },
+ "Tr\u00e1mites y licencias": {
+ "account_number": "524015",
+ "account_type": "Expense Account"
+ },
+ "Aduaneros": {
+ "account_number": "524020",
+ "account_type": "Expense Account"
+ },
+ "Consulares": {
+ "account_number": "524025",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "524095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "524099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Mantenimiento y reparaciones": {
+ "account_number": "5245",
+ "account_type": "Expense Account",
+ "Terrenos": {
+ "account_number": "524505",
+ "account_type": "Expense Account"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "524510",
+ "account_type": "Expense Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "524515",
+ "account_type": "Expense Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "524520",
+ "account_type": "Expense Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "524525",
+ "account_type": "Expense Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "524530",
+ "account_type": "Expense Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "524535",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "524540",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "524545",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "524550",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "524555",
+ "account_type": "Expense Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "524560",
+ "account_type": "Expense Account"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "524565",
+ "account_type": "Expense Account"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "524570",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "524599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Adecuaci\u00f3n e instalaci\u00f3n": {
+ "account_number": "5250",
+ "account_type": "Expense Account",
+ "Instalaciones el\u00e9ctricas": {
+ "account_number": "525005",
+ "account_type": "Expense Account"
+ },
+ "Arreglos ornamentales": {
+ "account_number": "525010",
+ "account_type": "Expense Account"
+ },
+ "Reparaciones locativas": {
+ "account_number": "525015",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "525095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "525099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Gastos de viaje": {
+ "account_number": "5255",
+ "account_type": "Expense Account",
+ "Alojamiento y manutenci\u00f3n": {
+ "account_number": "525505",
+ "account_type": "Expense Account"
+ },
+ "Pasajes fluviales y/o mar\u00edtimos": {
+ "account_number": "525510",
+ "account_type": "Expense Account"
+ },
+ "Pasajes a\u00e9reos": {
+ "account_number": "525515",
+ "account_type": "Expense Account"
+ },
+ "Pasajes terrestres": {
+ "account_number": "525520",
+ "account_type": "Expense Account"
+ },
+ "Pasajes f\u00e9rreos": {
+ "account_number": "525525",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "525595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "525599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Depreciaciones": {
+ "account_number": "5260",
+ "account_type": "Expense Account",
+ "Construcciones y edificaciones": {
+ "account_number": "526005",
+ "account_type": "Expense Account"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "526010",
+ "account_type": "Expense Account"
+ },
+ "Equipo de oficina": {
+ "account_number": "526015",
+ "account_type": "Expense Account"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "526020",
+ "account_type": "Expense Account"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "526025",
+ "account_type": "Expense Account"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "526030",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "526035",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "526040",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "526045",
+ "account_type": "Expense Account"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "526050",
+ "account_type": "Expense Account"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "526055",
+ "account_type": "Expense Account"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "526060",
+ "account_type": "Expense Account"
+ },
+ "Envases y empaques": {
+ "account_number": "526065",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "526099",
+ "account_type": "Expense Account"
+ }
+ },
+ "Amortizaciones": {
+ "account_number": "5265",
+ "account_type": "Expense Account",
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "526505",
+ "account_type": "Expense Account"
+ },
+ "Intangibles": {
+ "account_number": "526510",
+ "account_type": "Expense Account"
+ },
+ "Cargos diferidos": {
+ "account_number": "526515",
+ "account_type": "Expense Account"
+ },
+ "Otras": {
+ "account_number": "526595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "526599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Financieros-reajuste del sistema": {
+ "account_number": "5270",
+ "account_type": "Expense Account",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "527099",
+ "account_type": "Expense Account"
+ }
+ },
+ "P\u00e9rdidas m\u00e9todo de participaci\u00f3n": {
+ "account_number": "5275",
+ "account_type": "Expense Account",
+ "De sociedades an\u00f3nimas y/o asimiladas": {
+ "account_number": "527505",
+ "account_type": "Expense Account"
+ },
+ "De sociedades limitadas y/o asimiladas": {
+ "account_number": "527510",
+ "account_type": "Expense Account"
+ }
+ },
+ "Diversos": {
+ "account_number": "5295",
+ "account_type": "Expense Account",
+ "Comisiones": {
+ "account_number": "529505",
+ "account_type": "Expense Account"
+ },
+ "Libros, suscripciones, peri\u00f3dicos y revistas": {
+ "account_number": "529510",
+ "account_type": "Expense Account"
+ },
+ "M\u00fasica ambiental": {
+ "account_number": "529515",
+ "account_type": "Expense Account"
+ },
+ "Gastos de representaci\u00f3n y relaciones p\u00fablicas": {
+ "account_number": "529520",
+ "account_type": "Expense Account"
+ },
+ "Elementos de aseo y cafeter\u00eda": {
+ "account_number": "529525",
+ "account_type": "Expense Account"
+ },
+ "\u00datiles, papeler\u00eda y fotocopias": {
+ "account_number": "529530",
+ "account_type": "Expense Account"
+ },
+ "Combustibles y lubricantes": {
+ "account_number": "529535",
+ "account_type": "Expense Account"
+ },
+ "Envases y empaques": {
+ "account_number": "529540",
+ "account_type": "Expense Account"
+ },
+ "Taxis y buses": {
+ "account_number": "529545",
+ "account_type": "Expense Account"
+ },
+ "Estampillas": {
+ "account_number": "529550",
+ "account_type": "Expense Account"
+ },
+ "Microfilmaci\u00f3n": {
+ "account_number": "529555",
+ "account_type": "Expense Account"
+ },
+ "Casino y restaurante": {
+ "account_number": "529560",
+ "account_type": "Expense Account"
+ },
+ "Parqueaderos": {
+ "account_number": "529565",
+ "account_type": "Expense Account"
+ },
+ "Indemnizaci\u00f3n por da\u00f1os a terceros": {
+ "account_number": "529570",
+ "account_type": "Expense Account"
+ },
+ "P\u00f3lvora y similares": {
+ "account_number": "529575",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "529595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "529599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Provisiones": {
+ "account_number": "5299",
+ "account_type": "Expense Account",
+ "Inversiones": {
+ "account_number": "529905",
+ "account_type": "Expense Account"
+ },
+ "Deudores": {
+ "account_number": "529910",
+ "account_type": "Expense Account"
+ },
+ "Inventarios": {
+ "account_number": "529915",
+ "account_type": "Expense Account"
+ },
+ "Propiedades, planta y equipo": {
+ "account_number": "529920",
+ "account_type": "Expense Account"
+ },
+ "Otros activos": {
+ "account_number": "529995",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "529999",
+ "account_type": "Expense Account"
+ }
+ }
+ },
+ "No operacionales": {
+ "account_number": "53",
+ "account_type": "Expense Account",
+ "Financieros": {
+ "account_number": "5305",
+ "account_type": "Expense Account",
+ "Gastos bancarios": {
+ "account_number": "530505",
+ "account_type": "Expense Account"
+ },
+ "Reajuste monetario-UPAC (hoy UVR)": {
+ "account_number": "530510",
+ "account_type": "Expense Account"
+ },
+ "Comisiones": {
+ "account_number": "530515",
+ "account_type": "Expense Account"
+ },
+ "Intereses": {
+ "account_number": "530520",
+ "account_type": "Expense Account"
+ },
+ "Diferencia en cambio": {
+ "account_number": "530525",
+ "account_type": "Expense Account"
+ },
+ "Gastos en negociaci\u00f3n certificados de cambio": {
+ "account_number": "530530",
+ "account_type": "Expense Account"
+ },
+ "Descuentos comerciales condicionados": {
+ "account_number": "530535",
+ "account_type": "Expense Account"
+ },
+ "Gastos manejo y emisi\u00f3n de bonos": {
+ "account_number": "530540",
+ "account_type": "Expense Account"
+ },
+ "Prima amortizada": {
+ "account_number": "530545",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "530595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "530599",
+ "account_type": "Expense Account"
+ }
+ },
+ "P\u00e9rdida en venta y retiro de bienes": {
+ "account_number": "5310",
+ "account_type": "Expense Account",
+ "Venta de inversiones": {
+ "account_number": "531005",
+ "account_type": "Expense Account"
+ },
+ "Venta de cartera": {
+ "account_number": "531010",
+ "account_type": "Expense Account"
+ },
+ "Venta de propiedades, planta y equipo": {
+ "account_number": "531015",
+ "account_type": "Expense Account"
+ },
+ "Venta de intangibles": {
+ "account_number": "531020",
+ "account_type": "Expense Account"
+ },
+ "Venta de otros activos": {
+ "account_number": "531025",
+ "account_type": "Expense Account"
+ },
+ "Retiro de propiedades, planta y equipo": {
+ "account_number": "531030",
+ "account_type": "Expense Account"
+ },
+ "Retiro de otros activos": {
+ "account_number": "531035",
+ "account_type": "Expense Account"
+ },
+ "P\u00e9rdidas por siniestros": {
+ "account_number": "531040",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "531095",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "531099",
+ "account_type": "Expense Account"
+ }
+ },
+ "P\u00e9rdidas m\u00e9todo de participaci\u00f3n": {
+ "account_number": "5313",
+ "account_type": "Expense Account",
+ "De sociedades an\u00f3nimas y/o asimiladas": {
+ "account_number": "531305",
+ "account_type": "Expense Account"
+ },
+ "De sociedades limitadas y/o asimiladas": {
+ "account_number": "531310",
+ "account_type": "Expense Account"
+ }
+ },
+ "Gastos extraordinarios": {
+ "account_number": "5315",
+ "account_type": "Expense Account",
+ "Costas y procesos judiciales": {
+ "account_number": "531505",
+ "account_type": "Expense Account"
+ },
+ "Actividades culturales y c\u00edvicas": {
+ "account_number": "531510",
+ "account_type": "Expense Account"
+ },
+ "Costos y gastos de ejercicios anteriores": {
+ "account_number": "531515",
+ "account_type": "Expense Account"
+ },
+ "Impuestos asumidos": {
+ "account_number": "531520",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "531595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "531599",
+ "account_type": "Expense Account"
+ }
+ },
+ "Gastos diversos": {
+ "account_number": "5395",
+ "account_type": "Expense Account",
+ "Demandas laborales": {
+ "account_number": "539505",
+ "account_type": "Expense Account"
+ },
+ "Demandas por incumplimiento de contratos": {
+ "account_number": "539510",
+ "account_type": "Expense Account"
+ },
+ "Indemnizaciones": {
+ "account_number": "539515",
+ "account_type": "Expense Account"
+ },
+ "Multas, sanciones y litigios": {
+ "account_number": "539520",
+ "account_type": "Expense Account"
+ },
+ "Donaciones": {
+ "account_number": "539525",
+ "account_type": "Expense Account"
+ },
+ "Constituci\u00f3n de garant\u00edas": {
+ "account_number": "539530",
+ "account_type": "Expense Account"
+ },
+ "Amortizaci\u00f3n de bienes entregados en comodato": {
+ "account_number": "539535",
+ "account_type": "Expense Account"
+ },
+ "Otros": {
+ "account_number": "539595",
+ "account_type": "Expense Account"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "539599",
+ "account_type": "Expense Account"
+ }
+ }
+ },
+ "Impuesto de renta y complementarios": {
+ "account_number": "54",
+ "account_type": "Expense Account",
+ "Impuesto de renta y complementarios": {
+ "account_number": "5405",
+ "account_type": "Expense Account",
+ "Impuesto de renta y complementarios": {
+ "account_number": "540505",
+ "account_type": "Expense Account"
+ }
+ }
+ },
+ "Ganancias y p\u00e9rdidas": {
+ "account_number": "59",
+ "account_type": "Expense Account",
+ "Ganancias y p\u00e9rdidas": {
+ "account_number": "5905",
+ "account_type": "Expense Account",
+ "Ganancias y p\u00e9rdidas": {
+ "account_number": "590505",
+ "account_type": "Expense Account"
+ }
+ }
+ }
+ },
+ "Costos de ventas": {
+ "account_number": "6",
+ "account_type": "Cost of Goods Sold",
+ "root_type": "Expense",
+ "Costo de ventas y de prestaci\u00f3n de servicios": {
+ "account_number": "61",
+ "account_type": "Cost of Goods Sold",
+ "Agricultura, ganader\u00eda, caza y silvicultura": {
+ "account_number": "6105",
+ "account_type": "Cost of Goods Sold",
+ "Cultivo de cereales": {
+ "account_number": "610505",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivos de hortalizas, legumbres y plantas ornamentales": {
+ "account_number": "610510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivos de frutas, nueces y plantas arom\u00e1ticas": {
+ "account_number": "610515",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivo de caf\u00e9": {
+ "account_number": "610520",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivo de flores": {
+ "account_number": "610525",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivo de ca\u00f1a de az\u00facar": {
+ "account_number": "610530",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivo de algod\u00f3n y plantas para material textil": {
+ "account_number": "610535",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cultivo de banano": {
+ "account_number": "610540",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Otros cultivos agr\u00edcolas": {
+ "account_number": "610545",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cr\u00eda de ovejas, cabras, asnos, mulas y burd\u00e9ganos": {
+ "account_number": "610550",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cr\u00eda de ganado caballar y vacuno": {
+ "account_number": "610555",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Producci\u00f3n av\u00edcola": {
+ "account_number": "610560",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cr\u00eda de otros animales": {
+ "account_number": "610565",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicios agr\u00edcolas y ganaderos": {
+ "account_number": "610570",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividad de caza": {
+ "account_number": "610575",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividad de silvicultura": {
+ "account_number": "610580",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "610595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "610599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Pesca": {
+ "account_number": "6110",
+ "account_type": "Cost of Goods Sold",
+ "Actividad de pesca": {
+ "account_number": "611005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Explotaci\u00f3n de criaderos de peces": {
+ "account_number": "611010",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "611095",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "611099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Explotaci\u00f3n de minas y canteras": {
+ "account_number": "6115",
+ "account_type": "Cost of Goods Sold",
+ "Carb\u00f3n": {
+ "account_number": "611505",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Petr\u00f3leo crudo": {
+ "account_number": "611510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Gas natural": {
+ "account_number": "611512",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicios relacionados con extracci\u00f3n de petr\u00f3leo y gas": {
+ "account_number": "611514",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Minerales de hierro": {
+ "account_number": "611515",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Minerales metal\u00edferos no ferrosos": {
+ "account_number": "611520",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Piedra, arena y arcilla": {
+ "account_number": "611525",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Piedras preciosas": {
+ "account_number": "611527",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Oro": {
+ "account_number": "611528",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Otras minas y canteras": {
+ "account_number": "611530",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Prestaci\u00f3n de servicios sector minero": {
+ "account_number": "611532",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "611595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "611599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Industrias manufactureras": {
+ "account_number": "6120",
+ "account_type": "Cost of Goods Sold",
+ "Producci\u00f3n y procesamiento de carnes y productos c\u00e1rnicos": {
+ "account_number": "612001",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Productos de pescado": {
+ "account_number": "612002",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Productos de frutas, legumbres y hortalizas": {
+ "account_number": "612003",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de aceites y grasas": {
+ "account_number": "612004",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos l\u00e1cteos": {
+ "account_number": "612005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de moliner\u00eda": {
+ "account_number": "612006",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de almidones y derivados": {
+ "account_number": "612007",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de alimentos para animales": {
+ "account_number": "612008",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos para panader\u00eda": {
+ "account_number": "612009",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de az\u00facar y melazas": {
+ "account_number": "612010",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de cacao, chocolate y confiter\u00eda": {
+ "account_number": "612011",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de pastas y productos farin\u00e1ceos": {
+ "account_number": "612012",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de caf\u00e9": {
+ "account_number": "612013",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros productos alimenticios": {
+ "account_number": "612014",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de bebidas alcoh\u00f3licas y alcohol et\u00edlico": {
+ "account_number": "612015",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de vinos": {
+ "account_number": "612016",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de bebidas malteadas y de malta": {
+ "account_number": "612017",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de bebidas no alcoh\u00f3licas": {
+ "account_number": "612018",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de tabaco": {
+ "account_number": "612019",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Preparaci\u00f3n e hilatura de fibras textiles y tejedur\u00eda": {
+ "account_number": "612020",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Acabado de productos textiles": {
+ "account_number": "612021",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de art\u00edculos de materiales textiles": {
+ "account_number": "612022",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de tapices y alfombras": {
+ "account_number": "612023",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de cuerdas, cordeles, bramantes y redes": {
+ "account_number": "612024",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros productos textiles": {
+ "account_number": "612025",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de tejidos": {
+ "account_number": "612026",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de prendas de vestir": {
+ "account_number": "612027",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Preparaci\u00f3n, adobo y te\u00f1ido de pieles": {
+ "account_number": "612028",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Curtido, adobo o preparaci\u00f3n de cuero": {
+ "account_number": "612029",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de maletas, bolsos y similares": {
+ "account_number": "612030",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de calzado": {
+ "account_number": "612031",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Producci\u00f3n de madera, art\u00edculos de madera y corcho": {
+ "account_number": "612032",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de pasta y productos de madera, papel y cart\u00f3n": {
+ "account_number": "612033",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ediciones y publicaciones": {
+ "account_number": "612034",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Impresi\u00f3n": {
+ "account_number": "612035",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicios relacionados con la edici\u00f3n y la impresi\u00f3n": {
+ "account_number": "612036",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Reproducci\u00f3n de grabaciones": {
+ "account_number": "612037",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de horno de coque": {
+ "account_number": "612038",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de la refinaci\u00f3n de petr\u00f3leo": {
+ "account_number": "612039",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de sustancias qu\u00edmicas b\u00e1sicas": {
+ "account_number": "612040",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de abonos y compuestos de nitr\u00f3geno": {
+ "account_number": "612041",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de pl\u00e1stico y caucho sint\u00e9tico": {
+ "account_number": "612042",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos qu\u00edmicos de uso agropecuario": {
+ "account_number": "612043",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de pinturas, tintas y masillas": {
+ "account_number": "612044",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos farmac\u00e9uticos y bot\u00e1nicos": {
+ "account_number": "612045",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de jabones, detergentes y preparados de tocador": {
+ "account_number": "612046",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros productos qu\u00edmicos": {
+ "account_number": "612047",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de fibras": {
+ "account_number": "612048",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros productos de caucho": {
+ "account_number": "612049",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de pl\u00e1stico": {
+ "account_number": "612050",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de vidrio y productos de vidrio": {
+ "account_number": "612051",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de productos de cer\u00e1mica, loza, piedra, arcilla y porcelana": {
+ "account_number": "612052",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de cemento, cal y yeso": {
+ "account_number": "612053",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de art\u00edculos de hormig\u00f3n, cemento y yeso": {
+ "account_number": "612054",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Corte, tallado y acabado de la piedra": {
+ "account_number": "612055",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros productos minerales no met\u00e1licos": {
+ "account_number": "612056",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Industrias b\u00e1sicas y fundici\u00f3n de hierro y acero": {
+ "account_number": "612057",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Productos primarios de metales preciosos y de metales no ferrosos": {
+ "account_number": "612058",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fundici\u00f3n de metales no ferrosos": {
+ "account_number": "612059",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de productos met\u00e1licos para uso estructural": {
+ "account_number": "612060",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Forja, prensado, estampado, laminado de metal y pulvimetalurgia": {
+ "account_number": "612061",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Revestimiento de metales y obras de ingenier\u00eda mec\u00e1nica": {
+ "account_number": "612062",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de art\u00edculos de ferreter\u00eda": {
+ "account_number": "612063",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros productos de metal": {
+ "account_number": "612064",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de maquinaria y equipo": {
+ "account_number": "612065",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de equipos de elevaci\u00f3n y manipulaci\u00f3n": {
+ "account_number": "612066",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de aparatos de uso dom\u00e9stico": {
+ "account_number": "612067",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de equipo de oficina": {
+ "account_number": "612068",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de pilas y bater\u00edas primarias": {
+ "account_number": "612069",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de equipo de iluminaci\u00f3n": {
+ "account_number": "612070",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Elaboraci\u00f3n de otros tipos de equipo el\u00e9ctrico": {
+ "account_number": "612071",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de equipos de radio, televisi\u00f3n y comunicaciones": {
+ "account_number": "612072",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de aparatos e instrumentos m\u00e9dicos": {
+ "account_number": "612073",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de instrumentos de medici\u00f3n y control": {
+ "account_number": "612074",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de instrumentos de \u00f3ptica y equipo fotogr\u00e1fico": {
+ "account_number": "612075",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de relojes": {
+ "account_number": "612076",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de veh\u00edculos automotores": {
+ "account_number": "612077",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de carrocer\u00edas para automotores": {
+ "account_number": "612078",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de partes, piezas y accesorios para automotores": {
+ "account_number": "612079",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n y reparaci\u00f3n de buques y otras embarcaciones": {
+ "account_number": "612080",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de locomotoras y material rodante para ferrocarriles": {
+ "account_number": "612081",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de aeronaves": {
+ "account_number": "612082",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de motocicletas": {
+ "account_number": "612083",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de bicicletas y sillas de ruedas": {
+ "account_number": "612084",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de otros tipos de transporte": {
+ "account_number": "612085",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de muebles": {
+ "account_number": "612086",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de joyas y art\u00edculos conexos": {
+ "account_number": "612087",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de instrumentos de m\u00fasica": {
+ "account_number": "612088",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de art\u00edculos y equipo para deporte": {
+ "account_number": "612089",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de juegos y juguetes": {
+ "account_number": "612090",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Reciclamiento de desperdicios": {
+ "account_number": "612091",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Productos de otras industrias manufactureras": {
+ "account_number": "612095",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "612099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Suministro de electricidad, gas y agua": {
+ "account_number": "6125",
+ "account_type": "Cost of Goods Sold",
+ "Generaci\u00f3n, captaci\u00f3n y distribuci\u00f3n de energ\u00eda el\u00e9ctrica": {
+ "account_number": "612505",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fabricaci\u00f3n de gas y distribuci\u00f3n de combustibles gaseosos": {
+ "account_number": "612510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Captaci\u00f3n, depuraci\u00f3n y distribuci\u00f3n de agua": {
+ "account_number": "612515",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "612595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "612599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Construcci\u00f3n": {
+ "account_number": "6130",
+ "account_type": "Cost of Goods Sold",
+ "Preparaci\u00f3n de terrenos": {
+ "account_number": "613005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Construcci\u00f3n de edificios y obras de ingenier\u00eda civil": {
+ "account_number": "613010",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Acondicionamiento de edificios": {
+ "account_number": "613015",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Terminaci\u00f3n de edificaciones": {
+ "account_number": "613020",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Alquiler de equipo con operario": {
+ "account_number": "613025",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "613095",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "613099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Comercio al por mayor y al por menor": {
+ "account_number": "6135",
+ "account_type": "Cost of Goods Sold",
+ "Venta de veh\u00edculos automotores": {
+ "account_number": "613502",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Mantenimiento, reparaci\u00f3n y lavado de veh\u00edculos automotores": {
+ "account_number": "613504",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de partes, piezas y accesorios de veh\u00edculos automotores": {
+ "account_number": "613506",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de combustibles s\u00f3lidos, l\u00edquidos, gaseosos": {
+ "account_number": "613508",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de lubricantes, aditivos, llantas y lujos para automotores": {
+ "account_number": "613510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta a cambio de retribuci\u00f3n o por contrata": {
+ "account_number": "613512",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de insumos, materias primas agropecuarias y flores": {
+ "account_number": "613514",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de otros insumos y materias primas no agropecuarias": {
+ "account_number": "613516",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de animales vivos y cueros": {
+ "account_number": "613518",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de productos en almacenes no especializados": {
+ "account_number": "613520",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de productos agropecuarios": {
+ "account_number": "613522",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de productos textiles, de vestir, de cuero y calzado": {
+ "account_number": "613524",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de papel y cart\u00f3n": {
+ "account_number": "613526",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de libros, revistas, elementos de papeler\u00eda, \u00fatiles y textos escolares": {
+ "account_number": "613528",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de juegos, juguetes y art\u00edculos deportivos": {
+ "account_number": "613530",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de instrumentos quir\u00fargicos y ortop\u00e9dicos": {
+ "account_number": "613532",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de art\u00edculos en relojer\u00edas y joyer\u00edas": {
+ "account_number": "613534",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de electrodom\u00e9sticos y muebles": {
+ "account_number": "613536",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de productos de aseo, farmac\u00e9uticos, medicinales y art\u00edculos de tocador": {
+ "account_number": "613538",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de cubiertos, vajillas, cristaler\u00eda, porcelanas, cer\u00e1micas y otros art\u00edculos de uso dom\u00e9stico": {
+ "account_number": "613540",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de materiales de construcci\u00f3n, fontaner\u00eda y calefacci\u00f3n": {
+ "account_number": "613542",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de pinturas y lacas": {
+ "account_number": "613544",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de productos de vidrios y marqueter\u00eda": {
+ "account_number": "613546",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de herramientas y art\u00edculos de ferreter\u00eda": {
+ "account_number": "613548",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de qu\u00edmicos": {
+ "account_number": "613550",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de productos intermedios, desperdicios y desechos": {
+ "account_number": "613552",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de maquinaria, equipo de oficina y programas de computador": {
+ "account_number": "613554",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de art\u00edculos en cacharrer\u00edas y miscel\u00e1neas": {
+ "account_number": "613556",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de instrumentos musicales": {
+ "account_number": "613558",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de art\u00edculos en casas de empe\u00f1o y prender\u00edas": {
+ "account_number": "613560",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de equipo fotogr\u00e1fico": {
+ "account_number": "613562",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de equipo \u00f3ptico y de precisi\u00f3n": {
+ "account_number": "613564",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de empaques": {
+ "account_number": "613566",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de equipo profesional y cient\u00edfico": {
+ "account_number": "613568",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de loter\u00edas, rifas, chance, apuestas y similares": {
+ "account_number": "613570",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Reparaci\u00f3n de efectos personales y electrodom\u00e9sticos": {
+ "account_number": "613572",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Venta de otros productos": {
+ "account_number": "613595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "613599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Hoteles y restaurantes": {
+ "account_number": "6140",
+ "account_type": "Cost of Goods Sold",
+ "Hoteler\u00eda": {
+ "account_number": "614005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Campamento y otros tipos de hospedaje": {
+ "account_number": "614010",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Restaurantes": {
+ "account_number": "614015",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Bares y cantinas": {
+ "account_number": "614020",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "614095",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "614099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Transporte, almacenamiento y comunicaciones": {
+ "account_number": "6145",
+ "account_type": "Cost of Goods Sold",
+ "Servicio de transporte por carretera": {
+ "account_number": "614505",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de transporte por v\u00eda f\u00e9rrea": {
+ "account_number": "614510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de transporte por v\u00eda acu\u00e1tica": {
+ "account_number": "614515",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de transporte por v\u00eda a\u00e9rea": {
+ "account_number": "614520",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de transporte por tuber\u00edas": {
+ "account_number": "614525",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Manipulaci\u00f3n de carga": {
+ "account_number": "614530",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Almacenamiento y dep\u00f3sito": {
+ "account_number": "614535",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicios complementarios para el transporte": {
+ "account_number": "614540",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Agencias de viaje": {
+ "account_number": "614545",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Otras agencias de transporte": {
+ "account_number": "614550",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio postal y de correo": {
+ "account_number": "614555",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio telef\u00f3nico": {
+ "account_number": "614560",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de tel\u00e9grafo": {
+ "account_number": "614565",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de transmisi\u00f3n de datos": {
+ "account_number": "614570",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de radio y televisi\u00f3n por cable": {
+ "account_number": "614575",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Transmisi\u00f3n de sonido e im\u00e1genes por contrato": {
+ "account_number": "614580",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "614595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "614599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Actividad financiera": {
+ "account_number": "6150",
+ "account_type": "Cost of Goods Sold",
+ "De inversiones": {
+ "account_number": "615005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "De servicio de bolsa": {
+ "account_number": "615010",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "615099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Actividades inmobiliarias, empresariales y de alquiler": {
+ "account_number": "6155",
+ "account_type": "Cost of Goods Sold",
+ "Arrendamientos de bienes inmuebles": {
+ "account_number": "615505",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Inmobiliarias por retribuci\u00f3n o contrata": {
+ "account_number": "615510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Alquiler equipo de transporte": {
+ "account_number": "615515",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Alquiler maquinaria y equipo": {
+ "account_number": "615520",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Alquiler de efectos personales y enseres dom\u00e9sticos": {
+ "account_number": "615525",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Consultor\u00eda en equipo y programas de inform\u00e1tica": {
+ "account_number": "615530",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Procesamiento de datos": {
+ "account_number": "615535",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Mantenimiento y reparaci\u00f3n de maquinaria de oficina": {
+ "account_number": "615540",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Investigaciones cient\u00edficas y de desarrollo": {
+ "account_number": "615545",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades empresariales de consultor\u00eda": {
+ "account_number": "615550",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Publicidad": {
+ "account_number": "615555",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Dotaci\u00f3n de personal": {
+ "account_number": "615560",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Investigaci\u00f3n y seguridad": {
+ "account_number": "615565",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Limpieza de inmuebles": {
+ "account_number": "615570",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fotograf\u00eda": {
+ "account_number": "615575",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Envase y empaque": {
+ "account_number": "615580",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Fotocopiado": {
+ "account_number": "615585",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Mantenimiento y reparaci\u00f3n de maquinaria y equipo": {
+ "account_number": "615590",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "615595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "615599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Ense\u00f1anza": {
+ "account_number": "6160",
+ "account_type": "Cost of Goods Sold",
+ "Actividades relacionadas con la educaci\u00f3n": {
+ "account_number": "616005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "616095",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "616099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Servicios sociales y de salud": {
+ "account_number": "6165",
+ "account_type": "Cost of Goods Sold",
+ "Servicio hospitalario": {
+ "account_number": "616505",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio m\u00e9dico": {
+ "account_number": "616510",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio odontol\u00f3gico": {
+ "account_number": "616515",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicio de laboratorio": {
+ "account_number": "616520",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades veterinarias": {
+ "account_number": "616525",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades de servicios sociales": {
+ "account_number": "616530",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "616595",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "616599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Otras actividades de servicios comunitarios, sociales y personales": {
+ "account_number": "6170",
+ "account_type": "Cost of Goods Sold",
+ "Eliminaci\u00f3n de desperdicios y aguas residuales": {
+ "account_number": "617005",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades de asociaci\u00f3n": {
+ "account_number": "617010",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Producci\u00f3n y distribuci\u00f3n de filmes y videocintas": {
+ "account_number": "617015",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Exhibici\u00f3n de filmes y videocintas": {
+ "account_number": "617020",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividad de radio y televisi\u00f3n": {
+ "account_number": "617025",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividad teatral, musical y art\u00edstica": {
+ "account_number": "617030",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Grabaci\u00f3n y producci\u00f3n de discos": {
+ "account_number": "617035",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Entretenimiento y esparcimiento": {
+ "account_number": "617040",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Agencias de noticias": {
+ "account_number": "617045",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Lavander\u00edas y similares": {
+ "account_number": "617050",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Peluquer\u00edas y similares": {
+ "account_number": "617055",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Servicios funerarios": {
+ "account_number": "617060",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Zonas francas": {
+ "account_number": "617065",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Actividades conexas": {
+ "account_number": "617095",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "617099",
+ "account_type": "Cost of Goods Sold"
+ }
+ }
+ },
+ "Compras": {
+ "account_number": "62",
+ "account_type": "Cost of Goods Sold",
+ "De mercanc\u00edas": {
+ "account_number": "6205",
+ "account_type": "Cost of Goods Sold",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "620599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "De materias primas": {
+ "account_number": "6210",
+ "account_type": "Cost of Goods Sold",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "621099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "De materiales indirectos": {
+ "account_number": "6215",
+ "account_type": "Cost of Goods Sold",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "621599",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Compra de energ\u00eda": {
+ "account_number": "6220",
+ "account_type": "Cost of Goods Sold",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "622099",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Devoluciones en compras (CR)": {
+ "account_number": "6225",
+ "account_type": "Cost of Goods Sold",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "622599",
+ "account_type": "Cost of Goods Sold"
+ }
+ }
+ }
+ },
+ "Costos de producci\u00f3n o de operaci\u00f3n": {
+ "account_number": "7",
+ "account_type": "Cost of Goods Sold",
+ "root_type": "Expense",
+ "Materia prima": {
+ "account_number": "71",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Mano de obra directa": {
+ "account_number": "72",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Costos indirectos": {
+ "account_number": "73",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Contratos de servicios": {
+ "account_number": "74",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Cuentas de orden deudoras": {
+ "account_number": "8",
+ "root_type": "Asset",
+ "Derechos contingentes": {
+ "account_number": "81",
+ "Bienes y valores entregados en custodia": {
+ "account_number": "8105",
+ "Valores mobiliarios": {
+ "account_number": "810505"
+ },
+ "Bienes muebles": {
+ "account_number": "810510"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "810599"
+ }
+ },
+ "Bienes y valores entregados en garant\u00eda": {
+ "account_number": "8110",
+ "Valores mobiliarios": {
+ "account_number": "811005"
+ },
+ "Bienes muebles": {
+ "account_number": "811010"
+ },
+ "Bienes inmuebles": {
+ "account_number": "811015"
+ },
+ "Contratos de ganado en participaci\u00f3n": {
+ "account_number": "811020"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "811099"
+ }
+ },
+ "Bienes y valores en poder de terceros": {
+ "account_number": "8115",
+ "En arrendamiento": {
+ "account_number": "811505"
+ },
+ "En pr\u00e9stamo": {
+ "account_number": "811510"
+ },
+ "En dep\u00f3sito": {
+ "account_number": "811515"
+ },
+ "En consignaci\u00f3n": {
+ "account_number": "811520"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "811599"
+ }
+ },
+ "Litigios y/o demandas": {
+ "account_number": "8120",
+ "Ejecutivos": {
+ "account_number": "812005"
+ },
+ "Incumplimiento de contratos": {
+ "account_number": "812010"
+ }
+ },
+ "Promesas de compraventa": {
+ "account_number": "8125"
+ },
+ "Diversas": {
+ "account_number": "8195",
+ "Valores adquiridos por recibir": {
+ "account_number": "819505"
+ },
+ "Otras": {
+ "account_number": "819595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "819599"
+ }
+ }
+ },
+ "Deudoras fiscales": {
+ "account_number": "82"
+ },
+ "Deudoras de control": {
+ "account_number": "83",
+ "Bienes recibidos en arrendamiento financiero": {
+ "account_number": "8305",
+ "Bienes muebles": {
+ "account_number": "830505"
+ },
+ "Bienes inmuebles": {
+ "account_number": "830510"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "830599"
+ }
+ },
+ "T\u00edtulos de inversi\u00f3n no colocados": {
+ "account_number": "8310",
+ "Acciones": {
+ "account_number": "831005"
+ },
+ "Bonos": {
+ "account_number": "831010"
+ },
+ "Otros": {
+ "account_number": "831095"
+ }
+ },
+ "Propiedades, planta y equipo totalmente depreciados, agotados y/o amortizados": {
+ "account_number": "8315",
+ "Materiales proyectos petroleros": {
+ "account_number": "831506"
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "831516"
+ },
+ "Maquinaria y equipo": {
+ "account_number": "831520"
+ },
+ "Equipo de oficina": {
+ "account_number": "831524"
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "831528"
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "831532"
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "831536"
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "831540"
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "831544"
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "831548"
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "831552"
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "831556"
+ },
+ "Armamento de vigilancia": {
+ "account_number": "831560"
+ },
+ "Envases y empaques": {
+ "account_number": "831562"
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "831564"
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "831568"
+ },
+ "Minas y canteras": {
+ "account_number": "831572"
+ },
+ "Pozos artesianos": {
+ "account_number": "831576"
+ },
+ "Yacimientos": {
+ "account_number": "831580"
+ },
+ "Semovientes": {
+ "account_number": "831584"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "831599"
+ }
+ },
+ "Cr\u00e9ditos a favor no utilizados": {
+ "account_number": "8320",
+ "Pa\u00eds": {
+ "account_number": "832005"
+ },
+ "Exterior": {
+ "account_number": "832010"
+ }
+ },
+ "Activos castigados": {
+ "account_number": "8325",
+ "Inversiones": {
+ "account_number": "832505"
+ },
+ "Deudores": {
+ "account_number": "832510"
+ },
+ "Otros activos": {
+ "account_number": "832595"
+ }
+ },
+ "T\u00edtulos de inversi\u00f3n amortizados": {
+ "account_number": "8330",
+ "Bonos": {
+ "account_number": "833005"
+ },
+ "Otros": {
+ "account_number": "833095"
+ }
+ },
+ "Capitalizaci\u00f3n por revalorizaci\u00f3n de patrimonio": {
+ "account_number": "8335"
+ },
+ "Otras cuentas deudoras de control": {
+ "account_number": "8395",
+ "Cheques posfechados": {
+ "account_number": "839505"
+ },
+ "Certificados de dep\u00f3sito a t\u00e9rmino": {
+ "account_number": "839510"
+ },
+ "Cheques devueltos": {
+ "account_number": "839515"
+ },
+ "Bienes y valores en fideicomiso": {
+ "account_number": "839520"
+ },
+ "Intereses sobre deudas vencidas": {
+ "account_number": "839525"
+ },
+ "Diversas": {
+ "account_number": "839595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "839599"
+ }
+ },
+ "Ajustes por inflaci\u00f3n activos": {
+ "account_number": "8399",
+ "Inversiones": {
+ "account_number": "839905"
+ },
+ "Inventarios": {
+ "account_number": "839910"
+ },
+ "Propiedades, planta y equipo": {
+ "account_number": "839915"
+ },
+ "Intangibles": {
+ "account_number": "839920"
+ },
+ "Cargos diferidos": {
+ "account_number": "839925"
+ },
+ "Otros activos": {
+ "account_number": "839995"
+ }
+ }
+ },
+ "Derechos contingentes por contra (CR)": {
+ "account_number": "84"
+ },
+ "Deudoras fiscales por contra (CR)": {
+ "account_number": "85"
+ },
+ "Deudoras de control por contra (CR)": {
+ "account_number": "86"
+ }
+ },
+ "Cuentas de orden acreedoras": {
+ "account_number": "9",
+ "root_type": "Liability",
+ "Responsabilidades contingentes": {
+ "account_number": "91",
+ "Bienes y valores recibidos en custodia": {
+ "account_number": "9105",
+ "Valores mobiliarios": {
+ "account_number": "910505"
+ },
+ "Bienes muebles": {
+ "account_number": "910510"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "910599"
+ }
+ },
+ "Bienes y valores recibidos en garant\u00eda": {
+ "account_number": "9110",
+ "Valores mobiliarios": {
+ "account_number": "911005"
+ },
+ "Bienes muebles": {
+ "account_number": "911010"
+ },
+ "Bienes inmuebles": {
+ "account_number": "911015"
+ },
+ "Contratos de ganado en participaci\u00f3n": {
+ "account_number": "911020"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "911099"
+ }
+ },
+ "Bienes y valores recibidos de terceros": {
+ "account_number": "9115",
+ "En arrendamiento": {
+ "account_number": "911505"
+ },
+ "En pr\u00e9stamo": {
+ "account_number": "911510"
+ },
+ "En dep\u00f3sito": {
+ "account_number": "911515"
+ },
+ "En consignaci\u00f3n": {
+ "account_number": "911520"
+ },
+ "En comodato": {
+ "account_number": "911525"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "911599"
+ }
+ },
+ "Litigios y/o demandas": {
+ "account_number": "9120",
+ "Laborales": {
+ "account_number": "912005"
+ },
+ "Civiles": {
+ "account_number": "912010"
+ },
+ "Administrativos o arbitrales": {
+ "account_number": "912015"
+ },
+ "Tributarios": {
+ "account_number": "912020"
+ }
+ },
+ "Promesas de compraventa": {
+ "account_number": "9125"
+ },
+ "Contratos de administraci\u00f3n delegada": {
+ "account_number": "9130"
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "9135"
+ },
+ "Otras responsabilidades contingentes": {
+ "account_number": "9195"
+ }
+ },
+ "Acreedoras fiscales": {
+ "account_number": "92"
+ },
+ "Acreedoras de control": {
+ "account_number": "93",
+ "Contratos de arrendamiento financiero": {
+ "account_number": "9305",
+ "Bienes muebles": {
+ "account_number": "930505"
+ },
+ "Bienes inmuebles": {
+ "account_number": "930510"
+ }
+ },
+ "Otras cuentas de orden acreedoras de control": {
+ "account_number": "9395",
+ "Documentos por cobrar descontados": {
+ "account_number": "939505"
+ },
+ "Convenios de pago": {
+ "account_number": "939510"
+ },
+ "Contratos de construcciones e instalaciones por ejecutar": {
+ "account_number": "939515"
+ },
+ "Adjudicaciones pendientes de legalizar": {
+ "account_number": "939525"
+ },
+ "Reserva art\u00edculo 3\u00ba Ley 4\u00aa de 1980": {
+ "account_number": "939530"
+ },
+ "Reserva costo reposici\u00f3n semovientes": {
+ "account_number": "939535"
+ },
+ "Diversas": {
+ "account_number": "939595"
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "939599"
+ }
+ },
+ "Ajustes por inflaci\u00f3n patrimonio": {
+ "account_number": "9399",
+ "Capital social": {
+ "account_number": "939905"
+ },
+ "Super\u00e1vit de capital": {
+ "account_number": "939910"
+ },
+ "Reservas": {
+ "account_number": "939915"
+ },
+ "Dividendos o participaciones decretadas en acciones, cuotas o partes de inter\u00e9s social": {
+ "account_number": "939925"
+ },
+ "Resultados de ejercicios anteriores": {
+ "account_number": "939930"
+ }
+ }
+ },
+ "Responsabilidades contingentes por contra (DB)": {
+ "account_number": "94"
+ },
+ "Acreedoras fiscales por contra (DB)": {
+ "account_number": "95"
+ },
+ "Acreedoras de control por contra (DB)": {
+ "account_number": "96"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/co_plan_unico_de_cuentas_simple.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/co_plan_unico_de_cuentas_simple.json
new file mode 100644
index 0000000..cd6ce1e
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/co_plan_unico_de_cuentas_simple.json
@@ -0,0 +1,1746 @@
+{
+ "country_code": "co",
+ "name": "Colombia PUC Simple",
+ "tree": {
+ "Activo": {
+ "account_number": "1",
+ "root_type": "Asset",
+ "Disponible": {
+ "account_number": "11",
+ "Caja": {
+ "account_number": "1105",
+ "account_type": "Cash",
+ "is_group": 1
+ },
+ "Bancos": {
+ "account_number": "1110",
+ "account_type": "Bank",
+ "is_group": 1
+ },
+ "Remesas en tr\u00e1nsito": {
+ "account_number": "1115",
+ "is_group": 1
+ },
+ "Cuentas de ahorro": {
+ "account_number": "1120",
+ "is_group": 1
+ },
+ "Fondos": {
+ "account_number": "1125",
+ "is_group": 1
+ }
+ },
+ "Inversiones": {
+ "account_number": "12",
+ "Acciones": {
+ "account_number": "1205",
+ "is_group": 1
+ },
+ "Cuotas o partes de inter\u00e9s social": {
+ "account_number": "1210",
+ "is_group": 1
+ },
+ "Bonos": {
+ "account_number": "1215",
+ "is_group": 1
+ },
+ "C\u00e9dulas": {
+ "account_number": "1220",
+ "is_group": 1
+ },
+ "Certificados": {
+ "account_number": "1225",
+ "is_group": 1
+ },
+ "Papeles comerciales": {
+ "account_number": "1230",
+ "is_group": 1
+ },
+ "T\u00edtulos": {
+ "account_number": "1235",
+ "is_group": 1
+ },
+ "Aceptaciones bancarias o financieras": {
+ "account_number": "1240",
+ "is_group": 1
+ },
+ "Derechos fiduciarios": {
+ "account_number": "1245",
+ "is_group": 1
+ },
+ "Derechos de recompra de inversiones negociadas (repos)": {
+ "account_number": "1250",
+ "is_group": 1
+ },
+ "Obligatorias": {
+ "account_number": "1255",
+ "is_group": 1
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "1260",
+ "is_group": 1
+ },
+ "Otras inversiones": {
+ "account_number": "1295",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "1299",
+ "is_group": 1
+ }
+ },
+ "Deudores": {
+ "account_number": "13",
+ "account_type": "Receivable",
+ "Clientes": {
+ "account_number": "1305",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas corrientes comerciales": {
+ "account_number": "1310",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas por cobrar a casa matriz": {
+ "account_number": "1315",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas por cobrar a vinculados econ\u00f3micos": {
+ "account_number": "1320",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas por cobrar a directores": {
+ "account_number": "1323",
+ "account_type": "Receivable"
+ },
+ "Cuentas por cobrar a socios y accionistas": {
+ "account_number": "1325",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Aportes por cobrar": {
+ "account_number": "1328",
+ "account_type": "Receivable"
+ },
+ "Anticipos y avances": {
+ "account_number": "1330",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas de operaci\u00f3n conjunta": {
+ "account_number": "1332",
+ "account_type": "Receivable"
+ },
+ "Dep\u00f3sitos": {
+ "account_number": "1335",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Promesas de compra venta": {
+ "account_number": "1340",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Ingresos por cobrar": {
+ "account_number": "1345",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Retenci\u00f3n sobre contratos": {
+ "account_number": "1350",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Anticipo de impuestos y contribuciones o saldos a favor": {
+ "account_number": "1355",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Reclamaciones": {
+ "account_number": "1360",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Cuentas por cobrar a trabajadores": {
+ "account_number": "1365",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Pr\u00e9stamos a particulares": {
+ "account_number": "1370",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Deudores varios": {
+ "account_number": "1380",
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "Derechos de recompra de cartera negociada": {
+ "account_number": "1385",
+ "account_type": "Receivable"
+ },
+ "Deudas de dif\u00edcil cobro": {
+ "account_number": "1390",
+ "account_type": "Receivable"
+ },
+ "Provisiones": {
+ "account_number": "1399",
+ "account_type": "Receivable",
+ "is_group": 1
+ }
+ },
+ "Inventarios": {
+ "account_number": "14",
+ "account_type": "Stock",
+ "Materias primas": {
+ "account_number": "1405",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Productos en proceso": {
+ "account_number": "1410",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Obras de construcci\u00f3n en curso": {
+ "account_number": "1415",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Obras de urbanismo": {
+ "account_number": "1417",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Contratos en ejecuci\u00f3n": {
+ "account_number": "1420",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Cultivos en desarrollo": {
+ "account_number": "1425",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Plantaciones agr\u00edcolas": {
+ "account_number": "1428",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Productos terminados": {
+ "account_number": "1430",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Mercanc\u00edas no fabricadas por la empresa": {
+ "account_number": "1435",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Bienes ra\u00edces para la venta": {
+ "account_number": "1440",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Semovientes": {
+ "account_number": "1445",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Terrenos": {
+ "account_number": "1450",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Materiales, repuestos y accesorios": {
+ "account_number": "1455",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Envases y empaques": {
+ "account_number": "1460",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Inventarios en tr\u00e1nsito": {
+ "account_number": "1465",
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "1499",
+ "account_type": "Stock",
+ "is_group": 1
+ }
+ },
+ "Propiedades, planta y equipo": {
+ "account_number": "15",
+ "account_type": "Fixed Asset",
+ "Terrenos": {
+ "account_number": "1504",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Materiales proyectos petroleros": {
+ "account_number": "1506",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Construcciones en curso": {
+ "account_number": "1508",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Maquinaria y equipos en montaje": {
+ "account_number": "1512",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Construcciones y edificaciones": {
+ "account_number": "1516",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Maquinaria y equipo": {
+ "account_number": "1520",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Equipo de oficina": {
+ "account_number": "1524",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Equipo de computaci\u00f3n y comunicaci\u00f3n": {
+ "account_number": "1528",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Equipo m\u00e9dico-cient\u00edfico": {
+ "account_number": "1532",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Equipo de hoteles y restaurantes": {
+ "account_number": "1536",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Flota y equipo de transporte": {
+ "account_number": "1540",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Flota y equipo fluvial y/o mar\u00edtimo": {
+ "account_number": "1544",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Flota y equipo a\u00e9reo": {
+ "account_number": "1548",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Flota y equipo f\u00e9rreo": {
+ "account_number": "1552",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Acueductos, plantas y redes": {
+ "account_number": "1556",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Armamento de vigilancia": {
+ "account_number": "1560",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Envases y empaques": {
+ "account_number": "1562",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Plantaciones agr\u00edcolas y forestales": {
+ "account_number": "1564",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "V\u00edas de comunicaci\u00f3n": {
+ "account_number": "1568",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Minas y canteras": {
+ "account_number": "1572",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Pozos artesianos": {
+ "account_number": "1576",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Yacimientos": {
+ "account_number": "1580",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Semovientes": {
+ "account_number": "1584",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Propiedades, planta y equipo en tr\u00e1nsito": {
+ "account_number": "1588",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Depreciaci\u00f3n acumulada": {
+ "account_number": "1592",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Depreciaci\u00f3n diferida": {
+ "account_number": "1596",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Amortizaci\u00f3n acumulada": {
+ "account_number": "1597",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Agotamiento acumulado": {
+ "account_number": "1598",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "1599",
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ }
+ },
+ "Intangibles": {
+ "account_number": "16",
+ "Cr\u00e9dito mercantil": {
+ "account_number": "1605",
+ "is_group": 1
+ },
+ "Marcas": {
+ "account_number": "1610",
+ "is_group": 1
+ },
+ "Patentes": {
+ "account_number": "1615",
+ "is_group": 1
+ },
+ "Concesiones y franquicias": {
+ "account_number": "1620",
+ "is_group": 1
+ },
+ "Derechos": {
+ "account_number": "1625",
+ "is_group": 1
+ },
+ "Know how": {
+ "account_number": "1630",
+ "is_group": 1
+ },
+ "Licencias": {
+ "account_number": "1635",
+ "is_group": 1
+ },
+ "Depreciaci\u00f3n y/o amortizaci\u00f3n acumulada": {
+ "account_number": "1698",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "1699",
+ "account_type": "Accumulated Depreciation"
+ }
+ },
+ "Diferidos": {
+ "account_number": "17",
+ "Gastos pagados por anticipado": {
+ "account_number": "1705",
+ "is_group": 1
+ },
+ "Cargos diferidos": {
+ "account_number": "1710",
+ "is_group": 1
+ },
+ "Costos de exploraci\u00f3n por amortizar": {
+ "account_number": "1715",
+ "is_group": 1
+ },
+ "Costos de explotaci\u00f3n y desarrollo": {
+ "account_number": "1720",
+ "is_group": 1
+ },
+ "Cargos por correcci\u00f3n monetaria diferida": {
+ "account_number": "1730"
+ },
+ "Amortizaci\u00f3n acumulada": {
+ "account_number": "1798",
+ "account_type": "Accumulated Depreciation",
+ "is_group": 1
+ }
+ },
+ "Otros activos": {
+ "account_number": "18",
+ "Bienes de arte y cultura": {
+ "account_number": "1805",
+ "is_group": 1
+ },
+ "Diversos": {
+ "account_number": "1895",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "1899",
+ "is_group": 1
+ }
+ },
+ "Valorizaciones": {
+ "account_number": "19",
+ "De inversiones": {
+ "account_number": "1905",
+ "is_group": 1
+ },
+ "De propiedades, planta y equipo": {
+ "account_number": "1910",
+ "is_group": 1
+ },
+ "De otros activos": {
+ "account_number": "1995",
+ "is_group": 1
+ }
+ }
+ },
+ "Pasivo": {
+ "account_number": "2",
+ "root_type": "Liability",
+ "Obligaciones financieras": {
+ "account_number": "21",
+ "Bancos nacionales": {
+ "account_number": "2105",
+ "is_group": 1
+ },
+ "Bancos del exterior": {
+ "account_number": "2110",
+ "is_group": 1
+ },
+ "Corporaciones financieras": {
+ "account_number": "2115",
+ "is_group": 1
+ },
+ "Compa\u00f1\u00edas de financiamiento comercial": {
+ "account_number": "2120",
+ "is_group": 1
+ },
+ "Corporaciones de ahorro y vivienda": {
+ "account_number": "2125",
+ "is_group": 1
+ },
+ "Entidades financieras del exterior": {
+ "account_number": "2130"
+ },
+ "Compromisos de recompra de inversiones negociadas": {
+ "account_number": "2135",
+ "is_group": 1
+ },
+ "Compromisos de recompra de cartera negociada": {
+ "account_number": "2140"
+ },
+ "Obligaciones gubernamentales": {
+ "account_number": "2145",
+ "is_group": 1
+ },
+ "Otras obligaciones": {
+ "account_number": "2195",
+ "is_group": 1
+ }
+ },
+ "Proveedores": {
+ "account_number": "22",
+ "account_type": "Payable",
+ "Nacionales": {
+ "account_number": "2205",
+ "account_type": "Payable"
+ },
+ "Del exterior": {
+ "account_number": "2210",
+ "account_type": "Payable"
+ },
+ "Cuentas corrientes comerciales": {
+ "account_number": "2215",
+ "account_type": "Payable"
+ },
+ "Casa matriz": {
+ "account_number": "2220",
+ "account_type": "Payable"
+ },
+ "Compa\u00f1\u00edas vinculadas": {
+ "account_number": "2225",
+ "account_type": "Payable"
+ }
+ },
+ "Cuentas por pagar": {
+ "account_number": "23",
+ "account_type": "Payable",
+ "Cuentas corrientes comerciales": {
+ "account_number": "2305",
+ "account_type": "Payable"
+ },
+ "A casa matriz": {
+ "account_number": "2310",
+ "account_type": "Payable"
+ },
+ "A compa\u00f1\u00edas vinculadas": {
+ "account_number": "2315",
+ "account_type": "Payable"
+ },
+ "A contratistas": {
+ "account_number": "2320",
+ "account_type": "Payable"
+ },
+ "\u00d3rdenes de compra por utilizar": {
+ "account_number": "2330",
+ "account_type": "Payable"
+ },
+ "Costos y gastos por pagar": {
+ "account_number": "2335",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Instalamentos por pagar": {
+ "account_number": "2340",
+ "account_type": "Payable"
+ },
+ "Acreedores oficiales": {
+ "account_number": "2345",
+ "account_type": "Payable"
+ },
+ "Regal\u00edas por pagar": {
+ "account_number": "2350",
+ "account_type": "Payable"
+ },
+ "Deudas con accionistas o socios": {
+ "account_number": "2355",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Deudas con directores": {
+ "account_number": "2357",
+ "account_type": "Payable"
+ },
+ "Dividendos o participaciones por pagar": {
+ "account_number": "2360",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Retenci\u00f3n en la fuente": {
+ "account_number": "2365",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Impuesto a las ventas retenido": {
+ "account_number": "2367",
+ "account_type": "Payable"
+ },
+ "Impuesto de industria y comercio retenido": {
+ "account_number": "2368",
+ "account_type": "Payable"
+ },
+ "Retenciones y aportes de n\u00f3mina": {
+ "account_number": "2370",
+ "account_type": "Payable",
+ "is_group": 1
+ },
+ "Cuotas por devolver": {
+ "account_number": "2375",
+ "account_type": "Payable"
+ },
+ "Acreedores varios": {
+ "account_number": "2380",
+ "account_type": "Payable",
+ "is_group": 1
+ }
+ },
+ "Impuestos, grav\u00e1menes y tasas": {
+ "account_number": "24",
+ "account_type": "Tax",
+ "De renta y complementarios": {
+ "account_number": "2404",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "Impuesto sobre las ventas por pagar": {
+ "account_number": "2408",
+ "account_type": "Tax"
+ },
+ "De industria y comercio": {
+ "account_number": "2412",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "A la propiedad ra\u00edz": {
+ "account_number": "2416",
+ "account_type": "Tax"
+ },
+ "Derechos sobre instrumentos p\u00fablicos": {
+ "account_number": "2420",
+ "account_type": "Tax"
+ },
+ "De valorizaci\u00f3n": {
+ "account_number": "2424",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "De turismo": {
+ "account_number": "2428",
+ "account_type": "Tax"
+ },
+ "Tasa por utilizaci\u00f3n de puertos": {
+ "account_number": "2432",
+ "account_type": "Tax"
+ },
+ "De veh\u00edculos": {
+ "account_number": "2436",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "De espect\u00e1culos p\u00fablicos": {
+ "account_number": "2440",
+ "account_type": "Tax"
+ },
+ "De hidrocarburos y minas": {
+ "account_number": "2444",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "Regal\u00edas e impuestos a la peque\u00f1a y mediana miner\u00eda": {
+ "account_number": "2448",
+ "account_type": "Tax"
+ },
+ "A las exportaciones cafeteras": {
+ "account_number": "2452",
+ "account_type": "Tax"
+ },
+ "A las importaciones": {
+ "account_number": "2456",
+ "account_type": "Tax"
+ },
+ "Cuotas de fomento": {
+ "account_number": "2460",
+ "account_type": "Tax"
+ },
+ "De licores, cervezas y cigarrillos": {
+ "account_number": "2464",
+ "account_type": "Tax",
+ "is_group": 1
+ },
+ "Al sacrificio de ganado": {
+ "account_number": "2468",
+ "account_type": "Tax"
+ },
+ "Al azar y juegos": {
+ "account_number": "2472",
+ "account_type": "Tax"
+ },
+ "Grav\u00e1menes y regal\u00edas por utilizaci\u00f3n del suelo": {
+ "account_number": "2476",
+ "account_type": "Tax"
+ },
+ "Otros": {
+ "account_number": "2495",
+ "account_type": "Tax"
+ }
+ },
+ "Obligaciones laborales": {
+ "account_number": "25",
+ "Salarios por pagar": {
+ "account_number": "2505"
+ },
+ "Cesant\u00edas consolidadas": {
+ "account_number": "2510",
+ "is_group": 1
+ },
+ "Intereses sobre cesant\u00edas": {
+ "account_number": "2515"
+ },
+ "Prima de servicios": {
+ "account_number": "2520"
+ },
+ "Vacaciones consolidadas": {
+ "account_number": "2525"
+ },
+ "Prestaciones extralegales": {
+ "account_number": "2530",
+ "is_group": 1
+ },
+ "Pensiones por pagar": {
+ "account_number": "2532"
+ },
+ "Cuotas partes pensiones de jubilaci\u00f3n": {
+ "account_number": "2535"
+ },
+ "Indemnizaciones laborales": {
+ "account_number": "2540"
+ }
+ },
+ "Pasivos estimados y provisiones": {
+ "account_number": "26",
+ "Para costos y gastos": {
+ "account_number": "2605",
+ "is_group": 1
+ },
+ "Para obligaciones laborales": {
+ "account_number": "2610",
+ "is_group": 1
+ },
+ "Para obligaciones fiscales": {
+ "account_number": "2615",
+ "is_group": 1
+ },
+ "Pensiones de jubilaci\u00f3n": {
+ "account_number": "2620",
+ "is_group": 1
+ },
+ "Para obras de urbanismo": {
+ "account_number": "2625",
+ "is_group": 1
+ },
+ "Para mantenimiento y reparaciones": {
+ "account_number": "2630",
+ "is_group": 1
+ },
+ "Para contingencias": {
+ "account_number": "2635",
+ "is_group": 1
+ },
+ "Para obligaciones de garant\u00edas": {
+ "account_number": "2640"
+ },
+ "Provisiones diversas": {
+ "account_number": "2695",
+ "is_group": 1
+ }
+ },
+ "Diferidos": {
+ "account_number": "27",
+ "Ingresos recibidos por anticipado": {
+ "account_number": "2705",
+ "is_group": 1
+ },
+ "Abonos diferidos": {
+ "account_number": "2710",
+ "is_group": 1
+ },
+ "Utilidad diferida en ventas a plazos": {
+ "account_number": "2715"
+ },
+ "Cr\u00e9dito por correcci\u00f3n monetaria diferida": {
+ "account_number": "2720"
+ },
+ "Impuestos diferidos": {
+ "account_number": "2725",
+ "is_group": 1
+ }
+ },
+ "Otros pasivos": {
+ "account_number": "28",
+ "Anticipos y avances recibidos": {
+ "account_number": "2805",
+ "is_group": 1
+ },
+ "Dep\u00f3sitos recibidos": {
+ "account_number": "2810",
+ "is_group": 1
+ },
+ "Ingresos recibidos para terceros": {
+ "account_number": "2815",
+ "is_group": 1
+ },
+ "Cuentas de operaci\u00f3n conjunta": {
+ "account_number": "2820"
+ },
+ "Retenciones a terceros sobre contratos": {
+ "account_number": "2825",
+ "is_group": 1
+ },
+ "Embargos judiciales": {
+ "account_number": "2830",
+ "is_group": 1
+ },
+ "Acreedores del sistema": {
+ "account_number": "2835",
+ "is_group": 1
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "2840"
+ },
+ "Diversos": {
+ "account_number": "2895",
+ "is_group": 1
+ }
+ },
+ "Bonos y papeles comerciales": {
+ "account_number": "29",
+ "Bonos en circulaci\u00f3n": {
+ "account_number": "2905"
+ },
+ "Bonos obligatoriamente convertibles en acciones": {
+ "account_number": "2910"
+ },
+ "Papeles comerciales": {
+ "account_number": "2915"
+ },
+ "Bonos pensionales": {
+ "account_number": "2920",
+ "is_group": 1
+ },
+ "T\u00edtulos pensionales": {
+ "account_number": "2925",
+ "is_group": 1
+ }
+ }
+ },
+ "Patrimonio": {
+ "account_number": "3",
+ "account_type": "Equity",
+ "root_type": "Equity",
+ "Capital social": {
+ "account_number": "31",
+ "account_type": "Equity",
+ "Capital suscrito y pagado": {
+ "account_number": "3105",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Aportes sociales": {
+ "account_number": "3115",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Capital asignado": {
+ "account_number": "3120",
+ "account_type": "Equity"
+ },
+ "Inversi\u00f3n suplementaria al capital asignado": {
+ "account_number": "3125",
+ "account_type": "Equity"
+ },
+ "Capital de personas naturales": {
+ "account_number": "3130",
+ "account_type": "Equity"
+ },
+ "Aportes del Estado": {
+ "account_number": "3135",
+ "account_type": "Equity"
+ },
+ "Fondo social": {
+ "account_number": "3140",
+ "account_type": "Equity"
+ }
+ },
+ "Super\u00e1vit de capital": {
+ "account_number": "32",
+ "account_type": "Equity",
+ "Prima en colocaci\u00f3n de acciones, cuotas o partes de inter\u00e9s social": {
+ "account_number": "3205",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Donaciones": {
+ "account_number": "3210",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Cr\u00e9dito mercantil": {
+ "account_number": "3215",
+ "account_type": "Equity"
+ },
+ "Know how": {
+ "account_number": "3220",
+ "account_type": "Equity"
+ },
+ "Super\u00e1vit m\u00e9todo de participaci\u00f3n": {
+ "account_number": "3225",
+ "account_type": "Equity",
+ "is_group": 1
+ }
+ },
+ "Reservas": {
+ "account_number": "33",
+ "account_type": "Equity",
+ "Reservas obligatorias": {
+ "account_number": "3305",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Reservas estatutarias": {
+ "account_number": "3310",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Reservas ocasionales": {
+ "account_number": "3315",
+ "account_type": "Equity",
+ "is_group": 1
+ }
+ },
+ "Revalorizaci\u00f3n del patrimonio": {
+ "account_number": "34",
+ "account_type": "Equity",
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "3405",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "Saneamiento fiscal": {
+ "account_number": "3410",
+ "account_type": "Equity"
+ },
+ "Ajustes por inflaci\u00f3n Decreto 3019 de 1989": {
+ "account_number": "3415",
+ "account_type": "Equity"
+ }
+ },
+ "Dividendos o participaciones decretados en acciones, cuotas o partes de inter\u00e9s social": {
+ "account_number": "35",
+ "account_type": "Equity",
+ "Dividendos decretados en acciones": {
+ "account_number": "3505",
+ "account_type": "Equity"
+ },
+ "Participaciones decretadas en cuotas o partes de inter\u00e9s social": {
+ "account_number": "3510",
+ "account_type": "Equity"
+ }
+ },
+ "Resultados del ejercicio": {
+ "account_number": "36",
+ "account_type": "Equity",
+ "Utilidad del ejercicio": {
+ "account_number": "3605",
+ "account_type": "Equity"
+ },
+ "P\u00e9rdida del ejercicio": {
+ "account_number": "3610",
+ "account_type": "Equity"
+ }
+ },
+ "Resultados de ejercicios anteriores": {
+ "account_number": "37",
+ "account_type": "Equity",
+ "Utilidades acumuladas": {
+ "account_number": "3705",
+ "account_type": "Equity"
+ },
+ "P\u00e9rdidas acumuladas": {
+ "account_number": "3710",
+ "account_type": "Equity"
+ }
+ },
+ "Super\u00e1vit por valorizaciones": {
+ "account_number": "38",
+ "account_type": "Equity",
+ "De inversiones": {
+ "account_number": "3805",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "De propiedades, planta y equipo": {
+ "account_number": "3810",
+ "account_type": "Equity",
+ "is_group": 1
+ },
+ "De otros activos": {
+ "account_number": "3895",
+ "account_type": "Equity",
+ "is_group": 1
+ }
+ }
+ },
+ "Ingresos": {
+ "account_number": "4",
+ "account_type": "Income Account",
+ "root_type": "Income",
+ "Operacionales": {
+ "account_number": "41",
+ "account_type": "Income Account",
+ "Agricultura, ganader\u00eda, caza y silvicultura": {
+ "account_number": "4105",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Pesca": {
+ "account_number": "4110",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Explotaci\u00f3n de minas y canteras": {
+ "account_number": "4115",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Industrias manufactureras": {
+ "account_number": "4120",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Suministro de electricidad, gas y agua": {
+ "account_number": "4125",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Construcci\u00f3n": {
+ "account_number": "4130",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Comercio al por mayor y al por menor": {
+ "account_number": "4135",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Hoteles y restaurantes": {
+ "account_number": "4140",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Transporte, almacenamiento y comunicaciones": {
+ "account_number": "4145",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Actividad financiera": {
+ "account_number": "4150",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Actividades inmobiliarias, empresariales y de alquiler": {
+ "account_number": "4155",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Ense\u00f1anza": {
+ "account_number": "4160",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Servicios sociales y de salud": {
+ "account_number": "4165",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Otras actividades de servicios comunitarios, sociales y personales": {
+ "account_number": "4170",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Devoluciones en ventas (DB)": {
+ "account_number": "4175",
+ "account_type": "Income Account",
+ "is_group": 1
+ }
+ },
+ "No operacionales": {
+ "account_number": "42",
+ "account_type": "Income Account",
+ "Otras ventas": {
+ "account_number": "4205",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Financieros": {
+ "account_number": "4210",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Dividendos y participaciones": {
+ "account_number": "4215",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Ingresos m\u00e9todo de participaci\u00f3n": {
+ "account_number": "4218",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Arrendamientos": {
+ "account_number": "4220",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Comisiones": {
+ "account_number": "4225",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Honorarios": {
+ "account_number": "4230",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Servicios": {
+ "account_number": "4235",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Utilidad en venta de inversiones": {
+ "account_number": "4240",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Utilidad en venta de propiedades, planta y equipo": {
+ "account_number": "4245",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Utilidad en venta de otros bienes": {
+ "account_number": "4248",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Recuperaciones": {
+ "account_number": "4250",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Indemnizaciones": {
+ "account_number": "4255",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Participaciones en concesiones": {
+ "account_number": "4260",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Ingresos de ejercicios anteriores": {
+ "account_number": "4265",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Devoluciones en otras ventas (DB)": {
+ "account_number": "4275",
+ "account_type": "Income Account",
+ "is_group": 1
+ },
+ "Diversos": {
+ "account_number": "4295",
+ "account_type": "Income Account",
+ "is_group": 1
+ }
+ },
+ "Ajustes por inflaci\u00f3n": {
+ "account_number": "47",
+ "account_type": "Income Account",
+ "Correcci\u00f3n monetaria": {
+ "account_number": "4705",
+ "account_type": "Income Account",
+ "is_group": 1
+ }
+ }
+ },
+ "Gastos": {
+ "account_number": "5",
+ "account_type": "Expense Account",
+ "root_type": "Expense",
+ "Operacionales de administraci\u00f3n": {
+ "account_number": "51",
+ "account_type": "Expense Account",
+ "Gastos de personal": {
+ "account_number": "5105",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Honorarios": {
+ "account_number": "5110",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Impuestos": {
+ "account_number": "5115",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Arrendamientos": {
+ "account_number": "5120",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Contribuciones y afiliaciones": {
+ "account_number": "5125",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Seguros": {
+ "account_number": "5130",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Servicios": {
+ "account_number": "5135",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Gastos legales": {
+ "account_number": "5140",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Mantenimiento y reparaciones": {
+ "account_number": "5145",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Adecuaci\u00f3n e instalaci\u00f3n": {
+ "account_number": "5150",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Gastos de viaje": {
+ "account_number": "5155",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Depreciaciones": {
+ "account_number": "5160",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Amortizaciones": {
+ "account_number": "5165",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Diversos": {
+ "account_number": "5195",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "5199",
+ "account_type": "Expense Account",
+ "is_group": 1
+ }
+ },
+ "Operacionales de ventas": {
+ "account_number": "52",
+ "account_type": "Expense Account",
+ "Gastos de personal": {
+ "account_number": "5205",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Honorarios": {
+ "account_number": "5210",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Impuestos": {
+ "account_number": "5215",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Arrendamientos": {
+ "account_number": "5220",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Contribuciones y afiliaciones": {
+ "account_number": "5225",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Seguros": {
+ "account_number": "5230",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Servicios": {
+ "account_number": "5235",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Gastos legales": {
+ "account_number": "5240",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Mantenimiento y reparaciones": {
+ "account_number": "5245",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Adecuaci\u00f3n e instalaci\u00f3n": {
+ "account_number": "5250",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Gastos de viaje": {
+ "account_number": "5255",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Depreciaciones": {
+ "account_number": "5260",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Amortizaciones": {
+ "account_number": "5265",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Financieros-reajuste del sistema": {
+ "account_number": "5270",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "P\u00e9rdidas m\u00e9todo de participaci\u00f3n": {
+ "account_number": "5275",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Diversos": {
+ "account_number": "5295",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Provisiones": {
+ "account_number": "5299",
+ "account_type": "Expense Account",
+ "is_group": 1
+ }
+ },
+ "No operacionales": {
+ "account_number": "53",
+ "account_type": "Expense Account",
+ "Financieros": {
+ "account_number": "5305",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "P\u00e9rdida en venta y retiro de bienes": {
+ "account_number": "5310",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "P\u00e9rdidas m\u00e9todo de participaci\u00f3n": {
+ "account_number": "5313",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Gastos extraordinarios": {
+ "account_number": "5315",
+ "account_type": "Expense Account",
+ "is_group": 1
+ },
+ "Gastos diversos": {
+ "account_number": "5395",
+ "account_type": "Expense Account",
+ "is_group": 1
+ }
+ },
+ "Impuesto de renta y complementarios": {
+ "account_number": "54",
+ "account_type": "Expense Account",
+ "Impuesto de renta y complementarios": {
+ "account_number": "5405",
+ "account_type": "Expense Account",
+ "is_group": 1
+ }
+ },
+ "Ganancias y p\u00e9rdidas": {
+ "account_number": "59",
+ "account_type": "Expense Account",
+ "Ganancias y p\u00e9rdidas": {
+ "account_number": "5905",
+ "account_type": "Expense Account",
+ "is_group": 1
+ }
+ }
+ },
+ "Costos de ventas": {
+ "account_number": "6",
+ "account_type": "Cost of Goods Sold",
+ "root_type": "Expense",
+ "Costo de ventas y de prestaci\u00f3n de servicios": {
+ "account_number": "61",
+ "account_type": "Cost of Goods Sold",
+ "Agricultura, ganader\u00eda, caza y silvicultura": {
+ "account_number": "6105",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Pesca": {
+ "account_number": "6110",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Explotaci\u00f3n de minas y canteras": {
+ "account_number": "6115",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Industrias manufactureras": {
+ "account_number": "6120",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Suministro de electricidad, gas y agua": {
+ "account_number": "6125",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Construcci\u00f3n": {
+ "account_number": "6130",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Comercio al por mayor y al por menor": {
+ "account_number": "6135",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Hoteles y restaurantes": {
+ "account_number": "6140",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Transporte, almacenamiento y comunicaciones": {
+ "account_number": "6145",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Actividad financiera": {
+ "account_number": "6150",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Actividades inmobiliarias, empresariales y de alquiler": {
+ "account_number": "6155",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Ense\u00f1anza": {
+ "account_number": "6160",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Servicios sociales y de salud": {
+ "account_number": "6165",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Otras actividades de servicios comunitarios, sociales y personales": {
+ "account_number": "6170",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ }
+ },
+ "Compras": {
+ "account_number": "62",
+ "account_type": "Cost of Goods Sold",
+ "De mercanc\u00edas": {
+ "account_number": "6205",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "De materias primas": {
+ "account_number": "6210",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "De materiales indirectos": {
+ "account_number": "6215",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Compra de energ\u00eda": {
+ "account_number": "6220",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ },
+ "Devoluciones en compras (CR)": {
+ "account_number": "6225",
+ "account_type": "Cost of Goods Sold",
+ "is_group": 1
+ }
+ }
+ },
+ "Costos de producci\u00f3n o de operaci\u00f3n": {
+ "account_number": "7",
+ "account_type": "Cost of Goods Sold",
+ "root_type": "Expense",
+ "Materia prima": {
+ "account_number": "71",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Mano de obra directa": {
+ "account_number": "72",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Costos indirectos": {
+ "account_number": "73",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Contratos de servicios": {
+ "account_number": "74",
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Cuentas de orden deudoras": {
+ "account_number": "8",
+ "root_type": "Asset",
+ "Derechos contingentes": {
+ "account_number": "81",
+ "Bienes y valores entregados en custodia": {
+ "account_number": "8105",
+ "is_group": 1
+ },
+ "Bienes y valores entregados en garant\u00eda": {
+ "account_number": "8110",
+ "is_group": 1
+ },
+ "Bienes y valores en poder de terceros": {
+ "account_number": "8115",
+ "is_group": 1
+ },
+ "Litigios y/o demandas": {
+ "account_number": "8120",
+ "is_group": 1
+ },
+ "Promesas de compraventa": {
+ "account_number": "8125"
+ },
+ "Diversas": {
+ "account_number": "8195",
+ "is_group": 1
+ }
+ },
+ "Deudoras fiscales": {
+ "account_number": "82"
+ },
+ "Deudoras de control": {
+ "account_number": "83",
+ "Bienes recibidos en arrendamiento financiero": {
+ "account_number": "8305",
+ "is_group": 1
+ },
+ "T\u00edtulos de inversi\u00f3n no colocados": {
+ "account_number": "8310",
+ "is_group": 1
+ },
+ "Propiedades, planta y equipo totalmente depreciados, agotados y/o amortizados": {
+ "account_number": "8315",
+ "is_group": 1
+ },
+ "Cr\u00e9ditos a favor no utilizados": {
+ "account_number": "8320",
+ "is_group": 1
+ },
+ "Activos castigados": {
+ "account_number": "8325",
+ "is_group": 1
+ },
+ "T\u00edtulos de inversi\u00f3n amortizados": {
+ "account_number": "8330",
+ "is_group": 1
+ },
+ "Capitalizaci\u00f3n por revalorizaci\u00f3n de patrimonio": {
+ "account_number": "8335"
+ },
+ "Otras cuentas deudoras de control": {
+ "account_number": "8395",
+ "is_group": 1
+ },
+ "Ajustes por inflaci\u00f3n activos": {
+ "account_number": "8399",
+ "is_group": 1
+ }
+ },
+ "Derechos contingentes por contra (CR)": {
+ "account_number": "84"
+ },
+ "Deudoras fiscales por contra (CR)": {
+ "account_number": "85"
+ },
+ "Deudoras de control por contra (CR)": {
+ "account_number": "86"
+ }
+ },
+ "Cuentas de orden acreedoras": {
+ "account_number": "9",
+ "root_type": "Liability",
+ "Responsabilidades contingentes": {
+ "account_number": "91",
+ "Bienes y valores recibidos en custodia": {
+ "account_number": "9105",
+ "is_group": 1
+ },
+ "Bienes y valores recibidos en garant\u00eda": {
+ "account_number": "9110",
+ "is_group": 1
+ },
+ "Bienes y valores recibidos de terceros": {
+ "account_number": "9115",
+ "is_group": 1
+ },
+ "Litigios y/o demandas": {
+ "account_number": "9120",
+ "is_group": 1
+ },
+ "Promesas de compraventa": {
+ "account_number": "9125"
+ },
+ "Contratos de administraci\u00f3n delegada": {
+ "account_number": "9130"
+ },
+ "Cuentas en participaci\u00f3n": {
+ "account_number": "9135"
+ },
+ "Otras responsabilidades contingentes": {
+ "account_number": "9195"
+ }
+ },
+ "Acreedoras fiscales": {
+ "account_number": "92"
+ },
+ "Acreedoras de control": {
+ "account_number": "93",
+ "Contratos de arrendamiento financiero": {
+ "account_number": "9305",
+ "is_group": 1
+ },
+ "Otras cuentas de orden acreedoras de control": {
+ "account_number": "9395",
+ "is_group": 1
+ },
+ "Ajustes por inflaci\u00f3n patrimonio": {
+ "account_number": "9399",
+ "is_group": 1
+ }
+ },
+ "Responsabilidades contingentes por contra (DB)": {
+ "account_number": "94"
+ },
+ "Acreedoras fiscales por contra (DB)": {
+ "account_number": "95"
+ },
+ "Acreedoras de control por contra (DB)": {
+ "account_number": "96"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json
index 58b9122..9fb47bb 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json
@@ -2,75 +2,13 @@
"country_code": "nl",
"name": "Netherlands - Grootboekschema",
"tree": {
- "FABRIKAGEREKENINGEN": {
- "is_group": 1,
- "root_type": "Expense"
- },
"FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
"Bank": {
"RABO Bank": {
"account_type": "Bank"
},
"account_type": "Bank"
- },
- "KORTLOPENDE SCHULDEN": {
- "Af te dragen Btw-verlegd": {
- "account_type": "Tax"
- },
- "Afdracht loonheffing": {},
- "Btw af te dragen hoog": {
- "account_type": "Tax"
- },
- "Btw af te dragen laag": {
- "account_type": "Tax"
- },
- "Btw af te dragen overig": {
- "account_type": "Tax"
- },
- "Btw oude jaren": {
- "account_type": "Tax"
- },
- "Btw te vorderen hoog": {
- "account_type": "Tax"
- },
- "Btw te vorderen laag": {
- "account_type": "Tax"
- },
- "Btw te vorderen overig": {
- "account_type": "Tax"
- },
- "Btw-afdracht": {
- "account_type": "Tax"
- },
- "Crediteuren": {
- "account_type": "Payable"
- },
- "Dividend": {},
- "Dividendbelasting": {},
- "Energiekosten 1": {},
- "Investeringsaftrek": {},
- "Loonheffing": {},
- "Overige te betalen posten": {},
- "Pensioenpremies 1": {},
- "Premie WIR": {},
- "Rekening-courant inkoopvereniging": {},
- "Rente": {},
- "Sociale lasten 1": {},
- "Stock Recieved niet gefactureerd": {
- "account_type": "Stock Received But Not Billed"
- },
- "Tanti\u00e8mes 1": {},
- "Te vorderen Btw-verlegd": {
- "account_type": "Tax"
- },
- "Telefoon/telefax 1": {},
- "Termijnen onderh. werk": {},
- "Vakantiedagen": {},
- "Vakantiegeld 1": {},
- "Vakantiezegels": {},
- "Vennootschapsbelasting": {},
- "Vooruit ontvangen bedr.": {}
- },
+ },
"LIQUIDE MIDDELEN": {
"ABN-AMRO bank": {},
"Bankbetaalkaarten": {},
@@ -91,6 +29,110 @@
},
"account_type": "Cash"
},
+ "TUSSENREKENINGEN": {
+ "Betaalwijze cadeaubonnen": {
+ "account_type": "Cash"
+ },
+ "Betaalwijze chipknip": {
+ "account_type": "Cash"
+ },
+ "Betaalwijze contant": {
+ "account_type": "Cash"
+ },
+ "Betaalwijze pin": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland hoog": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland laag": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland onbelast": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland overig": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland verlegd": {
+ "account_type": "Cash"
+ },
+ "Inkopen binnen EU hoog": {
+ "account_type": "Cash"
+ },
+ "Inkopen binnen EU laag": {
+ "account_type": "Cash"
+ },
+ "Inkopen binnen EU overig": {
+ "account_type": "Cash"
+ },
+ "Inkopen buiten EU hoog": {
+ "account_type": "Cash"
+ },
+ "Inkopen buiten EU laag": {
+ "account_type": "Cash"
+ },
+ "Inkopen buiten EU overig": {
+ "account_type": "Cash"
+ },
+ "Kassa 1": {
+ "account_type": "Cash"
+ },
+ "Kassa 2": {
+ "account_type": "Cash"
+ },
+ "Netto lonen": {
+ "account_type": "Cash"
+ },
+ "Tegenrekening Inkopen": {
+ "account_type": "Cash"
+ },
+ "Tussenrek. autom. betalingen": {
+ "account_type": "Cash"
+ },
+ "Tussenrek. autom. loonbetalingen": {
+ "account_type": "Cash"
+ },
+ "Tussenrek. cadeaubonbetalingen": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening balans": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening chipknip": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening correcties": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening pin": {
+ "account_type": "Cash"
+ },
+ "Vraagposten": {
+ "account_type": "Cash"
+ },
+ "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
+ "Emballage": {},
+ "Gereed product 1": {},
+ "Gereed product 2": {},
+ "Goederen 1": {},
+ "Goederen 2": {},
+ "Goederen in consignatie": {},
+ "Goederen onderweg": {},
+ "Grondstoffen 1": {},
+ "Grondstoffen 2": {},
+ "Halffabrikaten 1": {},
+ "Halffabrikaten 2": {},
+ "Hulpstoffen 1": {},
+ "Hulpstoffen 2": {},
+ "Kantoorbenodigdheden": {},
+ "Onderhanden werk": {},
+ "Verpakkingsmateriaal": {},
+ "Zegels": {},
+ "root_type": "Asset"
+ },
+ "root_type": "Asset"
+ },
"VORDERINGEN": {
"Debiteuren": {
"account_type": "Receivable"
@@ -104,278 +146,299 @@
"Voorziening dubieuze debiteuren": {}
},
"root_type": "Asset"
- },
- "INDIRECTE KOSTEN": {
+ },
+ "KORTLOPENDE SCHULDEN": {
+ "Af te dragen Btw-verlegd": {
+ "account_type": "Tax"
+ },
+ "Afdracht loonheffing": {},
+ "Btw af te dragen hoog": {
+ "account_type": "Tax"
+ },
+ "Btw af te dragen laag": {
+ "account_type": "Tax"
+ },
+ "Btw af te dragen overig": {
+ "account_type": "Tax"
+ },
+ "Btw oude jaren": {
+ "account_type": "Tax"
+ },
+ "Btw te vorderen hoog": {
+ "account_type": "Tax"
+ },
+ "Btw te vorderen laag": {
+ "account_type": "Tax"
+ },
+ "Btw te vorderen overig": {
+ "account_type": "Tax"
+ },
+ "Btw-afdracht": {
+ "account_type": "Tax"
+ },
+ "Crediteuren": {
+ "account_type": "Payable"
+ },
+ "Dividend": {},
+ "Dividendbelasting": {},
+ "Energiekosten 1": {},
+ "Investeringsaftrek": {},
+ "Loonheffing": {},
+ "Overige te betalen posten": {},
+ "Pensioenpremies 1": {},
+ "Premie WIR": {},
+ "Rekening-courant inkoopvereniging": {},
+ "Rente": {},
+ "Sociale lasten 1": {},
+ "Stock Recieved niet gefactureerd": {
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Tanti\u00e8mes 1": {},
+ "Te vorderen Btw-verlegd": {
+ "account_type": "Tax"
+ },
+ "Telefoon/telefax 1": {},
+ "Termijnen onderh. werk": {},
+ "Vakantiedagen": {},
+ "Vakantiegeld 1": {},
+ "Vakantiezegels": {},
+ "Vennootschapsbelasting": {},
+ "Vooruit ontvangen bedr.": {},
+ "is_group": 1,
+ "root_type": "Liability"
+ },
+ "FABRIKAGEREKENINGEN": {
"is_group": 1,
- "root_type": "Expense"
- },
- "KOSTENREKENINGEN": {
- "AFSCHRIJVINGEN": {
- "Aanhangwagens": {},
- "Aankoopkosten": {},
- "Aanloopkosten": {},
- "Auteursrechten": {},
- "Bedrijfsgebouwen": {},
- "Bedrijfsinventaris": {
+ "root_type": "Expense",
+ "INDIRECTE KOSTEN": {
+ "is_group": 1,
+ "root_type": "Expense"
+ },
+ "KOSTENREKENINGEN": {
+ "AFSCHRIJVINGEN": {
+ "Aanhangwagens": {},
+ "Aankoopkosten": {},
+ "Aanloopkosten": {},
+ "Auteursrechten": {},
+ "Bedrijfsgebouwen": {},
+ "Bedrijfsinventaris": {
+ "account_type": "Depreciation"
+ },
+ "Drankvergunningen": {},
+ "Fabrieksinventaris": {
+ "account_type": "Depreciation"
+ },
+ "Gebouwen": {},
+ "Gereedschappen": {},
+ "Goodwill": {},
+ "Grondverbetering": {},
+ "Heftrucks": {},
+ "Kantine-inventaris": {},
+ "Kantoorinventaris": {
+ "account_type": "Depreciation"
+ },
+ "Kantoormachines": {},
+ "Licenties": {},
+ "Machines 1": {},
+ "Magazijninventaris": {},
+ "Octrooien": {},
+ "Ontwikkelingskosten": {},
+ "Pachtersinvestering": {},
+ "Parkeerplaats": {},
+ "Personenauto's": {
+ "account_type": "Depreciation"
+ },
+ "Rijwielen en bromfietsen": {},
+ "Tonnagevergunningen": {},
+ "Verbouwingen": {},
+ "Vergunningen": {},
+ "Voorraadverschillen": {},
+ "Vrachtauto's": {},
+ "Winkels": {},
+ "Woon-winkelhuis": {},
"account_type": "Depreciation"
},
- "Drankvergunningen": {},
- "Fabrieksinventaris": {
- "account_type": "Depreciation"
+ "ALGEMENE KOSTEN": {
+ "Accountantskosten": {},
+ "Advieskosten": {},
+ "Assuranties 1": {},
+ "Bankkosten": {},
+ "Juridische kosten": {},
+ "Overige algemene kosten": {},
+ "Toev. Ass. eigen risico": {}
},
- "Gebouwen": {},
- "Gereedschappen": {},
- "Goodwill": {},
- "Grondverbetering": {},
- "Heftrucks": {},
- "Kantine-inventaris": {},
- "Kantoorinventaris": {
- "account_type": "Depreciation"
+ "BEDRIJFSKOSTEN": {
+ "Assuranties 2": {},
+ "Energie (krachtstroom)": {},
+ "Gereedschappen 1": {},
+ "Hulpmaterialen 1": {},
+ "Huur inventaris": {},
+ "Huur machines": {},
+ "Leasing invent.operational": {},
+ "Leasing mach. operational": {},
+ "Onderhoud inventaris": {},
+ "Onderhoud machines": {},
+ "Ophalen/vervoer afval": {},
+ "Overige bedrijfskosten": {}
},
- "Kantoormachines": {},
- "Licenties": {},
- "Machines 1": {},
- "Magazijninventaris": {},
- "Octrooien": {},
- "Ontwikkelingskosten": {},
- "Pachtersinvestering": {},
- "Parkeerplaats": {},
- "Personenauto's": {
- "account_type": "Depreciation"
+ "FINANCIERINGSKOSTEN 1": {
+ "Overige rentebaten": {},
+ "Overige rentelasten": {},
+ "Rente bankkrediet": {},
+ "Rente huurkoopcontracten": {},
+ "Rente hypotheek": {},
+ "Rente leasecontracten": {},
+ "Rente lening o/g": {},
+ "Rente lening u/g": {}
},
- "Rijwielen en bromfietsen": {},
- "Tonnagevergunningen": {},
- "Verbouwingen": {},
- "Vergunningen": {},
- "Voorraadverschillen": {},
- "Vrachtauto's": {},
- "Winkels": {},
- "Woon-winkelhuis": {},
- "account_type": "Depreciation"
- },
- "ALGEMENE KOSTEN": {
- "Accountantskosten": {},
- "Advieskosten": {},
- "Assuranties 1": {},
- "Bankkosten": {},
- "Juridische kosten": {},
- "Overige algemene kosten": {},
- "Toev. Ass. eigen risico": {}
- },
- "BEDRIJFSKOSTEN": {
- "Assuranties 2": {},
- "Energie (krachtstroom)": {},
- "Gereedschappen 1": {},
- "Hulpmaterialen 1": {},
- "Huur inventaris": {},
- "Huur machines": {},
- "Leasing invent.operational": {},
- "Leasing mach. operational": {},
- "Onderhoud inventaris": {},
- "Onderhoud machines": {},
- "Ophalen/vervoer afval": {},
- "Overige bedrijfskosten": {}
- },
- "FINANCIERINGSKOSTEN 1": {
- "Overige rentebaten": {},
- "Overige rentelasten": {},
- "Rente bankkrediet": {},
- "Rente huurkoopcontracten": {},
- "Rente hypotheek": {},
- "Rente leasecontracten": {},
- "Rente lening o/g": {},
- "Rente lening u/g": {}
- },
- "HUISVESTINGSKOSTEN": {
- "Assurantie onroerend goed": {},
- "Belastingen onr. Goed": {},
- "Energiekosten": {},
- "Groot onderhoud onr. Goed": {},
- "Huur": {},
- "Huurwaarde woongedeelte": {},
- "Onderhoud onroerend goed": {},
- "Ontvangen huren": {},
- "Overige huisvestingskosten": {},
- "Pacht": {},
- "Schoonmaakkosten": {},
- "Toevoeging egalisatieres. Groot onderhoud": {}
- },
- "KANTOORKOSTEN": {
- "Administratiekosten": {},
- "Contributies/abonnementen": {},
- "Huur kantoorapparatuur": {},
- "Internetaansluiting": {},
- "Kantoorbenodigdh./drukw.": {},
- "Onderhoud kantoorinvent.": {},
- "Overige kantoorkosten": {},
- "Porti": {},
- "Telefoon/telefax": {}
- },
- "OVERIGE BATEN EN LASTEN": {
- "Betaalde schadevergoed.": {},
- "Boekverlies vaste activa": {},
- "Boekwinst van vaste activa": {},
- "K.O. regeling OB": {},
- "Kasverschillen": {},
- "Kosten loonbelasting": {},
- "Kosten omzetbelasting": {},
- "Nadelige koersverschillen": {},
- "Naheffing bedrijfsver.": {},
- "Ontvangen schadevergoed.": {},
- "Overige baten": {},
- "Overige lasten": {},
- "Voordelige koersverschil.": {}
- },
- "PERSONEELSKOSTEN": {
- "Autokostenvergoeding": {},
- "Bedrijfskleding": {},
- "Belastingvrije uitkeringen": {},
- "Bijzondere beloningen": {},
- "Congressen, seminars en symposia": {},
- "Gereedschapsgeld": {},
- "Geschenken personeel": {},
- "Gratificaties": {},
- "Inhouding pensioenpremies": {},
- "Inhouding sociale lasten": {},
- "Kantinekosten": {},
- "Lonen en salarissen": {},
- "Loonwerk": {},
- "Managementvergoedingen": {},
- "Opleidingskosten": {},
- "Oprenting stamrechtverpl.": {},
- "Overhevelingstoeslag": {},
- "Overige kostenverg.": {},
- "Overige personeelskosten": {},
- "Overige uitkeringen": {},
- "Pensioenpremies": {},
- "Provisie 1": {},
- "Reiskosten": {},
- "Rijwielvergoeding": {},
- "Sociale lasten": {},
- "Tanti\u00e8mes": {},
- "Thuiswerkers": {},
- "Toev. Backservice pens.verpl.": {},
- "Toevoeging pensioenverpl.": {},
- "Uitkering ziekengeld": {},
- "Uitzendkrachten": {},
- "Vakantiebonnen": {},
- "Vakantiegeld": {},
- "Vergoeding studiekosten": {},
- "Wervingskosten personeel": {}
- },
- "VERKOOPKOSTEN": {
- "Advertenties": {},
- "Afschrijving dubieuze deb.": {},
- "Beurskosten": {},
- "Etalagekosten": {},
- "Exportkosten": {},
- "Kascorrecties": {},
- "Overige verkoopkosten": {},
- "Provisie": {},
- "Reclame": {},
- "Reis en verblijfkosten": {},
- "Relatiegeschenken": {},
- "Representatiekosten": {},
- "Uitgaande vrachten": {},
- "Veilingkosten": {},
- "Verpakkingsmateriaal 1": {},
- "Websitekosten": {}
- },
- "VERVOERSKOSTEN": {
- "Assuranties auto's": {},
- "Brandstoffen": {},
- "Leasing auto's": {},
- "Onderhoud personenauto's": {},
- "Onderhoud vrachtauto's": {},
- "Overige vervoerskosten": {},
- "Priv\u00e9-gebruik auto's": {},
- "Wegenbelasting": {}
- },
- "root_type": "Expense"
- },
- "TUSSENREKENINGEN": {
- "Betaalwijze cadeaubonnen": {
- "account_type": "Cash"
- },
- "Betaalwijze chipknip": {
- "account_type": "Cash"
- },
- "Betaalwijze contant": {
- "account_type": "Cash"
- },
- "Betaalwijze pin": {
- "account_type": "Cash"
- },
- "Inkopen Nederland hoog": {
- "account_type": "Cash"
- },
- "Inkopen Nederland laag": {
- "account_type": "Cash"
- },
- "Inkopen Nederland onbelast": {
- "account_type": "Cash"
- },
- "Inkopen Nederland overig": {
- "account_type": "Cash"
- },
- "Inkopen Nederland verlegd": {
- "account_type": "Cash"
- },
- "Inkopen binnen EU hoog": {
- "account_type": "Cash"
- },
- "Inkopen binnen EU laag": {
- "account_type": "Cash"
- },
- "Inkopen binnen EU overig": {
- "account_type": "Cash"
- },
- "Inkopen buiten EU hoog": {
- "account_type": "Cash"
- },
- "Inkopen buiten EU laag": {
- "account_type": "Cash"
- },
- "Inkopen buiten EU overig": {
- "account_type": "Cash"
- },
- "Kassa 1": {
- "account_type": "Cash"
- },
- "Kassa 2": {
- "account_type": "Cash"
- },
- "Netto lonen": {
- "account_type": "Cash"
- },
- "Tegenrekening Inkopen": {
- "account_type": "Cash"
- },
- "Tussenrek. autom. betalingen": {
- "account_type": "Cash"
- },
- "Tussenrek. autom. loonbetalingen": {
- "account_type": "Cash"
- },
- "Tussenrek. cadeaubonbetalingen": {
- "account_type": "Cash"
- },
- "Tussenrekening balans": {
- "account_type": "Cash"
- },
- "Tussenrekening chipknip": {
- "account_type": "Cash"
- },
- "Tussenrekening correcties": {
- "account_type": "Cash"
- },
- "Tussenrekening pin": {
- "account_type": "Cash"
- },
- "Vraagposten": {
- "account_type": "Cash"
- },
- "root_type": "Asset"
+ "HUISVESTINGSKOSTEN": {
+ "Assurantie onroerend goed": {},
+ "Belastingen onr. Goed": {},
+ "Energiekosten": {},
+ "Groot onderhoud onr. Goed": {},
+ "Huur": {},
+ "Huurwaarde woongedeelte": {},
+ "Onderhoud onroerend goed": {},
+ "Ontvangen huren": {},
+ "Overige huisvestingskosten": {},
+ "Pacht": {},
+ "Schoonmaakkosten": {},
+ "Toevoeging egalisatieres. Groot onderhoud": {}
+ },
+ "KANTOORKOSTEN": {
+ "Administratiekosten": {},
+ "Contributies/abonnementen": {},
+ "Huur kantoorapparatuur": {},
+ "Internetaansluiting": {},
+ "Kantoorbenodigdh./drukw.": {},
+ "Onderhoud kantoorinvent.": {},
+ "Overige kantoorkosten": {},
+ "Porti": {},
+ "Telefoon/telefax": {}
+ },
+ "OVERIGE BATEN EN LASTEN": {
+ "Betaalde schadevergoed.": {},
+ "Boekverlies vaste activa": {},
+ "Boekwinst van vaste activa": {},
+ "K.O. regeling OB": {},
+ "Kasverschillen": {},
+ "Kosten loonbelasting": {},
+ "Kosten omzetbelasting": {},
+ "Nadelige koersverschillen": {},
+ "Naheffing bedrijfsver.": {},
+ "Ontvangen schadevergoed.": {},
+ "Overige baten": {},
+ "Overige lasten": {},
+ "Voordelige koersverschil.": {}
+ },
+ "PERSONEELSKOSTEN": {
+ "Autokostenvergoeding": {},
+ "Bedrijfskleding": {},
+ "Belastingvrije uitkeringen": {},
+ "Bijzondere beloningen": {},
+ "Congressen, seminars en symposia": {},
+ "Gereedschapsgeld": {},
+ "Geschenken personeel": {},
+ "Gratificaties": {},
+ "Inhouding pensioenpremies": {},
+ "Inhouding sociale lasten": {},
+ "Kantinekosten": {},
+ "Lonen en salarissen": {},
+ "Loonwerk": {},
+ "Managementvergoedingen": {},
+ "Opleidingskosten": {},
+ "Oprenting stamrechtverpl.": {},
+ "Overhevelingstoeslag": {},
+ "Overige kostenverg.": {},
+ "Overige personeelskosten": {},
+ "Overige uitkeringen": {},
+ "Pensioenpremies": {},
+ "Provisie 1": {},
+ "Reiskosten": {},
+ "Rijwielvergoeding": {},
+ "Sociale lasten": {},
+ "Tanti\u00e8mes": {},
+ "Thuiswerkers": {},
+ "Toev. Backservice pens.verpl.": {},
+ "Toevoeging pensioenverpl.": {},
+ "Uitkering ziekengeld": {},
+ "Uitzendkrachten": {},
+ "Vakantiebonnen": {},
+ "Vakantiegeld": {},
+ "Vergoeding studiekosten": {},
+ "Wervingskosten personeel": {}
+ },
+ "VERKOOPKOSTEN": {
+ "Advertenties": {},
+ "Afschrijving dubieuze deb.": {},
+ "Beurskosten": {},
+ "Etalagekosten": {},
+ "Exportkosten": {},
+ "Kascorrecties": {},
+ "Overige verkoopkosten": {},
+ "Provisie": {},
+ "Reclame": {},
+ "Reis en verblijfkosten": {},
+ "Relatiegeschenken": {},
+ "Representatiekosten": {},
+ "Uitgaande vrachten": {},
+ "Veilingkosten": {},
+ "Verpakkingsmateriaal 1": {},
+ "Websitekosten": {}
+ },
+ "VERVOERSKOSTEN": {
+ "Assuranties auto's": {},
+ "Brandstoffen": {},
+ "Leasing auto's": {},
+ "Onderhoud personenauto's": {},
+ "Onderhoud vrachtauto's": {},
+ "Overige vervoerskosten": {},
+ "Priv\u00e9-gebruik auto's": {},
+ "Wegenbelasting": {}
+ },
+ "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
+ "Betalingskort. crediteuren": {},
+ "Garantiekosten": {},
+ "Hulpmaterialen": {},
+ "Inkomende vrachten": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Inkoop import buiten EU hoog": {},
+ "Inkoop import buiten EU laag": {},
+ "Inkoop import buiten EU overig": {},
+ "Inkoopbonussen": {},
+ "Inkoopkosten": {},
+ "Inkoopprovisie": {},
+ "Inkopen BTW verlegd": {},
+ "Inkopen EU hoog tarief": {},
+ "Inkopen EU laag tarief": {},
+ "Inkopen EU overig": {},
+ "Inkopen hoog": {},
+ "Inkopen laag": {},
+ "Inkopen nul": {},
+ "Inkopen overig": {},
+ "Invoerkosten": {},
+ "Kosten inkoopvereniging": {},
+ "Kostprijs omzet grondstoffen": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Kostprijs omzet handelsgoederen": {},
+ "Onttrekking uitgev.garantie": {},
+ "Priv\u00e9-gebruik goederen": {},
+ "Stock aanpassing": {
+ "account_type": "Stock Adjustment"
+ },
+ "Tegenrekening inkoop": {},
+ "Toev. Voorz. incour. grondst.": {},
+ "Toevoeging garantieverpl.": {},
+ "Toevoeging voorz. incour. handelsgoed.": {},
+ "Uitbesteed werk": {},
+ "Voorz. Incourourant grondst.": {},
+ "Voorz.incour. handelsgoed.": {},
+ "root_type": "Expense"
+ },
+ "root_type": "Expense"
+ }
},
"VASTE ACTIVA, EIGEN VERMOGEN, LANGLOPEND VREEMD VERMOGEN EN VOORZIENINGEN": {
"EIGEN VERMOGEN": {
@@ -602,7 +665,7 @@
"account_type": "Equity"
}
},
- "root_type": "Asset"
+ "root_type": "Equity"
},
"VERKOOPRESULTATEN": {
"Diensten fabric. 0% niet-EU": {},
@@ -627,67 +690,6 @@
"Verleende Kredietbep. fabricage": {},
"Verleende Kredietbep. handel": {},
"root_type": "Income"
- },
- "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
- "Betalingskort. crediteuren": {},
- "Garantiekosten": {},
- "Hulpmaterialen": {},
- "Inkomende vrachten": {
- "account_type": "Expenses Included In Valuation"
- },
- "Inkoop import buiten EU hoog": {},
- "Inkoop import buiten EU laag": {},
- "Inkoop import buiten EU overig": {},
- "Inkoopbonussen": {},
- "Inkoopkosten": {},
- "Inkoopprovisie": {},
- "Inkopen BTW verlegd": {},
- "Inkopen EU hoog tarief": {},
- "Inkopen EU laag tarief": {},
- "Inkopen EU overig": {},
- "Inkopen hoog": {},
- "Inkopen laag": {},
- "Inkopen nul": {},
- "Inkopen overig": {},
- "Invoerkosten": {},
- "Kosten inkoopvereniging": {},
- "Kostprijs omzet grondstoffen": {
- "account_type": "Cost of Goods Sold"
- },
- "Kostprijs omzet handelsgoederen": {},
- "Onttrekking uitgev.garantie": {},
- "Priv\u00e9-gebruik goederen": {},
- "Stock aanpassing": {
- "account_type": "Stock Adjustment"
- },
- "Tegenrekening inkoop": {},
- "Toev. Voorz. incour. grondst.": {},
- "Toevoeging garantieverpl.": {},
- "Toevoeging voorz. incour. handelsgoed.": {},
- "Uitbesteed werk": {},
- "Voorz. Incourourant grondst.": {},
- "Voorz.incour. handelsgoed.": {},
- "root_type": "Expense"
- },
- "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
- "Emballage": {},
- "Gereed product 1": {},
- "Gereed product 2": {},
- "Goederen 1": {},
- "Goederen 2": {},
- "Goederen in consignatie": {},
- "Goederen onderweg": {},
- "Grondstoffen 1": {},
- "Grondstoffen 2": {},
- "Halffabrikaten 1": {},
- "Halffabrikaten 2": {},
- "Hulpstoffen 1": {},
- "Hulpstoffen 2": {},
- "Kantoorbenodigdheden": {},
- "Onderhanden werk": {},
- "Verpakkingsmateriaal": {},
- "Zegels": {},
- "root_type": "Asset"
}
}
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/pt_pt_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/pt_pt_chart_template.json
new file mode 100644
index 0000000..9749c79
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/pt_pt_chart_template.json
@@ -0,0 +1,2475 @@
+{
+ "country_code": "pt",
+ "name": "Portugal - Plano de Contas SNC",
+ "tree": {
+ "1 - Meios financeiros l\u00edquidos": {
+ "root_type": "Asset",
+ "Caixa": {
+ "account_number": "11",
+ "account_name": "Caixa",
+ "account_type": "Cash"
+ },
+ "Dep\u00f3sitos \u00e0 ordem": {
+ "account_number": "12",
+ "account_name": "Dep\u00f3sitos \u00e0 ordem",
+ "account_type": "Bank"
+ },
+ "Outros dep\u00f3sitos banc\u00e1rios": {
+ "account_number": "13",
+ "account_name": "Outros dep\u00f3sitos banc\u00e1rios",
+ "account_type": "Cash"
+ },
+ "Outros instrumentos financeiros": {
+ "account_number": "14",
+ "account_name": "Outros instrumentos financeiros",
+ "account_type": "Cash"
+ },
+ "Derivados": {
+ "account_number": "141",
+ "account_name": "Derivados",
+ "account_type": "Cash"
+ },
+ "Potencialmente favor\u00e1veis": {
+ "account_number": "1411",
+ "account_name": "Potencialmente favor\u00e1veis",
+ "account_type": "Cash"
+ },
+ "Potencialmente desfavor\u00e1veis": {
+ "account_number": "1412",
+ "account_name": "Potencialmente desfavor\u00e1veis",
+ "account_type": "Cash"
+ },
+ "Instrumentos financeiros detidos para negocia\u00e7\u00e3o": {
+ "account_number": "142",
+ "account_name": "Instrumentos financeiros detidos para negocia\u00e7\u00e3o",
+ "account_type": "Cash"
+ },
+ "Activos financeiros": {
+ "account_number": "1421",
+ "account_name": "Activos financeiros",
+ "account_type": "Cash"
+ },
+ "Passivos financeiros": {
+ "account_number": "1422",
+ "account_name": "Passivos financeiros",
+ "account_type": "Cash"
+ },
+ "Outros activos e passivos financeiros": {
+ "account_number": "143",
+ "account_name": "Outros activos e passivos financeiros",
+ "account_type": "Cash"
+ },
+ "Outros activos financeiros": {
+ "account_number": "1431",
+ "account_name": "Outros activos financeiros",
+ "account_type": "Cash"
+ },
+ "Outros passivos financeiros": {
+ "account_number": "1432",
+ "account_name": "Outros passivos financeiros",
+ "account_type": "Cash"
+ }
+ },
+ "2 - Contas a receber e a pagar": {
+ "root_type": "Liability",
+ "Clientes": {
+ "account_number": "21",
+ "account_name": "Clientes",
+ "account_type": "Receivable"
+ },
+ "Clientes c/c": {
+ "account_number": "211",
+ "account_name": "Clientes c/c",
+ "account_type": "Receivable"
+ },
+ "Clientes gerais": {
+ "account_number": "2111",
+ "account_name": "Clientes gerais",
+ "account_type": "Receivable"
+ },
+ "Clientes empresa m\u00e3e": {
+ "account_number": "2112",
+ "account_name": "Clientes empresa m\u00e3e",
+ "account_type": "Receivable"
+ },
+ "Clientes empresas subsidi\u00e1rias": {
+ "account_number": "2113",
+ "account_name": "Clientes empresas subsidi\u00e1rias",
+ "account_type": "Receivable"
+ },
+ "Clientes empresas associadas": {
+ "account_number": "2114",
+ "account_name": "Clientes empresas associadas",
+ "account_type": "Receivable"
+ },
+ "Clientes empreendimentos conjuntos": {
+ "account_number": "2115",
+ "account_name": "Clientes empreendimentos conjuntos",
+ "account_type": "Receivable"
+ },
+ "Clientes outras partes relacionadas": {
+ "account_number": "2116",
+ "account_name": "Clientes outras partes relacionadas",
+ "account_type": "Receivable"
+ },
+ "Clientes t\u00edtulos a receber": {
+ "account_number": "212",
+ "account_name": "Clientes t\u00edtulos a receber",
+ "account_type": "Receivable"
+ },
+ "Clientes gerais_2121": {
+ "account_number": "2121",
+ "account_name": "Clientes gerais",
+ "account_type": "Receivable"
+ },
+ "Clientes empresa m\u00e3e_2122": {
+ "account_number": "2122",
+ "account_name": "Clientes empresa m\u00e3e",
+ "account_type": "Receivable"
+ },
+ "Clientes empresas subsidi\u00e1rias_2123": {
+ "account_number": "2123",
+ "account_name": "Clientes empresas subsidi\u00e1rias",
+ "account_type": "Receivable"
+ },
+ "Clientes empresas associadas_2124": {
+ "account_number": "2124",
+ "account_name": "Clientes empresas associadas",
+ "account_type": "Receivable"
+ },
+ "Clientes empreendimentos conjuntos_2125": {
+ "account_number": "2125",
+ "account_name": "Clientes empreendimentos conjuntos",
+ "account_type": "Receivable"
+ },
+ "Clientes outras partes relacionadas_2126": {
+ "account_number": "2126",
+ "account_name": "Clientes outras partes relacionadas",
+ "account_type": "Receivable"
+ },
+ "Adiantamentos de clientes": {
+ "account_number": "218",
+ "account_name": "Adiantamentos de clientes",
+ "account_type": "Receivable"
+ },
+ "Perdas por imparidade acumuladas": {
+ "account_number": "219",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Receivable"
+ },
+ "Fornecedores": {
+ "account_number": "22",
+ "account_name": "Fornecedores",
+ "account_type": "Payable"
+ },
+ "Fornecedores c/c": {
+ "account_number": "221",
+ "account_name": "Fornecedores c/c",
+ "account_type": "Payable"
+ },
+ "Fornecedores gerais": {
+ "account_number": "2211",
+ "account_name": "Fornecedores gerais",
+ "account_type": "Payable"
+ },
+ "Fornecedores empresa m\u00e3e": {
+ "account_number": "2212",
+ "account_name": "Fornecedores empresa m\u00e3e",
+ "account_type": "Payable"
+ },
+ "Fornecedores empresas subsidi\u00e1rias": {
+ "account_number": "2213",
+ "account_name": "Fornecedores empresas subsidi\u00e1rias",
+ "account_type": "Payable"
+ },
+ "Fornecedores empresas associadas": {
+ "account_number": "2214",
+ "account_name": "Fornecedores empresas associadas",
+ "account_type": "Payable"
+ },
+ "Fornecedores empreendimentos conjuntos": {
+ "account_number": "2215",
+ "account_name": "Fornecedores empreendimentos conjuntos",
+ "account_type": "Payable"
+ },
+ "Fornecedores outras partes relacionadas": {
+ "account_number": "2216",
+ "account_name": "Fornecedores outras partes relacionadas",
+ "account_type": "Payable"
+ },
+ "Fornecedores t\u00edtulos a pagar": {
+ "account_number": "222",
+ "account_name": "Fornecedores t\u00edtulos a pagar",
+ "account_type": "Payable"
+ },
+ "Fornecedores gerais_2221": {
+ "account_number": "2221",
+ "account_name": "Fornecedores gerais",
+ "account_type": "Payable"
+ },
+ "Fornecedores empresa m\u00e3e_2222": {
+ "account_number": "2222",
+ "account_name": "Fornecedores empresa m\u00e3e",
+ "account_type": "Payable"
+ },
+ "Fornecedores empresas subsidi\u00e1rias_2223": {
+ "account_number": "2223",
+ "account_name": "Fornecedores empresas subsidi\u00e1rias",
+ "account_type": "Payable"
+ },
+ "Fornecedores empresas associadas_2224": {
+ "account_number": "2224",
+ "account_name": "Fornecedores empresas associadas",
+ "account_type": "Payable"
+ },
+ "Fornecedores empreendimentos conjuntos_2225": {
+ "account_number": "2225",
+ "account_name": "Fornecedores empreendimentos conjuntos",
+ "account_type": "Payable"
+ },
+ "Fornecedores outras partes relacionadas_2226": {
+ "account_number": "2226",
+ "account_name": "Fornecedores outras partes relacionadas",
+ "account_type": "Payable"
+ },
+ "Facturas em recep\u00e7\u00e3o e confer\u00eancia": {
+ "account_number": "225",
+ "account_name": "Facturas em recep\u00e7\u00e3o e confer\u00eancia",
+ "account_type": "Payable"
+ },
+ "Adiantamentos a fornecedores": {
+ "account_number": "228",
+ "account_name": "Adiantamentos a fornecedores",
+ "account_type": "Payable"
+ },
+ "Perdas por imparidade acumuladas_229": {
+ "account_number": "229",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Payable"
+ },
+ "Pessoal": {
+ "account_number": "23",
+ "account_name": "Pessoal",
+ "account_type": "Payable"
+ },
+ "Remunera\u00e7\u00f5es a pagar": {
+ "account_number": "231",
+ "account_name": "Remunera\u00e7\u00f5es a pagar",
+ "account_type": "Payable"
+ },
+ "Aos \u00f3rg\u00e3os sociais": {
+ "account_number": "2311",
+ "account_name": "Aos \u00f3rg\u00e3os sociais",
+ "account_type": "Payable"
+ },
+ "Ao pessoal": {
+ "account_number": "2312",
+ "account_name": "Ao pessoal",
+ "account_type": "Payable"
+ },
+ "Adiantamentos": {
+ "account_number": "232",
+ "account_name": "Adiantamentos",
+ "account_type": "Payable"
+ },
+ "Aos \u00f3rg\u00e3os sociais_2321": {
+ "account_number": "2321",
+ "account_name": "Aos \u00f3rg\u00e3os sociais",
+ "account_type": "Payable"
+ },
+ "Ao pessoal_2322": {
+ "account_number": "2322",
+ "account_name": "Ao pessoal",
+ "account_type": "Payable"
+ },
+ "Cau\u00e7\u00f5es": {
+ "account_number": "237",
+ "account_name": "Cau\u00e7\u00f5es",
+ "account_type": "Payable"
+ },
+ "Dos \u00f3rg\u00e3os sociais": {
+ "account_number": "2371",
+ "account_name": "Dos \u00f3rg\u00e3os sociais",
+ "account_type": "Payable"
+ },
+ "Do pessoal": {
+ "account_number": "2372",
+ "account_name": "Do pessoal",
+ "account_type": "Payable"
+ },
+ "Outras opera\u00e7\u00f5es": {
+ "account_number": "238",
+ "account_name": "Outras opera\u00e7\u00f5es",
+ "account_type": "Payable"
+ },
+ "Com os \u00f3rg\u00e3os sociais": {
+ "account_number": "2381",
+ "account_name": "Com os \u00f3rg\u00e3os sociais",
+ "account_type": "Payable"
+ },
+ "Com o pessoal": {
+ "account_number": "2382",
+ "account_name": "Com o pessoal",
+ "account_type": "Payable"
+ },
+ "Perdas por imparidade acumuladas_239": {
+ "account_number": "239",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Payable"
+ },
+ "Estado e outros entes p\u00fablicos": {
+ "account_number": "24",
+ "account_name": "Estado e outros entes p\u00fablicos",
+ "account_type": "Tax"
+ },
+ "Imposto sobre o rendimento": {
+ "account_number": "241",
+ "account_name": "Imposto sobre o rendimento",
+ "account_type": "Tax"
+ },
+ "Reten\u00e7\u00e3o de impostos sobre rendimentos": {
+ "account_number": "242",
+ "account_name": "Reten\u00e7\u00e3o de impostos sobre rendimentos",
+ "account_type": "Tax"
+ },
+ "Imposto sobre o valor acrescentado": {
+ "account_number": "243",
+ "account_name": "Imposto sobre o valor acrescentado",
+ "account_type": "Tax"
+ },
+ "Iva suportado": {
+ "account_number": "2431",
+ "account_name": "Iva suportado",
+ "account_type": "Tax"
+ },
+ "Iva dedut\u00edvel": {
+ "account_number": "2432",
+ "account_name": "Iva dedut\u00edvel",
+ "account_type": "Tax"
+ },
+ "Iva liquidado": {
+ "account_number": "2433",
+ "account_name": "Iva liquidado",
+ "account_type": "Tax"
+ },
+ "Iva regulariza\u00e7\u00f5es": {
+ "account_number": "2434",
+ "account_name": "Iva regulariza\u00e7\u00f5es",
+ "account_type": "Tax"
+ },
+ "Iva apuramento": {
+ "account_number": "2435",
+ "account_name": "Iva apuramento",
+ "account_type": "Tax"
+ },
+ "Iva a pagar": {
+ "account_number": "2436",
+ "account_name": "Iva a pagar",
+ "account_type": "Tax"
+ },
+ "Iva a recuperar": {
+ "account_number": "2437",
+ "account_name": "Iva a recuperar",
+ "account_type": "Tax"
+ },
+ "Iva reembolsos pedidos": {
+ "account_number": "2438",
+ "account_name": "Iva reembolsos pedidos",
+ "account_type": "Tax"
+ },
+ "Iva liquida\u00e7\u00f5es oficiosas": {
+ "account_number": "2439",
+ "account_name": "Iva liquida\u00e7\u00f5es oficiosas",
+ "account_type": "Tax"
+ },
+ "Outros impostos": {
+ "account_number": "244",
+ "account_name": "Outros impostos",
+ "account_type": "Tax"
+ },
+ "Contribui\u00e7\u00f5es para a seguran\u00e7a social": {
+ "account_number": "245",
+ "account_name": "Contribui\u00e7\u00f5es para a seguran\u00e7a social",
+ "account_type": "Tax"
+ },
+ "Tributos das autarquias locais": {
+ "account_number": "246",
+ "account_name": "Tributos das autarquias locais",
+ "account_type": "Tax"
+ },
+ "Outras tributa\u00e7\u00f5es": {
+ "account_number": "248",
+ "account_name": "Outras tributa\u00e7\u00f5es",
+ "account_type": "Tax"
+ },
+ "Financiamentos obtidos": {
+ "account_number": "25",
+ "account_name": "Financiamentos obtidos",
+ "account_type": "Equity"
+ },
+ "Institui\u00e7\u00f5es de cr\u00e9dito e sociedades financeiras": {
+ "account_number": "251",
+ "account_name": "Institui\u00e7\u00f5es de cr\u00e9dito e sociedades financeiras",
+ "account_type": "Equity"
+ },
+ "Empr\u00e9stimos banc\u00e1rios": {
+ "account_number": "2511",
+ "account_name": "Empr\u00e9stimos banc\u00e1rios",
+ "account_type": "Equity"
+ },
+ "Descobertos banc\u00e1rios": {
+ "account_number": "2512",
+ "account_name": "Descobertos banc\u00e1rios",
+ "account_type": "Equity"
+ },
+ "Loca\u00e7\u00f5es financeiras": {
+ "account_number": "2513",
+ "account_name": "Loca\u00e7\u00f5es financeiras",
+ "account_type": "Equity"
+ },
+ "Mercado de valores mobili\u00e1rios": {
+ "account_number": "252",
+ "account_name": "Mercado de valores mobili\u00e1rios",
+ "account_type": "Equity"
+ },
+ "Empr\u00e9stimos por obriga\u00e7\u00f5es": {
+ "account_number": "2521",
+ "account_name": "Empr\u00e9stimos por obriga\u00e7\u00f5es",
+ "account_type": "Equity"
+ },
+ "Participantes de capital": {
+ "account_number": "253",
+ "account_name": "Participantes de capital",
+ "account_type": "Equity"
+ },
+ "Empresa m\u00e3e suprimentos e outros m\u00fatuos": {
+ "account_number": "2531",
+ "account_name": "Empresa m\u00e3e suprimentos e outros m\u00fatuos",
+ "account_type": "Equity"
+ },
+ "Outros participantes suprimentos e outros m\u00fatuos": {
+ "account_number": "2532",
+ "account_name": "Outros participantes suprimentos e outros m\u00fatuos",
+ "account_type": "Equity"
+ },
+ "Subsidi\u00e1rias, associadas e empreendimentos conjuntos": {
+ "account_number": "254",
+ "account_name": "Subsidi\u00e1rias, associadas e empreendimentos conjuntos",
+ "account_type": "Equity"
+ },
+ "Outros financiadores": {
+ "account_number": "258",
+ "account_name": "Outros financiadores",
+ "account_type": "Equity"
+ },
+ "Accionistas/s\u00f3cios": {
+ "account_number": "26",
+ "account_name": "Accionistas/s\u00f3cios",
+ "account_type": "Equity"
+ },
+ "Accionistas c. subscri\u00e7\u00e3o": {
+ "account_number": "261",
+ "account_name": "Accionistas c. subscri\u00e7\u00e3o",
+ "account_type": "Equity"
+ },
+ "Quotas n\u00e3o liberadas": {
+ "account_number": "262",
+ "account_name": "Quotas n\u00e3o liberadas",
+ "account_type": "Equity"
+ },
+ "Adiantamentos por conta de lucros": {
+ "account_number": "263",
+ "account_name": "Adiantamentos por conta de lucros",
+ "account_type": "Equity"
+ },
+ "Resultados atribu\u00eddos": {
+ "account_number": "264",
+ "account_name": "Resultados atribu\u00eddos",
+ "account_type": "Equity"
+ },
+ "Lucros dispon\u00edveis": {
+ "account_number": "265",
+ "account_name": "Lucros dispon\u00edveis",
+ "account_type": "Equity"
+ },
+ "Empr\u00e9stimos concedidos empresa m\u00e3e": {
+ "account_number": "266",
+ "account_name": "Empr\u00e9stimos concedidos empresa m\u00e3e",
+ "account_type": "Equity"
+ },
+ "Outras opera\u00e7\u00f5es_268": {
+ "account_number": "268",
+ "account_name": "Outras opera\u00e7\u00f5es",
+ "account_type": "Equity"
+ },
+ "Perdas por imparidade acumuladas_269": {
+ "account_number": "269",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Equity"
+ },
+ "Outras contas a receber e a pagar": {
+ "account_number": "27",
+ "account_name": "Outras contas a receber e a pagar",
+ "account_type": "Equity"
+ },
+ "Fornecedores de investimentos": {
+ "account_number": "271",
+ "account_name": "Fornecedores de investimentos",
+ "account_type": "Equity"
+ },
+ "Fornecedores de investimentos contas gerais": {
+ "account_number": "2711",
+ "account_name": "Fornecedores de investimentos contas gerais",
+ "account_type": "Equity"
+ },
+ "Facturas em recep\u00e7\u00e3o e confer\u00eancia_2712": {
+ "account_number": "2712",
+ "account_name": "Facturas em recep\u00e7\u00e3o e confer\u00eancia",
+ "account_type": "Equity"
+ },
+ "Adiantamentos a fornecedores de investimentos": {
+ "account_number": "2713",
+ "account_name": "Adiantamentos a fornecedores de investimentos",
+ "account_type": "Equity"
+ },
+ "Devedores e credores por acr\u00e9scimos": {
+ "account_number": "272",
+ "account_name": "Devedores e credores por acr\u00e9scimos",
+ "account_type": "Equity"
+ },
+ "Devedores por acr\u00e9scimo de rendimentos": {
+ "account_number": "2721",
+ "account_name": "Devedores por acr\u00e9scimo de rendimentos",
+ "account_type": "Equity"
+ },
+ "Credores por acr\u00e9scimos de gastos": {
+ "account_number": "2722",
+ "account_name": "Credores por acr\u00e9scimos de gastos",
+ "account_type": "Equity"
+ },
+ "Benef\u00edcios p\u00f3s emprego": {
+ "account_number": "273",
+ "account_name": "Benef\u00edcios p\u00f3s emprego",
+ "account_type": "Equity"
+ },
+ "Impostos diferidos": {
+ "account_number": "274",
+ "account_name": "Impostos diferidos",
+ "account_type": "Equity"
+ },
+ "Activos por impostos diferidos": {
+ "account_number": "2741",
+ "account_name": "Activos por impostos diferidos",
+ "account_type": "Equity"
+ },
+ "Passivos por impostos diferidos": {
+ "account_number": "2742",
+ "account_name": "Passivos por impostos diferidos",
+ "account_type": "Equity"
+ },
+ "Credores por subscri\u00e7\u00f5es n\u00e3o liberadas": {
+ "account_number": "275",
+ "account_name": "Credores por subscri\u00e7\u00f5es n\u00e3o liberadas",
+ "account_type": "Equity"
+ },
+ "Adiantamentos por conta de vendas": {
+ "account_number": "276",
+ "account_name": "Adiantamentos por conta de vendas",
+ "account_type": "Equity"
+ },
+ "Outros devedores e credores": {
+ "account_number": "278",
+ "account_name": "Outros devedores e credores",
+ "account_type": "Equity"
+ },
+ "Perdas por imparidade acumuladas_279": {
+ "account_number": "279",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Equity"
+ },
+ "Diferimentos": {
+ "account_number": "28",
+ "account_name": "Diferimentos",
+ "account_type": "Equity"
+ },
+ "Gastos a reconhecer": {
+ "account_number": "281",
+ "account_name": "Gastos a reconhecer",
+ "account_type": "Equity"
+ },
+ "Rendimentos a reconhecer": {
+ "account_number": "282",
+ "account_name": "Rendimentos a reconhecer",
+ "account_type": "Equity"
+ },
+ "Provis\u00f5es": {
+ "account_number": "29",
+ "account_name": "Provis\u00f5es",
+ "account_type": "Equity"
+ },
+ "Impostos": {
+ "account_number": "291",
+ "account_name": "Impostos",
+ "account_type": "Equity"
+ },
+ "Garantias a clientes": {
+ "account_number": "292",
+ "account_name": "Garantias a clientes",
+ "account_type": "Equity"
+ },
+ "Processos judiciais em curso": {
+ "account_number": "293",
+ "account_name": "Processos judiciais em curso",
+ "account_type": "Equity"
+ },
+ "Acidentes de trabalho e doen\u00e7as profissionais": {
+ "account_number": "294",
+ "account_name": "Acidentes de trabalho e doen\u00e7as profissionais",
+ "account_type": "Equity"
+ },
+ "Mat\u00e9rias ambientais": {
+ "account_number": "295",
+ "account_name": "Mat\u00e9rias ambientais",
+ "account_type": "Equity"
+ },
+ "Contratos onerosos": {
+ "account_number": "296",
+ "account_name": "Contratos onerosos",
+ "account_type": "Equity"
+ },
+ "Reestrutura\u00e7\u00e3o": {
+ "account_number": "297",
+ "account_name": "Reestrutura\u00e7\u00e3o",
+ "account_type": "Equity"
+ },
+ "Outras provis\u00f5es": {
+ "account_number": "298",
+ "account_name": "Outras provis\u00f5es",
+ "account_type": "Equity"
+ }
+ },
+ "3 - Invent\u00e1rios e activos biol\u00f3gicos": {
+ "root_type": "Expense",
+ "Compras": {
+ "account_number": "31",
+ "account_name": "Compras",
+ "account_type": "Stock"
+ },
+ "Mercadorias": {
+ "account_number": "311",
+ "account_name": "Mercadorias",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo": {
+ "account_number": "312",
+ "account_name": "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo",
+ "account_type": "Expense Account"
+ },
+ "Activos biol\u00f3gicos": {
+ "account_number": "313",
+ "account_name": "Activos biol\u00f3gicos",
+ "account_type": "Expense Account"
+ },
+ "Devolu\u00e7\u00f5es de compras": {
+ "account_number": "317",
+ "account_name": "Devolu\u00e7\u00f5es de compras",
+ "account_type": "Expense Account"
+ },
+ "Descontos e abatimentos em compras": {
+ "account_number": "318",
+ "account_name": "Descontos e abatimentos em compras",
+ "account_type": "Expense Account"
+ },
+ "Mercadorias_32": {
+ "account_number": "32",
+ "account_name": "Mercadorias",
+ "account_type": "Stock"
+ },
+ "Mercadorias em tr\u00e2nsito": {
+ "account_number": "325",
+ "account_name": "Mercadorias em tr\u00e2nsito",
+ "account_type": "Expense Account"
+ },
+ "Mercadorias em poder de terceiros": {
+ "account_number": "326",
+ "account_name": "Mercadorias em poder de terceiros",
+ "account_type": "Expense Account"
+ },
+ "Perdas por imparidade acumuladas_329": {
+ "account_number": "329",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo_33": {
+ "account_number": "33",
+ "account_name": "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias primas": {
+ "account_number": "331",
+ "account_name": "Mat\u00e9rias primas",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias subsidi\u00e1rias": {
+ "account_number": "332",
+ "account_name": "Mat\u00e9rias subsidi\u00e1rias",
+ "account_type": "Expense Account"
+ },
+ "Embalagens": {
+ "account_number": "333",
+ "account_name": "Embalagens",
+ "account_type": "Expense Account"
+ },
+ "Materiais diversos": {
+ "account_number": "334",
+ "account_name": "Materiais diversos",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias em tr\u00e2nsito": {
+ "account_number": "335",
+ "account_name": "Mat\u00e9rias em tr\u00e2nsito",
+ "account_type": "Expense Account"
+ },
+ "Perdas por imparidade acumuladas_339": {
+ "account_number": "339",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Expense Account"
+ },
+ "Produtos acabados e interm\u00e9dios": {
+ "account_number": "34",
+ "account_name": "Produtos acabados e interm\u00e9dios",
+ "account_type": "Expense Account"
+ },
+ "Produtos em poder de terceiros": {
+ "account_number": "346",
+ "account_name": "Produtos em poder de terceiros",
+ "account_type": "Expense Account"
+ },
+ "Perdas por imparidade acumuladas_349": {
+ "account_number": "349",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Expense Account"
+ },
+ "Subprodutos, desperd\u00edcios, res\u00edduos e refugos": {
+ "account_number": "35",
+ "account_name": "Subprodutos, desperd\u00edcios, res\u00edduos e refugos",
+ "account_type": "Expense Account"
+ },
+ "Subprodutos": {
+ "account_number": "351",
+ "account_name": "Subprodutos",
+ "account_type": "Expense Account"
+ },
+ "Desperd\u00edcios, res\u00edduos e refugos": {
+ "account_number": "352",
+ "account_name": "Desperd\u00edcios, res\u00edduos e refugos",
+ "account_type": "Expense Account"
+ },
+ "Perdas por imparidade acumuladas_359": {
+ "account_number": "359",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Expense Account"
+ },
+ "Produtos e trabalhos em curso": {
+ "account_number": "36",
+ "account_name": "Produtos e trabalhos em curso",
+ "account_type": "Capital Work in Progress"
+ },
+ "Activos biol\u00f3gicos_37": {
+ "account_number": "37",
+ "account_name": "Activos biol\u00f3gicos",
+ "account_type": "Expense Account"
+ },
+ "Consum\u00edveis": {
+ "account_number": "371",
+ "account_name": "Consum\u00edveis",
+ "account_type": "Expense Account"
+ },
+ "Animais": {
+ "account_number": "3711",
+ "account_name": "Animais",
+ "account_type": "Expense Account"
+ },
+ "Plantas": {
+ "account_number": "3712",
+ "account_name": "Plantas",
+ "account_type": "Expense Account"
+ },
+ "De produ\u00e7\u00e3o": {
+ "account_number": "372",
+ "account_name": "De produ\u00e7\u00e3o",
+ "account_type": "Expense Account"
+ },
+ "Animais_3721": {
+ "account_number": "3721",
+ "account_name": "Animais",
+ "account_type": "Expense Account"
+ },
+ "Plantas_3722": {
+ "account_number": "3722",
+ "account_name": "Plantas",
+ "account_type": "Expense Account"
+ },
+ "Reclassifica\u00e7\u00e3o e regular. de invent. e activos biol\u00f3g.": {
+ "account_number": "38",
+ "account_name": "Reclassifica\u00e7\u00e3o e regular. de invent. e activos biol\u00f3g.",
+ "account_type": "Stock Adjustment"
+ },
+ "Mercadorias_382": {
+ "account_number": "382",
+ "account_name": "Mercadorias",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo_383": {
+ "account_number": "383",
+ "account_name": "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo",
+ "account_type": "Expense Account"
+ },
+ "Produtos acabados e interm\u00e9dios_384": {
+ "account_number": "384",
+ "account_name": "Produtos acabados e interm\u00e9dios",
+ "account_type": "Expense Account"
+ },
+ "Subprodutos, desperd\u00edcios, res\u00edduos e refugos_385": {
+ "account_number": "385",
+ "account_name": "Subprodutos, desperd\u00edcios, res\u00edduos e refugos",
+ "account_type": "Expense Account"
+ },
+ "Produtos e trabalhos em curso_386": {
+ "account_number": "386",
+ "account_name": "Produtos e trabalhos em curso",
+ "account_type": "Expense Account"
+ },
+ "Activos biol\u00f3gicos_387": {
+ "account_number": "387",
+ "account_name": "Activos biol\u00f3gicos",
+ "account_type": "Expense Account"
+ },
+ "Adiantamentos por conta de compras": {
+ "account_number": "39",
+ "account_name": "Adiantamentos por conta de compras",
+ "account_type": "Expense Account"
+ }
+ },
+
+ "4 - Investimentos": {
+ "root_type": "Asset",
+ "Investimentos financeiros": {
+ "account_number": "41",
+ "account_name": "Investimentos financeiros",
+ "account_type": "Fixed Asset"
+ },
+ "Investimentos em subsidi\u00e1rias": {
+ "account_number": "411",
+ "account_name": "Investimentos em subsidi\u00e1rias",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital m\u00e9todo da equiv. patrimonial": {
+ "account_number": "4111",
+ "account_name": "Participa\u00e7\u00f5es de capital m\u00e9todo da equiv. patrimonial",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital outros m\u00e9todos": {
+ "account_number": "4112",
+ "account_name": "Participa\u00e7\u00f5es de capital outros m\u00e9todos",
+ "account_type": "Fixed Asset"
+ },
+ "Empr\u00e9stimos concedidos": {
+ "account_number": "4113",
+ "account_name": "Empr\u00e9stimos concedidos",
+ "account_type": "Fixed Asset"
+ },
+ "Investimentos em associadas": {
+ "account_number": "412",
+ "account_name": "Investimentos em associadas",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital m\u00e9todo da equiv. patrimonial_4121": {
+ "account_number": "4121",
+ "account_name": "Participa\u00e7\u00f5es de capital m\u00e9todo da equiv. patrimonial",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital outros m\u00e9todos_4122": {
+ "account_number": "4122",
+ "account_name": "Participa\u00e7\u00f5es de capital outros m\u00e9todos",
+ "account_type": "Fixed Asset"
+ },
+ "Empr\u00e9stimos concedidos_4123": {
+ "account_number": "4123",
+ "account_name": "Empr\u00e9stimos concedidos",
+ "account_type": "Fixed Asset"
+ },
+ "Investimentos em entidades conjuntamente controladas": {
+ "account_number": "413",
+ "account_name": "Investimentos em entidades conjuntamente controladas",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital m\u00e9todo da equiv. patrimonial_4131": {
+ "account_number": "4131",
+ "account_name": "Participa\u00e7\u00f5es de capital m\u00e9todo da equiv. patrimonial",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital outros m\u00e9todos_4132": {
+ "account_number": "4132",
+ "account_name": "Participa\u00e7\u00f5es de capital outros m\u00e9todos",
+ "account_type": "Fixed Asset"
+ },
+ "Empr\u00e9stimos concedidos_4133": {
+ "account_number": "4133",
+ "account_name": "Empr\u00e9stimos concedidos",
+ "account_type": "Fixed Asset"
+ },
+ "Investimentos noutras empresas": {
+ "account_number": "414",
+ "account_name": "Investimentos noutras empresas",
+ "account_type": "Fixed Asset"
+ },
+ "Participa\u00e7\u00f5es de capital": {
+ "account_number": "4141",
+ "account_name": "Participa\u00e7\u00f5es de capital",
+ "account_type": "Fixed Asset"
+ },
+ "Empr\u00e9stimos concedidos_4142": {
+ "account_number": "4142",
+ "account_name": "Empr\u00e9stimos concedidos",
+ "account_type": "Fixed Asset"
+ },
+ "Outros investimentos financeiros": {
+ "account_number": "415",
+ "account_name": "Outros investimentos financeiros",
+ "account_type": "Fixed Asset"
+ },
+ "Detidos at\u00e9 \u00e0 maturidade": {
+ "account_number": "4151",
+ "account_name": "Detidos at\u00e9 \u00e0 maturidade",
+ "account_type": "Fixed Asset"
+ },
+ "Ac\u00e7\u00f5es da sgm (6500x1,00)": {
+ "account_number": "4158",
+ "account_name": "Ac\u00e7\u00f5es da sgm (6500x1,00)",
+ "account_type": "Fixed Asset"
+ },
+ "Perdas por imparidade acumuladas_419": {
+ "account_number": "419",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Fixed Asset"
+ },
+ "Propriedades de investimento": {
+ "account_number": "42",
+ "account_name": "Propriedades de investimento",
+ "account_type": "Fixed Asset"
+ },
+ "Terrenos e recursos naturais": {
+ "account_number": "421",
+ "account_name": "Terrenos e recursos naturais",
+ "account_type": "Fixed Asset"
+ },
+ "Edif\u00edcios e outras constru\u00e7\u00f5es": {
+ "account_number": "422",
+ "account_name": "Edif\u00edcios e outras constru\u00e7\u00f5es",
+ "account_type": "Fixed Asset"
+ },
+ "Outras propriedades de investimento": {
+ "account_number": "426",
+ "account_name": "Outras propriedades de investimento",
+ "account_type": "Fixed Asset"
+ },
+ "Deprecia\u00e7\u00f5es acumuladas": {
+ "account_number": "428",
+ "account_name": "Deprecia\u00e7\u00f5es acumuladas",
+ "account_type": "Accumulated Depreciation"
+ },
+ "Perdas por imparidade acumuladas_429": {
+ "account_number": "429",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Fixed Asset"
+ },
+ "Activo fixos tang\u00edveis": {
+ "account_number": "43",
+ "account_name": "Activo fixos tang\u00edveis",
+ "account_type": "Fixed Asset"
+ },
+ "Terrenos e recursos naturais_431": {
+ "account_number": "431",
+ "account_name": "Terrenos e recursos naturais",
+ "account_type": "Fixed Asset"
+ },
+ "Edif\u00edcios e outras constru\u00e7\u00f5es_432": {
+ "account_number": "432",
+ "account_name": "Edif\u00edcios e outras constru\u00e7\u00f5es",
+ "account_type": "Fixed Asset"
+ },
+ "Equipamento b\u00e1sico": {
+ "account_number": "433",
+ "account_name": "Equipamento b\u00e1sico",
+ "account_type": "Fixed Asset"
+ },
+ "Equipamento de transporte": {
+ "account_number": "434",
+ "account_name": "Equipamento de transporte",
+ "account_type": "Fixed Asset"
+ },
+ "Equipamento administrativo": {
+ "account_number": "435",
+ "account_name": "Equipamento administrativo",
+ "account_type": "Fixed Asset"
+ },
+ "Equipamentos biol\u00f3gicos": {
+ "account_number": "436",
+ "account_name": "Equipamentos biol\u00f3gicos",
+ "account_type": "Fixed Asset"
+ },
+ "Outros activos fixos tang\u00edveis": {
+ "account_number": "437",
+ "account_name": "Outros activos fixos tang\u00edveis",
+ "account_type": "Fixed Asset"
+ },
+ "Deprecia\u00e7\u00f5es acumuladas_438": {
+ "account_number": "438",
+ "account_name": "Deprecia\u00e7\u00f5es acumuladas",
+ "account_type": "Accumulated Depreciation"
+ },
+ "Perdas por imparidade acumuladas_439": {
+ "account_number": "439",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Fixed Asset"
+ },
+ "Activos intang\u00edveis": {
+ "account_number": "44",
+ "account_name": "Activos intang\u00edveis",
+ "account_type": "Fixed Asset"
+ },
+ "Goodwill": {
+ "account_number": "441",
+ "account_name": "Goodwill",
+ "account_type": "Fixed Asset"
+ },
+ "Projectos de desenvolvimento": {
+ "account_number": "442",
+ "account_name": "Projectos de desenvolvimento",
+ "account_type": "Fixed Asset"
+ },
+ "Programas de computador": {
+ "account_number": "443",
+ "account_name": "Programas de computador",
+ "account_type": "Fixed Asset"
+ },
+ "Propriedade industrial": {
+ "account_number": "444",
+ "account_name": "Propriedade industrial",
+ "account_type": "Fixed Asset"
+ },
+ "Outros activos intang\u00edveis": {
+ "account_number": "446",
+ "account_name": "Outros activos intang\u00edveis",
+ "account_type": "Fixed Asset"
+ },
+ "Deprecia\u00e7\u00f5es acumuladas_448": {
+ "account_number": "448",
+ "account_name": "Deprecia\u00e7\u00f5es acumuladas",
+ "account_type": "Accumulated Depreciation"
+ },
+ "Perdas por imparidade acumuladas_449": {
+ "account_number": "449",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Fixed Asset"
+ },
+ "Investimentos em curso": {
+ "account_number": "45",
+ "account_name": "Investimentos em curso",
+ "account_type": "Fixed Asset"
+ },
+ "Investimentos financeiros em curso": {
+ "account_number": "451",
+ "account_name": "Investimentos financeiros em curso",
+ "account_type": "Fixed Asset"
+ },
+ "Propriedades de investimento em curso": {
+ "account_number": "452",
+ "account_name": "Propriedades de investimento em curso",
+ "account_type": "Fixed Asset"
+ },
+ "Activos fixos tang\u00edveis em curso": {
+ "account_number": "453",
+ "account_name": "Activos fixos tang\u00edveis em curso",
+ "account_type": "Fixed Asset"
+ },
+ "Activos intang\u00edveis em curso": {
+ "account_number": "454",
+ "account_name": "Activos intang\u00edveis em curso",
+ "account_type": "Fixed Asset"
+ },
+ "Adiantamentos por conta de investimentos": {
+ "account_number": "455",
+ "account_name": "Adiantamentos por conta de investimentos",
+ "account_type": "Fixed Asset"
+ },
+ "Perdas por imparidade acumuladas_459": {
+ "account_number": "459",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Fixed Asset"
+ },
+ "Activos n\u00e3o correntes detidos para venda": {
+ "account_number": "46",
+ "account_name": "Activos n\u00e3o correntes detidos para venda",
+ "account_type": "Fixed Asset"
+ },
+ "Perdas por imparidade acumuladas_469": {
+ "account_number": "469",
+ "account_name": "Perdas por imparidade acumuladas",
+ "account_type": "Fixed Asset"
+ }
+ },
+ "5 - Capital, reservas e resultados transitados": {
+ "root_type": "Equity",
+ "Capital": {
+ "account_number": "51",
+ "account_name": "Capital",
+ "account_type": "Equity"
+ },
+ "Ac\u00e7\u00f5es (quotas) pr\u00f3prias": {
+ "account_number": "52",
+ "account_name": "Ac\u00e7\u00f5es (quotas) pr\u00f3prias",
+ "account_type": "Equity"
+ },
+ "Valor nominal": {
+ "account_number": "521",
+ "account_name": "Valor nominal",
+ "account_type": "Equity"
+ },
+ "Descontos e pr\u00e9mios": {
+ "account_number": "522",
+ "account_name": "Descontos e pr\u00e9mios",
+ "account_type": "Equity"
+ },
+ "Outros instrumentos de capital pr\u00f3prio": {
+ "account_number": "53",
+ "account_name": "Outros instrumentos de capital pr\u00f3prio",
+ "account_type": "Equity"
+ },
+ "Pr\u00e9mios de emiss\u00e3o": {
+ "account_number": "54",
+ "account_name": "Pr\u00e9mios de emiss\u00e3o",
+ "account_type": "Equity"
+ },
+ "Reservas": {
+ "account_number": "55",
+ "account_name": "Reservas",
+ "account_type": "Equity"
+ },
+ "Reservas legais": {
+ "account_number": "551",
+ "account_name": "Reservas legais",
+ "account_type": "Equity"
+ },
+ "Outras reservas": {
+ "account_number": "552",
+ "account_name": "Outras reservas",
+ "account_type": "Equity"
+ },
+ "Resultados transitados": {
+ "account_number": "56",
+ "account_name": "Resultados transitados",
+ "account_type": "Equity"
+ },
+ "Ajustamentos em activos financeiros": {
+ "account_number": "57",
+ "account_name": "Ajustamentos em activos financeiros",
+ "account_type": "Equity"
+ },
+ "Relacionados com o m\u00e9todo da equival\u00eancia patrimonial": {
+ "account_number": "571",
+ "account_name": "Relacionados com o m\u00e9todo da equival\u00eancia patrimonial",
+ "account_type": "Equity"
+ },
+ "Ajustamentos de transi\u00e7\u00e3o": {
+ "account_number": "5711",
+ "account_name": "Ajustamentos de transi\u00e7\u00e3o",
+ "account_type": "Equity"
+ },
+ "Lucros n\u00e3o atribu\u00eddos": {
+ "account_number": "5712",
+ "account_name": "Lucros n\u00e3o atribu\u00eddos",
+ "account_type": "Equity"
+ },
+ "Decorrentes de outras varia\u00e7\u00f5es nos capitais pr\u00f3prios d": {
+ "account_number": "5713",
+ "account_name": "Decorrentes de outras varia\u00e7\u00f5es nos capitais pr\u00f3prios d",
+ "account_type": "Equity"
+ },
+ "Outros": {
+ "account_number": "579",
+ "account_name": "Outros",
+ "account_type": "Equity"
+ },
+ "Excedentes de revalor. de activos fixos tang\u00edveis e int": {
+ "account_number": "58",
+ "account_name": "Excedentes de revalor. de activos fixos tang\u00edveis e int",
+ "account_type": "Equity"
+ },
+ "Reavalia\u00e7\u00f5es decorrentes de diplomas legais": {
+ "account_number": "581",
+ "account_name": "Reavalia\u00e7\u00f5es decorrentes de diplomas legais",
+ "account_type": "Equity"
+ },
+ "Antes de imposto sobre o rendimento": {
+ "account_number": "5811",
+ "account_name": "Antes de imposto sobre o rendimento",
+ "account_type": "Equity"
+ },
+ "Impostos diferidos_5812": {
+ "account_number": "5812",
+ "account_name": "Impostos diferidos",
+ "account_type": "Equity"
+ },
+ "Outros excedentes": {
+ "account_number": "589",
+ "account_name": "Outros excedentes",
+ "account_type": "Equity"
+ },
+ "Antes de imposto sobre o rendimento_5891": {
+ "account_number": "5891",
+ "account_name": "Antes de imposto sobre o rendimento",
+ "account_type": "Equity"
+ },
+ "Impostos diferidos_5892": {
+ "account_number": "5892",
+ "account_name": "Impostos diferidos",
+ "account_type": "Equity"
+ },
+ "Outras varia\u00e7\u00f5es no capital pr\u00f3prio": {
+ "account_number": "59",
+ "account_name": "Outras varia\u00e7\u00f5es no capital pr\u00f3prio",
+ "account_type": "Equity"
+ },
+ "Diferen\u00e7as de convers\u00e3o de demonstra\u00e7\u00f5es financeiras": {
+ "account_number": "591",
+ "account_name": "Diferen\u00e7as de convers\u00e3o de demonstra\u00e7\u00f5es financeiras",
+ "account_type": "Equity"
+ },
+ "Ajustamentos por impostos diferidos": {
+ "account_number": "592",
+ "account_name": "Ajustamentos por impostos diferidos",
+ "account_type": "Equity"
+ },
+ "Subs\u00eddios": {
+ "account_number": "593",
+ "account_name": "Subs\u00eddios",
+ "account_type": "Equity"
+ },
+ "Doa\u00e7\u00f5es": {
+ "account_number": "594",
+ "account_name": "Doa\u00e7\u00f5es",
+ "account_type": "Equity"
+ },
+ "Outras": {
+ "account_number": "599",
+ "account_name": "Outras",
+ "account_type": "Equity"
+ }
+ },
+
+ "6 - Gastos": {
+ "root_type": "Expense",
+ "Custo das mercadorias vendidas e mat\u00e9rias consumidas": {
+ "account_number": "61",
+ "account_name": "Custo das mercadorias vendidas e mat\u00e9rias consumidas",
+ "account_type": "Cost of Goods Sold"
+ },
+ "Mercadorias_611": {
+ "account_number": "611",
+ "account_name": "Mercadorias",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo_612": {
+ "account_number": "612",
+ "account_name": "Mat\u00e9rias primas, subsidi\u00e1rias e de consumo",
+ "account_type": "Expense Account"
+ },
+ "Activos biol\u00f3gicos (compras)": {
+ "account_number": "613",
+ "account_name": "Activos biol\u00f3gicos (compras)",
+ "account_type": "Expense Account"
+ },
+ "Fornecimentos e servi\u00e7os externos": {
+ "account_number": "62",
+ "account_name": "Fornecimentos e servi\u00e7os externos",
+ "account_type": "Expense Account"
+ },
+ "Subcontratos": {
+ "account_number": "621",
+ "account_name": "Subcontratos",
+ "account_type": "Expense Account"
+ },
+ "Trabalhos especializados": {
+ "account_number": "622",
+ "account_name": "Trabalhos especializados",
+ "account_type": "Expense Account"
+ },
+ "Trabalhos especializados_6221": {
+ "account_number": "6221",
+ "account_name": "Trabalhos especializados",
+ "account_type": "Expense Account"
+ },
+ "Publicidade e propaganda": {
+ "account_number": "6222",
+ "account_name": "Publicidade e propaganda",
+ "account_type": "Expense Account"
+ },
+ "Vigil\u00e2ncia e seguran\u00e7a": {
+ "account_number": "6223",
+ "account_name": "Vigil\u00e2ncia e seguran\u00e7a",
+ "account_type": "Expense Account"
+ },
+ "Honor\u00e1rios": {
+ "account_number": "6224",
+ "account_name": "Honor\u00e1rios",
+ "account_type": "Expense Account"
+ },
+ "Comiss\u00f5es": {
+ "account_number": "6225",
+ "account_name": "Comiss\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Conserva\u00e7\u00e3o e repara\u00e7\u00e3o": {
+ "account_number": "6226",
+ "account_name": "Conserva\u00e7\u00e3o e repara\u00e7\u00e3o",
+ "account_type": "Expense Account"
+ },
+ "Outros_6228": {
+ "account_number": "6228",
+ "account_name": "Outros",
+ "account_type": "Expense Account"
+ },
+ "Materiais": {
+ "account_number": "623",
+ "account_name": "Materiais",
+ "account_type": "Expense Account"
+ },
+ "Ferramentas e utens\u00edlios de desgaste r\u00e1pido": {
+ "account_number": "6231",
+ "account_name": "Ferramentas e utens\u00edlios de desgaste r\u00e1pido",
+ "account_type": "Expense Account"
+ },
+ "Livros de documenta\u00e7\u00e3o t\u00e9cnica": {
+ "account_number": "6232",
+ "account_name": "Livros de documenta\u00e7\u00e3o t\u00e9cnica",
+ "account_type": "Expense Account"
+ },
+ "Material de escrit\u00f3rio": {
+ "account_number": "6233",
+ "account_name": "Material de escrit\u00f3rio",
+ "account_type": "Expense Account"
+ },
+ "Artigos de oferta": {
+ "account_number": "6234",
+ "account_name": "Artigos de oferta",
+ "account_type": "Expense Account"
+ },
+ "Outros_6238": {
+ "account_number": "6238",
+ "account_name": "Outros",
+ "account_type": "Expense Account"
+ },
+ "Energia e flu\u00eddos": {
+ "account_number": "624",
+ "account_name": "Energia e flu\u00eddos",
+ "account_type": "Expense Account"
+ },
+ "Electricidade": {
+ "account_number": "6241",
+ "account_name": "Electricidade",
+ "account_type": "Expense Account"
+ },
+ "Combust\u00edveis": {
+ "account_number": "6242",
+ "account_name": "Combust\u00edveis",
+ "account_type": "Expense Account"
+ },
+ "\u00c1gua": {
+ "account_number": "6243",
+ "account_name": "\u00c1gua",
+ "account_type": "Expense Account"
+ },
+ "Outros_6248": {
+ "account_number": "6248",
+ "account_name": "Outros",
+ "account_type": "Expense Account"
+ },
+ "Desloca\u00e7\u00f5es, estadas e transportes": {
+ "account_number": "625",
+ "account_name": "Desloca\u00e7\u00f5es, estadas e transportes",
+ "account_type": "Expense Account"
+ },
+ "Desloca\u00e7\u00f5es e estadas": {
+ "account_number": "6251",
+ "account_name": "Desloca\u00e7\u00f5es e estadas",
+ "account_type": "Expense Account"
+ },
+ "Transporte de pessoal": {
+ "account_number": "6252",
+ "account_name": "Transporte de pessoal",
+ "account_type": "Expense Account"
+ },
+ "Transportes de mercadorias": {
+ "account_number": "6253",
+ "account_name": "Transportes de mercadorias",
+ "account_type": "Expense Account"
+ },
+ "Outros_6258": {
+ "account_number": "6258",
+ "account_name": "Outros",
+ "account_type": "Expense Account"
+ },
+ "Servi\u00e7os diversos": {
+ "account_number": "626",
+ "account_name": "Servi\u00e7os diversos",
+ "account_type": "Expense Account"
+ },
+ "Rendas e alugueres": {
+ "account_number": "6261",
+ "account_name": "Rendas e alugueres",
+ "account_type": "Expense Account"
+ },
+ "Comunica\u00e7\u00e3o": {
+ "account_number": "6262",
+ "account_name": "Comunica\u00e7\u00e3o",
+ "account_type": "Expense Account"
+ },
+ "Seguros": {
+ "account_number": "6263",
+ "account_name": "Seguros",
+ "account_type": "Expense Account"
+ },
+ "Royalties": {
+ "account_number": "6264",
+ "account_name": "Royalties",
+ "account_type": "Expense Account"
+ },
+ "Contencioso e notariado": {
+ "account_number": "6265",
+ "account_name": "Contencioso e notariado",
+ "account_type": "Expense Account"
+ },
+ "Despesas de representa\u00e7\u00e3o": {
+ "account_number": "6266",
+ "account_name": "Despesas de representa\u00e7\u00e3o",
+ "account_type": "Expense Account"
+ },
+ "Limpeza, higiene e conforto": {
+ "account_number": "6267",
+ "account_name": "Limpeza, higiene e conforto",
+ "account_type": "Expense Account"
+ },
+ "Outros servi\u00e7os": {
+ "account_number": "6268",
+ "account_name": "Outros servi\u00e7os",
+ "account_type": "Expense Account"
+ },
+ "Gastos com o pessoal": {
+ "account_number": "63",
+ "account_name": "Gastos com o pessoal",
+ "account_type": "Expense Account"
+ },
+ "Remunera\u00e7\u00f5es dos \u00f3rg\u00e3os sociais": {
+ "account_number": "631",
+ "account_name": "Remunera\u00e7\u00f5es dos \u00f3rg\u00e3os sociais",
+ "account_type": "Expense Account"
+ },
+ "Remunera\u00e7\u00f5es do pessoal": {
+ "account_number": "632",
+ "account_name": "Remunera\u00e7\u00f5es do pessoal",
+ "account_type": "Expense Account"
+ },
+ "Benef\u00edcios p\u00f3s emprego_633": {
+ "account_number": "633",
+ "account_name": "Benef\u00edcios p\u00f3s emprego",
+ "account_type": "Expense Account"
+ },
+ "Pr\u00e9mios para pens\u00f5es": {
+ "account_number": "6331",
+ "account_name": "Pr\u00e9mios para pens\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Outros benef\u00edcios": {
+ "account_number": "6332",
+ "account_name": "Outros benef\u00edcios",
+ "account_type": "Expense Account"
+ },
+ "Indemniza\u00e7\u00f5es": {
+ "account_number": "634",
+ "account_name": "Indemniza\u00e7\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Encargos sobre remunera\u00e7\u00f5es": {
+ "account_number": "635",
+ "account_name": "Encargos sobre remunera\u00e7\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Seguros de acidentes no trabalho e doen\u00e7as profissionais": {
+ "account_number": "636",
+ "account_name": "Seguros de acidentes no trabalho e doen\u00e7as profissionais",
+ "account_type": "Expense Account"
+ },
+ "Gastos de ac\u00e7\u00e3o social": {
+ "account_number": "637",
+ "account_name": "Gastos de ac\u00e7\u00e3o social",
+ "account_type": "Expense Account"
+ },
+ "Outros gastos com o pessoal": {
+ "account_number": "638",
+ "account_name": "Outros gastos com o pessoal",
+ "account_type": "Expense Account"
+ },
+ "Gastos de deprecia\u00e7\u00e3o e de amortiza\u00e7\u00e3o": {
+ "account_number": "64",
+ "account_name": "Gastos de deprecia\u00e7\u00e3o e de amortiza\u00e7\u00e3o",
+ "account_type": "Depreciation"
+ },
+ "Propriedades de investimento_641": {
+ "account_number": "641",
+ "account_name": "Propriedades de investimento",
+ "account_type": "Expense Account"
+ },
+ "Activos fixos tang\u00edveis": {
+ "account_number": "642",
+ "account_name": "Activos fixos tang\u00edveis",
+ "account_type": "Expense Account"
+ },
+ "Activos intang\u00edveis_643": {
+ "account_number": "643",
+ "account_name": "Activos intang\u00edveis",
+ "account_type": "Expense Account"
+ },
+ "Perdas por imparidade": {
+ "account_number": "65",
+ "account_name": "Perdas por imparidade",
+ "account_type": "Expense Account"
+ },
+ "Em d\u00edvidas a receber": {
+ "account_number": "651",
+ "account_name": "Em d\u00edvidas a receber",
+ "account_type": "Expense Account"
+ },
+ "Clientes_6511": {
+ "account_number": "6511",
+ "account_name": "Clientes",
+ "account_type": "Expense Account"
+ },
+ "Outros devedores": {
+ "account_number": "6512",
+ "account_name": "Outros devedores",
+ "account_type": "Expense Account"
+ },
+ "Em invent\u00e1rios": {
+ "account_number": "652",
+ "account_name": "Em invent\u00e1rios",
+ "account_type": "Expense Account"
+ },
+ "Em investimentos financeiros": {
+ "account_number": "653",
+ "account_name": "Em investimentos financeiros",
+ "account_type": "Expense Account"
+ },
+ "Em propriedades de investimento": {
+ "account_number": "654",
+ "account_name": "Em propriedades de investimento",
+ "account_type": "Expense Account"
+ },
+ "Em activos fixos tang\u00edveis": {
+ "account_number": "655",
+ "account_name": "Em activos fixos tang\u00edveis",
+ "account_type": "Expense Account"
+ },
+ "Em activos intang\u00edveis": {
+ "account_number": "656",
+ "account_name": "Em activos intang\u00edveis",
+ "account_type": "Expense Account"
+ },
+ "Em investimentos em curso": {
+ "account_number": "657",
+ "account_name": "Em investimentos em curso",
+ "account_type": "Expense Account"
+ },
+ "Em activos n\u00e3o correntes detidos para venda": {
+ "account_number": "658",
+ "account_name": "Em activos n\u00e3o correntes detidos para venda",
+ "account_type": "Expense Account"
+ },
+ "Perdas por redu\u00e7\u00f5es de justo valor": {
+ "account_number": "66",
+ "account_name": "Perdas por redu\u00e7\u00f5es de justo valor",
+ "account_type": "Expense Account"
+ },
+ "Em instrumentos financeiros": {
+ "account_number": "661",
+ "account_name": "Em instrumentos financeiros",
+ "account_type": "Expense Account"
+ },
+ "Em investimentos financeiros_662": {
+ "account_number": "662",
+ "account_name": "Em investimentos financeiros",
+ "account_type": "Expense Account"
+ },
+ "Em propriedades de investimento_663": {
+ "account_number": "663",
+ "account_name": "Em propriedades de investimento",
+ "account_type": "Expense Account"
+ },
+ "Em activos biol\u00f3gicos": {
+ "account_number": "664",
+ "account_name": "Em activos biol\u00f3gicos",
+ "account_type": "Expense Account"
+ },
+ "Provis\u00f5es do per\u00edodo": {
+ "account_number": "67",
+ "account_name": "Provis\u00f5es do per\u00edodo",
+ "account_type": "Expense Account"
+ },
+ "Impostos_671": {
+ "account_number": "671",
+ "account_name": "Impostos",
+ "account_type": "Expense Account"
+ },
+ "Garantias a clientes_672": {
+ "account_number": "672",
+ "account_name": "Garantias a clientes",
+ "account_type": "Expense Account"
+ },
+ "Processos judiciais em curso_673": {
+ "account_number": "673",
+ "account_name": "Processos judiciais em curso",
+ "account_type": "Expense Account"
+ },
+ "Acidentes de trabalho e doen\u00e7as profissionais_674": {
+ "account_number": "674",
+ "account_name": "Acidentes de trabalho e doen\u00e7as profissionais",
+ "account_type": "Expense Account"
+ },
+ "Mat\u00e9rias ambientais_675": {
+ "account_number": "675",
+ "account_name": "Mat\u00e9rias ambientais",
+ "account_type": "Expense Account"
+ },
+ "Contratos onerosos_676": {
+ "account_number": "676",
+ "account_name": "Contratos onerosos",
+ "account_type": "Expense Account"
+ },
+ "Reestrutura\u00e7\u00e3o_677": {
+ "account_number": "677",
+ "account_name": "Reestrutura\u00e7\u00e3o",
+ "account_type": "Expense Account"
+ },
+ "Outras provis\u00f5es_678": {
+ "account_number": "678",
+ "account_name": "Outras provis\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Outros gastos e perdas": {
+ "account_number": "68",
+ "account_name": "Outros gastos e perdas",
+ "account_type": "Expense Account"
+ },
+ "Impostos_681": {
+ "account_number": "681",
+ "account_name": "Impostos",
+ "account_type": "Expense Account"
+ },
+ "Impostos directos": {
+ "account_number": "6811",
+ "account_name": "Impostos directos",
+ "account_type": "Expense Account"
+ },
+ "Impostos indirectos": {
+ "account_number": "6812",
+ "account_name": "Impostos indirectos",
+ "account_type": "Expense Account"
+ },
+ "Taxas": {
+ "account_number": "6813",
+ "account_name": "Taxas",
+ "account_type": "Expense Account"
+ },
+ "Descontos de pronto pagamento concedidos": {
+ "account_number": "682",
+ "account_name": "Descontos de pronto pagamento concedidos",
+ "account_type": "Expense Account"
+ },
+ "D\u00edvidas incobr\u00e1veis": {
+ "account_number": "683",
+ "account_name": "D\u00edvidas incobr\u00e1veis",
+ "account_type": "Expense Account"
+ },
+ "Perdas em invent\u00e1rios": {
+ "account_number": "684",
+ "account_name": "Perdas em invent\u00e1rios",
+ "account_type": "Expense Account"
+ },
+ "Sinistros": {
+ "account_number": "6841",
+ "account_name": "Sinistros",
+ "account_type": "Expense Account"
+ },
+ "Quebras": {
+ "account_number": "6842",
+ "account_name": "Quebras",
+ "account_type": "Expense Account"
+ },
+ "Outras perdas": {
+ "account_number": "6848",
+ "account_name": "Outras perdas",
+ "account_type": "Expense Account"
+ },
+ "Gastos e perdas em subsid. , assoc. e empreend. conjuntos": {
+ "account_number": "685",
+ "account_name": "Gastos e perdas em subsid. , assoc. e empreend. conjuntos",
+ "account_type": "Expense Account"
+ },
+ "Cobertura de preju\u00edzos": {
+ "account_number": "6851",
+ "account_name": "Cobertura de preju\u00edzos",
+ "account_type": "Expense Account"
+ },
+ "Aplica\u00e7\u00e3o do m\u00e9todo da equival\u00eancia patrimonial": {
+ "account_number": "6852",
+ "account_name": "Aplica\u00e7\u00e3o do m\u00e9todo da equival\u00eancia patrimonial",
+ "account_type": "Expense Account"
+ },
+ "Aliena\u00e7\u00f5es": {
+ "account_number": "6853",
+ "account_name": "Aliena\u00e7\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Outros gastos e perdas_6858": {
+ "account_number": "6858",
+ "account_name": "Outros gastos e perdas",
+ "account_type": "Expense Account"
+ },
+ "Gastos e perdas nos restantes investimentos financeiros": {
+ "account_number": "686",
+ "account_name": "Gastos e perdas nos restantes investimentos financeiros",
+ "account_type": "Expense Account"
+ },
+ "Cobertura de preju\u00edzos_6861": {
+ "account_number": "6861",
+ "account_name": "Cobertura de preju\u00edzos",
+ "account_type": "Expense Account"
+ },
+ "Aliena\u00e7\u00f5es_6862": {
+ "account_number": "6862",
+ "account_name": "Aliena\u00e7\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Outros gastos e perdas_6868": {
+ "account_number": "6868",
+ "account_name": "Outros gastos e perdas",
+ "account_type": "Expense Account"
+ },
+ "Gastos e perdas em investimentos n\u00e3o financeiros": {
+ "account_number": "687",
+ "account_name": "Gastos e perdas em investimentos n\u00e3o financeiros",
+ "account_type": "Expense Account"
+ },
+ "Aliena\u00e7\u00f5es_6871": {
+ "account_number": "6871",
+ "account_name": "Aliena\u00e7\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Sinistros_6872": {
+ "account_number": "6872",
+ "account_name": "Sinistros",
+ "account_type": "Expense Account"
+ },
+ "Abates": {
+ "account_number": "6873",
+ "account_name": "Abates",
+ "account_type": "Expense Account"
+ },
+ "Gastos em propriedades de investimento": {
+ "account_number": "6874",
+ "account_name": "Gastos em propriedades de investimento",
+ "account_type": "Expense Account"
+ },
+ "Outros gastos e perdas_6878": {
+ "account_number": "6878",
+ "account_name": "Outros gastos e perdas",
+ "account_type": "Expense Account"
+ },
+ "Outros_688": {
+ "account_number": "688",
+ "account_name": "Outros",
+ "account_type": "Expense Account"
+ },
+ "Correc\u00e7\u00f5es relativas a per\u00edodos anteriores": {
+ "account_number": "6881",
+ "account_name": "Correc\u00e7\u00f5es relativas a per\u00edodos anteriores",
+ "account_type": "Expense Account"
+ },
+ "Donativos": {
+ "account_number": "6882",
+ "account_name": "Donativos",
+ "account_type": "Expense Account"
+ },
+ "Quotiza\u00e7\u00f5es": {
+ "account_number": "6883",
+ "account_name": "Quotiza\u00e7\u00f5es",
+ "account_type": "Expense Account"
+ },
+ "Ofertas e amostras de invent\u00e1rios": {
+ "account_number": "6884",
+ "account_name": "Ofertas e amostras de invent\u00e1rios",
+ "account_type": "Expense Account"
+ },
+ "Insufici\u00eancia da estimativa para impostos": {
+ "account_number": "6885",
+ "account_name": "Insufici\u00eancia da estimativa para impostos",
+ "account_type": "Expense Account"
+ },
+ "Perdas em instrumentos financeiros": {
+ "account_number": "6886",
+ "account_name": "Perdas em instrumentos financeiros",
+ "account_type": "Expense Account"
+ },
+ "Outros n\u00e3o especificados": {
+ "account_number": "6888",
+ "account_name": "Outros n\u00e3o especificados",
+ "account_type": "Expense Account"
+ },
+ "Gastos e perdas de financiamento": {
+ "account_number": "69",
+ "account_name": "Gastos e perdas de financiamento",
+ "account_type": "Expense Account"
+ },
+ "Juros suportados": {
+ "account_number": "691",
+ "account_name": "Juros suportados",
+ "account_type": "Expense Account"
+ },
+ "Juros de financiamento obtidos": {
+ "account_number": "6911",
+ "account_name": "Juros de financiamento obtidos",
+ "account_type": "Expense Account"
+ },
+ "Outros juros": {
+ "account_number": "6918",
+ "account_name": "Outros juros",
+ "account_type": "Expense Account"
+ },
+ "Diferen\u00e7as de c\u00e2mbio desfavor\u00e1veis": {
+ "account_number": "692",
+ "account_name": "Diferen\u00e7as de c\u00e2mbio desfavor\u00e1veis",
+ "account_type": "Expense Account"
+ },
+ "Relativos a financiamentos obtidos": {
+ "account_number": "6921",
+ "account_name": "Relativos a financiamentos obtidos",
+ "account_type": "Expense Account"
+ },
+ "Outras_6928": {
+ "account_number": "6928",
+ "account_name": "Outras",
+ "account_type": "Expense Account"
+ },
+ "Outros gastos e perdas de financiamento": {
+ "account_number": "698",
+ "account_name": "Outros gastos e perdas de financiamento",
+ "account_type": "Expense Account"
+ },
+ "Relativos a financiamentos obtidos_6981": {
+ "account_number": "6981",
+ "account_name": "Relativos a financiamentos obtidos",
+ "account_type": "Expense Account"
+ },
+ "Outros_6988": {
+ "account_number": "6988",
+ "account_name": "Outros",
+ "account_type": "Expense Account"
+ }
+ },
+ "7 - Rendimentos": {
+ "root_type": "Income",
+ "Vendas": {
+ "account_number": "71",
+ "account_name": "Vendas",
+ "account_type": "Income Account"
+ },
+ "Mercadoria": {
+ "account_number": "711",
+ "account_name": "Mercadoria",
+ "account_type": "Income Account"
+ },
+ "Produtos acabados e interm\u00e9dios_712": {
+ "account_number": "712",
+ "account_name": "Produtos acabados e interm\u00e9dios",
+ "account_type": "Income Account"
+ },
+ "Subprodutos, desperd\u00edcios, res\u00edduos e refugos_713": {
+ "account_number": "713",
+ "account_name": "Subprodutos, desperd\u00edcios, res\u00edduos e refugos",
+ "account_type": "Income Account"
+ },
+ "Activos biol\u00f3gicos_714": {
+ "account_number": "714",
+ "account_name": "Activos biol\u00f3gicos",
+ "account_type": "Income Account"
+ },
+ "Iva das vendas com imposto inclu\u00eddo": {
+ "account_number": "716",
+ "account_name": "Iva das vendas com imposto inclu\u00eddo",
+ "account_type": "Income Account"
+ },
+ "Devolu\u00e7\u00f5es de vendas": {
+ "account_number": "717",
+ "account_name": "Devolu\u00e7\u00f5es de vendas",
+ "account_type": "Income Account"
+ },
+ "Descontos e abatimentos em vendas": {
+ "account_number": "718",
+ "account_name": "Descontos e abatimentos em vendas",
+ "account_type": "Income Account"
+ },
+ "Presta\u00e7\u00f5es de servi\u00e7os": {
+ "account_number": "72",
+ "account_name": "Presta\u00e7\u00f5es de servi\u00e7os",
+ "account_type": "Income Account"
+ },
+ "Servi\u00e7o a": {
+ "account_number": "721",
+ "account_name": "Servi\u00e7o a",
+ "account_type": "Income Account"
+ },
+ "Servi\u00e7o b": {
+ "account_number": "722",
+ "account_name": "Servi\u00e7o b",
+ "account_type": "Income Account"
+ },
+ "Servi\u00e7os secund\u00e1rios": {
+ "account_number": "725",
+ "account_name": "Servi\u00e7os secund\u00e1rios",
+ "account_type": "Income Account"
+ },
+ "Iva dos servi\u00e7os com imposto inclu\u00eddo": {
+ "account_number": "726",
+ "account_name": "Iva dos servi\u00e7os com imposto inclu\u00eddo",
+ "account_type": "Income Account"
+ },
+ "Descontos e abatimentos": {
+ "account_number": "728",
+ "account_name": "Descontos e abatimentos",
+ "account_type": "Income Account"
+ },
+ "Varia\u00e7\u00f5es nos invent\u00e1rios da produ\u00e7\u00e3o": {
+ "account_number": "73",
+ "account_name": "Varia\u00e7\u00f5es nos invent\u00e1rios da produ\u00e7\u00e3o",
+ "account_type": "Income Account"
+ },
+ "Produtos acabados e interm\u00e9dios_731": {
+ "account_number": "731",
+ "account_name": "Produtos acabados e interm\u00e9dios",
+ "account_type": "Income Account"
+ },
+ "Subprodutos, desperd\u00edcios, res\u00edduos e refugos_732": {
+ "account_number": "732",
+ "account_name": "Subprodutos, desperd\u00edcios, res\u00edduos e refugos",
+ "account_type": "Income Account"
+ },
+ "Produtos e trabalhos em curso_733": {
+ "account_number": "733",
+ "account_name": "Produtos e trabalhos em curso",
+ "account_type": "Income Account"
+ },
+ "Activos biol\u00f3gicos_734": {
+ "account_number": "734",
+ "account_name": "Activos biol\u00f3gicos",
+ "account_type": "Income Account"
+ },
+ "Trabalhos para a pr\u00f3pria entidade": {
+ "account_number": "74",
+ "account_name": "Trabalhos para a pr\u00f3pria entidade",
+ "account_type": "Income Account"
+ },
+ "Activos fixos tang\u00edveis_741": {
+ "account_number": "741",
+ "account_name": "Activos fixos tang\u00edveis",
+ "account_type": "Income Account"
+ },
+ "Activos intang\u00edveis_742": {
+ "account_number": "742",
+ "account_name": "Activos intang\u00edveis",
+ "account_type": "Income Account"
+ },
+ "Propriedades de investimento_743": {
+ "account_number": "743",
+ "account_name": "Propriedades de investimento",
+ "account_type": "Income Account"
+ },
+ "Activos por gastos diferidos": {
+ "account_number": "744",
+ "account_name": "Activos por gastos diferidos",
+ "account_type": "Income Account"
+ },
+ "Subs\u00eddios \u00e0 explora\u00e7\u00e3o": {
+ "account_number": "75",
+ "account_name": "Subs\u00eddios \u00e0 explora\u00e7\u00e3o",
+ "account_type": "Income Account"
+ },
+ "Subs\u00eddios do estado e outros entes p\u00fablicos": {
+ "account_number": "751",
+ "account_name": "Subs\u00eddios do estado e outros entes p\u00fablicos",
+ "account_type": "Income Account"
+ },
+ "Subs\u00eddios de outras entidades": {
+ "account_number": "752",
+ "account_name": "Subs\u00eddios de outras entidades",
+ "account_type": "Income Account"
+ },
+ "Revers\u00f5es": {
+ "account_number": "76",
+ "account_name": "Revers\u00f5es",
+ "account_type": "Income Account"
+ },
+ "De deprecia\u00e7\u00f5es e de amortiza\u00e7\u00f5es": {
+ "account_number": "761",
+ "account_name": "De deprecia\u00e7\u00f5es e de amortiza\u00e7\u00f5es",
+ "account_type": "Income Account"
+ },
+ "Propriedades de investimento_7611": {
+ "account_number": "7611",
+ "account_name": "Propriedades de investimento",
+ "account_type": "Income Account"
+ },
+ "Activos fixos tang\u00edveis_7612": {
+ "account_number": "7612",
+ "account_name": "Activos fixos tang\u00edveis",
+ "account_type": "Income Account"
+ },
+ "Activos intang\u00edveis_7613": {
+ "account_number": "7613",
+ "account_name": "Activos intang\u00edveis",
+ "account_type": "Income Account"
+ },
+ "De perdas por imparidade": {
+ "account_number": "762",
+ "account_name": "De perdas por imparidade",
+ "account_type": "Income Account"
+ },
+ "Em d\u00edvidas a receber_7621": {
+ "account_number": "7621",
+ "account_name": "Em d\u00edvidas a receber",
+ "account_type": "Income Account"
+ },
+ "Clientes_76211": {
+ "account_number": "76211",
+ "account_name": "Clientes",
+ "account_type": "Income Account"
+ },
+ "Outros devedores_76212": {
+ "account_number": "76212",
+ "account_name": "Outros devedores",
+ "account_type": "Income Account"
+ },
+ "Em invent\u00e1rios_7622": {
+ "account_number": "7622",
+ "account_name": "Em invent\u00e1rios",
+ "account_type": "Income Account"
+ },
+ "Em investimentos financeiros_7623": {
+ "account_number": "7623",
+ "account_name": "Em investimentos financeiros",
+ "account_type": "Income Account"
+ },
+ "Em propriedades de investimento_7624": {
+ "account_number": "7624",
+ "account_name": "Em propriedades de investimento",
+ "account_type": "Income Account"
+ },
+ "Em activos fixos tang\u00edveis_7625": {
+ "account_number": "7625",
+ "account_name": "Em activos fixos tang\u00edveis",
+ "account_type": "Income Account"
+ },
+ "Em activos intang\u00edveis_7626": {
+ "account_number": "7626",
+ "account_name": "Em activos intang\u00edveis",
+ "account_type": "Income Account"
+ },
+ "Em investimentos em curso_7627": {
+ "account_number": "7627",
+ "account_name": "Em investimentos em curso",
+ "account_type": "Income Account"
+ },
+ "Em activos n\u00e3o correntes detidos para venda_7628": {
+ "account_number": "7628",
+ "account_name": "Em activos n\u00e3o correntes detidos para venda",
+ "account_type": "Income Account"
+ },
+ "De provis\u00f5es": {
+ "account_number": "763",
+ "account_name": "De provis\u00f5es",
+ "account_type": "Income Account"
+ },
+ "Impostos_7631": {
+ "account_number": "7631",
+ "account_name": "Impostos",
+ "account_type": "Income Account"
+ },
+ "Garantias a clientes_7632": {
+ "account_number": "7632",
+ "account_name": "Garantias a clientes",
+ "account_type": "Income Account"
+ },
+ "Processos judiciais em curso_7633": {
+ "account_number": "7633",
+ "account_name": "Processos judiciais em curso",
+ "account_type": "Income Account"
+ },
+ "Acidentes no trabalho e doen\u00e7as profissionais": {
+ "account_number": "7634",
+ "account_name": "Acidentes no trabalho e doen\u00e7as profissionais",
+ "account_type": "Income Account"
+ },
+ "Mat\u00e9rias ambientais_7635": {
+ "account_number": "7635",
+ "account_name": "Mat\u00e9rias ambientais",
+ "account_type": "Income Account"
+ },
+ "Contratos onerosos_7636": {
+ "account_number": "7636",
+ "account_name": "Contratos onerosos",
+ "account_type": "Income Account"
+ },
+ "Reestrutura\u00e7\u00e3o_7637": {
+ "account_number": "7637",
+ "account_name": "Reestrutura\u00e7\u00e3o",
+ "account_type": "Income Account"
+ },
+ "Outras provis\u00f5es_7638": {
+ "account_number": "7638",
+ "account_name": "Outras provis\u00f5es",
+ "account_type": "Income Account"
+ },
+ "Ganhos por aumentos de justo valor": {
+ "account_number": "77",
+ "account_name": "Ganhos por aumentos de justo valor",
+ "account_type": "Income Account"
+ },
+ "Em instrumentos financeiros_771": {
+ "account_number": "771",
+ "account_name": "Em instrumentos financeiros",
+ "account_type": "Income Account"
+ },
+ "Em investimentos financeiros_772": {
+ "account_number": "772",
+ "account_name": "Em investimentos financeiros",
+ "account_type": "Income Account"
+ },
+ "Em propriedades de investimento_773": {
+ "account_number": "773",
+ "account_name": "Em propriedades de investimento",
+ "account_type": "Income Account"
+ },
+ "Em activos biol\u00f3gicos_774": {
+ "account_number": "774",
+ "account_name": "Em activos biol\u00f3gicos",
+ "account_type": "Income Account"
+ },
+ "Outros rendimentos e ganhos": {
+ "account_number": "78",
+ "account_name": "Outros rendimentos e ganhos",
+ "account_type": "Income Account"
+ },
+ "Rendimentos suplementares": {
+ "account_number": "781",
+ "account_name": "Rendimentos suplementares",
+ "account_type": "Income Account"
+ },
+ "Servi\u00e7os sociais": {
+ "account_number": "7811",
+ "account_name": "Servi\u00e7os sociais",
+ "account_type": "Income Account"
+ },
+ "Aluguer de equipamento": {
+ "account_number": "7812",
+ "account_name": "Aluguer de equipamento",
+ "account_type": "Income Account"
+ },
+ "Estudos, projectos e assist\u00eancia tecnol\u00f3gica": {
+ "account_number": "7813",
+ "account_name": "Estudos, projectos e assist\u00eancia tecnol\u00f3gica",
+ "account_type": "Income Account"
+ },
+ "Royalties_7814": {
+ "account_number": "7814",
+ "account_name": "Royalties",
+ "account_type": "Income Account"
+ },
+ "Desempenho de cargos sociais noutras empresas": {
+ "account_number": "7815",
+ "account_name": "Desempenho de cargos sociais noutras empresas",
+ "account_type": "Income Account"
+ },
+ "Outros rendimentos suplementares": {
+ "account_number": "7816",
+ "account_name": "Outros rendimentos suplementares",
+ "account_type": "Income Account"
+ },
+ "Descontos de pronto pagamento obtidos": {
+ "account_number": "782",
+ "account_name": "Descontos de pronto pagamento obtidos",
+ "account_type": "Income Account"
+ },
+ "Recupera\u00e7\u00e3o de d\u00edvidas a receber": {
+ "account_number": "783",
+ "account_name": "Recupera\u00e7\u00e3o de d\u00edvidas a receber",
+ "account_type": "Income Account"
+ },
+ "Ganhos em invent\u00e1rios": {
+ "account_number": "784",
+ "account_name": "Ganhos em invent\u00e1rios",
+ "account_type": "Income Account"
+ },
+ "Sinistros_7841": {
+ "account_number": "7841",
+ "account_name": "Sinistros",
+ "account_type": "Income Account"
+ },
+ "Sobras": {
+ "account_number": "7842",
+ "account_name": "Sobras",
+ "account_type": "Income Account"
+ },
+ "Outros ganhos": {
+ "account_number": "7848",
+ "account_name": "Outros ganhos",
+ "account_type": "Income Account"
+ },
+ "Rendimentos e ganhos em subsidi\u00e1rias, associadas e empr": {
+ "account_number": "785",
+ "account_name": "Rendimentos e ganhos em subsidi\u00e1rias, associadas e empr",
+ "account_type": "Income Account"
+ },
+ "Aplica\u00e7\u00e3o do m\u00e9todo da equival\u00eancia patrimonial_7851": {
+ "account_number": "7851",
+ "account_name": "Aplica\u00e7\u00e3o do m\u00e9todo da equival\u00eancia patrimonial",
+ "account_type": "Income Account"
+ },
+ "Aliena\u00e7\u00f5es_7852": {
+ "account_number": "7852",
+ "account_name": "Aliena\u00e7\u00f5es",
+ "account_type": "Income Account"
+ },
+ "Outros rendimentos e ganhos_7858": {
+ "account_number": "7858",
+ "account_name": "Outros rendimentos e ganhos",
+ "account_type": "Income Account"
+ },
+ "Rendimentos e ganhos nos restantes activos financeiros": {
+ "account_number": "786",
+ "account_name": "Rendimentos e ganhos nos restantes activos financeiros",
+ "account_type": "Income Account"
+ },
+ "Diferen\u00e7as de c\u00e2mbio favor\u00e1veis": {
+ "account_number": "7861",
+ "account_name": "Diferen\u00e7as de c\u00e2mbio favor\u00e1veis",
+ "account_type": "Income Account"
+ },
+ "Aliena\u00e7\u00f5es_7862": {
+ "account_number": "7862",
+ "account_name": "Aliena\u00e7\u00f5es",
+ "account_type": "Income Account"
+ },
+ "Outros rendimentos e ganhos_7868": {
+ "account_number": "7868",
+ "account_name": "Outros rendimentos e ganhos",
+ "account_type": "Income Account"
+ },
+ "Rendimentos e ganhos em investimentos n\u00e3o financeiros": {
+ "account_number": "787",
+ "account_name": "Rendimentos e ganhos em investimentos n\u00e3o financeiros",
+ "account_type": "Income Account"
+ },
+ "Aliena\u00e7\u00f5es_7871": {
+ "account_number": "7871",
+ "account_name": "Aliena\u00e7\u00f5es",
+ "account_type": "Income Account"
+ },
+ "Sinistros_7872": {
+ "account_number": "7872",
+ "account_name": "Sinistros",
+ "account_type": "Income Account"
+ },
+ "Rendas e outros rendimentos em propriedades de investimento": {
+ "account_number": "7873",
+ "account_name": "Rendas e outros rendimentos em propriedades de investimento",
+ "account_type": "Income Account"
+ },
+ "Outros rendimentos e ganhos_7878": {
+ "account_number": "7878",
+ "account_name": "Outros rendimentos e ganhos",
+ "account_type": "Income Account"
+ },
+ "Outros_788": {
+ "account_number": "788",
+ "account_name": "Outros",
+ "account_type": "Income Account"
+ },
+ "Correc\u00e7\u00f5es relativas a per\u00edodos anteriores_7881": {
+ "account_number": "7881",
+ "account_name": "Correc\u00e7\u00f5es relativas a per\u00edodos anteriores",
+ "account_type": "Income Account"
+ },
+ "Excesso da estimativa para impostos": {
+ "account_number": "7882",
+ "account_name": "Excesso da estimativa para impostos",
+ "account_type": "Income Account"
+ },
+ "Imputa\u00e7\u00e3o de subs\u00eddios para investimentos": {
+ "account_number": "7883",
+ "account_name": "Imputa\u00e7\u00e3o de subs\u00eddios para investimentos",
+ "account_type": "Income Account"
+ },
+ "Ganhos em outros instrumentos financeiros": {
+ "account_number": "7884",
+ "account_name": "Ganhos em outros instrumentos financeiros",
+ "account_type": "Income Account"
+ },
+ "Restitui\u00e7\u00e3o de impostos": {
+ "account_number": "7885",
+ "account_name": "Restitui\u00e7\u00e3o de impostos",
+ "account_type": "Income Account"
+ },
+ "Outros n\u00e3o especificados_7888": {
+ "account_number": "7888",
+ "account_name": "Outros n\u00e3o especificados",
+ "account_type": "Income Account"
+ },
+ "Juros, dividendos e outros rendimentos similares": {
+ "account_number": "79",
+ "account_name": "Juros, dividendos e outros rendimentos similares",
+ "account_type": "Income Account"
+ },
+ "Juros obtidos": {
+ "account_number": "791",
+ "account_name": "Juros obtidos",
+ "account_type": "Income Account"
+ },
+ "De dep\u00f3sitos": {
+ "account_number": "7911",
+ "account_name": "De dep\u00f3sitos",
+ "account_type": "Income Account"
+ },
+ "De outras aplica\u00e7\u00f5es de meios financeiros l\u00edquidos": {
+ "account_number": "7912",
+ "account_name": "De outras aplica\u00e7\u00f5es de meios financeiros l\u00edquidos",
+ "account_type": "Income Account"
+ },
+ "De financiamentos concedidos a associadas e emp. conjun": {
+ "account_number": "7913",
+ "account_name": "De financiamentos concedidos a associadas e emp. conjun",
+ "account_type": "Income Account"
+ },
+ "De financiamentos concedidos a subsidi\u00e1rias": {
+ "account_number": "7914",
+ "account_name": "De financiamentos concedidos a subsidi\u00e1rias",
+ "account_type": "Income Account"
+ },
+ "De financiamentos obtidos": {
+ "account_number": "7915",
+ "account_name": "De financiamentos obtidos",
+ "account_type": "Income Account"
+ },
+ "De outros financiamentos obtidos": {
+ "account_number": "7918",
+ "account_name": "De outros financiamentos obtidos",
+ "account_type": "Income Account"
+ },
+ "Dividendos obtidos": {
+ "account_number": "792",
+ "account_name": "Dividendos obtidos",
+ "account_type": "Income Account"
+ },
+ "De aplica\u00e7\u00f5es de meios financeiros l\u00edquidos": {
+ "account_number": "7921",
+ "account_name": "De aplica\u00e7\u00f5es de meios financeiros l\u00edquidos",
+ "account_type": "Income Account"
+ },
+ "De associadas e empreendimentos conjuntos": {
+ "account_number": "7922",
+ "account_name": "De associadas e empreendimentos conjuntos",
+ "account_type": "Income Account"
+ },
+ "De subsidi\u00e1rias": {
+ "account_number": "7923",
+ "account_name": "De subsidi\u00e1rias",
+ "account_type": "Income Account"
+ },
+ "Outras_7928": {
+ "account_number": "7928",
+ "account_name": "Outras",
+ "account_type": "Income Account"
+ },
+ "Outros rendimentos similares": {
+ "account_number": "798",
+ "account_name": "Outros rendimentos similares",
+ "account_type": "Income Account"
+ }
+ },
+ "8 - Resultados": {
+ "root_type": "Liability",
+ "Resultado l\u00edquido do per\u00edodo": {
+ "account_number": "81",
+ "account_name": "Resultado l\u00edquido do per\u00edodo",
+ "account_type": "Income Account"
+ },
+ "Resultado antes de impostos": {
+ "account_number": "811",
+ "account_name": "Resultado antes de impostos",
+ "account_type": "Income Account"
+ },
+ "Impostos sobre o rendimento do per\u00edodo": {
+ "account_number": "812",
+ "account_name": "Impostos sobre o rendimento do per\u00edodo",
+ "account_type": "Payable"
+ },
+ "Imposto estimado para o per\u00edodo": {
+ "account_number": "8121",
+ "account_name": "Imposto estimado para o per\u00edodo",
+ "account_type": "Payable"
+ },
+ "Imposto diferido": {
+ "account_number": "8122",
+ "account_name": "Imposto diferido",
+ "account_type": "Payable"
+ },
+ "Resultado l\u00edquido": {
+ "account_number": "818",
+ "account_name": "Resultado l\u00edquido",
+ "account_type": "Income Account"
+ },
+ "Dividendos antecipados": {
+ "account_number": "89",
+ "account_name": "Dividendos antecipados",
+ "account_type": "Payable"
+ }
+ },
+ "Others": {
+ "root_type": "Liability",
+ "Asset Received But Not Billed": {
+ "account_number": "",
+ "account_name": "Asset Received But Not Billed",
+ "account_type": "Asset Received But Not Billed"
+ },
+ "Stock Received But Not Billed": {
+ "account_number": "",
+ "account_name": "Stock Received But Not Billed",
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Expenses Included In Valuation": {
+ "account_number": "",
+ "account_name": "Expenses Included In Valuation",
+ "account_type": "Expenses Included In Valuation"
+ }
+ }
+ }
+}
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index f9c9173..62303bd 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -5,10 +5,13 @@
import unittest
import frappe
+from frappe.test_runner import make_test_records
from erpnext.accounts.doctype.account.account import merge_account, update_account_number
from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
+test_dependencies = ["Company"]
+
class TestAccount(unittest.TestCase):
def test_rename_account(self):
@@ -188,6 +191,58 @@
frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC4")
frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC5")
+ def test_account_currency_sync(self):
+ """
+ In a parent->child company setup, child should inherit parent account currency if explicitly specified.
+ """
+
+ make_test_records("Company")
+
+ frappe.local.flags.pop("ignore_root_company_validation", None)
+
+ def create_bank_account():
+ acc = frappe.new_doc("Account")
+ acc.account_name = "_Test Bank JPY"
+
+ acc.parent_account = "Temporary Accounts - _TC6"
+ acc.company = "_Test Company 6"
+ return acc
+
+ acc = create_bank_account()
+ # Explicitly set currency
+ acc.account_currency = "JPY"
+ acc.insert()
+ self.assertTrue(
+ frappe.db.exists(
+ {
+ "doctype": "Account",
+ "account_name": "_Test Bank JPY",
+ "account_currency": "JPY",
+ "company": "_Test Company 7",
+ }
+ )
+ )
+
+ frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
+ frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
+
+ acc = create_bank_account()
+ # default currency is used
+ acc.insert()
+ self.assertTrue(
+ frappe.db.exists(
+ {
+ "doctype": "Account",
+ "account_name": "_Test Bank JPY",
+ "account_currency": "USD",
+ "company": "_Test Company 7",
+ }
+ )
+ )
+
+ frappe.delete_doc("Account", "_Test Bank JPY - _TC6")
+ frappe.delete_doc("Account", "_Test Bank JPY - _TC7")
+
def test_child_company_account_rename_sync(self):
frappe.local.flags.pop("ignore_root_company_validation", None)
@@ -297,7 +352,7 @@
# fixed asset depreciation
["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
- ["_Test Depreciations", "Expenses", 0, None, None],
+ ["_Test Depreciations", "Expenses", 0, "Depreciation", None],
["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
# Receivable / Payable Account
["_Test Receivable", "Current Assets", 0, "Receivable", None],
diff --git a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
index 7c84237..9540084 100644
--- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
+++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
@@ -38,6 +38,7 @@
"closing_date": closing_date,
}
)
+ cle.flags.ignore_permissions = True
cle.submit()
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
index ce1ed33..15c84d4 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
@@ -50,13 +50,15 @@
if frappe.flags.in_test:
make_dimension_in_accounting_doctypes(doc=self)
else:
- frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self, queue="long")
+ frappe.enqueue(
+ make_dimension_in_accounting_doctypes, doc=self, queue="long", enqueue_after_commit=True
+ )
def on_trash(self):
if frappe.flags.in_test:
delete_accounting_dimension(doc=self)
else:
- frappe.enqueue(delete_accounting_dimension, doc=self, queue="long")
+ frappe.enqueue(delete_accounting_dimension, doc=self, queue="long", enqueue_after_commit=True)
def set_fieldname_and_label(self):
if not self.label:
@@ -269,6 +271,12 @@
as_dict=1,
)
+ if isinstance(with_cost_center_and_project, str):
+ if with_cost_center_and_project.lower().strip() == "true":
+ with_cost_center_and_project = True
+ else:
+ with_cost_center_and_project = False
+
if with_cost_center_and_project:
dimension_filters.extend(
[
diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js
index 8a6b021..6f0b6fc 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js
@@ -68,6 +68,16 @@
frm.refresh_field("dimensions");
frm.trigger('setup_filters');
},
+ apply_restriction_on_values: function(frm) {
+ /** If restriction on values is not applied, we should set "allow_or_restrict" to "Restrict" with an empty allowed dimension table.
+ * Hence it's not "restricted" on any value.
+ */
+ if (!frm.doc.apply_restriction_on_values) {
+ frm.set_value("allow_or_restrict", "Restrict");
+ frm.clear_table("dimensions");
+ frm.refresh_field("dimensions");
+ }
+ }
});
frappe.ui.form.on('Allowed Dimension', {
diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
index 0f3fbc0..2bd6c12 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
@@ -10,6 +10,7 @@
"disabled",
"column_break_2",
"company",
+ "apply_restriction_on_values",
"allow_or_restrict",
"section_break_4",
"accounts",
@@ -24,94 +25,80 @@
"fieldtype": "Select",
"in_list_view": 1,
"label": "Accounting Dimension",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "column_break_2",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
"fieldname": "section_break_4",
"fieldtype": "Section Break",
- "hide_border": 1,
- "show_days": 1,
- "show_seconds": 1
+ "hide_border": 1
},
{
"fieldname": "column_break_6",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
+ "depends_on": "eval:doc.apply_restriction_on_values == 1;",
"fieldname": "allow_or_restrict",
"fieldtype": "Select",
"label": "Allow Or Restrict Dimension",
"options": "Allow\nRestrict",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "accounts",
"fieldtype": "Table",
"label": "Applicable On Account",
"options": "Applicable On Account",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
- "depends_on": "eval:doc.accounting_dimension",
+ "depends_on": "eval:doc.accounting_dimension && doc.apply_restriction_on_values",
"fieldname": "dimensions",
"fieldtype": "Table",
"label": "Applicable Dimension",
- "options": "Allowed Dimension",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "mandatory_depends_on": "eval:doc.apply_restriction_on_values == 1;",
+ "options": "Allowed Dimension"
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
- "label": "Disabled",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Disabled"
},
{
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "dimension_filter_help",
"fieldtype": "HTML",
- "label": "Dimension Filter Help",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Dimension Filter Help"
},
{
"fieldname": "section_break_10",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
+ },
+ {
+ "default": "1",
+ "fieldname": "apply_restriction_on_values",
+ "fieldtype": "Check",
+ "label": "Apply restriction on dimension values"
}
],
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2021-02-03 12:04:58.678402",
+ "modified": "2023-06-07 14:59:41.869117",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting Dimension Filter",
+ "naming_rule": "Expression",
"owner": "Administrator",
"permissions": [
{
@@ -154,5 +141,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py
index 80f736f..de1b82c 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py
@@ -8,6 +8,12 @@
class AccountingDimensionFilter(Document):
+ def before_save(self):
+ # If restriction is not applied on values, then remove all the dimensions and set allow_or_restrict to Restrict
+ if not self.apply_restriction_on_values:
+ self.allow_or_restrict = "Restrict"
+ self.set("dimensions", [])
+
def validate(self):
self.validate_applicable_accounts()
@@ -44,12 +50,12 @@
a.applicable_on_account, d.dimension_value, p.accounting_dimension,
p.allow_or_restrict, a.is_mandatory
FROM
- `tabApplicable On Account` a, `tabAllowed Dimension` d,
+ `tabApplicable On Account` a,
`tabAccounting Dimension Filter` p
+ LEFT JOIN `tabAllowed Dimension` d ON d.parent = p.name
WHERE
p.name = a.parent
AND p.disabled = 0
- AND p.name = d.parent
""",
as_dict=1,
)
@@ -76,4 +82,5 @@
(dimension, account),
{"allowed_dimensions": [], "is_mandatory": is_mandatory, "allow_or_restrict": allow_or_restrict},
)
- map_object[(dimension, account)]["allowed_dimensions"].append(filter_value)
+ if filter_value:
+ map_object[(dimension, account)]["allowed_dimensions"].append(filter_value)
diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
index f13f2f9..6aba2ab 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
@@ -64,6 +64,7 @@
"accounting_dimension": "Cost Center",
"allow_or_restrict": "Allow",
"company": "_Test Company",
+ "apply_restriction_on_values": 1,
"accounts": [
{
"applicable_on_account": "Sales - _TC",
@@ -85,6 +86,7 @@
"doctype": "Accounting Dimension Filter",
"accounting_dimension": "Department",
"allow_or_restrict": "Allow",
+ "apply_restriction_on_values": 1,
"company": "_Test Company",
"accounts": [{"applicable_on_account": "Sales - _TC", "is_mandatory": 1}],
"dimensions": [{"accounting_dimension": "Department", "dimension_value": "Accounts - _TC"}],
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index c0eed18..7cd498d 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -19,8 +19,8 @@
"column_break_17",
"enable_common_party_accounting",
"allow_multi_currency_invoices_against_single_party_account",
- "report_setting_section",
- "use_custom_cash_flow",
+ "journals_section",
+ "merge_similar_account_heads",
"deferred_accounting_settings_section",
"book_deferred_entries_based_on",
"column_break_18",
@@ -34,10 +34,13 @@
"book_tax_discount_loss",
"print_settings",
"show_inclusive_tax_in_print",
+ "show_taxes_as_table_in_print",
"column_break_12",
"show_payment_schedule_in_print",
"currency_exchange_section",
"allow_stale",
+ "section_break_jpd0",
+ "auto_reconcile_payments",
"stale_days",
"invoicing_settings_tab",
"accounts_transactions_settings_section",
@@ -57,9 +60,11 @@
"acc_frozen_upto",
"column_break_25",
"frozen_accounts_modifier",
- "report_settings_sb",
"tab_break_dpet",
- "show_balance_in_coa"
+ "show_balance_in_coa",
+ "banking_tab",
+ "enable_party_matching",
+ "enable_fuzzy_matching"
],
"fields": [
{
@@ -171,19 +176,8 @@
"label": "Stale Days"
},
{
- "fieldname": "report_settings_sb",
- "fieldtype": "Section Break",
- "label": "Report Settings"
- },
- {
"default": "0",
- "description": "Only select this if you have set up the Cash Flow Mapper documents",
- "fieldname": "use_custom_cash_flow",
- "fieldtype": "Check",
- "label": "Enable Custom Cash Flow Format"
- },
- {
- "default": "0",
+ "description": "Payment Terms from orders will be fetched into the invoices as is",
"fieldname": "automatically_fetch_payment_terms",
"fieldtype": "Check",
"label": "Automatically Fetch Payment Terms from Order"
@@ -340,11 +334,6 @@
"label": "POS"
},
{
- "fieldname": "report_setting_section",
- "fieldtype": "Section Break",
- "label": "Report Setting"
- },
- {
"default": "0",
"description": "Enabling this will allow creation of multi-currency invoices against single party account in company currency",
"fieldname": "allow_multi_currency_invoices_against_single_party_account",
@@ -368,6 +357,55 @@
"fieldname": "book_tax_discount_loss",
"fieldtype": "Check",
"label": "Book Tax Loss on Early Payment Discount"
+ },
+ {
+ "fieldname": "journals_section",
+ "fieldtype": "Section Break",
+ "label": "Journals"
+ },
+ {
+ "default": "0",
+ "description": "Rows with Same Account heads will be merged on Ledger",
+ "fieldname": "merge_similar_account_heads",
+ "fieldtype": "Check",
+ "label": "Merge Similar Account Heads"
+ },
+ {
+ "fieldname": "section_break_jpd0",
+ "fieldtype": "Section Break",
+ "label": "Payment Reconciliations"
+ },
+ {
+ "default": "0",
+ "fieldname": "auto_reconcile_payments",
+ "fieldtype": "Check",
+ "label": "Auto Reconcile Payments"
+ },
+ {
+ "default": "0",
+ "fieldname": "show_taxes_as_table_in_print",
+ "fieldtype": "Check",
+ "label": "Show Taxes as Table in Print"
+ },
+ {
+ "fieldname": "banking_tab",
+ "fieldtype": "Tab Break",
+ "label": "Banking"
+ },
+ {
+ "default": "0",
+ "description": "Auto match and set the Party in Bank Transactions",
+ "fieldname": "enable_party_matching",
+ "fieldtype": "Check",
+ "label": "Enable Automatic Party Matching"
+ },
+ {
+ "default": "0",
+ "depends_on": "enable_party_matching",
+ "description": "Approximately match the description/party name against parties",
+ "fieldname": "enable_fuzzy_matching",
+ "fieldtype": "Check",
+ "label": "Enable Fuzzy Matching"
}
],
"icon": "icon-cog",
@@ -375,7 +413,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2023-03-28 09:50:20.375233",
+ "modified": "2023-06-15 16:35:45.123456",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",
diff --git a/erpnext/accounts/doctype/bank/bank.js b/erpnext/accounts/doctype/bank/bank.js
index 35d606b..6667193 100644
--- a/erpnext/accounts/doctype/bank/bank.js
+++ b/erpnext/accounts/doctype/bank/bank.js
@@ -8,9 +8,6 @@
},
refresh: function(frm) {
add_fields_to_mapping_table(frm);
-
- frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank' };
-
frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
if (frm.doc.__islocal) {
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.py b/erpnext/accounts/doctype/bank_account/bank_account.py
index b91f0f9..363a277 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.py
+++ b/erpnext/accounts/doctype/bank_account/bank_account.py
@@ -70,7 +70,6 @@
return doc
-@frappe.whitelist()
def get_party_bank_account(party_type, party):
return frappe.db.get_value(party_type, party, "default_bank_account")
diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js
index 71f2dcc..7af635b 100644
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.js
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.js
@@ -41,7 +41,7 @@
frm.trigger("get_payment_entries")
);
- frm.change_custom_button_type('Get Payment Entries', null, 'primary');
+ frm.change_custom_button_type(__('Get Payment Entries'), null, 'primary');
},
update_clearance_date: function(frm) {
@@ -53,8 +53,8 @@
frm.refresh_fields();
if (!frm.doc.payment_entries.length) {
- frm.change_custom_button_type('Get Payment Entries', null, 'primary');
- frm.change_custom_button_type('Update Clearance Date', null, 'default');
+ frm.change_custom_button_type(__('Get Payment Entries'), null, 'primary');
+ frm.change_custom_button_type(__('Update Clearance Date'), null, 'default');
}
}
});
@@ -72,8 +72,8 @@
frm.trigger("update_clearance_date")
);
- frm.change_custom_button_type('Get Payment Entries', null, 'default');
- frm.change_custom_button_type('Update Clearance Date', null, 'primary');
+ frm.change_custom_button_type(__('Get Payment Entries'), null, 'default');
+ frm.change_custom_button_type(__('Update Clearance Date'), null, 'primary');
}
}
});
diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
index 0817187..8edd376 100644
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
@@ -5,7 +5,6 @@
import frappe
from frappe import _, msgprint
from frappe.model.document import Document
-from frappe.query_builder.custom import ConstantColumn
from frappe.utils import flt, fmt_money, getdate
import erpnext
@@ -22,167 +21,24 @@
if not self.account:
frappe.throw(_("Account is mandatory to get payment entries"))
- condition = ""
- if not self.include_reconciled_entries:
- condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
+ entries = []
- journal_entries = frappe.db.sql(
- """
- select
- "Journal Entry" as payment_document, t1.name as payment_entry,
- t1.cheque_no as cheque_number, t1.cheque_date,
- sum(t2.debit_in_account_currency) as debit, sum(t2.credit_in_account_currency) as credit,
- t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency
- from
- `tabJournal Entry` t1, `tabJournal Entry Account` t2
- where
- t2.parent = t1.name and t2.account = %(account)s and t1.docstatus=1
- and t1.posting_date >= %(from)s and t1.posting_date <= %(to)s
- and ifnull(t1.is_opening, 'No') = 'No' {condition}
- group by t2.account, t1.name
- order by t1.posting_date ASC, t1.name DESC
- """.format(
- condition=condition
- ),
- {"account": self.account, "from": self.from_date, "to": self.to_date},
- as_dict=1,
- )
-
- if self.bank_account:
- condition += "and bank_account = %(bank_account)s"
-
- payment_entries = frappe.db.sql(
- """
- select
- "Payment Entry" as payment_document, name as payment_entry,
- reference_no as cheque_number, reference_date as cheque_date,
- if(paid_from=%(account)s, paid_amount, 0) as credit,
- if(paid_from=%(account)s, 0, received_amount) as debit,
- posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
- if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
- from `tabPayment Entry`
- where
- (paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
- and posting_date >= %(from)s and posting_date <= %(to)s
- {condition}
- order by
- posting_date ASC, name DESC
- """.format(
- condition=condition
- ),
- {
- "account": self.account,
- "from": self.from_date,
- "to": self.to_date,
- "bank_account": self.bank_account,
- },
- as_dict=1,
- )
-
- loan_disbursement = frappe.qb.DocType("Loan Disbursement")
-
- query = (
- frappe.qb.from_(loan_disbursement)
- .select(
- ConstantColumn("Loan Disbursement").as_("payment_document"),
- loan_disbursement.name.as_("payment_entry"),
- loan_disbursement.disbursed_amount.as_("credit"),
- ConstantColumn(0).as_("debit"),
- loan_disbursement.reference_number.as_("cheque_number"),
- loan_disbursement.reference_date.as_("cheque_date"),
- loan_disbursement.clearance_date.as_("clearance_date"),
- loan_disbursement.disbursement_date.as_("posting_date"),
- loan_disbursement.applicant.as_("against_account"),
- )
- .where(loan_disbursement.docstatus == 1)
- .where(loan_disbursement.disbursement_date >= self.from_date)
- .where(loan_disbursement.disbursement_date <= self.to_date)
- .where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account]))
- .orderby(loan_disbursement.disbursement_date)
- .orderby(loan_disbursement.name, order=frappe.qb.desc)
- )
-
- if not self.include_reconciled_entries:
- query = query.where(loan_disbursement.clearance_date.isnull())
-
- loan_disbursements = query.run(as_dict=1)
-
- loan_repayment = frappe.qb.DocType("Loan Repayment")
-
- query = (
- frappe.qb.from_(loan_repayment)
- .select(
- ConstantColumn("Loan Repayment").as_("payment_document"),
- loan_repayment.name.as_("payment_entry"),
- loan_repayment.amount_paid.as_("debit"),
- ConstantColumn(0).as_("credit"),
- loan_repayment.reference_number.as_("cheque_number"),
- loan_repayment.reference_date.as_("cheque_date"),
- loan_repayment.clearance_date.as_("clearance_date"),
- loan_repayment.applicant.as_("against_account"),
- loan_repayment.posting_date,
- )
- .where(loan_repayment.docstatus == 1)
- .where(loan_repayment.posting_date >= self.from_date)
- .where(loan_repayment.posting_date <= self.to_date)
- .where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
- )
-
- if not self.include_reconciled_entries:
- query = query.where(loan_repayment.clearance_date.isnull())
-
- if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
- query = query.where((loan_repayment.repay_from_salary == 0))
-
- query = query.orderby(loan_repayment.posting_date).orderby(
- loan_repayment.name, order=frappe.qb.desc
- )
-
- loan_repayments = query.run(as_dict=True)
-
- pos_sales_invoices, pos_purchase_invoices = [], []
- if self.include_pos_transactions:
- pos_sales_invoices = frappe.db.sql(
- """
- select
- "Sales Invoice Payment" as payment_document, sip.name as payment_entry, sip.amount as debit,
- si.posting_date, si.customer as against_account, sip.clearance_date,
- account.account_currency, 0 as credit
- from `tabSales Invoice Payment` sip, `tabSales Invoice` si, `tabAccount` account
- where
- sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name
- and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s
- order by
- si.posting_date ASC, si.name DESC
- """,
- {"account": self.account, "from": self.from_date, "to": self.to_date},
- as_dict=1,
- )
-
- pos_purchase_invoices = frappe.db.sql(
- """
- select
- "Purchase Invoice" as payment_document, pi.name as payment_entry, pi.paid_amount as credit,
- pi.posting_date, pi.supplier as against_account, pi.clearance_date,
- account.account_currency, 0 as debit
- from `tabPurchase Invoice` pi, `tabAccount` account
- where
- pi.cash_bank_account=%(account)s and pi.docstatus=1 and account.name = pi.cash_bank_account
- and pi.posting_date >= %(from)s and pi.posting_date <= %(to)s
- order by
- pi.posting_date ASC, pi.name DESC
- """,
- {"account": self.account, "from": self.from_date, "to": self.to_date},
- as_dict=1,
+ # get entries from all the apps
+ for method_name in frappe.get_hooks("get_payment_entries_for_bank_clearance"):
+ entries += (
+ frappe.get_attr(method_name)(
+ self.from_date,
+ self.to_date,
+ self.account,
+ self.bank_account,
+ self.include_reconciled_entries,
+ self.include_pos_transactions,
+ )
+ or []
)
entries = sorted(
- list(payment_entries)
- + list(journal_entries)
- + list(pos_sales_invoices)
- + list(pos_purchase_invoices)
- + list(loan_disbursements)
- + list(loan_repayments),
+ entries,
key=lambda k: getdate(k["posting_date"]),
)
@@ -235,3 +91,111 @@
msgprint(_("Clearance Date updated"))
else:
msgprint(_("Clearance Date not mentioned"))
+
+
+def get_payment_entries_for_bank_clearance(
+ from_date, to_date, account, bank_account, include_reconciled_entries, include_pos_transactions
+):
+ entries = []
+
+ condition = ""
+ if not include_reconciled_entries:
+ condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
+
+ journal_entries = frappe.db.sql(
+ """
+ select
+ "Journal Entry" as payment_document, t1.name as payment_entry,
+ t1.cheque_no as cheque_number, t1.cheque_date,
+ sum(t2.debit_in_account_currency) as debit, sum(t2.credit_in_account_currency) as credit,
+ t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency
+ from
+ `tabJournal Entry` t1, `tabJournal Entry Account` t2
+ where
+ t2.parent = t1.name and t2.account = %(account)s and t1.docstatus=1
+ and t1.posting_date >= %(from)s and t1.posting_date <= %(to)s
+ and ifnull(t1.is_opening, 'No') = 'No' {condition}
+ group by t2.account, t1.name
+ order by t1.posting_date ASC, t1.name DESC
+ """.format(
+ condition=condition
+ ),
+ {"account": account, "from": from_date, "to": to_date},
+ as_dict=1,
+ )
+
+ if bank_account:
+ condition += "and bank_account = %(bank_account)s"
+
+ payment_entries = frappe.db.sql(
+ """
+ select
+ "Payment Entry" as payment_document, name as payment_entry,
+ reference_no as cheque_number, reference_date as cheque_date,
+ if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
+ if(paid_from=%(account)s, 0, received_amount) as debit,
+ posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
+ if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
+ from `tabPayment Entry`
+ where
+ (paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
+ and posting_date >= %(from)s and posting_date <= %(to)s
+ {condition}
+ order by
+ posting_date ASC, name DESC
+ """.format(
+ condition=condition
+ ),
+ {
+ "account": account,
+ "from": from_date,
+ "to": to_date,
+ "bank_account": bank_account,
+ },
+ as_dict=1,
+ )
+
+ pos_sales_invoices, pos_purchase_invoices = [], []
+ if include_pos_transactions:
+ pos_sales_invoices = frappe.db.sql(
+ """
+ select
+ "Sales Invoice Payment" as payment_document, sip.name as payment_entry, sip.amount as debit,
+ si.posting_date, si.customer as against_account, sip.clearance_date,
+ account.account_currency, 0 as credit
+ from `tabSales Invoice Payment` sip, `tabSales Invoice` si, `tabAccount` account
+ where
+ sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name
+ and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s
+ order by
+ si.posting_date ASC, si.name DESC
+ """,
+ {"account": account, "from": from_date, "to": to_date},
+ as_dict=1,
+ )
+
+ pos_purchase_invoices = frappe.db.sql(
+ """
+ select
+ "Purchase Invoice" as payment_document, pi.name as payment_entry, pi.paid_amount as credit,
+ pi.posting_date, pi.supplier as against_account, pi.clearance_date,
+ account.account_currency, 0 as debit
+ from `tabPurchase Invoice` pi, `tabAccount` account
+ where
+ pi.cash_bank_account=%(account)s and pi.docstatus=1 and account.name = pi.cash_bank_account
+ and pi.posting_date >= %(from)s and pi.posting_date <= %(to)s
+ order by
+ pi.posting_date ASC, pi.name DESC
+ """,
+ {"account": account, "from": from_date, "to": to_date},
+ as_dict=1,
+ )
+
+ entries = (
+ list(payment_entries)
+ + list(journal_entries)
+ + list(pos_sales_invoices)
+ + list(pos_purchase_invoices)
+ )
+
+ return entries
diff --git a/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
index c1e55f6..c7404d1 100644
--- a/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
@@ -8,34 +8,96 @@
from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
-from erpnext.loan_management.doctype.loan.test_loan import (
- create_loan,
- create_loan_accounts,
- create_loan_type,
- create_repayment_entry,
- make_loan_disbursement_entry,
-)
+from erpnext.tests.utils import if_lending_app_installed, if_lending_app_not_installed
class TestBankClearance(unittest.TestCase):
@classmethod
def setUpClass(cls):
+ clear_payment_entries()
+ clear_loan_transactions()
make_bank_account()
- create_loan_accounts()
- create_loan_masters()
add_transactions()
# Basic test case to test if bank clearance tool doesn't break
# Detailed test can be added later
+ @if_lending_app_not_installed
def test_bank_clearance(self):
bank_clearance = frappe.get_doc("Bank Clearance")
bank_clearance.account = "_Test Bank Clearance - _TC"
bank_clearance.from_date = add_months(getdate(), -1)
bank_clearance.to_date = getdate()
bank_clearance.get_payment_entries()
+ self.assertEqual(len(bank_clearance.payment_entries), 1)
+
+ @if_lending_app_installed
+ def test_bank_clearance_with_loan(self):
+ from lending.loan_management.doctype.loan.test_loan import (
+ create_loan,
+ create_loan_accounts,
+ create_loan_type,
+ create_repayment_entry,
+ make_loan_disbursement_entry,
+ )
+
+ def create_loan_masters():
+ create_loan_type(
+ "Clearance Loan",
+ 2000000,
+ 13.5,
+ 25,
+ 0,
+ 5,
+ "Cash",
+ "_Test Bank Clearance - _TC",
+ "_Test Bank Clearance - _TC",
+ "Loan Account - _TC",
+ "Interest Income Account - _TC",
+ "Penalty Income Account - _TC",
+ )
+
+ def make_loan():
+ loan = create_loan(
+ "_Test Customer",
+ "Clearance Loan",
+ 280000,
+ "Repay Over Number of Periods",
+ 20,
+ applicant_type="Customer",
+ )
+ loan.submit()
+ make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=getdate())
+ repayment_entry = create_repayment_entry(
+ loan.name, "_Test Customer", getdate(), loan.loan_amount
+ )
+ repayment_entry.save()
+ repayment_entry.submit()
+
+ create_loan_accounts()
+ create_loan_masters()
+ make_loan()
+
+ bank_clearance = frappe.get_doc("Bank Clearance")
+ bank_clearance.account = "_Test Bank Clearance - _TC"
+ bank_clearance.from_date = add_months(getdate(), -1)
+ bank_clearance.to_date = getdate()
+ bank_clearance.get_payment_entries()
self.assertEqual(len(bank_clearance.payment_entries), 3)
+def clear_payment_entries():
+ frappe.db.delete("Payment Entry")
+
+
+@if_lending_app_installed
+def clear_loan_transactions():
+ for dt in [
+ "Loan Disbursement",
+ "Loan Repayment",
+ ]:
+ frappe.db.delete(dt)
+
+
def make_bank_account():
if not frappe.db.get_value("Account", "_Test Bank Clearance - _TC"):
frappe.get_doc(
@@ -49,42 +111,8 @@
).insert()
-def create_loan_masters():
- create_loan_type(
- "Clearance Loan",
- 2000000,
- 13.5,
- 25,
- 0,
- 5,
- "Cash",
- "_Test Bank Clearance - _TC",
- "_Test Bank Clearance - _TC",
- "Loan Account - _TC",
- "Interest Income Account - _TC",
- "Penalty Income Account - _TC",
- )
-
-
def add_transactions():
make_payment_entry()
- make_loan()
-
-
-def make_loan():
- loan = create_loan(
- "_Test Customer",
- "Clearance Loan",
- 280000,
- "Repay Over Number of Periods",
- 20,
- applicant_type="Customer",
- )
- loan.submit()
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=getdate())
- repayment_entry = create_repayment_entry(loan.name, "_Test Customer", getdate(), loan.loan_amount)
- repayment_entry.save()
- repayment_entry.submit()
def make_payment_entry():
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
index d977261..d961ead 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
@@ -19,7 +19,7 @@
onload: function (frm) {
// Set default filter dates
- today = frappe.datetime.get_today()
+ let today = frappe.datetime.get_today()
frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
frm.doc.bank_statement_to_date = today;
frm.trigger('bank_account');
@@ -81,7 +81,7 @@
frm.add_custom_button(__('Get Unreconciled Entries'), function() {
frm.trigger("make_reconciliation_tool");
});
- frm.change_custom_button_type('Get Unreconciled Entries', null, 'primary');
+ frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
},
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
index c4a23a6..3da5ac3 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@@ -7,9 +7,9 @@
import frappe
from frappe import _
from frappe.model.document import Document
-from frappe.query_builder.custom import ConstantColumn
from frappe.utils import cint, flt
+from erpnext import get_default_cost_center
from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
get_amounts_not_reflected_in_system,
@@ -140,6 +140,9 @@
second_account
)
)
+
+ company = frappe.get_value("Account", company_account, "company")
+
accounts = []
# Multi Currency?
accounts.append(
@@ -149,6 +152,7 @@
"debit_in_account_currency": bank_transaction.withdrawal,
"party_type": party_type,
"party": party,
+ "cost_center": get_default_cost_center(company),
}
)
@@ -158,11 +162,10 @@
"bank_account": bank_transaction.bank_account,
"credit_in_account_currency": bank_transaction.withdrawal,
"debit_in_account_currency": bank_transaction.deposit,
+ "cost_center": get_default_cost_center(company),
}
)
- company = frappe.get_value("Account", company_account, "company")
-
journal_entry_dict = {
"voucher_type": entry_type,
"company": company,
@@ -415,19 +418,7 @@
to_reference_date,
):
exact_match = True if "exact_match" in document_types else False
- # combine all types of vouchers
- subquery = get_queries(
- bank_account,
- company,
- transaction,
- document_types,
- from_date,
- to_date,
- filter_by_reference_date,
- from_reference_date,
- to_reference_date,
- exact_match,
- )
+
filters = {
"amount": transaction.unallocated_amount,
"payment_type": "Receive" if transaction.deposit > 0.0 else "Pay",
@@ -439,21 +430,29 @@
matching_vouchers = []
- matching_vouchers.extend(
- get_loan_vouchers(bank_account, transaction, document_types, filters, exact_match)
- )
-
- for query in subquery:
+ # get matching vouchers from all the apps
+ for method_name in frappe.get_hooks("get_matching_vouchers_for_bank_reconciliation"):
matching_vouchers.extend(
- frappe.db.sql(
- query,
+ frappe.get_attr(method_name)(
+ bank_account,
+ company,
+ transaction,
+ document_types,
+ from_date,
+ to_date,
+ filter_by_reference_date,
+ from_reference_date,
+ to_reference_date,
+ exact_match,
filters,
)
+ or []
)
+
return sorted(matching_vouchers, key=lambda x: x[0], reverse=True) if matching_vouchers else []
-def get_queries(
+def get_matching_vouchers_for_bank_reconciliation(
bank_account,
company,
transaction,
@@ -464,6 +463,7 @@
from_reference_date,
to_reference_date,
exact_match,
+ filters,
):
# get queries to get matching vouchers
account_from_to = "paid_to" if transaction.deposit > 0.0 else "paid_from"
@@ -488,7 +488,17 @@
or []
)
- return queries
+ vouchers = []
+
+ for query in queries:
+ vouchers.extend(
+ frappe.db.sql(
+ query,
+ filters,
+ )
+ )
+
+ return vouchers
def get_matching_queries(
@@ -546,18 +556,6 @@
return queries
-def get_loan_vouchers(bank_account, transaction, document_types, filters, exact_match):
- vouchers = []
-
- if transaction.withdrawal > 0.0 and "loan_disbursement" in document_types:
- vouchers.extend(get_ld_matching_query(bank_account, exact_match, filters))
-
- if transaction.deposit > 0.0 and "loan_repayment" in document_types:
- vouchers.extend(get_lr_matching_query(bank_account, exact_match, filters))
-
- return vouchers
-
-
def get_bt_matching_query(exact_match, transaction):
# get matching bank transaction query
# find bank transactions in the same bank account with opposite sign
@@ -591,85 +589,6 @@
"""
-def get_ld_matching_query(bank_account, exact_match, filters):
- loan_disbursement = frappe.qb.DocType("Loan Disbursement")
- matching_reference = loan_disbursement.reference_number == filters.get("reference_number")
- matching_party = loan_disbursement.applicant_type == filters.get(
- "party_type"
- ) and loan_disbursement.applicant == filters.get("party")
-
- rank = frappe.qb.terms.Case().when(matching_reference, 1).else_(0)
-
- rank1 = frappe.qb.terms.Case().when(matching_party, 1).else_(0)
-
- query = (
- frappe.qb.from_(loan_disbursement)
- .select(
- rank + rank1 + 1,
- ConstantColumn("Loan Disbursement").as_("doctype"),
- loan_disbursement.name,
- loan_disbursement.disbursed_amount,
- loan_disbursement.reference_number,
- loan_disbursement.reference_date,
- loan_disbursement.applicant_type,
- loan_disbursement.disbursement_date,
- )
- .where(loan_disbursement.docstatus == 1)
- .where(loan_disbursement.clearance_date.isnull())
- .where(loan_disbursement.disbursement_account == bank_account)
- )
-
- if exact_match:
- query.where(loan_disbursement.disbursed_amount == filters.get("amount"))
- else:
- query.where(loan_disbursement.disbursed_amount > 0.0)
-
- vouchers = query.run(as_list=True)
-
- return vouchers
-
-
-def get_lr_matching_query(bank_account, exact_match, filters):
- loan_repayment = frappe.qb.DocType("Loan Repayment")
- matching_reference = loan_repayment.reference_number == filters.get("reference_number")
- matching_party = loan_repayment.applicant_type == filters.get(
- "party_type"
- ) and loan_repayment.applicant == filters.get("party")
-
- rank = frappe.qb.terms.Case().when(matching_reference, 1).else_(0)
-
- rank1 = frappe.qb.terms.Case().when(matching_party, 1).else_(0)
-
- query = (
- frappe.qb.from_(loan_repayment)
- .select(
- rank + rank1 + 1,
- ConstantColumn("Loan Repayment").as_("doctype"),
- loan_repayment.name,
- loan_repayment.amount_paid,
- loan_repayment.reference_number,
- loan_repayment.reference_date,
- loan_repayment.applicant_type,
- loan_repayment.posting_date,
- )
- .where(loan_repayment.docstatus == 1)
- .where(loan_repayment.clearance_date.isnull())
- .where(loan_repayment.payment_account == bank_account)
- )
-
- if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
- query = query.where((loan_repayment.repay_from_salary == 0))
-
- if exact_match:
- query.where(loan_repayment.amount_paid == filters.get("amount"))
- else:
- query.where(loan_repayment.amount_paid > 0.0)
-
- vouchers = query.run()
-
- return vouchers
-
-
def get_pe_matching_query(
exact_match,
account_from_to,
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
index d8880f7..003a43c 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
@@ -53,19 +53,20 @@
if "Bank Account" not in json.dumps(preview["columns"]):
frappe.throw(_("Please add the Bank Account column"))
- from frappe.utils.background_jobs import is_job_queued
+ from frappe.utils.background_jobs import is_job_enqueued
from frappe.utils.scheduler import is_scheduler_inactive
if is_scheduler_inactive() and not frappe.flags.in_test:
frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
- if not is_job_queued(self.name):
+ job_id = f"bank_statement_import::{self.name}"
+ if not is_job_enqueued(job_id):
enqueue(
start_import,
queue="default",
timeout=6000,
event="data_import",
- job_name=self.name,
+ job_id=job_id,
data_import=self.name,
bank_account=self.bank_account,
import_file_path=self.import_file,
diff --git a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
new file mode 100644
index 0000000..5d94a08
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
@@ -0,0 +1,178 @@
+from typing import Tuple, Union
+
+import frappe
+from frappe.utils import flt
+from rapidfuzz import fuzz, process
+
+
+class AutoMatchParty:
+ """
+ Matches by Account/IBAN and then by Party Name/Description sequentially.
+ Returns when a result is obtained.
+
+ Result (if present) is of the form: (Party Type, Party,)
+ """
+
+ def __init__(self, **kwargs) -> None:
+ self.__dict__.update(kwargs)
+
+ def get(self, key):
+ return self.__dict__.get(key, None)
+
+ def match(self) -> Union[Tuple, None]:
+ result = None
+ result = AutoMatchbyAccountIBAN(
+ bank_party_account_number=self.bank_party_account_number,
+ bank_party_iban=self.bank_party_iban,
+ deposit=self.deposit,
+ ).match()
+
+ fuzzy_matching_enabled = frappe.db.get_single_value("Accounts Settings", "enable_fuzzy_matching")
+ if not result and fuzzy_matching_enabled:
+ result = AutoMatchbyPartyNameDescription(
+ bank_party_name=self.bank_party_name, description=self.description, deposit=self.deposit
+ ).match()
+
+ return result
+
+
+class AutoMatchbyAccountIBAN:
+ def __init__(self, **kwargs) -> None:
+ self.__dict__.update(kwargs)
+
+ def get(self, key):
+ return self.__dict__.get(key, None)
+
+ def match(self):
+ if not (self.bank_party_account_number or self.bank_party_iban):
+ return None
+
+ result = self.match_account_in_party()
+ return result
+
+ def match_account_in_party(self) -> Union[Tuple, None]:
+ """Check if there is a IBAN/Account No. match in Customer/Supplier/Employee"""
+ result = None
+ parties = get_parties_in_order(self.deposit)
+ or_filters = self.get_or_filters()
+
+ for party in parties:
+ party_result = frappe.db.get_all(
+ "Bank Account", or_filters=or_filters, pluck="party", limit_page_length=1
+ )
+
+ if party == "Employee" and not party_result:
+ # Search in Bank Accounts first for Employee, and then Employee record
+ if "bank_account_no" in or_filters:
+ or_filters["bank_ac_no"] = or_filters.pop("bank_account_no")
+
+ party_result = frappe.db.get_all(
+ party, or_filters=or_filters, pluck="name", limit_page_length=1
+ )
+
+ if party_result:
+ result = (
+ party,
+ party_result[0],
+ )
+ break
+
+ return result
+
+ def get_or_filters(self) -> dict:
+ or_filters = {}
+ if self.bank_party_account_number:
+ or_filters["bank_account_no"] = self.bank_party_account_number
+
+ if self.bank_party_iban:
+ or_filters["iban"] = self.bank_party_iban
+
+ return or_filters
+
+
+class AutoMatchbyPartyNameDescription:
+ def __init__(self, **kwargs) -> None:
+ self.__dict__.update(kwargs)
+
+ def get(self, key):
+ return self.__dict__.get(key, None)
+
+ def match(self) -> Union[Tuple, None]:
+ # fuzzy search by customer/supplier & employee
+ if not (self.bank_party_name or self.description):
+ return None
+
+ result = self.match_party_name_desc_in_party()
+ return result
+
+ def match_party_name_desc_in_party(self) -> Union[Tuple, None]:
+ """Fuzzy search party name and/or description against parties in the system"""
+ result = None
+ parties = get_parties_in_order(self.deposit)
+
+ for party in parties:
+ filters = {"status": "Active"} if party == "Employee" else {"disabled": 0}
+ names = frappe.get_all(party, filters=filters, pluck=party.lower() + "_name")
+
+ for field in ["bank_party_name", "description"]:
+ if not self.get(field):
+ continue
+
+ result, skip = self.fuzzy_search_and_return_result(party, names, field)
+ if result or skip:
+ break
+
+ if result or skip:
+ # Skip If: It was hard to distinguish between close matches and so match is None
+ # OR if the right match was found
+ break
+
+ return result
+
+ def fuzzy_search_and_return_result(self, party, names, field) -> Union[Tuple, None]:
+ skip = False
+ result = process.extract(query=self.get(field), choices=names, scorer=fuzz.token_set_ratio)
+ party_name, skip = self.process_fuzzy_result(result)
+
+ if not party_name:
+ return None, skip
+
+ return (
+ party,
+ party_name,
+ ), skip
+
+ def process_fuzzy_result(self, result: Union[list, None]):
+ """
+ If there are multiple valid close matches return None as result may be faulty.
+ Return the result only if one accurate match stands out.
+
+ Returns: Result, Skip (whether or not to discontinue matching)
+ """
+ PARTY, SCORE, CUTOFF = 0, 1, 80
+
+ if not result or not len(result):
+ return None, False
+
+ first_result = result[0]
+ if len(result) == 1:
+ return (first_result[PARTY] if first_result[SCORE] > CUTOFF else None), True
+
+ second_result = result[1]
+ if first_result[SCORE] > CUTOFF:
+ # If multiple matches with the same score, return None but discontinue matching
+ # Matches were found but were too close to distinguish between
+ if first_result[SCORE] == second_result[SCORE]:
+ return None, True
+
+ return first_result[PARTY], True
+ else:
+ return None, False
+
+
+def get_parties_in_order(deposit: float) -> list:
+ parties = ["Supplier", "Employee", "Customer"] # most -> least likely to receive
+ if flt(deposit) > 0:
+ parties = ["Customer", "Supplier", "Employee"] # most -> least likely to pay
+
+ return parties
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
index 768d2f0..b32022e 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -33,7 +33,11 @@
"unallocated_amount",
"party_section",
"party_type",
- "party"
+ "party",
+ "column_break_3czf",
+ "bank_party_name",
+ "bank_party_account_number",
+ "bank_party_iban"
],
"fields": [
{
@@ -63,7 +67,7 @@
"fieldtype": "Select",
"in_standard_filter": 1,
"label": "Status",
- "options": "\nPending\nSettled\nUnreconciled\nReconciled"
+ "options": "\nPending\nSettled\nUnreconciled\nReconciled\nCancelled"
},
{
"fieldname": "bank_account",
@@ -202,11 +206,30 @@
"fieldtype": "Data",
"label": "Transaction Type",
"length": 50
+ },
+ {
+ "fieldname": "column_break_3czf",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "bank_party_name",
+ "fieldtype": "Data",
+ "label": "Party Name/Account Holder (Bank Statement)"
+ },
+ {
+ "fieldname": "bank_party_iban",
+ "fieldtype": "Data",
+ "label": "Party IBAN (Bank Statement)"
+ },
+ {
+ "fieldname": "bank_party_account_number",
+ "fieldtype": "Data",
+ "label": "Party Account No. (Bank Statement)"
}
],
"is_submittable": 1,
"links": [],
- "modified": "2022-05-29 18:36:50.475964",
+ "modified": "2023-06-06 13:58:12.821411",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Bank Transaction",
@@ -260,4 +283,4 @@
"states": [],
"title_field": "bank_account",
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
index fcbaf32..6a47562 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -15,6 +15,9 @@
self.clear_linked_payment_entries()
self.set_status()
+ if frappe.db.get_single_value("Accounts Settings", "enable_party_matching"):
+ self.auto_set_party()
+
_saving_flag = False
# nosemgrep: frappe-semgrep-rules.rules.frappe-modifying-but-not-comitting
@@ -146,6 +149,26 @@
payment_entry.payment_document, payment_entry.payment_entry, clearance_date, self
)
+ def auto_set_party(self):
+ from erpnext.accounts.doctype.bank_transaction.auto_match_party import AutoMatchParty
+
+ if self.party_type and self.party:
+ return
+
+ result = AutoMatchParty(
+ bank_party_account_number=self.bank_party_account_number,
+ bank_party_iban=self.bank_party_iban,
+ bank_party_name=self.bank_party_name,
+ description=self.description,
+ deposit=self.deposit,
+ ).match()
+
+ if result:
+ party_type, party = result
+ frappe.db.set_value(
+ "Bank Transaction", self.name, field={"party_type": party_type, "party": party}
+ )
+
@frappe.whitelist()
def get_doctypes_for_bank_reconciliation():
@@ -281,10 +304,13 @@
)
elif payment_entry.payment_document == "Journal Entry":
- return frappe.db.get_value(
- "Journal Entry Account",
- {"parent": payment_entry.payment_entry, "account": gl_bank_account},
- "sum(credit_in_account_currency)",
+ return abs(
+ frappe.db.get_value(
+ "Journal Entry Account",
+ {"parent": payment_entry.payment_entry, "account": gl_bank_account},
+ "sum(debit_in_account_currency-credit_in_account_currency)",
+ )
+ or 0
)
elif payment_entry.payment_document == "Expense Claim":
@@ -317,14 +343,7 @@
def set_voucher_clearance(doctype, docname, clearance_date, self):
- if doctype in [
- "Payment Entry",
- "Journal Entry",
- "Purchase Invoice",
- "Expense Claim",
- "Loan Repayment",
- "Loan Disbursement",
- ]:
+ if doctype in get_doctypes_for_bank_reconciliation():
if (
doctype == "Payment Entry"
and frappe.db.get_value("Payment Entry", docname, "payment_type") == "Internal Transfer"
diff --git a/erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py b/erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py
new file mode 100644
index 0000000..36ef1fc
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/test_auto_match_party.py
@@ -0,0 +1,151 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import nowdate
+
+from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import create_bank_account
+
+
+class TestAutoMatchParty(FrappeTestCase):
+ @classmethod
+ def setUpClass(cls):
+ create_bank_account()
+ frappe.db.set_single_value("Accounts Settings", "enable_party_matching", 1)
+ frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 1)
+ return super().setUpClass()
+
+ @classmethod
+ def tearDownClass(cls):
+ frappe.db.set_single_value("Accounts Settings", "enable_party_matching", 0)
+ frappe.db.set_single_value("Accounts Settings", "enable_fuzzy_matching", 0)
+
+ def test_match_by_account_number(self):
+ create_supplier_for_match(account_no="000000003716541159")
+ doc = create_bank_transaction(
+ withdrawal=1200,
+ transaction_id="562213b0ca1bf838dab8f2c6a39bbc3b",
+ account_no="000000003716541159",
+ iban="DE02000000003716541159",
+ )
+
+ self.assertEqual(doc.party_type, "Supplier")
+ self.assertEqual(doc.party, "John Doe & Co.")
+
+ def test_match_by_iban(self):
+ create_supplier_for_match(iban="DE02000000003716541159")
+ doc = create_bank_transaction(
+ withdrawal=1200,
+ transaction_id="c5455a224602afaa51592a9d9250600d",
+ account_no="000000003716541159",
+ iban="DE02000000003716541159",
+ )
+
+ self.assertEqual(doc.party_type, "Supplier")
+ self.assertEqual(doc.party, "John Doe & Co.")
+
+ def test_match_by_party_name(self):
+ create_supplier_for_match(supplier_name="Jackson Ella W.")
+ doc = create_bank_transaction(
+ withdrawal=1200,
+ transaction_id="1f6f661f347ff7b1ea588665f473adb1",
+ party_name="Ella Jackson",
+ iban="DE04000000003716545346",
+ )
+ self.assertEqual(doc.party_type, "Supplier")
+ self.assertEqual(doc.party, "Jackson Ella W.")
+
+ def test_match_by_description(self):
+ create_supplier_for_match(supplier_name="Microsoft")
+ doc = create_bank_transaction(
+ description="Auftraggeber: microsoft payments Buchungstext: msft ..e3006b5hdy. ref. j375979555927627/5536",
+ withdrawal=1200,
+ transaction_id="8df880a2d09c3bed3fea358ca5168c5a",
+ party_name="",
+ )
+ self.assertEqual(doc.party_type, "Supplier")
+ self.assertEqual(doc.party, "Microsoft")
+
+ def test_skip_match_if_multiple_close_results(self):
+ create_supplier_for_match(supplier_name="Adithya Medical & General Stores")
+ create_supplier_for_match(supplier_name="Adithya Medical And General Stores")
+
+ doc = create_bank_transaction(
+ description="Paracetamol Consignment, SINV-0009",
+ withdrawal=24.85,
+ transaction_id="3a1da4ee2dc5a980138d56ef3460cbd9",
+ party_name="Adithya Medical & General",
+ )
+
+ # Mapping is skipped as both Supplier names have the same match score
+ self.assertEqual(doc.party_type, None)
+ self.assertEqual(doc.party, None)
+
+
+def create_supplier_for_match(supplier_name="John Doe & Co.", iban=None, account_no=None):
+ if frappe.db.exists("Supplier", {"supplier_name": supplier_name}):
+ # Update related Bank Account details
+ if not (iban or account_no):
+ return
+
+ frappe.db.set_value(
+ dt="Bank Account",
+ dn={"party": supplier_name},
+ field={"iban": iban, "bank_account_no": account_no},
+ )
+ return
+
+ # Create Supplier and Bank Account for the same
+ supplier = frappe.new_doc("Supplier")
+ supplier.supplier_name = supplier_name
+ supplier.supplier_group = "Services"
+ supplier.supplier_type = "Company"
+ supplier.insert()
+
+ if not frappe.db.exists("Bank", "TestBank"):
+ bank = frappe.new_doc("Bank")
+ bank.bank_name = "TestBank"
+ bank.insert(ignore_if_duplicate=True)
+
+ if not frappe.db.exists("Bank Account", supplier.name + " - " + "TestBank"):
+ bank_account = frappe.new_doc("Bank Account")
+ bank_account.account_name = supplier.name
+ bank_account.bank = "TestBank"
+ bank_account.iban = iban
+ bank_account.bank_account_no = account_no
+ bank_account.party_type = "Supplier"
+ bank_account.party = supplier.name
+ bank_account.insert()
+
+
+def create_bank_transaction(
+ description=None,
+ withdrawal=0,
+ deposit=0,
+ transaction_id=None,
+ party_name=None,
+ account_no=None,
+ iban=None,
+):
+ doc = frappe.new_doc("Bank Transaction")
+ doc.update(
+ {
+ "doctype": "Bank Transaction",
+ "description": description or "1512567 BG/000002918 OPSKATTUZWXXX AT776000000098709837 Herr G",
+ "date": nowdate(),
+ "withdrawal": withdrawal,
+ "deposit": deposit,
+ "currency": "INR",
+ "bank_account": "Checking Account - Citi Bank",
+ "transaction_id": transaction_id,
+ "bank_party_name": party_name,
+ "bank_party_account_number": account_no,
+ "bank_party_iban": iban,
+ }
+ )
+ doc.insert()
+ doc.submit()
+ doc.reload()
+
+ return doc
diff --git a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
index f900e07..59905da 100644
--- a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
@@ -16,6 +16,7 @@
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.tests.utils import if_lending_app_installed
test_dependencies = ["Item", "Cost Center"]
@@ -23,14 +24,13 @@
class TestBankTransaction(FrappeTestCase):
def setUp(self):
for dt in [
- "Loan Repayment",
"Bank Transaction",
"Payment Entry",
"Payment Entry Reference",
"POS Profile",
]:
frappe.db.delete(dt)
-
+ clear_loan_transactions()
make_pos_profile()
add_transactions()
add_vouchers()
@@ -160,8 +160,9 @@
is not None
)
+ @if_lending_app_installed
def test_matching_loan_repayment(self):
- from erpnext.loan_management.doctype.loan.test_loan import create_loan_accounts
+ from lending.loan_management.doctype.loan.test_loan import create_loan_accounts
create_loan_accounts()
bank_account = frappe.get_doc(
@@ -190,6 +191,11 @@
self.assertEqual(linked_payments[0][2], repayment_entry.name)
+@if_lending_app_installed
+def clear_loan_transactions():
+ frappe.db.delete("Loan Repayment")
+
+
def create_bank_account(bank_name="Citi Bank", account_name="_Test Bank - _TC"):
try:
frappe.get_doc(
@@ -400,16 +406,18 @@
si.submit()
+@if_lending_app_installed
def create_loan_and_repayment():
- from erpnext.loan_management.doctype.loan.test_loan import (
+ from lending.loan_management.doctype.loan.test_loan import (
create_loan,
create_loan_type,
create_repayment_entry,
make_loan_disbursement_entry,
)
- from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
+ from lending.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
process_loan_interest_accrual_for_term_loans,
)
+
from erpnext.setup.doctype.employee.test_employee import make_employee
create_loan_type(
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index 4c628a4..63e7bc6 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -125,14 +125,27 @@
if not args.account:
return
- for budget_against in ["project", "cost_center"] + get_accounting_dimensions():
+ default_dimensions = [
+ {
+ "fieldname": "project",
+ "document_type": "Project",
+ },
+ {
+ "fieldname": "cost_center",
+ "document_type": "Cost Center",
+ },
+ ]
+
+ for dimension in default_dimensions + get_accounting_dimensions(as_list=False):
+ budget_against = dimension.get("fieldname")
+
if (
args.get(budget_against)
and args.account
and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"})
):
- doctype = frappe.unscrub(budget_against)
+ doctype = dimension.get("document_type")
if frappe.get_cached_value("DocType", doctype, "is_tree"):
lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"])
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js b/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js
deleted file mode 100644
index 13d223a..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Cash Flow Mapper', {
-
-});
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.json b/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.json
deleted file mode 100644
index f0e984d..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 1,
- "autoname": "field:section_name",
- "beta": 0,
- "creation": "2018-02-08 10:00:14.066519",
- "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": "section_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": "Section 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": "section_header",
- "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": "Section Header",
- "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": "e.g Adjustments for:",
- "fieldname": "section_leader",
- "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": "Section Leader",
- "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_subtotal",
- "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": "Section Subtotal",
- "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_footer",
- "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": "Section Footer",
- "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": "accounts",
- "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": "Accounts",
- "length": 0,
- "no_copy": 0,
- "options": "Cash Flow Mapping Template Details",
- "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": "position",
- "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": "Position",
- "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": 0,
- "max_attachments": 0,
- "modified": "2018-02-15 18:28:55.034933",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cash Flow Mapper",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "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": "name",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py b/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py
deleted file mode 100644
index d975f80..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapper/cash_flow_mapper.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-from frappe.model.document import Document
-
-
-class CashFlowMapper(Document):
- pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py b/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py
deleted file mode 100644
index 79feb2d..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py
+++ /dev/null
@@ -1,25 +0,0 @@
-DEFAULT_MAPPERS = [
- {
- "doctype": "Cash Flow Mapper",
- "section_footer": "Net cash generated by operating activities",
- "section_header": "Cash flows from operating activities",
- "section_leader": "Adjustments for",
- "section_name": "Operating Activities",
- "position": 0,
- "section_subtotal": "Cash generated from operations",
- },
- {
- "doctype": "Cash Flow Mapper",
- "position": 1,
- "section_footer": "Net cash used in investing activities",
- "section_header": "Cash flows from investing activities",
- "section_name": "Investing Activities",
- },
- {
- "doctype": "Cash Flow Mapper",
- "position": 2,
- "section_footer": "Net cash used in financing activites",
- "section_header": "Cash flows from financing activities",
- "section_name": "Financing Activities",
- },
-]
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py b/erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py
deleted file mode 100644
index 044f2ae..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapper/test_cash_flow_mapper.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-
-class TestCashFlowMapper(unittest.TestCase):
- pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js b/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js
deleted file mode 100644
index 00c7165..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Cash Flow Mapping', {
- refresh: function(frm) {
- frm.events.disable_unchecked_fields(frm);
- },
- reset_check_fields: function(frm) {
- frm.fields.filter(field => field.df.fieldtype === 'Check')
- .map(field => frm.set_df_property(field.df.fieldname, 'read_only', 0));
- },
- has_checked_field(frm) {
- const val = frm.fields.filter(field => field.value === 1);
- return val.length ? 1 : 0;
- },
- _disable_unchecked_fields: function(frm) {
- // get value of clicked field
- frm.fields.filter(field => field.value === 0)
- .map(field => frm.set_df_property(field.df.fieldname, 'read_only', 1));
- },
- disable_unchecked_fields: function(frm) {
- frm.events.reset_check_fields(frm);
- const checked = frm.events.has_checked_field(frm);
- if (checked) {
- frm.events._disable_unchecked_fields(frm);
- }
- },
- is_working_capital: function(frm) {
- frm.events.disable_unchecked_fields(frm);
- },
- is_finance_cost: function(frm) {
- frm.events.disable_unchecked_fields(frm);
- },
- is_income_tax_liability: function(frm) {
- frm.events.disable_unchecked_fields(frm);
- },
- is_income_tax_expense: function(frm) {
- frm.events.disable_unchecked_fields(frm);
- },
- is_finance_cost_adjustment: function(frm) {
- frm.events.disable_unchecked_fields(frm);
- }
-});
diff --git a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.json b/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.json
deleted file mode 100644
index bd7fd1c..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.json
+++ /dev/null
@@ -1,359 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 1,
- "autoname": "field:mapping_name",
- "beta": 0,
- "creation": "2018-02-08 09:28:44.678364",
- "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": "mapping_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": "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": "label",
- "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": "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": 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": "accounts",
- "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": "Accounts",
- "length": 0,
- "no_copy": 0,
- "options": "Cash Flow Mapping Accounts",
- "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": "sb_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,
- "label": "Select Maximum Of 1",
- "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_finance_cost",
- "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 Finance Cost",
- "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_working_capital",
- "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 Working Capital",
- "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_finance_cost_adjustment",
- "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 Finance Cost Adjustment",
- "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_income_tax_liability",
- "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 Income Tax Liability",
- "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_income_tax_expense",
- "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 Income Tax Expense",
- "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-02-15 08:25:18.693533",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cash Flow Mapping",
- "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": "Administrator",
- "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": "name",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py b/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py
deleted file mode 100644
index 402469f..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-
-class CashFlowMapping(Document):
- def validate(self):
- self.validate_checked_options()
-
- def validate_checked_options(self):
- checked_fields = [
- d for d in self.meta.fields if d.fieldtype == "Check" and self.get(d.fieldname) == 1
- ]
- if len(checked_fields) > 1:
- frappe.throw(
- _("You can only select a maximum of one option from the list of check boxes."),
- title=_("Error"),
- )
diff --git a/erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py b/erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py
deleted file mode 100644
index 19f2425..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping/test_cash_flow_mapping.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-import frappe
-
-
-class TestCashFlowMapping(unittest.TestCase):
- def setUp(self):
- if frappe.db.exists("Cash Flow Mapping", "Test Mapping"):
- frappe.delete_doc("Cash Flow Mappping", "Test Mapping")
-
- def tearDown(self):
- frappe.delete_doc("Cash Flow Mapping", "Test Mapping")
-
- def test_multiple_selections_not_allowed(self):
- doc = frappe.new_doc("Cash Flow Mapping")
- doc.mapping_name = "Test Mapping"
- doc.label = "Test label"
- doc.append("accounts", {"account": "Accounts Receivable - _TC"})
- doc.is_working_capital = 1
- doc.is_finance_cost = 1
-
- self.assertRaises(frappe.ValidationError, doc.insert)
-
- doc.is_finance_cost = 0
- doc.insert()
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.json b/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.json
deleted file mode 100644
index 470c87c..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "field:account",
- "beta": 0,
- "creation": "2018-02-08 09:25:34.353995",
- "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": "account",
- "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": "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": 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": "2018-02-08 09:25:34.353995",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cash Flow Mapping Accounts",
- "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/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py b/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py
deleted file mode 100644
index d8dd05c..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_accounts/cash_flow_mapping_accounts.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-from frappe.model.document import Document
-
-
-class CashFlowMappingAccounts(Document):
- pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js b/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js
deleted file mode 100644
index 8611153..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Cash Flow Mapping Template', {
-
-});
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.json b/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.json
deleted file mode 100644
index 27e19dc..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2018-02-08 10:20:18.316801",
- "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": "template_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": "Template 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": "mapping",
- "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": "Cash Flow Mapping",
- "length": 0,
- "no_copy": 0,
- "options": "Cash Flow Mapping Template Details",
- "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": "2018-02-08 10:20:18.316801",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cash Flow Mapping Template",
- "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/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py b/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py
deleted file mode 100644
index 610428c..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/cash_flow_mapping_template.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-from frappe.model.document import Document
-
-
-class CashFlowMappingTemplate(Document):
- pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py b/erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py
deleted file mode 100644
index 1946146..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template/test_cash_flow_mapping_template.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-
-class TestCashFlowMappingTemplate(unittest.TestCase):
- pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template_details/__init__.py b/erpnext/accounts/doctype/cash_flow_mapping_template_details/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/__init__.py
+++ /dev/null
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js b/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js
deleted file mode 100644
index 2e5dce4..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Cash Flow Mapping Template Details', {
-
-});
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.json b/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.json
deleted file mode 100644
index 02c6875..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "actions": [],
- "creation": "2018-02-08 10:18:48.513608",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "mapping"
- ],
- "fields": [
- {
- "fieldname": "mapping",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Mapping",
- "options": "Cash Flow Mapping",
- "reqd": 1,
- "unique": 1
- }
- ],
- "istable": 1,
- "links": [],
- "modified": "2022-02-21 03:34:57.902332",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cash Flow Mapping Template Details",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py b/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py
deleted file mode 100644
index d15ab7e..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/cash_flow_mapping_template_details.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-from frappe.model.document import Document
-
-
-class CashFlowMappingTemplateDetails(Document):
- pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py b/erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py
deleted file mode 100644
index 5795e61..0000000
--- a/erpnext/accounts/doctype/cash_flow_mapping_template_details/test_cash_flow_mapping_template_details.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-
-class TestCashFlowMappingTemplateDetails(unittest.TestCase):
- pass
diff --git a/erpnext/accounts/doctype/dunning/dunning.json b/erpnext/accounts/doctype/dunning/dunning.json
index d55bfd1..2a32b99 100644
--- a/erpnext/accounts/doctype/dunning/dunning.json
+++ b/erpnext/accounts/doctype/dunning/dunning.json
@@ -245,6 +245,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -315,10 +316,11 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2020-08-03 18:55:43.683053",
+ "modified": "2023-06-03 16:24:01.677026",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Dunning",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -365,6 +367,7 @@
],
"sort_field": "modified",
"sort_order": "ASC",
+ "states": [],
"title_field": "customer_name",
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
index f72ecc9..1ef5c83 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
@@ -35,6 +35,21 @@
}
},
+ validate_rounding_loss: function(frm) {
+ let allowance = frm.doc.rounding_loss_allowance;
+ if (!(allowance >= 0 && allowance < 1)) {
+ frappe.throw(__("Rounding Loss Allowance should be between 0 and 1"));
+ }
+ },
+
+ rounding_loss_allowance: function(frm) {
+ frm.events.validate_rounding_loss(frm);
+ },
+
+ validate: function(frm) {
+ frm.events.validate_rounding_loss(frm);
+ },
+
get_entries: function(frm, account) {
frappe.call({
method: "get_accounts_data",
@@ -126,7 +141,8 @@
company: frm.doc.company,
posting_date: frm.doc.posting_date,
party_type: row.party_type,
- party: row.party
+ party: row.party,
+ rounding_loss_allowance: frm.doc.rounding_loss_allowance
},
callback: function(r){
$.extend(row, r.message);
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
index 0d198ca..79428d5 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"posting_date",
+ "rounding_loss_allowance",
"column_break_2",
"company",
"section_break_4",
@@ -96,11 +97,19 @@
{
"fieldname": "column_break_10",
"fieldtype": "Column Break"
+ },
+ {
+ "default": "0.05",
+ "description": "Only values between [0,1) are allowed. Like {0.00, 0.04, 0.09, ...}\nEx: If allowance is set at 0.07, accounts that have balance of 0.07 in either of the currencies will be considered as zero balance account",
+ "fieldname": "rounding_loss_allowance",
+ "fieldtype": "Float",
+ "label": "Rounding Loss Allowance",
+ "precision": "9"
}
],
"is_submittable": 1,
"links": [],
- "modified": "2022-12-29 19:38:24.416529",
+ "modified": "2023-06-20 07:29:06.972434",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Exchange Rate Revaluation",
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
index 81c2d8b..3b5698b 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
@@ -12,13 +12,19 @@
import erpnext
from erpnext.accounts.doctype.journal_entry.journal_entry import get_balance_on
+from erpnext.accounts.utils import get_currency_precision
from erpnext.setup.utils import get_exchange_rate
class ExchangeRateRevaluation(Document):
def validate(self):
+ self.validate_rounding_loss_allowance()
self.set_total_gain_loss()
+ def validate_rounding_loss_allowance(self):
+ if not (self.rounding_loss_allowance >= 0 and self.rounding_loss_allowance < 1):
+ frappe.throw(_("Rounding Loss Allowance should be between 0 and 1"))
+
def set_total_gain_loss(self):
total_gain_loss = 0
@@ -87,11 +93,22 @@
return True
+ def fetch_and_calculate_accounts_data(self):
+ accounts = self.get_accounts_data()
+ if accounts:
+ for acc in accounts:
+ self.append("accounts", acc)
+
@frappe.whitelist()
def get_accounts_data(self):
self.validate_mandatory()
account_details = self.get_account_balance_from_gle(
- company=self.company, posting_date=self.posting_date, account=None, party_type=None, party=None
+ company=self.company,
+ posting_date=self.posting_date,
+ account=None,
+ party_type=None,
+ party=None,
+ rounding_loss_allowance=self.rounding_loss_allowance,
)
accounts_with_new_balance = self.calculate_new_account_balance(
self.company, self.posting_date, account_details
@@ -103,7 +120,9 @@
return accounts_with_new_balance
@staticmethod
- def get_account_balance_from_gle(company, posting_date, account, party_type, party):
+ def get_account_balance_from_gle(
+ company, posting_date, account, party_type, party, rounding_loss_allowance
+ ):
account_details = []
if company and posting_date:
@@ -170,6 +189,23 @@
.run(as_dict=True)
)
+ # round off balance based on currency precision
+ # and consider debit-credit difference allowance
+ currency_precision = get_currency_precision()
+ rounding_loss_allowance = float(rounding_loss_allowance) or 0.05
+ for acc in account_details:
+ acc.balance_in_account_currency = flt(acc.balance_in_account_currency, currency_precision)
+ if abs(acc.balance_in_account_currency) <= rounding_loss_allowance:
+ acc.balance_in_account_currency = 0
+
+ acc.balance = flt(acc.balance, currency_precision)
+ if abs(acc.balance) <= rounding_loss_allowance:
+ acc.balance = 0
+
+ acc.zero_balance = (
+ True if (acc.balance == 0 or acc.balance_in_account_currency == 0) else False
+ )
+
return account_details
@staticmethod
@@ -222,8 +258,8 @@
new_balance_in_base_currency = 0
new_balance_in_account_currency = 0
- current_exchange_rate = calculate_exchange_rate_using_last_gle(
- company, d.account, d.party_type, d.party
+ current_exchange_rate = (
+ calculate_exchange_rate_using_last_gle(company, d.account, d.party_type, d.party) or 0.0
)
gain_loss = new_balance_in_account_currency - (
@@ -343,6 +379,24 @@
"credit": 0,
}
)
+
+ journal_entry_accounts.append(journal_account)
+
+ journal_entry_accounts.append(
+ {
+ "account": unrealized_exchange_gain_loss_account,
+ "balance": get_balance_on(unrealized_exchange_gain_loss_account),
+ "debit": 0,
+ "credit": 0,
+ "debit_in_account_currency": abs(d.gain_loss) if d.gain_loss < 0 else 0,
+ "credit_in_account_currency": abs(d.gain_loss) if d.gain_loss > 0 else 0,
+ "cost_center": erpnext.get_default_cost_center(self.company),
+ "exchange_rate": 1,
+ "reference_type": "Exchange Rate Revaluation",
+ "reference_name": self.name,
+ }
+ )
+
elif d.get("balance_in_base_currency") and not d.get("new_balance_in_base_currency"):
# Base currency has balance
dr_or_cr = "credit" if d.get("balance_in_base_currency") > 0 else "debit"
@@ -358,22 +412,22 @@
}
)
- journal_entry_accounts.append(journal_account)
+ journal_entry_accounts.append(journal_account)
- journal_entry_accounts.append(
- {
- "account": unrealized_exchange_gain_loss_account,
- "balance": get_balance_on(unrealized_exchange_gain_loss_account),
- "debit": abs(self.gain_loss_booked) if self.gain_loss_booked < 0 else 0,
- "credit": abs(self.gain_loss_booked) if self.gain_loss_booked > 0 else 0,
- "debit_in_account_currency": abs(self.gain_loss_booked) if self.gain_loss_booked < 0 else 0,
- "credit_in_account_currency": self.gain_loss_booked if self.gain_loss_booked > 0 else 0,
- "cost_center": erpnext.get_default_cost_center(self.company),
- "exchange_rate": 1,
- "reference_type": "Exchange Rate Revaluation",
- "reference_name": self.name,
- }
- )
+ journal_entry_accounts.append(
+ {
+ "account": unrealized_exchange_gain_loss_account,
+ "balance": get_balance_on(unrealized_exchange_gain_loss_account),
+ "debit": abs(d.gain_loss) if d.gain_loss < 0 else 0,
+ "credit": abs(d.gain_loss) if d.gain_loss > 0 else 0,
+ "debit_in_account_currency": 0,
+ "credit_in_account_currency": 0,
+ "cost_center": erpnext.get_default_cost_center(self.company),
+ "exchange_rate": 1,
+ "reference_type": "Exchange Rate Revaluation",
+ "reference_name": self.name,
+ }
+ )
journal_entry.set("accounts", journal_entry_accounts)
journal_entry.set_total_debit_credit()
@@ -521,7 +575,9 @@
@frappe.whitelist()
-def get_account_details(company, posting_date, account, party_type=None, party=None):
+def get_account_details(
+ company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float = None
+):
if not (company and posting_date):
frappe.throw(_("Company and Posting Date is mandatory"))
@@ -539,7 +595,12 @@
"account_currency": account_currency,
}
account_balance = ExchangeRateRevaluation.get_account_balance_from_gle(
- company=company, posting_date=posting_date, account=account, party_type=party_type, party=party
+ company=company,
+ posting_date=posting_date,
+ account=account,
+ party_type=party_type,
+ party=party,
+ rounding_loss_allowance=rounding_loss_allowance,
)
if account_balance and (
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
index 2968359..fd2d931 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
@@ -73,6 +73,7 @@
"fieldname": "current_exchange_rate",
"fieldtype": "Float",
"label": "Current Exchange Rate",
+ "precision": "9",
"read_only": 1
},
{
@@ -92,6 +93,7 @@
"fieldtype": "Float",
"in_list_view": 1,
"label": "New Exchange Rate",
+ "precision": "9",
"reqd": 1
},
{
@@ -147,7 +149,7 @@
],
"istable": 1,
"links": [],
- "modified": "2022-12-29 19:38:52.915295",
+ "modified": "2023-06-22 12:39:56.446722",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Exchange Rate Revaluation Account",
diff --git a/erpnext/accounts/doctype/finance_book/test_finance_book.py b/erpnext/accounts/doctype/finance_book/test_finance_book.py
index 7b2575d..42c0e51 100644
--- a/erpnext/accounts/doctype/finance_book/test_finance_book.py
+++ b/erpnext/accounts/doctype/finance_book/test_finance_book.py
@@ -13,7 +13,7 @@
finance_book = create_finance_book()
# create jv entry
- jv = make_journal_entry("_Test Bank - _TC", "_Test Receivable - _TC", 100, save=False)
+ jv = make_journal_entry("_Test Bank - _TC", "Debtors - _TC", 100, save=False)
jv.accounts[1].update({"party_type": "Customer", "party": "_Test Customer"})
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 3207e41..9d1b99b 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -12,7 +12,7 @@
class FiscalYear(Document):
@frappe.whitelist()
def set_as_default(self):
- frappe.db.set_value("Global Defaults", None, "current_fiscal_year", self.name)
+ frappe.db.set_single_value("Global Defaults", "current_fiscal_year", self.name)
global_defaults = frappe.get_doc("Global Defaults")
global_defaults.check_permission("write")
global_defaults.on_update()
diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.json b/erpnext/accounts/doctype/item_tax_template/item_tax_template.json
index b42d712..87f0ad1 100644
--- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.json
+++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.json
@@ -35,6 +35,7 @@
{
"fieldname": "company",
"fieldtype": "Link",
+ "in_filter": 1,
"in_list_view": 1,
"label": "Company",
"options": "Company",
@@ -56,7 +57,7 @@
}
],
"links": [],
- "modified": "2022-01-18 21:11:23.105589",
+ "modified": "2023-07-09 18:11:23.105589",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Item Tax Template",
@@ -102,4 +103,4 @@
"states": [],
"title_field": "title",
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 089f20b..a51e38e 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -8,7 +8,7 @@
frappe.ui.form.on("Journal Entry", {
setup: function(frm) {
frm.add_fetch("bank_account", "account", "account");
- frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger"];
+ frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger", 'Asset', 'Asset Movement', 'Asset Depreciation Schedule'];
},
refresh: function(frm) {
@@ -575,7 +575,7 @@
};
if(!frm.doc.multi_currency) {
$.extend(filters, {
- account_currency: frappe.get_doc(":Company", frm.doc.company).default_currency
+ account_currency: ['in', [frappe.get_doc(":Company", frm.doc.company).default_currency, null]]
});
}
return { filters: filters };
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 68364be..83312db 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -69,6 +69,7 @@
self.validate_empty_accounts_table()
self.set_account_and_party_balance()
self.validate_inter_company_accounts()
+ self.validate_depr_entry_voucher_type()
if self.docstatus == 0:
self.apply_tax_withholding()
@@ -130,6 +131,13 @@
if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
+ def validate_depr_entry_voucher_type(self):
+ if (
+ any(d.account_type == "Depreciation" for d in self.get("accounts"))
+ and self.voucher_type != "Depreciation Entry"
+ ):
+ frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
+
def validate_stock_accounts(self):
stock_accounts = get_stock_accounts(self.company, self.doctype, self.name)
for account in stock_accounts:
@@ -233,25 +241,30 @@
self.remove(d)
def update_asset_value(self):
- if self.voucher_type != "Depreciation Entry":
+ if self.flags.planned_depr_entry or self.voucher_type != "Depreciation Entry":
return
- processed_assets = []
-
for d in self.get("accounts"):
if (
- d.reference_type == "Asset" and d.reference_name and d.reference_name not in processed_assets
+ d.reference_type == "Asset"
+ and d.reference_name
+ and d.account_type == "Depreciation"
+ and d.debit
):
- processed_assets.append(d.reference_name)
-
asset = frappe.get_doc("Asset", d.reference_name)
if asset.calculate_depreciation:
- continue
-
- depr_value = d.debit or d.credit
-
- asset.db_set("value_after_depreciation", asset.value_after_depreciation - depr_value)
+ fb_idx = 1
+ if self.finance_book:
+ for fb_row in asset.get("finance_books"):
+ if fb_row.finance_book == self.finance_book:
+ fb_idx = fb_row.idx
+ break
+ fb_row = asset.get("finance_books")[fb_idx - 1]
+ fb_row.value_after_depreciation -= d.debit
+ fb_row.db_update()
+ else:
+ asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
asset.set_status()
@@ -313,45 +326,57 @@
d.db_update()
def unlink_asset_reference(self):
- if self.voucher_type != "Depreciation Entry":
- return
-
- processed_assets = []
-
for d in self.get("accounts"):
if (
- d.reference_type == "Asset" and d.reference_name and d.reference_name not in processed_assets
+ self.voucher_type == "Depreciation Entry"
+ and d.reference_type == "Asset"
+ and d.reference_name
+ and d.account_type == "Depreciation"
+ and d.debit
):
- processed_assets.append(d.reference_name)
-
asset = frappe.get_doc("Asset", d.reference_name)
if asset.calculate_depreciation:
je_found = False
- for row in asset.get("finance_books"):
+ for fb_row in asset.get("finance_books"):
if je_found:
break
- depr_schedule = get_depr_schedule(asset.name, "Active", row.finance_book)
+ depr_schedule = get_depr_schedule(asset.name, "Active", fb_row.finance_book)
for s in depr_schedule or []:
if s.journal_entry == self.name:
s.db_set("journal_entry", None)
- row.value_after_depreciation += s.depreciation_amount
- row.db_update()
-
- asset.set_status()
+ fb_row.value_after_depreciation += d.debit
+ fb_row.db_update()
je_found = True
break
+ if not je_found:
+ fb_idx = 1
+ if self.finance_book:
+ for fb_row in asset.get("finance_books"):
+ if fb_row.finance_book == self.finance_book:
+ fb_idx = fb_row.idx
+ break
+
+ fb_row = asset.get("finance_books")[fb_idx - 1]
+ fb_row.value_after_depreciation += d.debit
+ fb_row.db_update()
else:
- depr_value = d.debit or d.credit
+ asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
+ asset.set_status()
+ elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name:
+ journal_entry_for_scrap = frappe.db.get_value(
+ "Asset", d.reference_name, "journal_entry_for_scrap"
+ )
- asset.db_set("value_after_depreciation", asset.value_after_depreciation + depr_value)
-
- asset.set_status()
+ if journal_entry_for_scrap == self.name:
+ frappe.throw(
+ _("Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset.")
+ )
def unlink_inter_company_jv(self):
if (
@@ -885,6 +910,8 @@
def make_gl_entries(self, cancel=0, adv_adj=0):
from erpnext.accounts.general_ledger import make_gl_entries
+ merge_entries = frappe.db.get_single_value("Accounts Settings", "merge_similar_account_heads")
+
gl_map = self.build_gl_map()
if self.voucher_type in ("Deferred Revenue", "Deferred Expense"):
update_outstanding = "No"
@@ -892,7 +919,13 @@
update_outstanding = "Yes"
if gl_map:
- make_gl_entries(gl_map, cancel=cancel, adv_adj=adv_adj, update_outstanding=update_outstanding)
+ make_gl_entries(
+ gl_map,
+ cancel=cancel,
+ adv_adj=adv_adj,
+ merge_entries=merge_entries,
+ update_outstanding=update_outstanding,
+ )
@frappe.whitelist()
def get_balance(self, difference_account=None):
@@ -926,6 +959,7 @@
blank_row.debit_in_account_currency = abs(diff)
blank_row.debit = abs(diff)
+ self.set_total_debit_credit()
self.validate_total_debit_and_credit()
@frappe.whitelist()
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index f7297d1..e7aca79 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -43,7 +43,7 @@
frappe.db.sql(
"""select name from `tabJournal Entry Account`
where account = %s and docstatus = 1 and parent = %s""",
- ("_Test Receivable - _TC", test_voucher.name),
+ ("Debtors - _TC", test_voucher.name),
)
)
@@ -105,8 +105,8 @@
elif test_voucher.doctype in ["Sales Order", "Purchase Order"]:
# if test_voucher is a Sales Order/Purchase Order, test error on cancellation of test_voucher
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
+ frappe.db.set_single_value(
+ "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
)
submitted_voucher = frappe.get_doc(test_voucher.doctype, test_voucher.name)
self.assertRaises(frappe.LinkExistsError, submitted_voucher.cancel)
@@ -273,7 +273,7 @@
jv.submit()
# create jv in USD, but account currency in INR
- jv = make_journal_entry("_Test Bank - _TC", "_Test Receivable - _TC", 100, save=False)
+ jv = make_journal_entry("_Test Bank - _TC", "Debtors - _TC", 100, save=False)
jv.accounts[1].update({"party_type": "Customer", "party": "_Test Customer USD"})
diff --git a/erpnext/accounts/doctype/journal_entry/test_records.json b/erpnext/accounts/doctype/journal_entry/test_records.json
index 5077305..dafcf56 100644
--- a/erpnext/accounts/doctype/journal_entry/test_records.json
+++ b/erpnext/accounts/doctype/journal_entry/test_records.json
@@ -6,7 +6,7 @@
"doctype": "Journal Entry",
"accounts": [
{
- "account": "_Test Receivable - _TC",
+ "account": "Debtors - _TC",
"party_type": "Customer",
"party": "_Test Customer",
"credit_in_account_currency": 400.0,
@@ -70,7 +70,7 @@
"doctype": "Journal Entry",
"accounts": [
{
- "account": "_Test Receivable - _TC",
+ "account": "Debtors - _TC",
"party_type": "Customer",
"party": "_Test Customer",
"credit_in_account_currency": 0.0,
diff --git a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
index 88f1c90..7d80754 100644
--- a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
+++ b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
@@ -2,6 +2,21 @@
// For license information, please see license.txt
frappe.ui.form.on("Journal Entry Template", {
+ onload: function(frm) {
+ if(frm.is_new()) {
+ frappe.call({
+ type: "GET",
+ method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
+ callback: function(r){
+ if(r.message) {
+ frm.set_df_property("naming_series", "options", r.message.split("\n"));
+ frm.set_value("naming_series", r.message.split("\n")[0]);
+ frm.refresh_field("naming_series");
+ }
+ }
+ });
+ }
+ },
refresh: function(frm) {
frappe.model.set_default_values(frm.doc);
@@ -13,24 +28,12 @@
if(!frm.doc.multi_currency) {
$.extend(filters, {
- account_currency: frappe.get_doc(":Company", frm.doc.company).default_currency
+ account_currency: ['in', [frappe.get_doc(":Company", frm.doc.company).default_currency, null]]
});
}
return { filters: filters };
});
-
- frappe.call({
- type: "GET",
- method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
- callback: function(r){
- if(r.message){
- frm.set_df_property("naming_series", "options", r.message.split("\n"));
- frm.set_value("naming_series", r.message.split("\n")[0]);
- frm.refresh_field("naming_series");
- }
- }
- });
},
voucher_type: function(frm) {
var add_accounts = function(doc, r) {
diff --git a/erpnext/accounts/doctype/ledger_merge/ledger_merge.py b/erpnext/accounts/doctype/ledger_merge/ledger_merge.py
index 7cd6d04..381083b 100644
--- a/erpnext/accounts/doctype/ledger_merge/ledger_merge.py
+++ b/erpnext/accounts/doctype/ledger_merge/ledger_merge.py
@@ -4,7 +4,7 @@
import frappe
from frappe import _
from frappe.model.document import Document
-from frappe.utils.background_jobs import is_job_queued
+from frappe.utils.background_jobs import is_job_enqueued
from erpnext.accounts.doctype.account.account import merge_account
@@ -17,13 +17,14 @@
if is_scheduler_inactive() and not frappe.flags.in_test:
frappe.throw(_("Scheduler is inactive. Cannot merge accounts."), title=_("Scheduler Inactive"))
- if not is_job_queued(self.name):
+ job_id = f"ledger_merge::{self.name}"
+ if not is_job_enqueued(job_id):
enqueue(
start_merge,
queue="default",
timeout=6000,
event="ledger_merge",
- job_name=self.name,
+ job_id=job_id,
docname=self.name,
now=frappe.conf.developer_mode or frappe.flags.in_test,
)
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
index 47c2ceb..680afb1 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
@@ -6,7 +6,7 @@
from frappe import _, scrub
from frappe.model.document import Document
from frappe.utils import flt, nowdate
-from frappe.utils.background_jobs import enqueue, is_job_queued
+from frappe.utils.background_jobs import enqueue, is_job_enqueued
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
get_accounting_dimensions,
@@ -212,13 +212,15 @@
if is_scheduler_inactive() and not frappe.flags.in_test:
frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
- if not is_job_queued(self.name):
+ job_id = f"opening_invoice::{self.name}"
+
+ if not is_job_enqueued(job_id):
enqueue(
start_import,
queue="default",
timeout=6000,
event="opening_invoice_creation",
- job_name=self.name,
+ job_id=job_id,
invoices=invoices,
now=frappe.conf.developer_mode or frappe.flags.in_test,
)
diff --git a/erpnext/accounts/doctype/party_account/party_account.json b/erpnext/accounts/doctype/party_account/party_account.json
index 6933057..7e345d8 100644
--- a/erpnext/accounts/doctype/party_account/party_account.json
+++ b/erpnext/accounts/doctype/party_account/party_account.json
@@ -6,7 +6,8 @@
"engine": "InnoDB",
"field_order": [
"company",
- "account"
+ "account",
+ "advance_account"
],
"fields": [
{
@@ -22,14 +23,20 @@
"fieldname": "account",
"fieldtype": "Link",
"in_list_view": 1,
- "label": "Account",
+ "label": "Default Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "advance_account",
+ "fieldtype": "Link",
+ "label": "Advance Account",
"options": "Account"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-04-04 12:31:02.994197",
+ "modified": "2023-06-06 14:15:42.053150",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Party Account",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index f8969b8..0701435 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -155,6 +155,7 @@
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm);
+ erpnext.accounts.ledger_preview.show_accounting_ledger_preview(frm);
},
validate_company: (frm) => {
@@ -318,6 +319,10 @@
}
},
+ company: function(frm){
+ frm.trigger('party');
+ },
+
party: function(frm) {
if (frm.doc.contact_email || frm.doc.contact_person) {
frm.set_value("contact_email", "");
@@ -612,7 +617,7 @@
frm.events.set_unallocated_amount(frm);
},
- get_outstanding_invoice: function(frm) {
+ get_outstanding_invoices_or_orders: function(frm, get_outstanding_invoices, get_orders_to_be_billed) {
const today = frappe.datetime.get_today();
const fields = [
{fieldtype:"Section Break", label: __("Posting Date")},
@@ -642,12 +647,29 @@
{fieldtype:"Check", label: __("Allocate Payment Amount"), fieldname:"allocate_payment_amount", default:1},
];
+ let btn_text = "";
+
+ if (get_outstanding_invoices) {
+ btn_text = "Get Outstanding Invoices";
+ }
+ else if (get_orders_to_be_billed) {
+ btn_text = "Get Outstanding Orders";
+ }
+
frappe.prompt(fields, function(filters){
frappe.flags.allocate_payment_amount = true;
frm.events.validate_filters_data(frm, filters);
frm.doc.cost_center = filters.cost_center;
- frm.events.get_outstanding_documents(frm, filters);
- }, __("Filters"), __("Get Outstanding Documents"));
+ frm.events.get_outstanding_documents(frm, filters, get_outstanding_invoices, get_orders_to_be_billed);
+ }, __("Filters"), __(btn_text));
+ },
+
+ get_outstanding_invoices: function(frm) {
+ frm.events.get_outstanding_invoices_or_orders(frm, true, false);
+ },
+
+ get_outstanding_orders: function(frm) {
+ frm.events.get_outstanding_invoices_or_orders(frm, false, true);
},
validate_filters_data: function(frm, filters) {
@@ -673,7 +695,7 @@
}
},
- get_outstanding_documents: function(frm, filters) {
+ get_outstanding_documents: function(frm, filters, get_outstanding_invoices, get_orders_to_be_billed) {
frm.clear_table("references");
if(!frm.doc.party) {
@@ -697,6 +719,13 @@
args[key] = filters[key];
}
+ if (get_outstanding_invoices) {
+ args["get_outstanding_invoices"] = true;
+ }
+ else if (get_orders_to_be_billed) {
+ args["get_orders_to_be_billed"] = true;
+ }
+
frappe.flags.allocate_payment_amount = filters['allocate_payment_amount'];
return frappe.call({
@@ -708,7 +737,6 @@
if(r.message) {
var total_positive_outstanding = 0;
var total_negative_outstanding = 0;
-
$.each(r.message, function(i, d) {
var c = frm.add_child("references");
c.reference_doctype = d.voucher_type;
@@ -719,6 +747,7 @@
c.bill_no = d.bill_no;
c.payment_term = d.payment_term;
c.allocated_amount = d.allocated_amount;
+ c.account = d.account;
if(!in_list(frm.events.get_order_doctypes(frm), d.voucher_type)) {
if(flt(d.outstanding_amount) > 0)
@@ -904,7 +933,7 @@
function(d) { return flt(d.amount) }));
frm.set_value("difference_amount", difference_amount - total_deductions +
- frm.doc.base_total_taxes_and_charges);
+ flt(frm.doc.base_total_taxes_and_charges));
frm.events.hide_unhide_fields(frm);
},
@@ -970,29 +999,48 @@
},
callback: function(r, rt) {
if(r.message) {
- var write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
+ const write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
return t.account==r.message[account] ? t : null; });
- var row = [];
-
- var difference_amount = flt(frm.doc.difference_amount,
+ const difference_amount = flt(frm.doc.difference_amount,
precision("difference_amount"));
- if (!write_off_row.length && difference_amount) {
- row = frm.add_child("deductions");
- row.account = r.message[account];
- row.cost_center = r.message["cost_center"];
- } else {
- row = write_off_row[0];
- }
+ const add_deductions = (details) => {
+ let row = null;
+ if (!write_off_row.length && difference_amount) {
+ row = frm.add_child("deductions");
+ row.account = details[account];
+ row.cost_center = details["cost_center"];
+ } else {
+ row = write_off_row[0];
+ }
- if (row) {
- row.amount = flt(row.amount) + difference_amount;
- } else {
- frappe.msgprint(__("No gain or loss in the exchange rate"))
- }
+ if (row) {
+ row.amount = flt(row.amount) + difference_amount;
+ } else {
+ frappe.msgprint(__("No gain or loss in the exchange rate"))
+ }
+ refresh_field("deductions");
+ };
- refresh_field("deductions");
+ if (!r.message[account]) {
+ frappe.prompt({
+ label: __("Please Specify Account"),
+ fieldname: account,
+ fieldtype: "Link",
+ options: "Account",
+ get_query: () => ({
+ filters: {
+ company: frm.doc.company,
+ }
+ })
+ }, (values) => {
+ const details = Object.assign({}, r.message, values);
+ add_deductions(details);
+ }, __(frappe.unscrub(account)));
+ } else {
+ add_deductions(r.message);
+ }
frm.events.set_unallocated_amount(frm);
}
@@ -1415,4 +1463,4 @@
});
}
},
-})
+})
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 3927eca..d7b6a19 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -19,6 +19,7 @@
"party_type",
"party",
"party_name",
+ "book_advance_payments_in_separate_party_account",
"column_break_11",
"bank_account",
"party_bank_account",
@@ -48,7 +49,8 @@
"base_received_amount",
"base_received_amount_after_tax",
"section_break_14",
- "get_outstanding_invoice",
+ "get_outstanding_invoices",
+ "get_outstanding_orders",
"references",
"section_break_34",
"total_allocated_amount",
@@ -356,12 +358,6 @@
"label": "Reference"
},
{
- "depends_on": "eval:doc.docstatus==0",
- "fieldname": "get_outstanding_invoice",
- "fieldtype": "Button",
- "label": "Get Outstanding Invoice"
- },
- {
"fieldname": "references",
"fieldtype": "Table",
"label": "Payment References",
@@ -728,12 +724,33 @@
"fieldname": "section_break_60",
"fieldtype": "Section Break",
"hide_border": 1
+ },
+ {
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "get_outstanding_invoices",
+ "fieldtype": "Button",
+ "label": "Get Outstanding Invoices"
+ },
+ {
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "get_outstanding_orders",
+ "fieldtype": "Button",
+ "label": "Get Outstanding Orders"
+ },
+ {
+ "default": "0",
+ "fetch_from": "company.book_advance_payments_in_separate_party_account",
+ "fieldname": "book_advance_payments_in_separate_party_account",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "label": "Book Advance Payments in Separate Party Account",
+ "read_only": 1
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-02-14 04:52:30.478523",
+ "modified": "2023-06-23 18:07:38.023010",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index c34bddd..dcd7295 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -8,6 +8,7 @@
import frappe
from frappe import ValidationError, _, qb, scrub, throw
from frappe.utils import cint, comma_or, flt, getdate, nowdate
+from frappe.utils.data import comma_and, fmt_money
import erpnext
from erpnext.accounts.doctype.bank_account.bank_account import (
@@ -21,7 +22,11 @@
from erpnext.accounts.doctype.tax_withholding_category.tax_withholding_category import (
get_party_tax_withholding_details,
)
-from erpnext.accounts.general_ledger import make_gl_entries, process_gl_map
+from erpnext.accounts.general_ledger import (
+ make_gl_entries,
+ make_reverse_gl_entries,
+ process_gl_map,
+)
from erpnext.accounts.party import get_party_account
from erpnext.accounts.utils import get_account_currency, get_balance_on, get_outstanding_invoices
from erpnext.controllers.accounts_controller import (
@@ -60,6 +65,8 @@
def validate(self):
self.setup_party_account_field()
self.set_missing_values()
+ self.set_liability_account()
+ self.set_missing_ref_details()
self.validate_payment_type()
self.validate_party_details()
self.set_exchange_rate()
@@ -86,11 +93,48 @@
if self.difference_amount:
frappe.throw(_("Difference Amount must be zero"))
self.make_gl_entries()
+ self.make_advance_gl_entries()
self.update_outstanding_amounts()
self.update_advance_paid()
self.update_payment_schedule()
self.set_status()
+ def set_liability_account(self):
+ if not self.book_advance_payments_in_separate_party_account:
+ return
+
+ account_type = frappe.get_value(
+ "Account", {"name": self.party_account, "company": self.company}, "account_type"
+ )
+
+ if (account_type == "Payable" and self.party_type == "Customer") or (
+ account_type == "Receivable" and self.party_type == "Supplier"
+ ):
+ return
+
+ if self.unallocated_amount == 0:
+ for d in self.references:
+ if d.reference_doctype in ["Sales Order", "Purchase Order"]:
+ break
+ else:
+ return
+
+ liability_account = get_party_account(
+ self.party_type, self.party, self.company, include_advance=True
+ )[1]
+
+ self.set(self.party_account_field, liability_account)
+
+ frappe.msgprint(
+ _(
+ "Book Advance Payments as Liability option is chosen. Paid From account changed from {0} to {1}."
+ ).format(
+ frappe.bold(self.party_account),
+ frappe.bold(liability_account),
+ ),
+ alert=True,
+ )
+
def on_cancel(self):
self.ignore_linked_doctypes = (
"GL Entry",
@@ -100,6 +144,7 @@
"Repost Payment Ledger Items",
)
self.make_gl_entries(cancel=1)
+ self.make_advance_gl_entries(cancel=1)
self.update_outstanding_amounts()
self.update_advance_paid()
self.delink_advance_entry_references()
@@ -147,19 +192,68 @@
)
def validate_allocated_amount(self):
+ if self.payment_type == "Internal Transfer":
+ return
+
+ if self.party_type in ("Customer", "Supplier"):
+ self.validate_allocated_amount_with_latest_data()
+ else:
+ fail_message = _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.")
+ for d in self.get("references"):
+ if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(d.outstanding_amount):
+ frappe.throw(fail_message.format(d.idx))
+
+ # Check for negative outstanding invoices as well
+ if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(d.outstanding_amount):
+ frappe.throw(fail_message.format(d.idx))
+
+ def validate_allocated_amount_with_latest_data(self):
+ latest_references = get_outstanding_reference_documents(
+ {
+ "posting_date": self.posting_date,
+ "company": self.company,
+ "party_type": self.party_type,
+ "payment_type": self.payment_type,
+ "party": self.party,
+ "party_account": self.paid_from if self.payment_type == "Receive" else self.paid_to,
+ "get_outstanding_invoices": True,
+ "get_orders_to_be_billed": True,
+ },
+ validate=True,
+ )
+
+ # Group latest_references by (voucher_type, voucher_no)
+ latest_lookup = {}
+ for d in latest_references:
+ d = frappe._dict(d)
+ latest_lookup.update({(d.voucher_type, d.voucher_no): d})
+
for d in self.get("references"):
- if (flt(d.allocated_amount)) > 0:
- if flt(d.allocated_amount) > flt(d.outstanding_amount):
- frappe.throw(
- _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx)
- )
+ latest = latest_lookup.get((d.reference_doctype, d.reference_name))
+
+ # The reference has already been fully paid
+ if not latest:
+ frappe.throw(
+ _("{0} {1} has already been fully paid.").format(_(d.reference_doctype), d.reference_name)
+ )
+ # The reference has already been partly paid
+ elif latest.outstanding_amount < latest.invoice_amount and flt(
+ d.outstanding_amount, d.precision("outstanding_amount")
+ ) != flt(latest.outstanding_amount, d.precision("outstanding_amount")):
+ frappe.throw(
+ _(
+ "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."
+ ).format(_(d.reference_doctype), d.reference_name)
+ )
+
+ fail_message = _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.")
+
+ if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(latest.outstanding_amount):
+ frappe.throw(fail_message.format(d.idx))
# Check for negative outstanding invoices as well
- if flt(d.allocated_amount) < 0:
- if flt(d.allocated_amount) < flt(d.outstanding_amount):
- frappe.throw(
- _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx)
- )
+ if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(latest.outstanding_amount):
+ frappe.throw(fail_message.format(d.idx))
def delink_advance_entry_references(self):
for reference in self.references:
@@ -219,11 +313,16 @@
else self.paid_to_account_currency
)
- self.set_missing_ref_details()
-
- def set_missing_ref_details(self, force=False):
+ def set_missing_ref_details(
+ self, force: bool = False, update_ref_details_only_for: list | None = None
+ ) -> None:
for d in self.get("references"):
if d.allocated_amount:
+ if update_ref_details_only_for and (
+ not (d.reference_doctype, d.reference_name) in update_ref_details_only_for
+ ):
+ continue
+
ref_details = get_reference_details(
d.reference_doctype, d.reference_name, self.party_account_currency
)
@@ -246,7 +345,7 @@
def validate_party_details(self):
if self.party:
if not frappe.db.exists(self.party_type, self.party):
- frappe.throw(_("Invalid {0}: {1}").format(self.party_type, self.party))
+ frappe.throw(_("{0} {1} does not exist").format(_(self.party_type), self.party))
def set_exchange_rate(self, ref_doc=None):
self.set_source_exchange_rate(ref_doc)
@@ -295,7 +394,9 @@
continue
if d.reference_doctype not in valid_reference_doctypes:
frappe.throw(
- _("Reference Doctype must be one of {0}").format(comma_or(valid_reference_doctypes))
+ _("Reference Doctype must be one of {0}").format(
+ comma_or((_(d) for d in valid_reference_doctypes))
+ )
)
elif d.reference_name:
@@ -308,7 +409,7 @@
if self.party != ref_doc.get(scrub(self.party_type)):
frappe.throw(
_("{0} {1} is not associated with {2} {3}").format(
- d.reference_doctype, d.reference_name, self.party_type, self.party
+ _(d.reference_doctype), d.reference_name, _(self.party_type), self.party
)
)
else:
@@ -324,21 +425,24 @@
elif self.party_type == "Employee":
ref_party_account = ref_doc.payable_account
- if ref_party_account != self.party_account:
+ if (
+ ref_party_account != self.party_account
+ and not self.book_advance_payments_in_separate_party_account
+ ):
frappe.throw(
_("{0} {1} is associated with {2}, but Party Account is {3}").format(
- d.reference_doctype, d.reference_name, ref_party_account, self.party_account
+ _(d.reference_doctype), d.reference_name, ref_party_account, self.party_account
)
)
if ref_doc.doctype == "Purchase Invoice" and ref_doc.get("on_hold"):
frappe.throw(
- _("{0} {1} is on hold").format(d.reference_doctype, d.reference_name),
- title=_("Invalid Invoice"),
+ _("{0} {1} is on hold").format(_(d.reference_doctype), d.reference_name),
+ title=_("Invalid Purchase Invoice"),
)
if ref_doc.docstatus != 1:
- frappe.throw(_("{0} {1} must be submitted").format(d.reference_doctype, d.reference_name))
+ frappe.throw(_("{0} {1} must be submitted").format(_(d.reference_doctype), d.reference_name))
def get_valid_reference_doctypes(self):
if self.party_type == "Customer":
@@ -364,14 +468,13 @@
if outstanding_amount <= 0 and not is_return:
no_oustanding_refs.setdefault(d.reference_doctype, []).append(d)
- for k, v in no_oustanding_refs.items():
+ for reference_doctype, references in no_oustanding_refs.items():
frappe.msgprint(
_(
- "{} - {} now have {} as they had no outstanding amount left before submitting the Payment Entry."
+ "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
).format(
- _(k),
- frappe.bold(", ".join(d.reference_name for d in v)),
- frappe.bold(_("negative outstanding amount")),
+ frappe.bold(comma_and((d.reference_name for d in references))),
+ _(reference_doctype),
)
+ "<br><br>"
+ _("If this is undesirable please cancel the corresponding Payment Entry."),
@@ -406,7 +509,7 @@
if not valid:
frappe.throw(
_("Against Journal Entry {0} does not have any unmatched {1} entry").format(
- d.reference_name, dr_or_cr
+ d.reference_name, _(dr_or_cr)
)
)
@@ -473,7 +576,7 @@
if allocated_amount > outstanding:
frappe.throw(
_("Row #{0}: Cannot allocate more than {1} against payment term {2}").format(
- idx, outstanding, key[0]
+ idx, fmt_money(outstanding), key[0]
)
)
@@ -648,6 +751,28 @@
self.precision("base_received_amount"),
)
+ def calculate_base_allocated_amount_for_reference(self, d) -> float:
+ base_allocated_amount = 0
+ if d.reference_doctype in frappe.get_hooks("advance_payment_doctypes"):
+ # When referencing Sales/Purchase Order, use the source/target exchange rate depending on payment type.
+ # This is so there are no Exchange Gain/Loss generated for such doctypes
+
+ exchange_rate = 1
+ if self.payment_type == "Receive":
+ exchange_rate = self.source_exchange_rate
+ elif self.payment_type == "Pay":
+ exchange_rate = self.target_exchange_rate
+
+ base_allocated_amount += flt(
+ flt(d.allocated_amount) * flt(exchange_rate), self.precision("base_paid_amount")
+ )
+ else:
+ base_allocated_amount += flt(
+ flt(d.allocated_amount) * flt(d.exchange_rate), self.precision("base_paid_amount")
+ )
+
+ return base_allocated_amount
+
def set_total_allocated_amount(self):
if self.payment_type == "Internal Transfer":
return
@@ -656,9 +781,7 @@
for d in self.get("references"):
if d.allocated_amount:
total_allocated_amount += flt(d.allocated_amount)
- base_total_allocated_amount += flt(
- flt(d.allocated_amount) * flt(d.exchange_rate), self.precision("base_paid_amount")
- )
+ base_total_allocated_amount += self.calculate_base_allocated_amount_for_reference(d)
self.total_allocated_amount = abs(total_allocated_amount)
self.base_total_allocated_amount = abs(base_total_allocated_amount)
@@ -757,7 +880,7 @@
elif paid_amount - additional_charges > total_negative_outstanding:
frappe.throw(
_("Paid Amount cannot be greater than total negative outstanding amount {0}").format(
- total_negative_outstanding
+ fmt_money(total_negative_outstanding)
),
InvalidPaymentEntry,
)
@@ -866,26 +989,27 @@
cost_center = self.cost_center
if d.reference_doctype == "Sales Invoice" and not cost_center:
cost_center = frappe.db.get_value(d.reference_doctype, d.reference_name, "cost_center")
+
gle = party_gl_dict.copy()
+
+ allocated_amount_in_company_currency = self.calculate_base_allocated_amount_for_reference(d)
+
+ if self.book_advance_payments_in_separate_party_account:
+ against_voucher_type = "Payment Entry"
+ against_voucher = self.name
+ else:
+ against_voucher_type = d.reference_doctype
+ against_voucher = d.reference_name
+
gle.update(
{
- "against_voucher_type": d.reference_doctype,
- "against_voucher": d.reference_name,
+ dr_or_cr: allocated_amount_in_company_currency,
+ dr_or_cr + "_in_account_currency": d.allocated_amount,
+ "against_voucher_type": against_voucher_type,
+ "against_voucher": against_voucher,
"cost_center": cost_center,
}
)
-
- allocated_amount_in_company_currency = flt(
- flt(d.allocated_amount) * flt(d.exchange_rate), self.precision("paid_amount")
- )
-
- gle.update(
- {
- dr_or_cr + "_in_account_currency": d.allocated_amount,
- dr_or_cr: allocated_amount_in_company_currency,
- }
- )
-
gl_entries.append(gle)
if self.unallocated_amount:
@@ -893,7 +1017,6 @@
base_unallocated_amount = self.unallocated_amount * exchange_rate
gle = party_gl_dict.copy()
-
gle.update(
{
dr_or_cr + "_in_account_currency": self.unallocated_amount,
@@ -903,6 +1026,80 @@
gl_entries.append(gle)
+ def make_advance_gl_entries(self, against_voucher_type=None, against_voucher=None, cancel=0):
+ if self.book_advance_payments_in_separate_party_account:
+ gl_entries = []
+ for d in self.get("references"):
+ if d.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
+ if not (against_voucher_type and against_voucher) or (
+ d.reference_doctype == against_voucher_type and d.reference_name == against_voucher
+ ):
+ self.make_invoice_liability_entry(gl_entries, d)
+
+ if cancel:
+ for entry in gl_entries:
+ frappe.db.set_value(
+ "GL Entry",
+ {
+ "voucher_no": self.name,
+ "voucher_type": self.doctype,
+ "voucher_detail_no": entry.voucher_detail_no,
+ "against_voucher_type": entry.against_voucher_type,
+ "against_voucher": entry.against_voucher,
+ },
+ "is_cancelled",
+ 1,
+ )
+
+ make_reverse_gl_entries(gl_entries=gl_entries, partial_cancel=True)
+ else:
+ make_gl_entries(gl_entries)
+
+ def make_invoice_liability_entry(self, gl_entries, invoice):
+ args_dict = {
+ "party_type": self.party_type,
+ "party": self.party,
+ "account_currency": self.party_account_currency,
+ "cost_center": self.cost_center,
+ "voucher_type": "Payment Entry",
+ "voucher_no": self.name,
+ "voucher_detail_no": invoice.name,
+ }
+
+ dr_or_cr = "credit" if invoice.reference_doctype == "Sales Invoice" else "debit"
+ args_dict["account"] = invoice.account
+ args_dict[dr_or_cr] = invoice.allocated_amount
+ args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount
+ args_dict.update(
+ {
+ "against_voucher_type": invoice.reference_doctype,
+ "against_voucher": invoice.reference_name,
+ }
+ )
+ gle = self.get_gl_dict(
+ args_dict,
+ item=self,
+ )
+ gl_entries.append(gle)
+
+ args_dict[dr_or_cr] = 0
+ args_dict[dr_or_cr + "_in_account_currency"] = 0
+ dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
+ args_dict["account"] = self.party_account
+ args_dict[dr_or_cr] = invoice.allocated_amount
+ args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount
+ args_dict.update(
+ {
+ "against_voucher_type": "Payment Entry",
+ "against_voucher": self.name,
+ }
+ )
+ gle = self.get_gl_dict(
+ args_dict,
+ item=self,
+ )
+ gl_entries.append(gle)
+
def add_bank_gl_entries(self, gl_entries):
if self.payment_type in ("Pay", "Internal Transfer"):
gl_entries.append(
@@ -1228,13 +1425,16 @@
@frappe.whitelist()
-def get_outstanding_reference_documents(args):
+def get_outstanding_reference_documents(args, validate=False):
if isinstance(args, str):
args = json.loads(args)
if args.get("party_type") == "Member":
return
+ if not args.get("get_outstanding_invoices") and not args.get("get_orders_to_be_billed"):
+ args["get_outstanding_invoices"] = True
+
ple = qb.DocType("Payment Ledger Entry")
common_filter = []
accounting_dimensions_filter = []
@@ -1285,63 +1485,77 @@
condition += " and company = {0}".format(frappe.db.escape(args.get("company")))
common_filter.append(ple.company == args.get("company"))
- outstanding_invoices = get_outstanding_invoices(
- args.get("party_type"),
- args.get("party"),
- args.get("party_account"),
- common_filter=common_filter,
- posting_date=posting_and_due_date,
- min_outstanding=args.get("outstanding_amt_greater_than"),
- max_outstanding=args.get("outstanding_amt_less_than"),
- accounting_dimensions=accounting_dimensions_filter,
- )
+ outstanding_invoices = []
+ negative_outstanding_invoices = []
- outstanding_invoices = split_invoices_based_on_payment_terms(outstanding_invoices)
+ if args.get("get_outstanding_invoices"):
+ outstanding_invoices = get_outstanding_invoices(
+ args.get("party_type"),
+ args.get("party"),
+ get_party_account(args.get("party_type"), args.get("party"), args.get("company")),
+ common_filter=common_filter,
+ posting_date=posting_and_due_date,
+ min_outstanding=args.get("outstanding_amt_greater_than"),
+ max_outstanding=args.get("outstanding_amt_less_than"),
+ accounting_dimensions=accounting_dimensions_filter,
+ )
- for d in outstanding_invoices:
- d["exchange_rate"] = 1
- if party_account_currency != company_currency:
- if d.voucher_type in frappe.get_hooks("invoice_doctypes"):
- d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
- elif d.voucher_type == "Journal Entry":
- d["exchange_rate"] = get_exchange_rate(
- party_account_currency, company_currency, d.posting_date
- )
- if d.voucher_type in ("Purchase Invoice"):
- d["bill_no"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "bill_no")
+ outstanding_invoices = split_invoices_based_on_payment_terms(outstanding_invoices)
+
+ for d in outstanding_invoices:
+ d["exchange_rate"] = 1
+ if party_account_currency != company_currency:
+ if d.voucher_type in frappe.get_hooks("invoice_doctypes"):
+ d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
+ elif d.voucher_type == "Journal Entry":
+ d["exchange_rate"] = get_exchange_rate(
+ party_account_currency, company_currency, d.posting_date
+ )
+ if d.voucher_type in ("Purchase Invoice"):
+ d["bill_no"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "bill_no")
+
+ # Get negative outstanding sales /purchase invoices
+ if args.get("party_type") != "Employee" and not args.get("voucher_no"):
+ negative_outstanding_invoices = get_negative_outstanding_invoices(
+ args.get("party_type"),
+ args.get("party"),
+ args.get("party_account"),
+ party_account_currency,
+ company_currency,
+ condition=condition,
+ )
# Get all SO / PO which are not fully billed or against which full advance not paid
orders_to_be_billed = []
- orders_to_be_billed = get_orders_to_be_billed(
- args.get("posting_date"),
- args.get("party_type"),
- args.get("party"),
- args.get("company"),
- party_account_currency,
- company_currency,
- filters=args,
- )
-
- # Get negative outstanding sales /purchase invoices
- negative_outstanding_invoices = []
- if args.get("party_type") != "Employee" and not args.get("voucher_no"):
- negative_outstanding_invoices = get_negative_outstanding_invoices(
+ if args.get("get_orders_to_be_billed"):
+ orders_to_be_billed = get_orders_to_be_billed(
+ args.get("posting_date"),
args.get("party_type"),
args.get("party"),
- args.get("party_account"),
+ args.get("company"),
party_account_currency,
company_currency,
- condition=condition,
+ filters=args,
)
data = negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
if not data:
- frappe.msgprint(
- _(
- "No outstanding invoices found for the {0} {1} which qualify the filters you have specified."
- ).format(_(args.get("party_type")).lower(), frappe.bold(args.get("party")))
- )
+ if args.get("get_outstanding_invoices") and args.get("get_orders_to_be_billed"):
+ ref_document_type = "invoices or orders"
+ elif args.get("get_outstanding_invoices"):
+ ref_document_type = "invoices"
+ elif args.get("get_orders_to_be_billed"):
+ ref_document_type = "orders"
+
+ if not validate:
+ frappe.msgprint(
+ _(
+ "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
+ ).format(
+ _(ref_document_type), _(args.get("party_type")).lower(), frappe.bold(args.get("party"))
+ )
+ )
return data
@@ -1377,6 +1591,7 @@
"outstanding_amount": flt(d.outstanding_amount),
"payment_amount": payment_term.payment_amount,
"payment_term": payment_term.payment_term,
+ "account": d.account,
}
)
)
@@ -1414,66 +1629,71 @@
cost_center=None,
filters=None,
):
+ voucher_type = None
if party_type == "Customer":
voucher_type = "Sales Order"
elif party_type == "Supplier":
voucher_type = "Purchase Order"
- elif party_type == "Employee":
- voucher_type = None
+
+ if not voucher_type:
+ return []
# Add cost center condition
- if voucher_type:
- doc = frappe.get_doc({"doctype": voucher_type})
- condition = ""
- if doc and hasattr(doc, "cost_center"):
- condition = " and cost_center='%s'" % cost_center
+ doc = frappe.get_doc({"doctype": voucher_type})
+ condition = ""
+ if doc and hasattr(doc, "cost_center") and doc.cost_center:
+ condition = " and cost_center='%s'" % cost_center
- orders = []
- if voucher_type:
- if party_account_currency == company_currency:
- grand_total_field = "base_grand_total"
- rounded_total_field = "base_rounded_total"
- else:
- grand_total_field = "grand_total"
- rounded_total_field = "rounded_total"
+ if party_account_currency == company_currency:
+ grand_total_field = "base_grand_total"
+ rounded_total_field = "base_rounded_total"
+ else:
+ grand_total_field = "grand_total"
+ rounded_total_field = "rounded_total"
- orders = frappe.db.sql(
- """
- select
- name as voucher_no,
- if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
- (if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) - advance_paid) as outstanding_amount,
- transaction_date as posting_date
- from
- `tab{voucher_type}`
- where
- {party_type} = %s
- and docstatus = 1
- and company = %s
- and ifnull(status, "") != "Closed"
- and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
- and abs(100 - per_billed) > 0.01
- {condition}
- order by
- transaction_date, name
- """.format(
- **{
- "rounded_total_field": rounded_total_field,
- "grand_total_field": grand_total_field,
- "voucher_type": voucher_type,
- "party_type": scrub(party_type),
- "condition": condition,
- }
- ),
- (party, company),
- as_dict=True,
- )
+ orders = frappe.db.sql(
+ """
+ select
+ name as voucher_no,
+ if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
+ (if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) - advance_paid) as outstanding_amount,
+ transaction_date as posting_date
+ from
+ `tab{voucher_type}`
+ where
+ {party_type} = %s
+ and docstatus = 1
+ and company = %s
+ and ifnull(status, "") != "Closed"
+ and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
+ and abs(100 - per_billed) > 0.01
+ {condition}
+ order by
+ transaction_date, name
+ """.format(
+ **{
+ "rounded_total_field": rounded_total_field,
+ "grand_total_field": grand_total_field,
+ "voucher_type": voucher_type,
+ "party_type": scrub(party_type),
+ "condition": condition,
+ }
+ ),
+ (party, company),
+ as_dict=True,
+ )
order_list = []
for d in orders:
- if not (
- flt(d.outstanding_amount) >= flt(filters.get("outstanding_amt_greater_than"))
- and flt(d.outstanding_amount) <= flt(filters.get("outstanding_amt_less_than"))
+ if (
+ filters
+ and filters.get("outstanding_amt_greater_than")
+ and filters.get("outstanding_amt_less_than")
+ and not (
+ flt(filters.get("outstanding_amt_greater_than"))
+ <= flt(d.outstanding_amount)
+ <= flt(filters.get("outstanding_amt_less_than"))
+ )
):
continue
@@ -1494,7 +1714,10 @@
cost_center=None,
condition=None,
):
+ if party_type not in ["Customer", "Supplier"]:
+ return []
voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
+ account = "debit_to" if voucher_type == "Sales Invoice" else "credit_to"
supplier_condition = ""
if voucher_type == "Purchase Invoice":
supplier_condition = "and (release_date is null or release_date <= CURRENT_DATE)"
@@ -1508,7 +1731,7 @@
return frappe.db.sql(
"""
select
- "{voucher_type}" as voucher_type, name as voucher_no,
+ "{voucher_type}" as voucher_type, name as voucher_no, {account} as account,
if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
outstanding_amount, posting_date,
due_date, conversion_rate as exchange_rate
@@ -1531,6 +1754,7 @@
"party_type": scrub(party_type),
"party_account": "debit_to" if party_type == "Customer" else "credit_to",
"cost_center": cost_center,
+ "account": account,
}
),
(party, party_account),
@@ -1542,10 +1766,9 @@
def get_party_details(company, party_type, party, date, cost_center=None):
bank_account = ""
if not frappe.db.exists(party_type, party):
- frappe.throw(_("Invalid {0}: {1}").format(party_type, party))
+ frappe.throw(_("{0} {1} does not exist").format(_(party_type), party))
party_account = get_party_account(party_type, party, company)
-
account_currency = get_account_currency(party_account)
account_balance = get_balance_on(party_account, date, cost_center=cost_center)
_party_name = "title" if party_type == "Shareholder" else party_type.lower() + "_name"
@@ -1594,17 +1817,7 @@
@frappe.whitelist()
def get_company_defaults(company):
fields = ["write_off_account", "exchange_gain_loss_account", "cost_center"]
- ret = frappe.get_cached_value("Company", company, fields, as_dict=1)
-
- for fieldname in fields:
- if not ret[fieldname]:
- frappe.throw(
- _("Please set default {0} in Company {1}").format(
- frappe.get_meta("Company").get_label(fieldname), company
- )
- )
-
- return ret
+ return frappe.get_cached_value("Company", company, fields, as_dict=1)
def get_outstanding_on_journal_entry(name):
@@ -1628,7 +1841,7 @@
@frappe.whitelist()
def get_reference_details(reference_doctype, reference_name, party_account_currency):
- total_amount = outstanding_amount = exchange_rate = None
+ total_amount = outstanding_amount = exchange_rate = account = None
ref_doc = frappe.get_doc(reference_doctype, reference_name)
company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(
@@ -1653,7 +1866,7 @@
if not total_amount:
if party_account_currency == company_currency:
# for handling cases that don't have multi-currency (base field)
- total_amount = ref_doc.get("grand_total") or ref_doc.get("base_grand_total")
+ total_amount = ref_doc.get("base_grand_total") or ref_doc.get("grand_total")
exchange_rate = 1
else:
total_amount = ref_doc.get("grand_total")
@@ -1666,6 +1879,9 @@
if reference_doctype in ("Sales Invoice", "Purchase Invoice"):
outstanding_amount = ref_doc.get("outstanding_amount")
+ account = (
+ ref_doc.get("debit_to") if reference_doctype == "Sales Invoice" else ref_doc.get("credit_to")
+ )
else:
outstanding_amount = flt(total_amount) - flt(ref_doc.get("advance_paid"))
@@ -1673,7 +1889,7 @@
# Get the exchange rate based on the posting date of the ref doc.
exchange_rate = get_exchange_rate(party_account_currency, company_currency, ref_doc.posting_date)
- return frappe._dict(
+ res = frappe._dict(
{
"due_date": ref_doc.get("due_date"),
"total_amount": flt(total_amount),
@@ -1682,6 +1898,9 @@
"bill_no": ref_doc.get("bill_no"),
}
)
+ if account:
+ res.update({"account": account})
+ return res
@frappe.whitelist()
@@ -1697,8 +1916,11 @@
):
reference_doc = None
doc = frappe.get_doc(dt, dn)
- if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= 99.99:
- frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
+ over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
+ if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= (
+ 100.0 + over_billing_allowance
+ ):
+ frappe.throw(_("Can only make payment against unbilled {0}").format(_(dt)))
if not party_type:
party_type = set_party_type(dt)
@@ -1716,6 +1938,13 @@
# bank or cash
bank = get_bank_cash_account(doc, bank_account)
+ # if default bank or cash account is not set in company master and party has default company bank account, fetch it
+ if party_type in ["Customer", "Supplier"] and not bank:
+ party_bank_account = get_party_bank_account(party_type, doc.get(scrub(party_type)))
+ if party_bank_account:
+ account = frappe.db.get_value("Bank Account", party_bank_account, "account")
+ bank = get_bank_cash_account(doc, account)
+
paid_amount, received_amount = set_paid_amount_and_received_amount(
dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc
)
@@ -1764,7 +1993,12 @@
if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked():
frappe.msgprint(_("{0} is on hold till {1}").format(doc.name, doc.release_date))
else:
- if doc.doctype in ("Sales Invoice", "Purchase Invoice") and frappe.get_cached_value(
+ if doc.doctype in (
+ "Sales Invoice",
+ "Purchase Invoice",
+ "Purchase Order",
+ "Sales Order",
+ ) and frappe.get_cached_value(
"Payment Terms Template",
doc.payment_terms_template,
"allocate_payment_based_on_payment_terms",
@@ -1816,6 +2050,7 @@
pe.setup_party_account_field()
pe.set_missing_values()
+ pe.set_missing_ref_details()
update_accounting_dimensions(pe, doc)
@@ -1926,19 +2161,27 @@
paid_amount = received_amount = 0
if party_account_currency == bank.account_currency:
paid_amount = received_amount = abs(outstanding_amount)
- elif payment_type == "Receive":
- paid_amount = abs(outstanding_amount)
- if bank_amount:
- received_amount = bank_amount
- else:
- received_amount = paid_amount * doc.get("conversion_rate", 1)
else:
- received_amount = abs(outstanding_amount)
- if bank_amount:
- paid_amount = bank_amount
+ company_currency = frappe.get_cached_value("Company", doc.get("company"), "default_currency")
+ if payment_type == "Receive":
+ paid_amount = abs(outstanding_amount)
+ if bank_amount:
+ received_amount = bank_amount
+ else:
+ if company_currency != bank.account_currency:
+ received_amount = paid_amount / doc.get("conversion_rate", 1)
+ else:
+ received_amount = paid_amount * doc.get("conversion_rate", 1)
else:
- # if party account currency and bank currency is different then populate paid amount as well
- paid_amount = received_amount * doc.get("conversion_rate", 1)
+ received_amount = abs(outstanding_amount)
+ if bank_amount:
+ paid_amount = bank_amount
+ else:
+ if company_currency != bank.account_currency:
+ paid_amount = received_amount / doc.get("conversion_rate", 1)
+ else:
+ # if party account currency and bank currency is different then populate paid amount as well
+ paid_amount = received_amount * doc.get("conversion_rate", 1)
return paid_amount, received_amount
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 67049c4..70cc4b3 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -11,6 +11,7 @@
from erpnext.accounts.doctype.payment_entry.payment_entry import (
InvalidPaymentEntry,
get_payment_entry,
+ get_reference_details,
)
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import (
make_purchase_invoice,
@@ -51,6 +52,38 @@
so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
self.assertEqual(so_advance_paid, 0)
+ def test_payment_against_sales_order_usd_to_inr(self):
+ so = make_sales_order(
+ customer="_Test Customer USD", currency="USD", qty=1, rate=100, do_not_submit=True
+ )
+ so.conversion_rate = 50
+ so.submit()
+ pe = get_payment_entry("Sales Order", so.name)
+ pe.source_exchange_rate = 55
+ pe.received_amount = 5500
+ pe.insert()
+ pe.submit()
+
+ # there should be no difference amount
+ pe.reload()
+ self.assertEqual(pe.difference_amount, 0)
+ self.assertEqual(pe.deductions, [])
+
+ expected_gle = dict(
+ (d[0], d)
+ for d in [["_Test Receivable USD - _TC", 0, 5500, so.name], ["Cash - _TC", 5500.0, 0, None]]
+ )
+
+ self.validate_gl_entries(pe.name, expected_gle)
+
+ so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
+ self.assertEqual(so_advance_paid, 100)
+
+ pe.cancel()
+
+ so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
+ self.assertEqual(so_advance_paid, 0)
+
def test_payment_entry_for_blocked_supplier_invoice(self):
supplier = frappe.get_doc("Supplier", "_Test Supplier")
supplier.on_hold = 1
@@ -899,7 +932,7 @@
self.assertEqual(pe.cost_center, si.cost_center)
self.assertEqual(flt(expected_account_balance), account_balance)
self.assertEqual(flt(expected_party_balance), party_balance)
- self.assertEqual(flt(expected_party_account_balance), party_account_balance)
+ self.assertEqual(flt(expected_party_account_balance, 2), flt(party_account_balance, 2))
def test_multi_currency_payment_entry_with_taxes(self):
payment_entry = create_payment_entry(
@@ -981,6 +1014,53 @@
employee = make_employee("test_payment_entry@salary.com", company="_Test Company")
create_payment_entry(party_type="Employee", party=employee, save=True)
+ def test_duplicate_payment_entry_allocate_amount(self):
+ si = create_sales_invoice()
+
+ pe_draft = get_payment_entry("Sales Invoice", si.name)
+ pe_draft.insert()
+
+ pe = get_payment_entry("Sales Invoice", si.name)
+ pe.submit()
+
+ self.assertRaises(frappe.ValidationError, pe_draft.submit)
+
+ def test_duplicate_payment_entry_partial_allocate_amount(self):
+ si = create_sales_invoice()
+
+ pe_draft = get_payment_entry("Sales Invoice", si.name)
+ pe_draft.insert()
+
+ pe = get_payment_entry("Sales Invoice", si.name)
+ pe.received_amount = si.total / 2
+ pe.references[0].allocated_amount = si.total / 2
+ pe.submit()
+
+ self.assertRaises(frappe.ValidationError, pe_draft.submit)
+
+ def test_details_update_on_reference_table(self):
+ so = make_sales_order(
+ customer="_Test Customer USD", currency="USD", qty=1, rate=100, do_not_submit=True
+ )
+ so.conversion_rate = 50
+ so.submit()
+ pe = get_payment_entry("Sales Order", so.name)
+ pe.references.clear()
+ pe.paid_from = "Debtors - _TC"
+ pe.paid_from_account_currency = "INR"
+ pe.source_exchange_rate = 50
+ pe.save()
+
+ ref_details = get_reference_details(so.doctype, so.name, pe.paid_from_account_currency)
+ expected_response = {
+ "total_amount": 5000.0,
+ "outstanding_amount": 5000.0,
+ "exchange_rate": 1.0,
+ "due_date": None,
+ "bill_no": None,
+ }
+ self.assertDictEqual(ref_details, expected_response)
+
def create_payment_entry(**args):
payment_entry = frappe.new_doc("Payment Entry")
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
index 3003c68..12aa0b5 100644
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
@@ -15,7 +15,8 @@
"outstanding_amount",
"allocated_amount",
"exchange_rate",
- "exchange_gain_loss"
+ "exchange_gain_loss",
+ "account"
],
"fields": [
{
@@ -101,12 +102,18 @@
"label": "Exchange Gain/Loss",
"options": "Company:company:default_currency",
"read_only": 1
+ },
+ {
+ "fieldname": "account",
+ "fieldtype": "Link",
+ "label": "Account",
+ "options": "Account"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-12-12 12:31:44.919895",
+ "modified": "2023-06-08 07:40:38.487874",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry Reference",
diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
index 22842ce..9cf2ac6 100644
--- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
+++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
@@ -13,6 +13,7 @@
"party_type",
"party",
"due_date",
+ "voucher_detail_no",
"cost_center",
"finance_book",
"voucher_type",
@@ -142,12 +143,17 @@
"fieldname": "remarks",
"fieldtype": "Text",
"label": "Remarks"
+ },
+ {
+ "fieldname": "voucher_detail_no",
+ "fieldtype": "Data",
+ "label": "Voucher Detail No"
}
],
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2022-08-22 15:32:56.629430",
+ "modified": "2023-06-29 12:24:20.500632",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Ledger Entry",
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index caffac5..2adc123 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -29,6 +29,17 @@
};
});
+ this.frm.set_query('default_advance_account', () => {
+ return {
+ filters: {
+ "company": this.frm.doc.company,
+ "is_group": 0,
+ "account_type": this.frm.doc.party_type == 'Customer' ? "Receivable": "Payable",
+ "root_type": this.frm.doc.party_type == 'Customer' ? "Liability": "Asset"
+ }
+ };
+ });
+
this.frm.set_query('bank_cash_account', () => {
return {
filters:[
@@ -65,23 +76,53 @@
this.frm.add_custom_button(__('Get Unreconciled Entries'), () =>
this.frm.trigger("get_unreconciled_entries")
);
- this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'primary');
+ this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
}
if (this.frm.doc.invoices.length && this.frm.doc.payments.length) {
this.frm.add_custom_button(__('Allocate'), () =>
this.frm.trigger("allocate")
);
- this.frm.change_custom_button_type('Allocate', null, 'primary');
- this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
+ this.frm.change_custom_button_type(__('Allocate'), null, 'primary');
+ this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
}
if (this.frm.doc.allocation.length) {
this.frm.add_custom_button(__('Reconcile'), () =>
this.frm.trigger("reconcile")
);
- this.frm.change_custom_button_type('Reconcile', null, 'primary');
- this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
- this.frm.change_custom_button_type('Allocate', null, 'default');
+ this.frm.change_custom_button_type(__('Reconcile'), null, 'primary');
+ this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
+ this.frm.change_custom_button_type(__('Allocate'), null, 'default');
}
+
+ // check for any running reconciliation jobs
+ if (this.frm.doc.receivable_payable_account) {
+ this.frm.call({
+ doc: this.frm.doc,
+ method: 'is_auto_process_enabled',
+ callback: (r) => {
+ if (r.message) {
+ this.frm.call({
+ 'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
+ "args": {
+ for_filter: {
+ company: this.frm.doc.company,
+ party_type: this.frm.doc.party_type,
+ party: this.frm.doc.party,
+ receivable_payable_account: this.frm.doc.receivable_payable_account
+ }
+ }
+ }).then(r => {
+ if (r.message) {
+ let doc_link = frappe.utils.get_form_link("Process Payment Reconciliation", r.message, true);
+ let msg = __("Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.", [doc_link]);
+ this.frm.dashboard.add_comment(msg, "yellow");
+ }
+ });
+ }
+ }
+ });
+ }
+
}
company() {
@@ -98,19 +139,20 @@
this.frm.trigger("clear_child_tables");
if (!this.frm.doc.receivable_payable_account && this.frm.doc.party_type && this.frm.doc.party) {
- return frappe.call({
+ frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {
company: this.frm.doc.company,
party_type: this.frm.doc.party_type,
- party: this.frm.doc.party
+ party: this.frm.doc.party,
+ include_advance: 1
},
callback: (r) => {
if (!r.exc && r.message) {
- this.frm.set_value("receivable_payable_account", r.message);
+ this.frm.set_value("receivable_payable_account", r.message[0]);
+ this.frm.set_value("default_advance_account", r.message[1]);
}
this.frm.refresh();
-
}
});
}
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index 18d3485..5f6c703 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -10,6 +10,7 @@
"column_break_4",
"party",
"receivable_payable_account",
+ "default_advance_account",
"col_break1",
"from_invoice_date",
"from_payment_date",
@@ -185,13 +186,21 @@
"fieldtype": "Link",
"label": "Cost Center",
"options": "Cost Center"
+ },
+ {
+ "depends_on": "eval:doc.party",
+ "fieldname": "default_advance_account",
+ "fieldtype": "Link",
+ "label": "Default Advance Account",
+ "mandatory_depends_on": "doc.party_type",
+ "options": "Account"
}
],
"hide_toolbar": 1,
"icon": "icon-resize-horizontal",
"issingle": 1,
"links": [],
- "modified": "2022-04-29 15:37:10.246831",
+ "modified": "2023-06-09 13:02:48.718362",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Reconciliation",
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index d8082d0..25d94c5 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -6,10 +6,12 @@
from frappe import _, msgprint, qb
from frappe.model.document import Document
from frappe.query_builder.custom import ConstantColumn
-from frappe.query_builder.functions import IfNull
-from frappe.utils import flt, getdate, nowdate, today
+from frappe.utils import flt, get_link_to_form, getdate, nowdate, today
import erpnext
+from erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation import (
+ is_any_doc_running,
+)
from erpnext.accounts.utils import (
QueryPaymentLedger,
get_outstanding_invoices,
@@ -53,12 +55,28 @@
self.add_payment_entries(non_reconciled_payments)
def get_payment_entries(self):
+ if self.default_advance_account:
+ party_account = [self.receivable_payable_account, self.default_advance_account]
+ else:
+ party_account = [self.receivable_payable_account]
+
order_doctype = "Sales Order" if self.party_type == "Customer" else "Purchase Order"
- condition = self.get_conditions(get_payments=True)
+ condition = frappe._dict(
+ {
+ "company": self.get("company"),
+ "get_payments": True,
+ "cost_center": self.get("cost_center"),
+ "from_payment_date": self.get("from_payment_date"),
+ "to_payment_date": self.get("to_payment_date"),
+ "maximum_payment_amount": self.get("maximum_payment_amount"),
+ "minimum_payment_amount": self.get("minimum_payment_amount"),
+ }
+ )
+
payment_entries = get_advance_payment_entries(
self.party_type,
self.party,
- self.receivable_payable_account,
+ party_account,
order_doctype,
against_all_orders=True,
limit=self.payment_limit,
@@ -124,12 +142,29 @@
return list(journal_entries)
+ def get_return_invoices(self):
+ voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
+ doc = qb.DocType(voucher_type)
+ self.return_invoices = (
+ qb.from_(doc)
+ .select(
+ ConstantColumn(voucher_type).as_("voucher_type"),
+ doc.name.as_("voucher_no"),
+ doc.return_against,
+ )
+ .where(
+ (doc.docstatus == 1)
+ & (doc[frappe.scrub(self.party_type)] == self.party)
+ & (doc.is_return == 1)
+ )
+ .run(as_dict=True)
+ )
+
def get_dr_or_cr_notes(self):
self.build_qb_filter_conditions(get_return_invoices=True)
ple = qb.DocType("Payment Ledger Entry")
- voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
if erpnext.get_party_account_type(self.party_type) == "Receivable":
self.common_filter_conditions.append(ple.account_type == "Receivable")
@@ -137,19 +172,10 @@
self.common_filter_conditions.append(ple.account_type == "Payable")
self.common_filter_conditions.append(ple.account == self.receivable_payable_account)
- # get return invoices
- doc = qb.DocType(voucher_type)
- return_invoices = (
- qb.from_(doc)
- .select(ConstantColumn(voucher_type).as_("voucher_type"), doc.name.as_("voucher_no"))
- .where(
- (doc.docstatus == 1)
- & (doc[frappe.scrub(self.party_type)] == self.party)
- & (doc.is_return == 1)
- & (IfNull(doc.return_against, "") == "")
- )
- .run(as_dict=True)
- )
+ self.get_return_invoices()
+ return_invoices = [
+ x for x in self.return_invoices if x.return_against == None or x.return_against == ""
+ ]
outstanding_dr_or_cr = []
if return_invoices:
@@ -201,6 +227,15 @@
accounting_dimensions=self.accounting_dimension_filter_conditions,
)
+ cr_dr_notes = (
+ [x.voucher_no for x in self.return_invoices]
+ if self.party_type in ["Customer", "Supplier"]
+ else []
+ )
+ # Filter out cr/dr notes from outstanding invoices list
+ # Happens when non-standalone cr/dr notes are linked with another invoice through journal entry
+ non_reconciled_invoices = [x for x in non_reconciled_invoices if x.voucher_no not in cr_dr_notes]
+
if self.invoice_limit:
non_reconciled_invoices = non_reconciled_invoices[: self.invoice_limit]
@@ -234,6 +269,10 @@
return difference_amount
@frappe.whitelist()
+ def is_auto_process_enabled(self):
+ return frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments")
+
+ @frappe.whitelist()
def calculate_difference_on_allocation_change(self, payment_entry, invoice, allocated_amount):
invoice_exchange_map = self.get_invoice_exchange_map(invoice, payment_entry)
invoice[0]["exchange_rate"] = invoice_exchange_map.get(invoice[0].get("invoice_number"))
@@ -304,9 +343,7 @@
}
)
- @frappe.whitelist()
- def reconcile(self):
- self.validate_allocation()
+ def reconcile_allocations(self, skip_ref_details_update_for_pe=False):
dr_or_cr = (
"credit_in_account_currency"
if erpnext.get_party_account_type(self.party_type) == "Receivable"
@@ -326,16 +363,42 @@
payment_details = self.get_payment_details(row, dr_or_cr)
reconciled_entry.append(payment_details)
- if payment_details.difference_amount:
+ if payment_details.difference_amount and row.reference_type not in [
+ "Sales Invoice",
+ "Purchase Invoice",
+ ]:
self.make_difference_entry(payment_details)
if entry_list:
- reconcile_against_document(entry_list)
+ reconcile_against_document(entry_list, skip_ref_details_update_for_pe)
if dr_or_cr_notes:
reconcile_dr_cr_note(dr_or_cr_notes, self.company)
+ @frappe.whitelist()
+ def reconcile(self):
+ if frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
+ running_doc = is_any_doc_running(
+ dict(
+ company=self.company,
+ party_type=self.party_type,
+ party=self.party,
+ receivable_payable_account=self.receivable_payable_account,
+ )
+ )
+
+ if running_doc:
+ frappe.throw(
+ _("A Reconciliation Job {0} is running for the same filters. Cannot reconcile now").format(
+ get_link_to_form("Auto Reconcile", running_doc)
+ )
+ )
+ return
+
+ self.validate_allocation()
+ self.reconcile_allocations()
msgprint(_("Successfully Reconciled"))
+
self.get_unreconciled_entries()
def make_difference_entry(self, row):
@@ -389,6 +452,8 @@
journal_entry.save()
journal_entry.submit()
+ return journal_entry
+
def get_payment_details(self, row, dr_or_cr):
return frappe._dict(
{
@@ -554,6 +619,16 @@
def reconcile_dr_cr_note(dr_cr_notes, company):
+ def get_difference_row(inv):
+ if inv.difference_amount != 0 and inv.difference_account:
+ difference_row = {
+ "account": inv.difference_account,
+ inv.dr_or_cr: abs(inv.difference_amount) if inv.difference_amount > 0 else 0,
+ reconcile_dr_or_cr: abs(inv.difference_amount) if inv.difference_amount < 0 else 0,
+ "cost_center": erpnext.get_default_cost_center(company),
+ }
+ return difference_row
+
for inv in dr_cr_notes:
voucher_type = "Credit Note" if inv.voucher_type == "Sales Invoice" else "Debit Note"
@@ -598,5 +673,9 @@
],
}
)
+
+ if difference_entry := get_difference_row(inv):
+ jv.append("accounts", difference_entry)
+
jv.flags.ignore_mandatory = True
jv.submit()
diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
index 3be11ae..2ac7df0 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
@@ -11,10 +11,13 @@
from erpnext import get_default_cost_center
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
+from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.party import get_party_account
from erpnext.stock.doctype.item.test_item import create_item
+test_dependencies = ["Item"]
+
class TestPaymentReconciliation(FrappeTestCase):
def setUp(self):
@@ -163,7 +166,9 @@
def create_payment_reconciliation(self):
pr = frappe.new_doc("Payment Reconciliation")
pr.company = self.company
- pr.party_type = "Customer"
+ pr.party_type = (
+ self.party_type if hasattr(self, "party_type") and self.party_type else "Customer"
+ )
pr.party = self.customer
pr.receivable_payable_account = get_party_account(pr.party_type, pr.party, pr.company)
pr.from_invoice_date = pr.to_invoice_date = pr.from_payment_date = pr.to_payment_date = nowdate()
@@ -890,6 +895,42 @@
self.assertEqual(pr.allocation[0].allocated_amount, 85)
self.assertEqual(pr.allocation[0].difference_amount, 0)
+ def test_reconciliation_purchase_invoice_against_return(self):
+ pi = make_purchase_invoice(
+ supplier="_Test Supplier USD", currency="USD", conversion_rate=50
+ ).submit()
+
+ pi_return = frappe.get_doc(pi.as_dict())
+ pi_return.name = None
+ pi_return.docstatus = 0
+ pi_return.is_return = 1
+ pi_return.conversion_rate = 80
+ pi_return.items[0].qty = -pi_return.items[0].qty
+ pi_return.submit()
+
+ self.company = "_Test Company"
+ self.party_type = "Supplier"
+ self.customer = "_Test Supplier USD"
+
+ pr = self.create_payment_reconciliation()
+ pr.get_unreconciled_entries()
+
+ invoices = []
+ payments = []
+ for invoice in pr.invoices:
+ if invoice.invoice_number == pi.name:
+ invoices.append(invoice.as_dict())
+ break
+ for payment in pr.payments:
+ if payment.reference_name == pi_return.name:
+ payments.append(payment.as_dict())
+ break
+
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+
+ # Should not raise frappe.exceptions.ValidationError: Total Debit must be equal to Total Credit.
+ pr.reconcile()
+
def make_customer(customer_name, currency=None):
if not frappe.db.exists("Customer", customer_name):
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
index ea18ade..6046c13 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
@@ -2,7 +2,11 @@
// For license information, please see license.txt
frappe.ui.form.on('Payment Terms Template', {
- setup: function(frm) {
+ refresh: function(frm) {
+ frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
+ },
+ allocate_payment_based_on_payment_terms: function(frm) {
+ frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
}
});
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
index ea3b76c..7b04a68 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
@@ -11,7 +11,7 @@
class PaymentTermsTemplate(Document):
def validate(self):
self.validate_invoice_portion()
- self.check_duplicate_terms()
+ self.validate_terms()
def validate_invoice_portion(self):
total_portion = 0
@@ -23,9 +23,12 @@
_("Combined invoice portion must equal 100%"), raise_exception=1, indicator="red"
)
- def check_duplicate_terms(self):
+ def validate_terms(self):
terms = []
for term in self.terms:
+ if self.allocate_payment_based_on_payment_terms and not term.payment_term:
+ frappe.throw(_("Row {0}: Payment Term is mandatory").format(term.idx))
+
term_info = (term.payment_term, term.credit_days, term.credit_months, term.due_date_based_on)
if term_info in terms:
frappe.msgprint(
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
index 9d636ad..641f452 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -44,6 +44,7 @@
voucher_type="Period Closing Voucher",
voucher_no=self.name,
queue="long",
+ enqueue_after_commit=True,
)
frappe.msgprint(
_("The GL Entries will be cancelled in the background, it can take a few minutes."), alert=True
diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
index 62ae857..5d08e8d 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
@@ -205,7 +205,7 @@
self.assertRaises(frappe.ValidationError, jv1.submit)
- def test_closing_balance_with_dimensions(self):
+ def test_closing_balance_with_dimensions_and_test_reposting_entry(self):
frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
frappe.db.sql("delete from `tabAccount Closing Balance` where company='Test PCV Company'")
@@ -299,6 +299,24 @@
self.assertEqual(cc2_closing_balance.credit, 500)
self.assertEqual(cc2_closing_balance.credit_in_account_currency, 500)
+ warehouse = frappe.db.get_value("Warehouse", {"company": company}, "name")
+
+ repost_doc = frappe.get_doc(
+ {
+ "doctype": "Repost Item Valuation",
+ "company": company,
+ "posting_date": "2020-03-15",
+ "based_on": "Item and Warehouse",
+ "item_code": "Test Item 1",
+ "warehouse": warehouse,
+ }
+ )
+
+ self.assertRaises(frappe.ValidationError, repost_doc.save)
+
+ repost_doc.posting_date = today()
+ repost_doc.save()
+
def make_period_closing_voucher(self, posting_date=None, submit=True):
surplus_account = create_account()
cost_center = create_cost_center("Test Cost Center 1")
diff --git a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
index e6d9fe2..a6c0102 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
@@ -123,22 +123,29 @@
row.expected_amount = row.opening_amount;
}
- const pos_inv_promises = frm.doc.pos_transactions.map(
- row => frappe.db.get_doc("POS Invoice", row.pos_invoice)
- );
-
- const pos_invoices = await Promise.all(pos_inv_promises);
-
- for (let doc of pos_invoices) {
- frm.doc.grand_total += flt(doc.grand_total);
- frm.doc.net_total += flt(doc.net_total);
- frm.doc.total_quantity += flt(doc.total_qty);
- refresh_payments(doc, frm);
- refresh_taxes(doc, frm);
- refresh_fields(frm);
- set_html_data(frm);
- }
-
+ await Promise.all([
+ frappe.call({
+ method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
+ args: {
+ start: frappe.datetime.get_datetime_as_string(frm.doc.period_start_date),
+ end: frappe.datetime.get_datetime_as_string(frm.doc.period_end_date),
+ pos_profile: frm.doc.pos_profile,
+ user: frm.doc.user
+ },
+ callback: (r) => {
+ let pos_invoices = r.message;
+ for (let doc of pos_invoices) {
+ frm.doc.grand_total += flt(doc.grand_total);
+ frm.doc.net_total += flt(doc.net_total);
+ frm.doc.total_quantity += flt(doc.total_qty);
+ refresh_payments(doc, frm);
+ refresh_taxes(doc, frm);
+ refresh_fields(frm);
+ set_html_data(frm);
+ }
+ }
+ })
+ ])
frappe.dom.unfreeze();
}
});
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
index cced375..32e267f 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
@@ -20,7 +20,7 @@
onload(doc) {
super.onload();
- this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log', 'POS Closing Entry'];
+ this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log', 'POS Closing Entry', 'Serial and Batch Bundle'];
if(doc.__islocal && doc.is_pos && frappe.get_route_str() !== 'point-of-sale') {
this.frm.script_manager.trigger("is_pos");
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
index eedaaaf..f604707 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -442,6 +442,7 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -1554,11 +1555,10 @@
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
- "modified": "2022-09-30 03:49:50.455199",
+ "modified": "2023-06-03 16:23:41.083409",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",
- "name_case": "Title Case",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index b40649b..4b2fcec 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -3,7 +3,8 @@
import frappe
-from frappe import _
+from frappe import _, bold
+from frappe.query_builder.functions import IfNull, Sum
from frappe.utils import cint, flt, get_link_to_form, getdate, nowdate
from erpnext.accounts.doctype.loyalty_program.loyalty_program import validate_loyalty_points
@@ -15,12 +16,7 @@
update_multi_mode_option,
)
from erpnext.accounts.party import get_due_date, get_party_account
-from erpnext.stock.doctype.batch.batch import get_batch_qty, get_pos_reserved_batch_qty
-from erpnext.stock.doctype.serial_no.serial_no import (
- get_delivered_serial_nos,
- get_pos_reserved_serial_nos,
- get_serial_nos,
-)
+from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
class POSInvoice(SalesInvoice):
@@ -70,6 +66,7 @@
self.apply_loyalty_points()
self.check_phone_payments()
self.set_status(update=True)
+ self.submit_serial_batch_bundle()
if self.coupon_code:
from erpnext.accounts.doctype.pricing_rule.utils import update_coupon_code_count
@@ -96,7 +93,7 @@
)
def on_cancel(self):
- self.ignore_linked_doctypes = "Payment Ledger Entry"
+ self.ignore_linked_doctypes = ["Payment Ledger Entry", "Serial and Batch Bundle"]
# run on cancel method of selling controller
super(SalesInvoice, self).on_cancel()
if not self.is_return and self.loyalty_program:
@@ -111,6 +108,29 @@
update_coupon_code_count(self.coupon_code, "cancelled")
+ self.delink_serial_and_batch_bundle()
+
+ def delink_serial_and_batch_bundle(self):
+ for row in self.items:
+ if row.serial_and_batch_bundle:
+ if not self.consolidated_invoice:
+ frappe.db.set_value(
+ "Serial and Batch Bundle",
+ row.serial_and_batch_bundle,
+ {"is_cancelled": 1, "voucher_no": ""},
+ )
+
+ row.db_set("serial_and_batch_bundle", None)
+
+ def submit_serial_batch_bundle(self):
+ for item in self.items:
+ if item.serial_and_batch_bundle:
+ doc = frappe.get_doc("Serial and Batch Bundle", item.serial_and_batch_bundle)
+
+ if doc.docstatus == 0:
+ doc.flags.ignore_voucher_validation = True
+ doc.submit()
+
def check_phone_payments(self):
for pay in self.payments:
if pay.type == "Phone" and pay.amount >= 0:
@@ -128,88 +148,6 @@
if paid_amt and pay.amount != paid_amt:
return frappe.throw(_("Payment related to {0} is not completed").format(pay.mode_of_payment))
- def validate_pos_reserved_serial_nos(self, item):
- serial_nos = get_serial_nos(item.serial_no)
- filters = {"item_code": item.item_code, "warehouse": item.warehouse}
- if item.batch_no:
- filters["batch_no"] = item.batch_no
-
- reserved_serial_nos = get_pos_reserved_serial_nos(filters)
- invalid_serial_nos = [s for s in serial_nos if s in reserved_serial_nos]
-
- bold_invalid_serial_nos = frappe.bold(", ".join(invalid_serial_nos))
- if len(invalid_serial_nos) == 1:
- frappe.throw(
- _(
- "Row #{}: Serial No. {} has already been transacted into another POS Invoice. Please select valid serial no."
- ).format(item.idx, bold_invalid_serial_nos),
- title=_("Item Unavailable"),
- )
- elif invalid_serial_nos:
- frappe.throw(
- _(
- "Row #{}: Serial Nos. {} have already been transacted into another POS Invoice. Please select valid serial no."
- ).format(item.idx, bold_invalid_serial_nos),
- title=_("Item Unavailable"),
- )
-
- def validate_pos_reserved_batch_qty(self, item):
- filters = {"item_code": item.item_code, "warehouse": item.warehouse, "batch_no": item.batch_no}
-
- available_batch_qty = get_batch_qty(item.batch_no, item.warehouse, item.item_code)
- reserved_batch_qty = get_pos_reserved_batch_qty(filters)
-
- bold_item_name = frappe.bold(item.item_name)
- bold_extra_batch_qty_needed = frappe.bold(
- abs(available_batch_qty - reserved_batch_qty - item.stock_qty)
- )
- bold_invalid_batch_no = frappe.bold(item.batch_no)
-
- if (available_batch_qty - reserved_batch_qty) == 0:
- frappe.throw(
- _(
- "Row #{}: Batch No. {} of item {} has no stock available. Please select valid batch no."
- ).format(item.idx, bold_invalid_batch_no, bold_item_name),
- title=_("Item Unavailable"),
- )
- elif (available_batch_qty - reserved_batch_qty - item.stock_qty) < 0:
- frappe.throw(
- _(
- "Row #{}: Batch No. {} of item {} has less than required stock available, {} more required"
- ).format(
- item.idx, bold_invalid_batch_no, bold_item_name, bold_extra_batch_qty_needed
- ),
- title=_("Item Unavailable"),
- )
-
- def validate_delivered_serial_nos(self, item):
- delivered_serial_nos = get_delivered_serial_nos(item.serial_no)
-
- if delivered_serial_nos:
- bold_delivered_serial_nos = frappe.bold(", ".join(delivered_serial_nos))
- frappe.throw(
- _(
- "Row #{}: Serial No. {} has already been transacted into another Sales Invoice. Please select valid serial no."
- ).format(item.idx, bold_delivered_serial_nos),
- title=_("Item Unavailable"),
- )
-
- def validate_invalid_serial_nos(self, item):
- serial_nos = get_serial_nos(item.serial_no)
- error_msg = []
- invalid_serials, msg = "", ""
- for serial_no in serial_nos:
- if not frappe.db.exists("Serial No", serial_no):
- invalid_serials = invalid_serials + (", " if invalid_serials else "") + serial_no
- msg = _("Row #{}: Following Serial numbers for item {} are <b>Invalid</b>: {}").format(
- item.idx, frappe.bold(item.get("item_code")), frappe.bold(invalid_serials)
- )
- if invalid_serials:
- error_msg.append(msg)
-
- if error_msg:
- frappe.throw(error_msg, title=_("Invalid Item"), as_list=True)
-
def validate_stock_availablility(self):
if self.is_return:
return
@@ -222,13 +160,7 @@
from erpnext.stock.stock_ledger import is_negative_stock_allowed
for d in self.get("items"):
- if d.serial_no:
- self.validate_pos_reserved_serial_nos(d)
- self.validate_delivered_serial_nos(d)
- self.validate_invalid_serial_nos(d)
- elif d.batch_no:
- self.validate_pos_reserved_batch_qty(d)
- else:
+ if not d.serial_and_batch_bundle:
if is_negative_stock_allowed(item_code=d.item_code):
return
@@ -257,36 +189,15 @@
def validate_serialised_or_batched_item(self):
error_msg = []
for d in self.get("items"):
- serialized = d.get("has_serial_no")
- batched = d.get("has_batch_no")
- no_serial_selected = not d.get("serial_no")
- no_batch_selected = not d.get("batch_no")
+ error_msg = ""
+ if d.get("has_serial_no") and not d.serial_and_batch_bundle:
+ error_msg = f"Row #{d.idx}: Please select Serial No. for item {bold(d.item_code)}"
- msg = ""
- item_code = frappe.bold(d.item_code)
- serial_nos = get_serial_nos(d.serial_no)
- if serialized and batched and (no_batch_selected or no_serial_selected):
- msg = _(
- "Row #{}: Please select a serial no and batch against item: {} or remove it to complete transaction."
- ).format(d.idx, item_code)
- elif serialized and no_serial_selected:
- msg = _(
- "Row #{}: No serial number selected against item: {}. Please select one or remove it to complete transaction."
- ).format(d.idx, item_code)
- elif batched and no_batch_selected:
- msg = _(
- "Row #{}: No batch selected against item: {}. Please select a batch or remove it to complete transaction."
- ).format(d.idx, item_code)
- elif serialized and not no_serial_selected and len(serial_nos) != d.qty:
- msg = _("Row #{}: You must select {} serial numbers for item {}.").format(
- d.idx, frappe.bold(cint(d.qty)), item_code
- )
-
- if msg:
- error_msg.append(msg)
+ elif d.get("has_batch_no") and not d.serial_and_batch_bundle:
+ error_msg = f"Row #{d.idx}: Please select Batch No. for item {bold(d.item_code)}"
if error_msg:
- frappe.throw(error_msg, title=_("Invalid Item"), as_list=True)
+ frappe.throw(error_msg, title=_("Serial / Batch Bundle Missing"), as_list=True)
def validate_return_items_qty(self):
if not self.get("is_return"):
@@ -651,7 +562,7 @@
item_pos_reserved_qty = get_pos_reserved_qty(item.item_code, warehouse)
available_qty = item_bin_qty - item_pos_reserved_qty
- max_available_bundles = available_qty / item.stock_qty
+ max_available_bundles = available_qty / item.qty
if bundle_bin_qty > max_available_bundles and frappe.get_value(
"Item", item.item_code, "is_stock_item"
):
@@ -674,18 +585,22 @@
def get_pos_reserved_qty(item_code, warehouse):
- reserved_qty = frappe.db.sql(
- """select sum(p_item.stock_qty) as qty
- from `tabPOS Invoice` p, `tabPOS Invoice Item` p_item
- where p.name = p_item.parent
- and ifnull(p.consolidated_invoice, '') = ''
- and p_item.docstatus = 1
- and p_item.item_code = %s
- and p_item.warehouse = %s
- """,
- (item_code, warehouse),
- as_dict=1,
- )
+ p_inv = frappe.qb.DocType("POS Invoice")
+ p_item = frappe.qb.DocType("POS Invoice Item")
+
+ reserved_qty = (
+ frappe.qb.from_(p_inv)
+ .from_(p_item)
+ .select(Sum(p_item.qty).as_("qty"))
+ .where(
+ (p_inv.name == p_item.parent)
+ & (IfNull(p_inv.consolidated_invoice, "") == "")
+ & (p_inv.is_return == 0)
+ & (p_item.docstatus == 1)
+ & (p_item.item_code == item_code)
+ & (p_item.warehouse == warehouse)
+ )
+ ).run(as_dict=True)
return reserved_qty[0].qty or 0 if reserved_qty else 0
diff --git a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
index 3132fdd..0fce61f 100644
--- a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
@@ -5,12 +5,18 @@
import unittest
import frappe
+from frappe import _
from erpnext.accounts.doctype.pos_invoice.pos_invoice import make_sales_return
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -25,7 +31,7 @@
frappe.set_user("Administrator")
if frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
- frappe.db.set_value("Selling Settings", None, "validate_selling_price", 0)
+ frappe.db.set_single_value("Selling Settings", "validate_selling_price", 0)
def test_timestamp_change(self):
w = create_pos_invoice(do_not_save=1)
@@ -249,7 +255,7 @@
expense_account="Cost of Goods Sold - _TC",
)
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
pos = create_pos_invoice(
company="_Test Company",
@@ -260,11 +266,11 @@
expense_account="Cost of Goods Sold - _TC",
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
+ serial_no=[serial_nos[0]],
rate=1000,
do_not_save=1,
)
- pos.get("items")[0].serial_no = serial_nos[0]
pos.append(
"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
)
@@ -276,7 +282,9 @@
pos_return.insert()
pos_return.submit()
- self.assertEqual(pos_return.get("items")[0].serial_no, serial_nos[0])
+ self.assertEqual(
+ get_serial_nos_from_bundle(pos_return.get("items")[0].serial_and_batch_bundle)[0], serial_nos[0]
+ )
def test_partial_pos_returns(self):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -289,7 +297,7 @@
expense_account="Cost of Goods Sold - _TC",
)
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
pos = create_pos_invoice(
company="_Test Company",
@@ -300,12 +308,12 @@
expense_account="Cost of Goods Sold - _TC",
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
+ serial_no=serial_nos,
qty=2,
rate=1000,
do_not_save=1,
)
- pos.get("items")[0].serial_no = serial_nos[0] + "\n" + serial_nos[1]
pos.append(
"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
)
@@ -317,14 +325,27 @@
# partial return 1
pos_return1.get("items")[0].qty = -1
- pos_return1.get("items")[0].serial_no = serial_nos[0]
+
+ bundle_id = frappe.get_doc(
+ "Serial and Batch Bundle", pos_return1.get("items")[0].serial_and_batch_bundle
+ )
+
+ bundle_id.remove(bundle_id.entries[1])
+ bundle_id.save()
+
+ bundle_id.load_from_db()
+
+ serial_no = bundle_id.entries[0].serial_no
+ self.assertEqual(serial_no, serial_nos[0])
+
pos_return1.insert()
pos_return1.submit()
# partial return 2
pos_return2 = make_sales_return(pos.name)
self.assertEqual(pos_return2.get("items")[0].qty, -1)
- self.assertEqual(pos_return2.get("items")[0].serial_no, serial_nos[1])
+ serial_no = get_serial_nos_from_bundle(pos_return2.get("items")[0].serial_and_batch_bundle)[0]
+ self.assertEqual(serial_no, serial_nos[1])
def test_pos_change_amount(self):
pos = create_pos_invoice(
@@ -368,7 +389,7 @@
expense_account="Cost of Goods Sold - _TC",
)
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
pos = create_pos_invoice(
company="_Test Company",
@@ -380,10 +401,10 @@
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
+ serial_no=[serial_nos[0]],
do_not_save=1,
)
- pos.get("items")[0].serial_no = serial_nos[0]
pos.append(
"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 1000}
)
@@ -401,10 +422,10 @@
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
+ serial_no=[serial_nos[0]],
do_not_save=1,
)
- pos2.get("items")[0].serial_no = serial_nos[0]
pos2.append(
"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 1000}
)
@@ -423,7 +444,7 @@
expense_account="Cost of Goods Sold - _TC",
)
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
si = create_sales_invoice(
company="_Test Company",
@@ -435,11 +456,11 @@
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
+ update_stock=1,
+ serial_no=[serial_nos[0]],
do_not_save=1,
)
- si.get("items")[0].serial_no = serial_nos[0]
- si.update_stock = 1
si.insert()
si.submit()
@@ -453,10 +474,10 @@
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
+ serial_no=[serial_nos[0]],
do_not_save=1,
)
- pos2.get("items")[0].serial_no = serial_nos[0]
pos2.append(
"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 1000}
)
@@ -473,7 +494,7 @@
cost_center="Main - _TC",
expense_account="Cost of Goods Sold - _TC",
)
- serial_nos = se.get("items")[0].serial_no + "wrong"
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0] + "wrong"
pos = create_pos_invoice(
company="_Test Company",
@@ -486,14 +507,13 @@
item=se.get("items")[0].item_code,
rate=1000,
qty=2,
+ serial_nos=[serial_nos],
do_not_save=1,
)
pos.get("items")[0].has_serial_no = 1
- pos.get("items")[0].serial_no = serial_nos
- pos.insert()
- self.assertRaises(frappe.ValidationError, pos.submit)
+ self.assertRaises(frappe.ValidationError, pos.insert)
def test_value_error_on_serial_no_validation(self):
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
@@ -504,7 +524,7 @@
cost_center="Main - _TC",
expense_account="Cost of Goods Sold - _TC",
)
- serial_nos = se.get("items")[0].serial_no
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
# make a pos invoice
pos = create_pos_invoice(
@@ -517,11 +537,11 @@
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
+ serial_no=[serial_nos[0]],
qty=1,
do_not_save=1,
)
pos.get("items")[0].has_serial_no = 1
- pos.get("items")[0].serial_no = serial_nos.split("\n")[0]
pos.set("payments", [])
pos.append(
"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
@@ -547,12 +567,12 @@
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
+ serial_no=[serial_nos[0]],
qty=1,
do_not_save=1,
)
pos2.get("items")[0].has_serial_no = 1
- pos2.get("items")[0].serial_no = serial_nos.split("\n")[0]
# Value error should not be triggered on validation
pos2.save()
@@ -702,7 +722,7 @@
)
if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
- frappe.db.set_value("Selling Settings", "Selling Settings", "validate_selling_price", 1)
+ frappe.db.set_single_value("Selling Settings", "validate_selling_price", 1)
item = "Test Selling Price Validation"
make_item(item, {"is_stock_item": 1})
@@ -747,17 +767,50 @@
)
self.assertEqual(rounded_total, 400)
- def test_pos_batch_item_qty_validation(self):
+ def test_pos_batch_reservation(self):
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_auto_batch_nos,
+ )
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
create_batch_item_with_batch,
)
+ create_batch_item_with_batch("_BATCH ITEM Test For Reserve", "TestBatch-RS 02")
+ make_stock_entry(
+ target="_Test Warehouse - _TC",
+ item_code="_BATCH ITEM Test For Reserve",
+ qty=20,
+ basic_rate=100,
+ batch_no="TestBatch-RS 02",
+ )
+
+ pos_inv1 = create_pos_invoice(
+ item="_BATCH ITEM Test For Reserve", rate=300, qty=15, batch_no="TestBatch-RS 02"
+ )
+ pos_inv1.save()
+ pos_inv1.submit()
+
+ batches = get_auto_batch_nos(
+ frappe._dict(
+ {"item_code": "_BATCH ITEM Test For Reserve", "warehouse": "_Test Warehouse - _TC"}
+ )
+ )
+
+ for batch in batches:
+ if batch.batch_no == "TestBatch-RS 02" and batch.warehouse == "_Test Warehouse - _TC":
+ self.assertEqual(batch.qty, 5)
+
+ def test_pos_batch_item_qty_validation(self):
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ BatchNegativeStockError,
+ )
+ from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
+ create_batch_item_with_batch,
+ )
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
+
create_batch_item_with_batch("_BATCH ITEM", "TestBatch 01")
item = frappe.get_doc("Item", "_BATCH ITEM")
- batch = frappe.get_doc("Batch", "TestBatch 01")
- batch.submit()
- item.batch_no = "TestBatch 01"
- item.save()
se = make_stock_entry(
target="_Test Warehouse - _TC",
@@ -767,16 +820,28 @@
batch_no="TestBatch 01",
)
- pos_inv1 = create_pos_invoice(item=item.name, rate=300, qty=1, do_not_submit=1)
- pos_inv1.items[0].batch_no = "TestBatch 01"
+ pos_inv1 = create_pos_invoice(
+ item=item.name, rate=300, qty=1, do_not_submit=1, batch_no="TestBatch 01"
+ )
pos_inv1.save()
pos_inv1.submit()
pos_inv2 = create_pos_invoice(item=item.name, rate=300, qty=2, do_not_submit=1)
- pos_inv2.items[0].batch_no = "TestBatch 01"
- pos_inv2.save()
- self.assertRaises(frappe.ValidationError, pos_inv2.submit)
+ sn_doc = SerialBatchCreation(
+ {
+ "item_code": item.name,
+ "warehouse": pos_inv2.items[0].warehouse,
+ "voucher_type": "Delivery Note",
+ "qty": 2,
+ "avg_rate": 300,
+ "batches": frappe._dict({"TestBatch 01": 2}),
+ "type_of_transaction": "Outward",
+ "company": pos_inv2.company,
+ }
+ )
+
+ self.assertRaises(BatchNegativeStockError, sn_doc.make_serial_and_batch_bundle)
# teardown
pos_inv1.reload()
@@ -785,9 +850,6 @@
pos_inv2.reload()
pos_inv2.delete()
se.cancel()
- batch.reload()
- batch.cancel()
- batch.delete()
def test_ignore_pricing_rule(self):
from erpnext.accounts.doctype.pricing_rule.test_pricing_rule import make_pricing_rule
@@ -838,18 +900,18 @@
frappe.db.savepoint("before_test_delivered_serial_no_case")
try:
se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
+ serial_no = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
- dn = create_delivery_note(item_code="_Test Serialized Item With Series", serial_no=serial_no)
+ dn = create_delivery_note(item_code="_Test Serialized Item With Series", serial_no=[serial_no])
+ delivered_serial_no = get_serial_nos_from_bundle(dn.get("items")[0].serial_and_batch_bundle)[0]
- delivery_document_no = frappe.db.get_value("Serial No", serial_no, "delivery_document_no")
- self.assertEquals(delivery_document_no, dn.name)
+ self.assertEqual(serial_no, delivered_serial_no)
init_user_and_profile()
pos_inv = create_pos_invoice(
item_code="_Test Serialized Item With Series",
- serial_no=serial_no,
+ serial_no=[serial_no],
qty=1,
rate=100,
do_not_submit=True,
@@ -861,42 +923,6 @@
frappe.db.rollback(save_point="before_test_delivered_serial_no_case")
frappe.set_user("Administrator")
- def test_returned_serial_no_case(self):
- from erpnext.accounts.doctype.pos_invoice_merge_log.test_pos_invoice_merge_log import (
- init_user_and_profile,
- )
- from erpnext.stock.doctype.serial_no.serial_no import get_pos_reserved_serial_nos
- from erpnext.stock.doctype.serial_no.test_serial_no import get_serial_nos
- from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
-
- frappe.db.savepoint("before_test_returned_serial_no_case")
- try:
- se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
-
- init_user_and_profile()
-
- pos_inv = create_pos_invoice(
- item_code="_Test Serialized Item With Series",
- serial_no=serial_no,
- qty=1,
- rate=100,
- )
-
- pos_return = make_sales_return(pos_inv.name)
- pos_return.flags.ignore_validate = True
- pos_return.insert()
- pos_return.submit()
-
- pos_reserved_serial_nos = get_pos_reserved_serial_nos(
- {"item_code": "_Test Serialized Item With Series", "warehouse": "_Test Warehouse - _TC"}
- )
- self.assertTrue(serial_no not in pos_reserved_serial_nos)
-
- finally:
- frappe.db.rollback(save_point="before_test_returned_serial_no_case")
- frappe.set_user("Administrator")
-
def create_pos_invoice(**args):
args = frappe._dict(args)
@@ -926,6 +952,40 @@
pos_inv.set_missing_values()
+ bundle_id = None
+ if args.get("batch_no") or args.get("serial_no"):
+ type_of_transaction = args.type_of_transaction or "Outward"
+
+ if pos_inv.is_return:
+ type_of_transaction = "Inward"
+
+ qty = args.get("qty") or 1
+ qty *= -1 if type_of_transaction == "Outward" else 1
+ batches = {}
+ if args.get("batch_no"):
+ batches = frappe._dict({args.batch_no: qty})
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": args.item or args.item_code or "_Test Item",
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": qty,
+ "batches": batches,
+ "voucher_type": "Delivery Note",
+ "serial_nos": args.serial_no,
+ "posting_date": pos_inv.posting_date,
+ "posting_time": pos_inv.posting_time,
+ "type_of_transaction": type_of_transaction,
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
+ if not bundle_id:
+ msg = f"Serial No {args.serial_no} not available for Item {args.item}"
+ frappe.throw(_(msg))
+
pos_inv.append(
"items",
{
@@ -936,8 +996,7 @@
"income_account": args.income_account or "Sales - _TC",
"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
"cost_center": args.cost_center or "_Test Cost Center - _TC",
- "serial_no": args.serial_no,
- "batch_no": args.batch_no,
+ "serial_and_batch_bundle": bundle_id,
},
)
diff --git a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
index 4bb1865..cb0ed3d 100644
--- a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
+++ b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -79,6 +79,7 @@
"warehouse",
"target_warehouse",
"quality_inspection",
+ "serial_and_batch_bundle",
"batch_no",
"col_break5",
"allow_zero_valuation_rate",
@@ -628,10 +629,11 @@
{
"fieldname": "batch_no",
"fieldtype": "Link",
- "in_list_view": 1,
+ "hidden": 1,
"label": "Batch No",
"options": "Batch",
- "print_hide": 1
+ "print_hide": 1,
+ "read_only": 1
},
{
"fieldname": "col_break5",
@@ -648,10 +650,12 @@
{
"fieldname": "serial_no",
"fieldtype": "Small Text",
+ "hidden": 1,
"in_list_view": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
- "oldfieldtype": "Small Text"
+ "oldfieldtype": "Small Text",
+ "read_only": 1
},
{
"fieldname": "item_tax_rate",
@@ -817,11 +821,19 @@
"fieldtype": "Check",
"label": "Has Item Scanned",
"read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"istable": 1,
"links": [],
- "modified": "2022-11-02 12:52:39.125295",
+ "modified": "2023-03-12 13:36:40.160468",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice Item",
diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
index b1e2208..d8cbcc1 100644
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
@@ -9,7 +9,7 @@
from frappe.model.document import Document
from frappe.model.mapper import map_child_doc, map_doc
from frappe.utils import cint, flt, get_time, getdate, nowdate, nowtime
-from frappe.utils.background_jobs import enqueue, is_job_queued
+from frappe.utils.background_jobs import enqueue, is_job_enqueued
from frappe.utils.scheduler import is_scheduler_inactive
@@ -184,6 +184,8 @@
item.base_amount = item.base_net_amount
item.price_list_rate = 0
si_item = map_child_doc(item, invoice, {"doctype": "Sales Invoice Item"})
+ if item.serial_and_batch_bundle:
+ si_item.serial_and_batch_bundle = item.serial_and_batch_bundle
items.append(si_item)
for tax in doc.get("taxes"):
@@ -385,7 +387,7 @@
]
for pos_invoice in pos_return_docs:
for item in pos_invoice.items:
- if not item.serial_no:
+ if not item.serial_no and not item.serial_and_batch_bundle:
continue
return_against_is_added = any(
@@ -483,15 +485,15 @@
closing_entry = kwargs.get("closing_entry") or {}
- job_name = closing_entry.get("name")
- if not is_job_queued(job_name):
+ job_id = "pos_invoice_merge::" + str(closing_entry.get("name"))
+ if not is_job_enqueued(job_id):
enqueue(
job,
**kwargs,
queue="long",
timeout=10000,
event="processing_merge_logs",
- job_name=job_name,
+ job_id=job_id,
now=frappe.conf.developer_mode or frappe.flags.in_test
)
diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
index 9e696f1..6af8a00 100644
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
@@ -13,6 +13,9 @@
from erpnext.accounts.doctype.pos_invoice_merge_log.pos_invoice_merge_log import (
consolidate_pos_invoices,
)
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_serial_nos_from_bundle,
+)
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -410,13 +413,13 @@
try:
se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
+ serial_no = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
init_user_and_profile()
pos_inv = create_pos_invoice(
item_code="_Test Serialized Item With Series",
- serial_no=serial_no,
+ serial_no=[serial_no],
qty=1,
rate=100,
do_not_submit=1,
@@ -430,7 +433,7 @@
pos_inv2 = create_pos_invoice(
item_code="_Test Serialized Item With Series",
- serial_no=serial_no,
+ serial_no=[serial_no],
qty=1,
rate=100,
do_not_submit=1,
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index a63039e..e8e8044 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -469,7 +469,7 @@
"options": "UOM"
},
{
- "description": "If rate is zero them item will be treated as \"Free Item\"",
+ "description": "If rate is zero then item will be treated as \"Free Item\"",
"fieldname": "free_item_rate",
"fieldtype": "Currency",
"label": "Free Item Rate"
@@ -670,4 +670,4 @@
"sort_order": "DESC",
"states": [],
"title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 2943500..0b7ea24 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -237,10 +237,6 @@
item_list = args.get("items")
args.pop("items")
- set_serial_nos_based_on_fifo = frappe.db.get_single_value(
- "Stock Settings", "automatically_set_serial_nos_based_on_fifo"
- )
-
item_code_list = tuple(item.get("item_code") for item in item_list)
query_items = frappe.get_all(
"Item",
@@ -258,28 +254,9 @@
data = get_pricing_rule_for_item(args_copy, doc=doc)
out.append(data)
- if (
- serialized_items.get(item.get("item_code"))
- and not item.get("serial_no")
- and set_serial_nos_based_on_fifo
- and not args.get("is_return")
- ):
- out[0].update(get_serial_no_for_item(args_copy))
-
return out
-def get_serial_no_for_item(args):
- from erpnext.stock.get_item_details import get_serial_no
-
- item_details = frappe._dict(
- {"doctype": args.doctype, "name": args.name, "serial_no": args.serial_no}
- )
- if args.get("parenttype") in ("Sales Invoice", "Delivery Note") and flt(args.stock_qty) > 0:
- item_details.serial_no = get_serial_no(args)
- return item_details
-
-
def update_pricing_rule_uom(pricing_rule, args):
child_doc = {"Item Code": "items", "Item Group": "item_groups", "Brand": "brands"}.get(
pricing_rule.apply_on
diff --git a/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py b/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
index 5a0aeb7..263621d 100644
--- a/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
+++ b/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
@@ -16,8 +16,10 @@
class TestProcessDeferredAccounting(unittest.TestCase):
def test_creation_of_ledger_entry_on_submit(self):
"""test creation of gl entries on submission of document"""
+ change_acc_settings(acc_frozen_upto="2023-05-31", book_deferred_entries_based_on="Months")
+
deferred_account = create_account(
- account_name="Deferred Revenue",
+ account_name="Deferred Revenue for Accounts Frozen",
parent_account="Current Liabilities - _TC",
company="_Test Company",
)
@@ -29,11 +31,11 @@
item.save()
si = create_sales_invoice(
- item=item.name, update_stock=0, posting_date="2019-01-10", do_not_submit=True
+ item=item.name, rate=3000, update_stock=0, posting_date="2023-07-01", do_not_submit=True
)
si.items[0].enable_deferred_revenue = 1
- si.items[0].service_start_date = "2019-01-10"
- si.items[0].service_end_date = "2019-03-15"
+ si.items[0].service_start_date = "2023-05-01"
+ si.items[0].service_end_date = "2023-07-31"
si.items[0].deferred_revenue_account = deferred_account
si.save()
si.submit()
@@ -41,9 +43,9 @@
process_deferred_accounting = doc = frappe.get_doc(
dict(
doctype="Process Deferred Accounting",
- posting_date="2019-01-01",
- start_date="2019-01-01",
- end_date="2019-01-31",
+ posting_date="2023-07-01",
+ start_date="2023-05-01",
+ end_date="2023-06-30",
type="Income",
)
)
@@ -52,11 +54,16 @@
process_deferred_accounting.submit()
expected_gle = [
- [deferred_account, 33.85, 0.0, "2019-01-31"],
- ["Sales - _TC", 0.0, 33.85, "2019-01-31"],
+ ["Debtors - _TC", 3000, 0.0, "2023-07-01"],
+ [deferred_account, 0.0, 3000, "2023-07-01"],
+ ["Sales - _TC", 0.0, 1000, "2023-06-30"],
+ [deferred_account, 1000, 0.0, "2023-06-30"],
+ ["Sales - _TC", 0.0, 1000, "2023-06-30"],
+ [deferred_account, 1000, 0.0, "2023-06-30"],
]
- check_gl_entries(self, si.name, expected_gle, "2019-01-10")
+ check_gl_entries(self, si.name, expected_gle, "2023-07-01")
+ change_acc_settings()
def test_pda_submission_and_cancellation(self):
pda = frappe.get_doc(
@@ -70,3 +77,10 @@
)
pda.submit()
pda.cancel()
+
+
+def change_acc_settings(acc_frozen_upto="", book_deferred_entries_based_on="Days"):
+ acc_settings = frappe.get_doc("Accounts Settings", "Accounts Settings")
+ acc_settings.acc_frozen_upto = acc_frozen_upto
+ acc_settings.book_deferred_entries_based_on = book_deferred_entries_based_on
+ acc_settings.save()
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/__init__.py b/erpnext/accounts/doctype/process_payment_reconciliation/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/cash_flow_mapper/__init__.py
rename to erpnext/accounts/doctype/process_payment_reconciliation/__init__.py
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
new file mode 100644
index 0000000..dd601bf
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
@@ -0,0 +1,130 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Process Payment Reconciliation", {
+ onload: function(frm) {
+ // set queries
+ frm.set_query("party_type", function() {
+ return {
+ "filters": {
+ "name": ["in", Object.keys(frappe.boot.party_account_types)],
+ }
+ }
+ });
+ frm.set_query('receivable_payable_account', function(doc) {
+ return {
+ filters: {
+ "company": doc.company,
+ "is_group": 0,
+ "account_type": frappe.boot.party_account_types[doc.party_type]
+ }
+ };
+ });
+ frm.set_query('cost_center', function(doc) {
+ return {
+ filters: {
+ "company": doc.company,
+ "is_group": 0,
+ }
+ };
+ });
+ frm.set_query('bank_cash_account', function(doc) {
+ return {
+ filters:[
+ ['Account', 'company', '=', doc.company],
+ ['Account', 'is_group', '=', 0],
+ ['Account', 'account_type', 'in', ['Bank', 'Cash']]
+ ]
+ };
+ });
+
+ },
+ refresh: function(frm) {
+ if (frm.doc.docstatus==1 && ['Queued', 'Paused'].find(x => x == frm.doc.status)) {
+ let execute_btn = __("Start / Resume")
+
+ frm.add_custom_button(execute_btn, () => {
+ frm.call({
+ method: 'erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_job_for_doc',
+ args: {
+ docname: frm.doc.name
+ }
+ }).then(r => {
+ if(!r.exc) {
+ frappe.show_alert(__("Job Started"));
+ frm.reload_doc();
+ }
+ });
+ });
+ }
+ if (frm.doc.docstatus==1 && ['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
+ frm.call({
+ 'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.get_reconciled_count",
+ args: {
+ "docname": frm.docname,
+ }
+ }).then(r => {
+ if (r.message) {
+ let progress = 0;
+ let description = "";
+
+ if (r.message.processed) {
+ progress = (r.message.processed/r.message.total) * 100;
+ description = r.message.processed + "/" + r.message.total + " processed";
+ } else if (r.message.total == 0 && frm.doc.status == "Completed") {
+ progress = 100;
+ }
+
+
+ frm.dashboard.add_progress('Reconciliation Progress', progress, description);
+ }
+ })
+ }
+ if (frm.doc.docstatus==1 && frm.doc.status == 'Running') {
+ let execute_btn = __("Pause")
+
+ frm.add_custom_button(execute_btn, () => {
+ frm.call({
+ 'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.pause_job_for_doc",
+ args: {
+ "docname": frm.docname,
+ }
+ }).then(r => {
+ if (!r.exc) {
+ frappe.show_alert(__("Job Paused"));
+ frm.reload_doc()
+ }
+ });
+
+ });
+ }
+ },
+ company(frm) {
+ frm.set_value('party', '');
+ frm.set_value('receivable_payable_account', '');
+ },
+ party_type(frm) {
+ frm.set_value('party', '');
+ },
+
+ party(frm) {
+ frm.set_value('receivable_payable_account', '');
+ if (!frm.doc.receivable_payable_account && frm.doc.party_type && frm.doc.party) {
+ return frappe.call({
+ method: "erpnext.accounts.party.get_party_account",
+ args: {
+ company: frm.doc.company,
+ party_type: frm.doc.party_type,
+ party: frm.doc.party
+ },
+ callback: (r) => {
+ if (!r.exc && r.message) {
+ frm.set_value("receivable_payable_account", r.message);
+ }
+ frm.refresh();
+
+ }
+ });
+ }
+ }
+});
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
new file mode 100644
index 0000000..8bb7092
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -0,0 +1,173 @@
+{
+ "actions": [],
+ "autoname": "format:ACC-PPR-{#####}",
+ "beta": 1,
+ "creation": "2023-03-30 21:28:39.793927",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "company",
+ "party_type",
+ "column_break_io6c",
+ "party",
+ "receivable_payable_account",
+ "filter_section",
+ "from_invoice_date",
+ "to_invoice_date",
+ "column_break_kegk",
+ "from_payment_date",
+ "to_payment_date",
+ "column_break_uj04",
+ "cost_center",
+ "bank_cash_account",
+ "section_break_2n02",
+ "status",
+ "error_log",
+ "section_break_a8yx",
+ "amended_from"
+ ],
+ "fields": [
+ {
+ "allow_on_submit": 1,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "options": "\nQueued\nRunning\nPaused\nCompleted\nPartially Reconciled\nFailed\nCancelled",
+ "read_only": 1
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company",
+ "reqd": 1
+ },
+ {
+ "fieldname": "party_type",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Party Type",
+ "options": "DocType",
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_io6c",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "party",
+ "fieldtype": "Dynamic Link",
+ "in_list_view": 1,
+ "label": "Party",
+ "options": "party_type",
+ "reqd": 1
+ },
+ {
+ "fieldname": "receivable_payable_account",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Receivable/Payable Account",
+ "options": "Account",
+ "reqd": 1
+ },
+ {
+ "fieldname": "filter_section",
+ "fieldtype": "Section Break",
+ "label": "Filters"
+ },
+ {
+ "fieldname": "from_invoice_date",
+ "fieldtype": "Date",
+ "label": "From Invoice Date"
+ },
+ {
+ "fieldname": "to_invoice_date",
+ "fieldtype": "Date",
+ "label": "To Invoice Date"
+ },
+ {
+ "fieldname": "column_break_kegk",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "from_payment_date",
+ "fieldtype": "Date",
+ "label": "From Payment Date"
+ },
+ {
+ "fieldname": "to_payment_date",
+ "fieldtype": "Date",
+ "label": "To Payment Date"
+ },
+ {
+ "fieldname": "column_break_uj04",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "options": "Cost Center"
+ },
+ {
+ "fieldname": "bank_cash_account",
+ "fieldtype": "Link",
+ "label": "Bank/Cash Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "section_break_2n02",
+ "fieldtype": "Section Break",
+ "label": "Status"
+ },
+ {
+ "depends_on": "eval:doc.error_log",
+ "fieldname": "error_log",
+ "fieldtype": "Long Text",
+ "label": "Error Log"
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Process Payment Reconciliation",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_a8yx",
+ "fieldtype": "Section Break"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-04-21 17:19:30.912953",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Process Payment Reconciliation",
+ "naming_rule": "Expression",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "company"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
new file mode 100644
index 0000000..3166030
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
@@ -0,0 +1,503 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _, qb
+from frappe.model.document import Document
+from frappe.utils import get_link_to_form
+from frappe.utils.scheduler import is_scheduler_inactive
+
+
+class ProcessPaymentReconciliation(Document):
+ def validate(self):
+ self.validate_receivable_payable_account()
+ self.validate_bank_cash_account()
+
+ def validate_receivable_payable_account(self):
+ if self.receivable_payable_account:
+ if self.company != frappe.db.get_value("Account", self.receivable_payable_account, "company"):
+ frappe.throw(
+ _("Receivable/Payable Account: {0} doesn't belong to company {1}").format(
+ frappe.bold(self.receivable_payable_account), frappe.bold(self.company)
+ )
+ )
+
+ def validate_bank_cash_account(self):
+ if self.bank_cash_account:
+ if self.company != frappe.db.get_value("Account", self.bank_cash_account, "company"):
+ frappe.throw(
+ _("Bank/Cash Account {0} doesn't belong to company {1}").format(
+ frappe.bold(self.bank_cash_account), frappe.bold(self.company)
+ )
+ )
+
+ def before_save(self):
+ self.status = ""
+ self.error_log = ""
+
+ def on_submit(self):
+ self.db_set("status", "Queued")
+ self.db_set("error_log", None)
+
+ def on_cancel(self):
+ self.db_set("status", "Cancelled")
+ log = frappe.db.get_value(
+ "Process Payment Reconciliation Log", filters={"process_pr": self.name}
+ )
+ if log:
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Cancelled")
+
+
+@frappe.whitelist()
+def get_reconciled_count(docname: str | None = None) -> float:
+ current_status = {}
+ if docname:
+ reconcile_log = frappe.db.get_value(
+ "Process Payment Reconciliation Log", filters={"process_pr": docname}, fieldname="name"
+ )
+ if reconcile_log:
+ res = frappe.get_all(
+ "Process Payment Reconciliation Log",
+ filters={"name": reconcile_log},
+ fields=["reconciled_entries", "total_allocations"],
+ as_list=1,
+ )
+ current_status["processed"], current_status["total"] = res[0]
+
+ return current_status
+
+
+def get_pr_instance(doc: str):
+ process_payment_reconciliation = frappe.get_doc("Process Payment Reconciliation", doc)
+
+ pr = frappe.get_doc("Payment Reconciliation")
+ fields = [
+ "company",
+ "party_type",
+ "party",
+ "receivable_payable_account",
+ "from_invoice_date",
+ "to_invoice_date",
+ "from_payment_date",
+ "to_payment_date",
+ ]
+ d = {}
+ for field in fields:
+ d[field] = process_payment_reconciliation.get(field)
+ pr.update(d)
+ pr.invoice_limit = 1000
+ pr.payment_limit = 1000
+ return pr
+
+
+def is_job_running(job_name: str) -> bool:
+ jobs = frappe.db.get_all("RQ Job", filters={"status": ["in", ["started", "queued"]]})
+ for x in jobs:
+ if x.job_name == job_name:
+ return True
+ return False
+
+
+@frappe.whitelist()
+def pause_job_for_doc(docname: str | None = None):
+ if docname:
+ frappe.db.set_value("Process Payment Reconciliation", docname, "status", "Paused")
+ log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": docname})
+ if log:
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Paused")
+
+
+@frappe.whitelist()
+def trigger_job_for_doc(docname: str | None = None):
+ """
+ Trigger background job
+ """
+ if not docname:
+ return
+
+ if not frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
+ frappe.throw(
+ _("Auto Reconciliation of Payments has been disabled. Enable it through {0}").format(
+ get_link_to_form("Accounts Settings", "Accounts Settings")
+ )
+ )
+
+ return
+
+ if not is_scheduler_inactive():
+ if frappe.db.get_value("Process Payment Reconciliation", docname, "status") == "Queued":
+ frappe.db.set_value("Process Payment Reconciliation", docname, "status", "Running")
+ job_name = f"start_processing_{docname}"
+ if not is_job_running(job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile_based_on_filters",
+ queue="long",
+ is_async=True,
+ job_name=job_name,
+ enqueue_after_commit=True,
+ doc=docname,
+ )
+
+ elif frappe.db.get_value("Process Payment Reconciliation", docname, "status") == "Paused":
+ frappe.db.set_value("Process Payment Reconciliation", docname, "status", "Running")
+ log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": docname})
+ if log:
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Running")
+
+ # Resume tasks for running doc
+ job_name = f"start_processing_{docname}"
+ if not is_job_running(job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile_based_on_filters",
+ queue="long",
+ is_async=True,
+ job_name=job_name,
+ doc=docname,
+ )
+ else:
+ frappe.msgprint(_("Scheduler is Inactive. Can't trigger job now."))
+
+
+def trigger_reconciliation_for_queued_docs():
+ """
+ Will be called from Cron Job
+ Fetch queued docs and start reconciliation process for each one
+ """
+ if not frappe.db.get_single_value("Accounts Settings", "auto_reconcile_payments"):
+ frappe.msgprint(
+ _("Auto Reconciliation of Payments has been disabled. Enable it through {0}").format(
+ get_link_to_form("Accounts Settings", "Accounts Settings")
+ )
+ )
+
+ return
+
+ if not is_scheduler_inactive():
+ # Get all queued documents
+ all_queued = frappe.db.get_all(
+ "Process Payment Reconciliation",
+ filters={"docstatus": 1, "status": "Queued"},
+ order_by="creation desc",
+ as_list=1,
+ )
+
+ docs_to_trigger = []
+ unique_filters = set()
+ queue_size = 5
+
+ fields = ["company", "party_type", "party", "receivable_payable_account"]
+
+ def get_filters_as_tuple(fields, doc):
+ filters = ()
+ for x in fields:
+ filters += tuple(doc.get(x))
+ return filters
+
+ for x in all_queued:
+ doc = frappe.get_doc("Process Payment Reconciliation", x)
+ filters = get_filters_as_tuple(fields, doc)
+ if filters not in unique_filters:
+ unique_filters.add(filters)
+ docs_to_trigger.append(doc.name)
+ if len(docs_to_trigger) == queue_size:
+ break
+
+ # trigger reconcilation process for queue_size unique filters
+ for doc in docs_to_trigger:
+ trigger_job_for_doc(doc)
+
+ else:
+ frappe.msgprint(_("Scheduler is Inactive. Can't trigger jobs now."))
+
+
+def reconcile_based_on_filters(doc: None | str = None) -> None:
+ """
+ Identify current state of document and execute next tasks in background
+ """
+ if doc:
+ log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": doc})
+ if not log:
+ log = frappe.new_doc("Process Payment Reconciliation Log")
+ log.process_pr = doc
+ log.status = "Running"
+ log = log.save()
+
+ job_name = f"process_{doc}_fetch_and_allocate"
+ if not is_job_running(job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.fetch_and_allocate",
+ queue="long",
+ timeout="3600",
+ is_async=True,
+ job_name=job_name,
+ enqueue_after_commit=True,
+ doc=doc,
+ )
+ else:
+ res = frappe.get_all(
+ "Process Payment Reconciliation Log",
+ filters={"name": log},
+ fields=["allocated", "reconciled"],
+ as_list=1,
+ )
+ allocated, reconciled = res[0]
+
+ if not allocated:
+ job_name = f"process__{doc}_fetch_and_allocate"
+ if not is_job_running(job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.fetch_and_allocate",
+ queue="long",
+ timeout="3600",
+ is_async=True,
+ job_name=job_name,
+ enqueue_after_commit=True,
+ doc=doc,
+ )
+ elif not reconciled:
+ allocation = get_next_allocation(log)
+ if allocation:
+ reconcile_job_name = (
+ f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
+ )
+ else:
+ reconcile_job_name = f"process_{doc}_reconcile"
+ if not is_job_running(reconcile_job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile",
+ queue="long",
+ timeout="3600",
+ is_async=True,
+ job_name=reconcile_job_name,
+ enqueue_after_commit=True,
+ doc=doc,
+ )
+ elif reconciled:
+ frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
+
+
+def get_next_allocation(log: str) -> list:
+ if log:
+ allocations = []
+ next = frappe.db.get_all(
+ "Process Payment Reconciliation Log Allocations",
+ filters={"parent": log, "reconciled": 0},
+ fields=["reference_type", "reference_name"],
+ order_by="idx",
+ limit=1,
+ )
+
+ if next:
+ allocations = frappe.db.get_all(
+ "Process Payment Reconciliation Log Allocations",
+ filters={
+ "parent": log,
+ "reconciled": 0,
+ "reference_type": next[0].reference_type,
+ "reference_name": next[0].reference_name,
+ },
+ fields=["*"],
+ order_by="idx",
+ )
+
+ return allocations
+ return []
+
+
+def fetch_and_allocate(doc: str) -> None:
+ """
+ Fetch Invoices and Payments based on filters applied. FIFO ordering is used for allocation.
+ """
+
+ if doc:
+ log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": doc})
+ if log:
+ if not frappe.db.get_value("Process Payment Reconciliation Log", log, "allocated"):
+ reconcile_log = frappe.get_doc("Process Payment Reconciliation Log", log)
+
+ pr = get_pr_instance(doc)
+ pr.get_unreconciled_entries()
+
+ if len(pr.invoices) > 0 and len(pr.payments) > 0:
+ invoices = [x.as_dict() for x in pr.invoices]
+ payments = [x.as_dict() for x in pr.payments]
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+
+ for x in pr.get("allocation"):
+ reconcile_log.append(
+ "allocations",
+ x.as_dict().update(
+ {
+ "parenttype": "Process Payment Reconciliation Log",
+ "parent": reconcile_log.name,
+ "name": None,
+ "reconciled": False,
+ }
+ ),
+ )
+ reconcile_log.allocated = True
+ reconcile_log.total_allocations = len(reconcile_log.get("allocations"))
+ reconcile_log.reconciled_entries = 0
+ reconcile_log.save()
+
+ # generate reconcile job name
+ allocation = get_next_allocation(log)
+ if allocation:
+ reconcile_job_name = (
+ f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
+ )
+ else:
+ reconcile_job_name = f"process_{doc}_reconcile"
+
+ if not is_job_running(reconcile_job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile",
+ queue="long",
+ timeout="3600",
+ is_async=True,
+ job_name=reconcile_job_name,
+ enqueue_after_commit=True,
+ doc=doc,
+ )
+
+
+def reconcile(doc: None | str = None) -> None:
+ if doc:
+ log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": doc})
+ if log:
+ res = frappe.get_all(
+ "Process Payment Reconciliation Log",
+ filters={"name": log},
+ fields=["reconciled_entries", "total_allocations"],
+ as_list=1,
+ limit=1,
+ )
+
+ reconciled_entries, total_allocations = res[0]
+ if reconciled_entries != total_allocations:
+ try:
+ # Fetch next allocation
+ allocations = get_next_allocation(log)
+
+ pr = get_pr_instance(doc)
+
+ # pass allocation to PR instance
+ for x in allocations:
+ pr.append("allocation", x)
+
+ # reconcile
+ pr.reconcile_allocations(skip_ref_details_update_for_pe=True)
+
+ # If Payment Entry, update details only for newly linked references
+ # This is for performance
+ if allocations[0].reference_type == "Payment Entry":
+
+ references = [(x.invoice_type, x.invoice_number) for x in allocations]
+ pe = frappe.get_doc(allocations[0].reference_type, allocations[0].reference_name)
+ pe.flags.ignore_validate_update_after_submit = True
+ pe.set_missing_ref_details(update_ref_details_only_for=references)
+ pe.save()
+
+ # Update reconciled flag
+ allocation_names = [x.name for x in allocations]
+ ppa = qb.DocType("Process Payment Reconciliation Log Allocations")
+ qb.update(ppa).set(ppa.reconciled, True).where(ppa.name.isin(allocation_names)).run()
+
+ # Update reconciled count
+ reconciled_count = frappe.db.count(
+ "Process Payment Reconciliation Log Allocations", filters={"parent": log, "reconciled": True}
+ )
+ frappe.db.set_value(
+ "Process Payment Reconciliation Log", log, "reconciled_entries", reconciled_count
+ )
+
+ except Exception as err:
+ # Update the parent doc about the exception
+ frappe.db.rollback()
+
+ traceback = frappe.get_traceback()
+ if traceback:
+ message = "Traceback: <br>" + traceback
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "error_log", message)
+ frappe.db.set_value(
+ "Process Payment Reconciliation",
+ doc,
+ "error_log",
+ message,
+ )
+ if reconciled_entries and total_allocations and reconciled_entries < total_allocations:
+ frappe.db.set_value(
+ "Process Payment Reconciliation Log", log, "status", "Partially Reconciled"
+ )
+ frappe.db.set_value(
+ "Process Payment Reconciliation",
+ doc,
+ "status",
+ "Partially Reconciled",
+ )
+ else:
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Failed")
+ frappe.db.set_value(
+ "Process Payment Reconciliation",
+ doc,
+ "status",
+ "Failed",
+ )
+ finally:
+ if reconciled_entries == total_allocations:
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Reconciled")
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "reconciled", True)
+ frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
+ else:
+
+ if not (frappe.db.get_value("Process Payment Reconciliation", doc, "status") == "Paused"):
+ # trigger next batch in job
+ # generate reconcile job name
+ allocation = get_next_allocation(log)
+ if allocation:
+ reconcile_job_name = (
+ f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
+ )
+ else:
+ reconcile_job_name = f"process_{doc}_reconcile"
+
+ if not is_job_running(reconcile_job_name):
+ job = frappe.enqueue(
+ method="erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.reconcile",
+ queue="long",
+ timeout="3600",
+ is_async=True,
+ job_name=reconcile_job_name,
+ enqueue_after_commit=True,
+ doc=doc,
+ )
+ else:
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Reconciled")
+ frappe.db.set_value("Process Payment Reconciliation Log", log, "reconciled", True)
+ frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
+
+
+@frappe.whitelist()
+def is_any_doc_running(for_filter: str | dict | None = None) -> str | None:
+ running_doc = None
+ if for_filter:
+ if type(for_filter) == str:
+ for_filter = frappe.json.loads(for_filter)
+
+ running_doc = frappe.db.get_value(
+ "Process Payment Reconciliation",
+ filters={
+ "docstatus": 1,
+ "status": ["in", ["Running", "Paused"]],
+ "company": for_filter.get("company"),
+ "party_type": for_filter.get("party_type"),
+ "party": for_filter.get("party"),
+ "receivable_payable_account": for_filter.get("receivable_payable_account"),
+ },
+ fieldname="name",
+ )
+ else:
+ running_doc = frappe.db.get_value(
+ "Process Payment Reconciliation", filters={"docstatus": 1, "status": "Running"}
+ )
+ return running_doc
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_dashboard.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_dashboard.py
new file mode 100644
index 0000000..784f454
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_dashboard.py
@@ -0,0 +1,15 @@
+from frappe import _
+
+
+def get_data():
+ return {
+ "fieldname": "process_pr",
+ "transactions": [
+ {
+ "label": _("Reconciliation Logs"),
+ "items": [
+ "Process Payment Reconciliation Log",
+ ],
+ },
+ ],
+ }
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
new file mode 100644
index 0000000..8012d6e
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
@@ -0,0 +1,15 @@
+frappe.listview_settings['Process Payment Reconciliation'] = {
+ add_fields: ["status"],
+ get_indicator: function(doc) {
+ let colors = {
+ 'Queued': 'orange',
+ 'Paused': 'orange',
+ 'Completed': 'green',
+ 'Partially Reconciled': 'orange',
+ 'Running': 'blue',
+ 'Failed': 'red',
+ };
+ let status = doc.status;
+ return [__(status), colors[status], 'status,=,'+status];
+ },
+};
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/test_process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/test_process_payment_reconciliation.py
new file mode 100644
index 0000000..ad1e952
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/test_process_payment_reconciliation.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestProcessPaymentReconciliation(FrappeTestCase):
+ pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping/__init__.py b/erpnext/accounts/doctype/process_payment_reconciliation_log/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/cash_flow_mapping/__init__.py
rename to erpnext/accounts/doctype/process_payment_reconciliation_log/__init__.py
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
new file mode 100644
index 0000000..2468f10
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Process Payment Reconciliation Log", {
+ refresh(frm) {
+ if (['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
+ let progress = 0;
+ if (frm.doc.reconciled_entries != 0) {
+ progress = frm.doc.reconciled_entries / frm.doc.total_allocations * 100;
+ } else if(frm.doc.total_allocations == 0 && frm.doc.status == "Completed"){
+ progress = 100;
+ }
+ frm.dashboard.add_progress(__('Reconciliation Progress'), progress);
+ }
+
+ },
+});
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
new file mode 100644
index 0000000..1131a0f
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
@@ -0,0 +1,137 @@
+{
+ "actions": [],
+ "autoname": "format:PPR-LOG-{##}",
+ "beta": 1,
+ "creation": "2023-03-13 15:00:09.149681",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "process_pr",
+ "section_break_fvdw",
+ "status",
+ "tasks_section",
+ "allocated",
+ "reconciled",
+ "column_break_yhin",
+ "total_allocations",
+ "reconciled_entries",
+ "section_break_4ywv",
+ "error_log",
+ "allocations_section",
+ "allocations"
+ ],
+ "fields": [
+ {
+ "fieldname": "allocations",
+ "fieldtype": "Table",
+ "label": "Allocations",
+ "options": "Process Payment Reconciliation Log Allocations",
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "description": "All allocations have been successfully reconciled",
+ "fieldname": "reconciled",
+ "fieldtype": "Check",
+ "label": "Reconciled",
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_allocations",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "Total Allocations",
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "description": "Invoices and Payments have been Fetched and Allocated",
+ "fieldname": "allocated",
+ "fieldtype": "Check",
+ "label": "Allocated",
+ "read_only": 1
+ },
+ {
+ "fieldname": "reconciled_entries",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "Reconciled Entries",
+ "read_only": 1
+ },
+ {
+ "fieldname": "tasks_section",
+ "fieldtype": "Section Break",
+ "label": "Tasks"
+ },
+ {
+ "fieldname": "allocations_section",
+ "fieldtype": "Section Break",
+ "label": "Allocations"
+ },
+ {
+ "fieldname": "column_break_yhin",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_4ywv",
+ "fieldtype": "Section Break"
+ },
+ {
+ "depends_on": "eval:doc.error_log",
+ "fieldname": "error_log",
+ "fieldtype": "Long Text",
+ "label": "Reconciliation Error Log",
+ "read_only": 1
+ },
+ {
+ "fieldname": "process_pr",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Parent Document",
+ "options": "Process Payment Reconciliation",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "section_break_fvdw",
+ "fieldtype": "Section Break",
+ "label": "Status"
+ },
+ {
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "options": "Running\nPaused\nReconciled\nPartially Reconciled\nFailed\nCancelled",
+ "read_only": 1
+ }
+ ],
+ "in_create": 1,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2023-04-21 17:36:26.642617",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Process Payment Reconciliation Log",
+ "naming_rule": "Expression",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "search_fields": "allocated, reconciled, total_allocations, reconciled_entries",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py
new file mode 100644
index 0000000..85d70a4
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ProcessPaymentReconciliationLog(Document):
+ pass
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
new file mode 100644
index 0000000..5a65204
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
@@ -0,0 +1,15 @@
+frappe.listview_settings['Process Payment Reconciliation Log'] = {
+ add_fields: ["status"],
+ get_indicator: function(doc) {
+ var colors = {
+ 'Partially Reconciled': 'orange',
+ 'Paused': 'orange',
+ 'Reconciled': 'green',
+ 'Failed': 'red',
+ 'Cancelled': 'red',
+ 'Running': 'blue',
+ };
+ let status = doc.status;
+ return [__(status), colors[status], "status,=,"+status];
+ },
+};
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/test_process_payment_reconciliation_log.py b/erpnext/accounts/doctype/process_payment_reconciliation_log/test_process_payment_reconciliation_log.py
new file mode 100644
index 0000000..c2da62e
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/test_process_payment_reconciliation_log.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestProcessPaymentReconciliationLog(FrappeTestCase):
+ pass
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_accounts/__init__.py b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/cash_flow_mapping_accounts/__init__.py
rename to erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/__init__.py
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
new file mode 100644
index 0000000..b97d738
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
@@ -0,0 +1,170 @@
+{
+ "actions": [],
+ "creation": "2023-03-13 13:51:27.351463",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "reference_type",
+ "reference_name",
+ "reference_row",
+ "column_break_3",
+ "invoice_type",
+ "invoice_number",
+ "section_break_6",
+ "allocated_amount",
+ "unreconciled_amount",
+ "column_break_8",
+ "amount",
+ "is_advance",
+ "section_break_5",
+ "difference_amount",
+ "column_break_7",
+ "difference_account",
+ "exchange_rate",
+ "currency",
+ "reconciled"
+ ],
+ "fields": [
+ {
+ "fieldname": "reference_type",
+ "fieldtype": "Link",
+ "label": "Reference Type",
+ "options": "DocType",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "reference_name",
+ "fieldtype": "Dynamic Link",
+ "in_list_view": 1,
+ "label": "Reference Name",
+ "options": "reference_type",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "reference_row",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Reference Row",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "invoice_type",
+ "fieldtype": "Link",
+ "label": "Invoice Type",
+ "options": "DocType",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "invoice_number",
+ "fieldtype": "Dynamic Link",
+ "in_list_view": 1,
+ "label": "Invoice Number",
+ "options": "invoice_type",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "allocated_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Allocated Amount",
+ "options": "currency",
+ "reqd": 1
+ },
+ {
+ "fieldname": "unreconciled_amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Unreconciled Amount",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_8",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Amount",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "is_advance",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Is Advance",
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "difference_amount",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Difference Amount",
+ "options": "Currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "difference_account",
+ "fieldtype": "Link",
+ "label": "Difference Account",
+ "options": "Account",
+ "read_only": 1
+ },
+ {
+ "fieldname": "exchange_rate",
+ "fieldtype": "Float",
+ "label": "Exchange Rate",
+ "read_only": 1
+ },
+ {
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Currency",
+ "options": "Currency"
+ },
+ {
+ "default": "0",
+ "fieldname": "reconciled",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Reconciled"
+ }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2023-03-20 21:05:43.121945",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Process Payment Reconciliation Log Allocations",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.py b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.py
new file mode 100644
index 0000000..c3e4329
--- /dev/null
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ProcessPaymentReconciliationLogAllocations(Document):
+ pass
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
index b9680df..5307ccb 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
@@ -1,6 +1,6 @@
<div class="page-break">
<div id="header-html" class="hidden-pdf">
- {% if letter_head %}
+ {% if letter_head.content %}
<div class="letter-head text-center">{{ letter_head.content }}</div>
<hr style="height:2px;border-width:0;color:black;background-color:black;">
{% endif %}
@@ -15,7 +15,12 @@
</div>
<h2 class="text-center">{{ _("STATEMENTS OF ACCOUNTS") }}</h2>
<div>
- <h5 style="float: left;">{{ _("Customer: ") }} <b>{{filters.party_name[0] }}</b></h5>
+ {% if filters.party[0] == filters.party_name[0] %}
+ <h5 style="float: left;">{{ _("Customer: ") }} <b>{{ filters.party_name[0] }}</b></h5>
+ {% else %}
+ <h5 style="float: left;">{{ _("Customer: ") }} <b>{{ filters.party[0] }}</b></h5>
+ <h5 style="float: left; margin-left:15px">{{ _("Customer Name: ") }} <b>{{filters.party_name[0] }}</b></h5>
+ {% endif %}
<h5 style="float: right;">
{{ _("Date: ") }}
<b>{{ frappe.format(filters.from_date, 'Date')}}
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js
index 7dd5ef3..cec48c1 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js
@@ -65,6 +65,20 @@
frm.set_value('to_date', frappe.datetime.get_today());
}
},
+ report: function(frm){
+ let filters = {
+ 'company': frm.doc.company,
+ }
+ if(frm.doc.report == 'Accounts Receivable'){
+ filters['account_type'] = 'Receivable';
+ }
+ frm.set_query("account", function() {
+ return {
+ filters: filters
+ };
+ });
+
+ },
customer_collection: function(frm){
frm.set_value('collection_name', '');
if(frm.doc.customer_collection){
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
index 16602d3..8004659 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -6,17 +6,24 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
+ "report",
"section_break_11",
"from_date",
+ "posting_date",
"company",
"account",
"group_by",
"cost_center",
+ "territory",
"column_break_14",
"to_date",
"finance_book",
"currency",
"project",
+ "payment_terms_template",
+ "sales_partner",
+ "sales_person",
+ "based_on_payment_terms",
"section_break_3",
"customer_collection",
"collection_name",
@@ -36,6 +43,8 @@
"terms_and_conditions",
"section_break_1",
"enable_auto_email",
+ "column_break_ocfq",
+ "sender",
"section_break_18",
"frequency",
"filter_duration",
@@ -65,14 +74,14 @@
"reqd": 1
},
{
- "depends_on": "eval:doc.enable_auto_email == 0;",
+ "depends_on": "eval:(doc.enable_auto_email == 0 && doc.report == 'General Ledger');",
"fieldname": "from_date",
"fieldtype": "Date",
"label": "From Date",
"mandatory_depends_on": "eval:doc.frequency == '';"
},
{
- "depends_on": "eval:doc.enable_auto_email == 0;",
+ "depends_on": "eval:(doc.enable_auto_email == 0 && doc.report == 'General Ledger');",
"fieldname": "to_date",
"fieldtype": "Date",
"label": "To Date",
@@ -85,6 +94,7 @@
"options": "PSOA Cost Center"
},
{
+ "depends_on": "eval: (doc.report == 'General Ledger');",
"fieldname": "project",
"fieldtype": "Table MultiSelect",
"label": "Project",
@@ -102,7 +112,7 @@
{
"fieldname": "section_break_11",
"fieldtype": "Section Break",
- "label": "General Ledger Filters"
+ "label": "Report Filters"
},
{
"fieldname": "column_break_14",
@@ -162,12 +172,14 @@
},
{
"default": "Group by Voucher (Consolidated)",
+ "depends_on": "eval:(doc.report == 'General Ledger');",
"fieldname": "group_by",
"fieldtype": "Select",
"label": "Group By",
"options": "\nGroup by Voucher\nGroup by Voucher (Consolidated)"
},
{
+ "depends_on": "eval: (doc.report == 'General Ledger');",
"fieldname": "currency",
"fieldtype": "Link",
"label": "Currency",
@@ -295,13 +307,73 @@
},
{
"default": "0",
+ "depends_on": "eval: (doc.report == 'General Ledger');",
"fieldname": "show_net_values_in_party_account",
"fieldtype": "Check",
"label": "Show Net Values in Party Account"
+ },
+ {
+ "fieldname": "sender",
+ "fieldtype": "Link",
+ "label": "Sender",
+ "options": "Email Account"
+ },
+ {
+ "fieldname": "column_break_ocfq",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "report",
+ "fieldtype": "Select",
+ "label": "Report",
+ "options": "General Ledger\nAccounts Receivable",
+ "reqd": 1
+ },
+ {
+ "default": "Today",
+ "depends_on": "eval:(doc.report == 'Accounts Receivable');",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "label": "Posting Date"
+ },
+ {
+ "depends_on": "eval: (doc.report == 'Accounts Receivable');",
+ "fieldname": "payment_terms_template",
+ "fieldtype": "Link",
+ "label": "Payment Terms Template",
+ "options": "Payment Terms Template"
+ },
+ {
+ "depends_on": "eval: (doc.report == 'Accounts Receivable');",
+ "fieldname": "sales_partner",
+ "fieldtype": "Link",
+ "label": "Sales Partner",
+ "options": "Sales Partner"
+ },
+ {
+ "depends_on": "eval: (doc.report == 'Accounts Receivable');",
+ "fieldname": "sales_person",
+ "fieldtype": "Link",
+ "label": "Sales Person",
+ "options": "Sales Person"
+ },
+ {
+ "depends_on": "eval: (doc.report == 'Accounts Receivable');",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "label": "Territory",
+ "options": "Territory"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:(doc.report == 'Accounts Receivable');",
+ "fieldname": "based_on_payment_terms",
+ "fieldtype": "Check",
+ "label": "Based On Payment Terms"
}
],
"links": [],
- "modified": "2022-11-10 17:44:17.165991",
+ "modified": "2023-06-23 10:13:15.051950",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Process Statement Of Accounts",
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
index a482931..08f4cf4 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -15,6 +15,7 @@
from erpnext import get_company_currency
from erpnext.accounts.party import get_party_account_currency
+from erpnext.accounts.report.accounts_receivable.accounts_receivable import execute as get_ar_soa
from erpnext.accounts.report.accounts_receivable_summary.accounts_receivable_summary import (
execute as get_ageing,
)
@@ -43,29 +44,10 @@
def get_report_pdf(doc, consolidated=True):
statement_dict = {}
ageing = ""
- base_template_path = "frappe/www/printview.html"
- template_path = (
- "erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html"
- )
for entry in doc.customers:
if doc.include_ageing:
- ageing_filters = frappe._dict(
- {
- "company": doc.company,
- "report_date": doc.to_date,
- "ageing_based_on": doc.ageing_based_on,
- "range1": 30,
- "range2": 60,
- "range3": 90,
- "range4": 120,
- "customer": entry.customer,
- }
- )
- col1, ageing = get_ageing(ageing_filters)
-
- if ageing:
- ageing[0]["ageing_based_on"] = doc.ageing_based_on
+ ageing = set_ageing(doc, entry)
tax_id = frappe.get_doc("Customer", entry.customer).tax_id
presentation_currency = (
@@ -73,60 +55,25 @@
or doc.currency
or get_company_currency(doc.company)
)
- if doc.letter_head:
- from frappe.www.printview import get_letter_head
- letter_head = get_letter_head(doc, 0)
+ filters = get_common_filters(doc)
- filters = frappe._dict(
- {
- "from_date": doc.from_date,
- "to_date": doc.to_date,
- "company": doc.company,
- "finance_book": doc.finance_book if doc.finance_book else None,
- "account": [doc.account] if doc.account else None,
- "party_type": "Customer",
- "party": [entry.customer],
- "party_name": [entry.customer_name] if entry.customer_name else None,
- "presentation_currency": presentation_currency,
- "group_by": doc.group_by,
- "currency": doc.currency,
- "cost_center": [cc.cost_center_name for cc in doc.cost_center],
- "project": [p.project_name for p in doc.project],
- "show_opening_entries": 0,
- "include_default_book_entries": 0,
- "tax_id": tax_id if tax_id else None,
- "show_net_values_in_party_account": doc.show_net_values_in_party_account,
- }
- )
- col, res = get_soa(filters)
+ if doc.report == "General Ledger":
+ filters.update(get_gl_filters(doc, entry, tax_id, presentation_currency))
+ else:
+ filters.update(get_ar_filters(doc, entry))
- for x in [0, -2, -1]:
- res[x]["account"] = res[x]["account"].replace("'", "")
+ if doc.report == "General Ledger":
+ col, res = get_soa(filters)
+ for x in [0, -2, -1]:
+ res[x]["account"] = res[x]["account"].replace("'", "")
+ if len(res) == 3:
+ continue
+ else:
+ ar_res = get_ar_soa(filters)
+ col, res = ar_res[0], ar_res[1]
- if len(res) == 3:
- continue
-
- html = frappe.render_template(
- template_path,
- {
- "filters": filters,
- "data": res,
- "ageing": ageing[0] if (doc.include_ageing and ageing) else None,
- "letter_head": letter_head if doc.letter_head else None,
- "terms_and_conditions": frappe.db.get_value(
- "Terms and Conditions", doc.terms_and_conditions, "terms"
- )
- if doc.terms_and_conditions
- else None,
- },
- )
-
- html = frappe.render_template(
- base_template_path,
- {"body": html, "css": get_print_style(), "title": "Statement For " + entry.customer},
- )
- statement_dict[entry.customer] = html
+ statement_dict[entry.customer] = get_html(doc, filters, entry, col, res, ageing)
if not bool(statement_dict):
return False
@@ -140,6 +87,110 @@
return statement_dict
+def set_ageing(doc, entry):
+ ageing_filters = frappe._dict(
+ {
+ "company": doc.company,
+ "report_date": doc.to_date,
+ "ageing_based_on": doc.ageing_based_on,
+ "range1": 30,
+ "range2": 60,
+ "range3": 90,
+ "range4": 120,
+ "customer": entry.customer,
+ }
+ )
+ col1, ageing = get_ageing(ageing_filters)
+
+ if ageing:
+ ageing[0]["ageing_based_on"] = doc.ageing_based_on
+
+ return ageing
+
+
+def get_common_filters(doc):
+ return frappe._dict(
+ {
+ "company": doc.company,
+ "finance_book": doc.finance_book if doc.finance_book else None,
+ "account": [doc.account] if doc.account else None,
+ "cost_center": [cc.cost_center_name for cc in doc.cost_center],
+ }
+ )
+
+
+def get_gl_filters(doc, entry, tax_id, presentation_currency):
+ return {
+ "from_date": doc.from_date,
+ "to_date": doc.to_date,
+ "party_type": "Customer",
+ "party": [entry.customer],
+ "party_name": [entry.customer_name] if entry.customer_name else None,
+ "presentation_currency": presentation_currency,
+ "group_by": doc.group_by,
+ "currency": doc.currency,
+ "project": [p.project_name for p in doc.project],
+ "show_opening_entries": 0,
+ "include_default_book_entries": 0,
+ "tax_id": tax_id if tax_id else None,
+ "show_net_values_in_party_account": doc.show_net_values_in_party_account,
+ }
+
+
+def get_ar_filters(doc, entry):
+ return {
+ "report_date": doc.posting_date if doc.posting_date else None,
+ "customer_name": entry.customer,
+ "payment_terms_template": doc.payment_terms_template if doc.payment_terms_template else None,
+ "sales_partner": doc.sales_partner if doc.sales_partner else None,
+ "sales_person": doc.sales_person if doc.sales_person else None,
+ "territory": doc.territory if doc.territory else None,
+ "based_on_payment_terms": doc.based_on_payment_terms,
+ "report_name": "Accounts Receivable",
+ "ageing_based_on": doc.ageing_based_on,
+ "range1": 30,
+ "range2": 60,
+ "range3": 90,
+ "range4": 120,
+ }
+
+
+def get_html(doc, filters, entry, col, res, ageing):
+ base_template_path = "frappe/www/printview.html"
+ template_path = (
+ "erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html"
+ if doc.report == "General Ledger"
+ else "erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html"
+ )
+
+ if doc.letter_head:
+ from frappe.www.printview import get_letter_head
+
+ letter_head = get_letter_head(doc, 0)
+
+ html = frappe.render_template(
+ template_path,
+ {
+ "filters": filters,
+ "data": res,
+ "report": {"report_name": doc.report, "columns": col},
+ "ageing": ageing[0] if (doc.include_ageing and ageing) else None,
+ "letter_head": letter_head if doc.letter_head else None,
+ "terms_and_conditions": frappe.db.get_value(
+ "Terms and Conditions", doc.terms_and_conditions, "terms"
+ )
+ if doc.terms_and_conditions
+ else None,
+ },
+ )
+
+ html = frappe.render_template(
+ base_template_path,
+ {"body": html, "css": get_print_style(), "title": "Statement For " + entry.customer},
+ )
+ return html
+
+
def get_customers_based_on_territory_or_customer_group(customer_collection, collection_name):
fields_dict = {
"Customer Group": "customer_group",
@@ -158,7 +209,7 @@
return frappe.get_list(
"Customer",
fields=["name", "customer_name", "email_id"],
- filters=[[fields_dict[customer_collection], "IN", selected]],
+ filters=[["disabled", "=", 0], [fields_dict[customer_collection], "IN", selected]],
)
@@ -334,7 +385,7 @@
queue="short",
method=frappe.sendmail,
recipients=recipients,
- sender=frappe.session.user,
+ sender=doc.sender or frappe.session.user,
cc=cc,
subject=subject,
message=message,
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
new file mode 100644
index 0000000..07e1896
--- /dev/null
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
@@ -0,0 +1,348 @@
+<style>
+ .print-format {
+ padding: 4mm;
+ font-size: 8.0pt !important;
+ }
+ .print-format td {
+ vertical-align:middle !important;
+ }
+ </style>
+
+ <h2 class="text-center" style="margin-top:0">{{ _(report.report_name) }}</h2>
+ <h4 class="text-center">
+ {% if (filters.customer_name) %}
+ {{ filters.customer_name }}
+ {% else %}
+ {{ filters.customer ~ filters.supplier }}
+ {% endif %}
+ </h4>
+ <h6 class="text-center">
+ {% if (filters.tax_id) %}
+ {{ _("Tax Id: ") }}{{ filters.tax_id }}
+ {% endif %}
+ </h6>
+ <h5 class="text-center">
+ {{ _(filters.ageing_based_on) }}
+ {{ _("Until") }}
+ {{ frappe.format(filters.report_date, 'Date') }}
+ </h5>
+
+ <div class="clearfix">
+ <div class="pull-left">
+ {% if(filters.payment_terms) %}
+ <strong>{{ _("Payment Terms") }}:</strong> {{ filters.payment_terms }}
+ {% endif %}
+ </div>
+ <div class="pull-right">
+ {% if(filters.credit_limit) %}
+ <strong>{{ _("Credit Limit") }}:</strong> {{ frappe.utils.fmt_money(filters.credit_limit) }}
+ {% endif %}
+ </div>
+ </div>
+
+ {% if(filters.show_future_payments) %}
+ {% set balance_row = data.slice(-1).pop() %}
+ {% for i in report.columns %}
+ {% if i.fieldname == 'age' %}
+ {% set elem = i %}
+ {% endif %}
+ {% endfor %}
+ {% set start = report.columns.findIndex(elem) %}
+ {% set range1 = report.columns[start].label %}
+ {% set range2 = report.columns[start+1].label %}
+ {% set range3 = report.columns[start+2].label %}
+ {% set range4 = report.columns[start+3].label %}
+ {% set range5 = report.columns[start+4].label %}
+ {% set range6 = report.columns[start+5].label %}
+
+ {% if(balance_row) %}
+ <table class="table table-bordered table-condensed">
+ <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;">
+ <col style="width: 18mm;">
+ </colgroup>
+
+ <thead>
+ <tr>
+ <th>{{ _(" ") }}</th>
+ <th>{{ _(range1) }}</th>
+ <th>{{ _(range2) }}</th>
+ <th>{{ _(range3) }}</th>
+ <th>{{ _(range4) }}</th>
+ <th>{{ _(range5) }}</th>
+ <th>{{ _(range6) }}</th>
+ <th>{{ _("Total") }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{{ _("Total Outstanding") }}</td>
+ <td class="text-right">
+ {{ format_number(balance_row["age"], null, 2) }}
+ </td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(balance_row["range1"], data[data.length-1]["currency"]) }}
+ </td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(balance_row["range2"], data[data.length-1]["currency"]) }}
+ </td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(balance_row["range3"], data[data.length-1]["currency"]) }}
+ </td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(balance_row["range4"], data[data.length-1]["currency"]) }}
+ </td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(balance_row["range5"], data[data.length-1]["currency"]) }}
+ </td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) }}
+ </td>
+ </tr>
+ <td>{{ _("Future Payments") }}</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td class="text-right">
+ {{ frappe.utils.fmt_money(flt(balance_row[("future_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></th>
+ <th></th>
+ <th class="text-right">
+ {{ frappe.utils.fmt_money(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) }}</th>
+ </tr>
+ </tbody>
+
+ </table>
+ {% endif %}
+ {% endif %}
+ <table class="table table-bordered">
+ <thead>
+ <tr>
+ {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %}
+ <th style="width: 10%">{{ _("Date") }}</th>
+ <th style="width: 4%">{{ _("Age (Days)") }}</th>
+
+ {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %}
+ <th style="width: 14%">{{ _("Reference") }}</th>
+ <th style="width: 10%">{{ _("Sales Person") }}</th>
+ {% else %}
+ <th style="width: 24%">{{ _("Reference") }}</th>
+ {% endif %}
+ {% if not(filters.show_future_payments) %}
+ <th style="width: 20%">
+ {% if (filters.customer or filters.supplier or filters.customer_name) %}
+ {{ _("Remarks") }}
+ {% else %}
+ {{ _("Party") }}
+ {% endif %}
+ </th>
+ {% endif %}
+ <th style="width: 10%; text-align: right">{{ _("Invoiced Amount") }}</th>
+ {% if not(filters.show_future_payments) %}
+ <th style="width: 10%; text-align: right">{{ _("Paid Amount") }}</th>
+ <th style="width: 10%; text-align: right">
+ {% if report.report_name == "Accounts Receivable" %}
+ {{ _('Credit Note') }}
+ {% else %}
+ {{ _('Debit Note') }}
+ {% endif %}
+ </th>
+ {% endif %}
+ <th style="width: 10%; text-align: right">{{ _("Outstanding Amount") }}</th>
+ {% if(filters.show_future_payments) %}
+ {% if(report.report_name == "Accounts Receivable") %}
+ <th style="width: 12%">{{ _("Customer LPO No.") }}</th>
+ {% endif %}
+ <th style="width: 10%">{{ _("Future Payment Ref") }}</th>
+ <th style="width: 10%">{{ _("Future Payment Amount") }}</th>
+ <th style="width: 10%">{{ _("Remaining Balance") }}</th>
+ {% endif %}
+ {% else %}
+ <th style="width: 40%">
+ {% if (filters.customer or filters.supplier or filters.customer_name) %}
+ {{ _("Remarks")}}
+ {% else %}
+ {{ _("Party") }}
+ {% endif %}
+ </th>
+ <th style="width: 15%">{{ _("Total Invoiced Amount") }}</th>
+ <th style="width: 15%">{{ _("Total Paid Amount") }}</th>
+ <th style="width: 15%">
+ {% if report.report_name == "Accounts Receivable Summary" %}
+ {{ _('Credit Note Amount') }}
+ {% else %}
+ {{ _('Debit Note Amount') }}
+ {% endif %}
+ </th>
+ <th style="width: 15%">{{ _("Total Outstanding Amount") }}</th>
+ {% endif %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for i in range(data|length) %}
+ <tr>
+ {% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %}
+ {% if(data[i]["party"]) %}
+ <td>{{ (data[i]["posting_date"]) }}</td>
+ <td style="text-align: right">{{ data[i]["age"] }}</td>
+ <td>
+ {% if not(filters.show_future_payments) %}
+ {{ data[i]["voucher_type"] }}
+ <br>
+ {% endif %}
+ {{ data[i]["voucher_no"] }}
+ </td>
+
+ {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %}
+ <td>{{ data[i]["sales_person"] }}</td>
+ {% endif %}
+
+ {% if not (filters.show_future_payments) %}
+ <td>
+ {% if(not(filters.customer or filters.supplier or filters.customer_name)) %}
+ {{ data[i]["party"] }}
+ {% if(data[i]["customer_name"] and data[i]["customer_name"] != data[i]["party"]) %}
+ <br> {{ data[i]["customer_name"] }}
+ {% elif(data[i]["supplier_name"] != data[i]["party"]) %}
+ <br> {{ data[i]["supplier_name"] }}
+ {% endif %}
+ {% endif %}
+ <div>
+ {% if data[i]["remarks"] %}
+ {{ _("Remarks") }}:
+ {{ data[i]["remarks"] }}
+ {% endif %}
+ </div>
+ </td>
+ {% endif %}
+
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }}</td>
+
+ {% if not(filters.show_future_payments) %}
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }}</td>
+ {% endif %}
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }}</td>
+
+ {% if(filters.show_future_payments) %}
+ {% if(report.report_name == "Accounts Receivable") %}
+ <td style="text-align: right">
+ {{ data[i]["po_no"] }}</td>
+ {% endif %}
+ <td style="text-align: right">{{ data[i]["future_ref"] }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }}</td>
+ {% endif %}
+ {% else %}
+ <td></td>
+ {% if not(filters.show_future_payments) %}
+ <td></td>
+ {% endif %}
+ {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %}
+ <td></td>
+ {% endif %}
+ <td></td>
+ <td style="text-align: right"><b>{{ _("Total") }}</b></td>
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["invoiced"], data[i]["currency"]) }}</td>
+
+ {% if not(filters.show_future_payments) %}
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} </td>
+ {% endif %}
+ <td style="text-align: right">
+ {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }}</td>
+
+ {% if(filters.show_future_payments) %}
+ {% if(report.report_name == "Accounts Receivable") %}
+ <td style="text-align: right">
+ {{ data[i]["po_no"] }}</td>
+ {% endif %}
+ <td style="text-align: right">{{ data[i]["future_ref"] }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }}</td>
+ {% endif %}
+ {% endif %}
+ {% else %}
+ {% if(data[i]["party"] or " ") %}
+ {% if not(data[i]["is_total_row"]) %}
+ <td>
+ {% if(not(filters.customer | filters.supplier)) %}
+ {{ data[i]["party"] }}
+ {% if(data[i]["customer_name"] and data[i]["customer_name"] != data[i]["party"]) %}
+ <br> {{ data[i]["customer_name"] }}
+ {% elif(data[i]["supplier_name"] != data[i]["party"]) %}
+ <br> {{ data[i]["supplier_name"] }}
+ {% endif %}
+ {% endif %}
+ <br>{{ _("Remarks") }}:
+ {{ data[i]["remarks"] }}
+ </td>
+ {% else %}
+ <td><b>{{ _("Total") }}</b></td>
+ {% endif %}
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }}</td>
+ <td style="text-align: right">{{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }}</td>
+ {% endif %}
+ {% endif %}
+ </tr>
+ {% endfor %}
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}</b></td>
+ <td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }}</b></td>
+ <td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="credit_note"), currency=data[0]["currency"]) }}</b></td>
+ <td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }}</b></td>
+ </tbody>
+ </table>
+ <br>
+ {% if ageing %}
+ <h4 class="text-center">{{ _("Ageing Report based on ") }} {{ ageing.ageing_based_on }}
+ {{ _("up to " ) }} {{ frappe.format(filters.report_date, 'Date')}}
+ </h4>
+ <table class="table table-bordered">
+ <thead>
+ <tr>
+ <th style="width: 25%">30 Days</th>
+ <th style="width: 25%">60 Days</th>
+ <th style="width: 25%">90 Days</th>
+ <th style="width: 25%">120 Days</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{{ frappe.utils.fmt_money(ageing.range1, currency=data[0]["currency"]) }}</td>
+ <td>{{ frappe.utils.fmt_money(ageing.range2, currency=data[0]["currency"]) }}</td>
+ <td>{{ frappe.utils.fmt_money(ageing.range3, currency=data[0]["currency"]) }}</td>
+ <td>{{ frappe.utils.fmt_money(ageing.range4, currency=data[0]["currency"]) }}</td>
+ </tr>
+ </tbody>
+ </table>
+ {% endif %}
+ <p class="text-right text-muted">{{ _("Printed On ") }}{{ frappe.utils.now() }}</p>
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
index 8bffd6a..1749d72 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
@@ -27,7 +27,7 @@
},
{
"fieldname": "billing_email",
- "fieldtype": "Read Only",
+ "fieldtype": "Data",
"in_list_view": 1,
"label": "Billing Email"
},
@@ -41,7 +41,7 @@
],
"istable": 1,
"links": [],
- "modified": "2023-03-13 00:12:34.508086",
+ "modified": "2023-04-26 13:02:41.964499",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Process Statement Of Accounts Customer",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 5c9168b..6a558ca 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -54,9 +54,11 @@
hide_fields(this.frm.doc);
// Show / Hide button
this.show_general_ledger();
+ erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm);
- if(doc.update_stock==1 && doc.docstatus==1) {
+ if(doc.update_stock==1) {
this.show_stock_ledger();
+ erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
}
if(!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0){
@@ -303,7 +305,7 @@
apply_tds(frm) {
var me = this;
-
+ me.frm.set_value("tax_withheld_vouchers", []);
if (!me.frm.doc.apply_tds) {
me.frm.set_value("tax_withholding_category", '');
me.frm.set_df_property("tax_withholding_category", "hidden", 1);
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index b4d369e..d8759e9 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -89,6 +89,7 @@
"column_break8",
"grand_total",
"rounding_adjustment",
+ "use_company_roundoff_cost_center",
"rounded_total",
"in_words",
"total_advance",
@@ -442,12 +443,14 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
"fieldname": "contact_email",
"fieldtype": "Small Text",
"label": "Contact Email",
+ "options": "Email",
"print_hide": 1,
"read_only": 1
},
@@ -546,6 +549,7 @@
"depends_on": "update_stock",
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"options": "Warehouse",
@@ -1085,6 +1089,7 @@
"fieldtype": "Button",
"label": "Get Advances Paid",
"oldfieldtype": "Button",
+ "options": "set_advances",
"print_hide": 1
},
{
@@ -1363,6 +1368,7 @@
"depends_on": "eval:doc.update_stock && doc.is_internal_supplier",
"fieldname": "set_from_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Set From Warehouse",
"no_copy": 1,
"options": "Warehouse",
@@ -1559,13 +1565,19 @@
"fieldname": "only_include_allocated_payments",
"fieldtype": "Check",
"label": "Only Include Allocated Payments"
+ },
+ {
+ "default": "0",
+ "fieldname": "use_company_roundoff_cost_center",
+ "fieldtype": "Check",
+ "label": "Use Company Default Round Off Cost Center"
}
],
"icon": "fa fa-file-text",
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2023-04-03 22:57:14.074982",
+ "modified": "2023-07-04 17:22:59.145031",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index a617447..230a8b3 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -102,9 +102,6 @@
# validate service stop date to lie in between start and end date
validate_service_stop_date(self)
- if self._action == "submit" and self.update_stock:
- self.make_batches("warehouse")
-
self.validate_release_date()
self.check_conversion_rate()
self.validate_credit_to_acc()
@@ -513,10 +510,6 @@
if self.is_old_subcontracting_flow:
self.set_consumed_qty_in_subcontract_order()
- from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
-
- update_serial_nos_after_submit(self, "items")
-
# this sequence because outstanding may get -negative
self.make_gl_entries()
@@ -978,7 +971,7 @@
def make_precision_loss_gl_entry(self, gl_entries):
round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
- self.company, "Purchase Invoice", self.name
+ self.company, "Purchase Invoice", self.name, self.use_company_roundoff_cost_center
)
precision_loss = self.get("base_net_total") - flt(
@@ -992,7 +985,9 @@
"account": round_off_account,
"against": self.supplier,
"credit": precision_loss,
- "cost_center": self.cost_center or round_off_cost_center,
+ "cost_center": round_off_cost_center
+ if self.use_company_roundoff_cost_center
+ else self.cost_center or round_off_cost_center,
"remarks": _("Net total calculation precision loss"),
}
)
@@ -1386,7 +1381,7 @@
not self.is_internal_transfer() and self.rounding_adjustment and self.base_rounding_adjustment
):
round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
- self.company, "Purchase Invoice", self.name
+ self.company, "Purchase Invoice", self.name, self.use_company_roundoff_cost_center
)
gl_entries.append(
@@ -1396,7 +1391,9 @@
"against": self.supplier,
"debit_in_account_currency": self.rounding_adjustment,
"debit": self.base_rounding_adjustment,
- "cost_center": self.cost_center or round_off_cost_center,
+ "cost_center": round_off_cost_center
+ if self.use_company_roundoff_cost_center
+ else (self.cost_center or round_off_cost_center),
},
item=self,
)
@@ -1444,6 +1441,7 @@
"Repost Payment Ledger Items",
"Payment Ledger Entry",
"Tax Withheld Vouchers",
+ "Serial and Batch Bundle",
)
self.update_advance_tax_references(cancel=1)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
index e1c37c6..fa30c37 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
@@ -19,7 +19,7 @@
],
get_indicator(doc) {
if (doc.status == "Debit Note Issued") {
- return [__(doc.status), "darkgrey", "status,=," + doc.status];
+ return [__(doc.status), "gray", "status,=," + doc.status];
}
if (
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index a6d7df6..8c96480 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -26,6 +26,11 @@
get_taxes,
make_purchase_receipt,
)
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.test_stock_entry import get_qty_after_transaction
from erpnext.stock.tests.test_utils import StockTestMixin
@@ -37,7 +42,7 @@
@classmethod
def setUpClass(self):
unlink_payment_on_cancel_of_invoice()
- frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+ frappe.db.set_single_value("Buying Settings", "allow_multiple_items", 1)
@classmethod
def tearDownClass(self):
@@ -637,13 +642,6 @@
gle_filters={"account": "Stock In Hand - TCP1"},
)
- # assert loss booked in COGS
- self.assertGLEs(
- return_pi,
- [{"credit": 0, "debit": 200}],
- gle_filters={"account": "Cost of Goods Sold - TCP1"},
- )
-
def test_return_with_lcv(self):
from erpnext.controllers.sales_and_purchase_return import make_return_doc
from erpnext.stock.doctype.landed_cost_voucher.test_landed_cost_voucher import (
@@ -888,14 +886,20 @@
rejected_warehouse="_Test Rejected Warehouse - _TC",
allow_zero_valuation_rate=1,
)
+ pi.load_from_db()
+
+ serial_no = get_serial_nos_from_bundle(pi.get("items")[0].serial_and_batch_bundle)[0]
+ rejected_serial_no = get_serial_nos_from_bundle(
+ pi.get("items")[0].rejected_serial_and_batch_bundle
+ )[0]
self.assertEqual(
- frappe.db.get_value("Serial No", pi.get("items")[0].serial_no, "warehouse"),
+ frappe.db.get_value("Serial No", serial_no, "warehouse"),
pi.get("items")[0].warehouse,
)
self.assertEqual(
- frappe.db.get_value("Serial No", pi.get("items")[0].rejected_serial_no, "warehouse"),
+ frappe.db.get_value("Serial No", rejected_serial_no, "warehouse"),
pi.get("items")[0].rejected_warehouse,
)
@@ -1221,9 +1225,7 @@
"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice"
)
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", 1
- )
+ frappe.db.set_single_value("Accounts Settings", "unlink_payment_on_cancel_of_invoice", 1)
original_account = frappe.db.get_value("Company", "_Test Company", "exchange_gain_loss_account")
frappe.db.set_value(
@@ -1358,8 +1360,8 @@
pay.reload()
pay.cancel()
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled
+ frappe.db.set_single_value(
+ "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled
)
frappe.db.set_value("Company", "_Test Company", "exchange_gain_loss_account", original_account)
@@ -1652,7 +1654,7 @@
)
pi.load_from_db()
- batch_no = pi.items[0].batch_no
+ batch_no = get_batch_from_bundle(pi.items[0].serial_and_batch_bundle)
self.assertTrue(batch_no)
frappe.db.set_value("Batch", batch_no, "expiry_date", add_days(nowdate(), -1))
@@ -1662,17 +1664,105 @@
self.assertTrue(return_pi.docstatus == 1)
+ def test_advance_entries_as_asset(self):
+ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
-def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
- gl_entries = frappe.db.sql(
- """select account, debit, credit, posting_date
- from `tabGL Entry`
- where voucher_type='Purchase Invoice' and voucher_no=%s and posting_date >= %s
- order by posting_date asc, account asc""",
- (voucher_no, posting_date),
- as_dict=1,
+ account = create_account(
+ parent_account="Current Assets - _TC",
+ account_name="Advances Paid",
+ company="_Test Company",
+ account_type="Receivable",
+ )
+
+ set_advance_flag(company="_Test Company", flag=1, default_account=account)
+
+ pe = create_payment_entry(
+ company="_Test Company",
+ payment_type="Pay",
+ party_type="Supplier",
+ party="_Test Supplier",
+ paid_from="Cash - _TC",
+ paid_to="Creditors - _TC",
+ paid_amount=500,
+ )
+ pe.submit()
+
+ pi = make_purchase_invoice(
+ company="_Test Company",
+ customer="_Test Supplier",
+ do_not_save=True,
+ do_not_submit=True,
+ rate=1000,
+ price_list_rate=1000,
+ qty=1,
+ )
+ pi.base_grand_total = 1000
+ pi.grand_total = 1000
+ pi.set_advances()
+ for advance in pi.advances:
+ advance.allocated_amount = 500 if advance.reference_name == pe.name else 0
+ pi.save()
+ pi.submit()
+
+ self.assertEqual(pi.advances[0].allocated_amount, 500)
+
+ # Check GL Entry against payment doctype
+ expected_gle = [
+ ["Advances Paid - _TC", 0.0, 500, nowdate()],
+ ["Cash - _TC", 0.0, 500, nowdate()],
+ ["Creditors - _TC", 500, 0.0, nowdate()],
+ ["Creditors - _TC", 500, 0.0, nowdate()],
+ ]
+
+ check_gl_entries(self, pe.name, expected_gle, nowdate(), voucher_type="Payment Entry")
+
+ pi.load_from_db()
+ self.assertEqual(pi.outstanding_amount, 500)
+
+ set_advance_flag(company="_Test Company", flag=0, default_account="")
+
+ def test_gl_entries_for_standalone_debit_note(self):
+ make_purchase_invoice(qty=5, rate=500, update_stock=True)
+
+ returned_inv = make_purchase_invoice(qty=-5, rate=5, update_stock=True, is_return=True)
+
+ # override the rate with valuation rate
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ fields=["stock_value_difference", "actual_qty"],
+ filters={"voucher_no": returned_inv.name},
+ )[0]
+
+ rate = flt(sle.stock_value_difference) / flt(sle.actual_qty)
+ self.assertAlmostEqual(returned_inv.items[0].rate, rate)
+
+
+def set_advance_flag(company, flag, default_account):
+ frappe.db.set_value(
+ "Company",
+ company,
+ {
+ "book_advance_payments_in_separate_party_account": flag,
+ "default_advance_paid_account": default_account,
+ },
)
+
+def check_gl_entries(doc, voucher_no, expected_gle, posting_date, voucher_type="Purchase Invoice"):
+ gl = frappe.qb.DocType("GL Entry")
+ q = (
+ frappe.qb.from_(gl)
+ .select(gl.account, gl.debit, gl.credit, gl.posting_date)
+ .where(
+ (gl.voucher_type == voucher_type)
+ & (gl.voucher_no == voucher_no)
+ & (gl.posting_date >= posting_date)
+ & (gl.is_cancelled == 0)
+ )
+ .orderby(gl.posting_date, gl.account, gl.creation)
+ )
+ gl_entries = q.run(as_dict=True)
+
for i, gle in enumerate(gl_entries):
doc.assertEqual(expected_gle[i][0], gle.account)
doc.assertEqual(expected_gle[i][1], gle.debit)
@@ -1734,6 +1824,32 @@
pi.supplier_warehouse = args.supplier_warehouse or "_Test Warehouse 1 - _TC"
pi.cost_center = args.parent_cost_center
+ bundle_id = None
+ if args.get("batch_no") or args.get("serial_no"):
+ batches = {}
+ qty = args.qty or 5
+ item_code = args.item or args.item_code or "_Test Item"
+ if args.get("batch_no"):
+ batches = frappe._dict({args.batch_no: qty})
+
+ serial_nos = args.get("serial_no") or []
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": qty,
+ "batches": batches,
+ "voucher_type": "Purchase Invoice",
+ "serial_nos": serial_nos,
+ "type_of_transaction": "Inward",
+ "posting_date": args.posting_date or today(),
+ "posting_time": args.posting_time,
+ }
+ )
+ ).name
+
pi.append(
"items",
{
@@ -1748,12 +1864,11 @@
"discount_account": args.discount_account or None,
"discount_amount": args.discount_amount or 0,
"conversion_factor": 1.0,
- "serial_no": args.serial_no,
+ "serial_and_batch_bundle": bundle_id,
"stock_uom": args.uom or "_Test UOM",
"cost_center": args.cost_center or "_Test Cost Center - _TC",
"project": args.project,
"rejected_warehouse": args.rejected_warehouse or "",
- "rejected_serial_no": args.rejected_serial_no or "",
"asset_location": args.location or "",
"allow_zero_valuation_rate": args.get("allow_zero_valuation_rate") or 0,
},
@@ -1797,6 +1912,31 @@
if args.supplier_warehouse:
pi.supplier_warehouse = "_Test Warehouse 1 - _TC"
+ bundle_id = None
+ if args.get("batch_no") or args.get("serial_no"):
+ batches = {}
+ qty = args.qty or 5
+ item_code = args.item or args.item_code or "_Test Item"
+ if args.get("batch_no"):
+ batches = frappe._dict({args.batch_no: qty})
+
+ serial_nos = args.get("serial_no") or []
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": qty,
+ "batches": batches,
+ "voucher_type": "Purchase Receipt",
+ "serial_nos": serial_nos,
+ "posting_date": args.posting_date or today(),
+ "posting_time": args.posting_time,
+ }
+ )
+ ).name
+
pi.append(
"items",
{
@@ -1807,12 +1947,11 @@
"rejected_qty": args.rejected_qty or 0,
"rate": args.rate or 50,
"conversion_factor": 1.0,
- "serial_no": args.serial_no,
+ "serial_and_batch_bundle": bundle_id,
"stock_uom": "_Test UOM",
"cost_center": args.cost_center or "_Test Cost Center - _TC",
"project": args.project,
"rejected_warehouse": args.rejected_warehouse or "",
- "rejected_serial_no": args.rejected_serial_no or "",
},
)
if not args.do_not_save:
diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
index 9fcbf5c..4db531e 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -117,7 +117,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-09-26 15:47:28.167371",
+ "modified": "2023-06-23 21:13:18.013816",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Advance",
@@ -125,5 +125,6 @@
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 1fa7e7f..4afc451 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -64,9 +64,11 @@
"warehouse",
"from_warehouse",
"quality_inspection",
+ "serial_and_batch_bundle",
"serial_no",
"col_br_wh",
"rejected_warehouse",
+ "rejected_serial_and_batch_bundle",
"batch_no",
"rejected_serial_no",
"manufacture_details",
@@ -176,6 +178,7 @@
"fieldname": "received_qty",
"fieldtype": "Float",
"label": "Received Qty",
+ "no_copy": 1,
"read_only": 1
},
{
@@ -420,6 +423,7 @@
{
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"options": "Warehouse"
},
@@ -436,9 +440,10 @@
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "batch_no",
"fieldtype": "Link",
+ "hidden": 1,
"label": "Batch No",
- "no_copy": 1,
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"fieldname": "col_br_wh",
@@ -448,8 +453,9 @@
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "serial_no",
"fieldtype": "Text",
+ "hidden": 1,
"label": "Serial No",
- "no_copy": 1
+ "read_only": 1
},
{
"depends_on": "eval:!doc.is_fixed_asset",
@@ -457,7 +463,8 @@
"fieldtype": "Text",
"label": "Rejected Serial No",
"no_copy": 1,
- "print_hide": 1
+ "print_hide": 1,
+ "read_only": 1
},
{
"fieldname": "accounting",
@@ -875,12 +882,30 @@
"fieldname": "apply_tds",
"fieldtype": "Check",
"label": "Apply TDS"
+ },
+ {
+ "depends_on": "eval:parent.update_stock == 1",
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "eval:parent.update_stock == 1",
+ "fieldname": "rejected_serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Rejected Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-11-29 13:01:20.438217",
+ "modified": "2023-07-04 17:22:21.501152",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 56e412b..8753ebc 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -88,8 +88,12 @@
}
this.show_general_ledger();
+ erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm);
- if(doc.update_stock) this.show_stock_ledger();
+ if(doc.update_stock){
+ this.show_stock_ledger();
+ erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
+ }
if (doc.docstatus == 1 && doc.outstanding_amount!=0
&& !(cint(doc.is_return) && doc.return_against)) {
@@ -334,6 +338,7 @@
}
make_inter_company_invoice() {
+ let me = this;
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice",
frm: me.frm
@@ -669,19 +674,6 @@
}
}
- // expense account
- frm.fields_dict['items'].grid.get_field('expense_account').get_query = function(doc) {
- if (erpnext.is_perpetual_inventory_enabled(doc.company)) {
- return {
- filters: {
- 'report_type': 'Profit and Loss',
- 'company': doc.company,
- "is_group": 0
- }
- }
- }
- }
-
// discount account
frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) {
return {
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index a41e13c..f0d3f72 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -79,6 +79,7 @@
"column_break5",
"grand_total",
"rounding_adjustment",
+ "use_company_roundoff_cost_center",
"rounded_total",
"in_words",
"total_advance",
@@ -319,6 +320,7 @@
},
{
"default": "0",
+ "depends_on": "eval: !doc.is_debit_note",
"fieldname": "is_return",
"fieldtype": "Check",
"hide_days": 1,
@@ -519,6 +521,7 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -1958,6 +1961,7 @@
},
{
"default": "0",
+ "depends_on": "eval: !doc.is_return",
"description": "Issue a debit note with 0 qty against an existing Sales Invoice",
"fieldname": "is_debit_note",
"fieldtype": "Check",
@@ -2135,6 +2139,12 @@
"fieldname": "only_include_allocated_payments",
"fieldtype": "Check",
"label": "Only Include Allocated Payments"
+ },
+ {
+ "default": "0",
+ "fieldname": "use_company_roundoff_cost_center",
+ "fieldtype": "Check",
+ "label": "Use Company default Cost Center for Round off"
}
],
"icon": "fa fa-file-text",
@@ -2147,7 +2157,7 @@
"link_fieldname": "consolidated_invoice"
}
],
- "modified": "2023-04-03 22:55:14.206473",
+ "modified": "2023-06-21 16:02:18.988799",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index db61995..7ab1c89 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -36,13 +36,8 @@
from erpnext.controllers.selling_controller import SellingController
from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
from erpnext.setup.doctype.company.company import update_company_current_month_sales
-from erpnext.stock.doctype.batch.batch import set_batch_nos
from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
-from erpnext.stock.doctype.serial_no.serial_no import (
- get_delivery_note_serial_no,
- get_serial_nos,
- update_serial_nos_after_submit,
-)
+from erpnext.stock.doctype.serial_no.serial_no import get_delivery_note_serial_no, get_serial_nos
form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
@@ -129,9 +124,6 @@
if not self.is_opening:
self.is_opening = "No"
- if self._action != "submit" and self.update_stock and not self.is_return:
- set_batch_nos(self, "warehouse", True)
-
if self.redeem_loyalty_points:
lp = frappe.get_doc("Loyalty Program", self.loyalty_program)
self.loyalty_redemption_account = (
@@ -262,8 +254,6 @@
# because updating reserved qty in bin depends upon updated delivered qty in SO
if self.update_stock == 1:
self.update_stock_ledger()
- if self.is_return and self.update_stock:
- update_serial_nos_after_submit(self, "items")
# this sequence because outstanding may get -ve
self.make_gl_entries()
@@ -276,8 +266,6 @@
self.update_billing_status_for_zero_amount_refdoc("Sales Order")
self.check_credit_limit()
- self.update_serial_no()
-
if not cint(self.is_pos) == 1 and not self.is_return:
self.update_against_document_in_jv()
@@ -361,7 +349,6 @@
if not self.is_return:
self.update_billing_status_for_zero_amount_refdoc("Delivery Note")
self.update_billing_status_for_zero_amount_refdoc("Sales Order")
- self.update_serial_no(in_cancel=True)
# Updating stock ledger should always be called after updating prevdoc status,
# because updating reserved qty in bin depends upon updated delivered qty in SO
@@ -400,6 +387,7 @@
"Repost Payment Ledger",
"Repost Payment Ledger Items",
"Payment Ledger Entry",
+ "Serial and Batch Bundle",
)
def update_status_updater_args(self):
@@ -1013,10 +1001,16 @@
def check_prev_docstatus(self):
for d in self.get("items"):
- if d.sales_order and frappe.db.get_value("Sales Order", d.sales_order, "docstatus") != 1:
+ if (
+ d.sales_order
+ and frappe.db.get_value("Sales Order", d.sales_order, "docstatus", cache=True) != 1
+ ):
frappe.throw(_("Sales Order {0} is not submitted").format(d.sales_order))
- if d.delivery_note and frappe.db.get_value("Delivery Note", d.delivery_note, "docstatus") != 1:
+ if (
+ d.delivery_note
+ and frappe.db.get_value("Delivery Note", d.delivery_note, "docstatus", cache=True) != 1
+ ):
throw(_("Delivery Note {0} is not submitted").format(d.delivery_note))
def make_gl_entries(self, gl_entries=None, from_repost=False):
@@ -1180,7 +1174,12 @@
if self.is_return:
fixed_asset_gl_entries = get_gl_entries_on_asset_regain(
- asset, item.base_net_amount, item.finance_book, self.get("doctype"), self.get("name")
+ asset,
+ item.base_net_amount,
+ item.finance_book,
+ self.get("doctype"),
+ self.get("name"),
+ self.get("posting_date"),
)
asset.db_set("disposal_date", None)
@@ -1208,7 +1207,12 @@
asset.reload()
fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(
- asset, item.base_net_amount, item.finance_book, self.get("doctype"), self.get("name")
+ asset,
+ item.base_net_amount,
+ item.finance_book,
+ self.get("doctype"),
+ self.get("name"),
+ self.get("posting_date"),
)
asset.db_set("disposal_date", self.posting_date)
@@ -1464,7 +1468,7 @@
and not self.is_internal_transfer()
):
round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
- self.company, "Sales Invoice", self.name
+ self.company, "Sales Invoice", self.name, self.use_company_roundoff_cost_center
)
gl_entries.append(
@@ -1476,7 +1480,9 @@
self.rounding_adjustment, self.precision("rounding_adjustment")
),
"credit": flt(self.base_rounding_adjustment, self.precision("base_rounding_adjustment")),
- "cost_center": self.cost_center or round_off_cost_center,
+ "cost_center": round_off_cost_center
+ if self.use_company_roundoff_cost_center
+ else (self.cost_center or round_off_cost_center),
},
item=self,
)
@@ -1506,20 +1512,6 @@
self.set("write_off_amount", reference_doc.get("write_off_amount"))
self.due_date = None
- def update_serial_no(self, in_cancel=False):
- """update Sales Invoice refrence in Serial No"""
- invoice = None if (in_cancel or self.is_return) else self.name
- if in_cancel and self.is_return:
- invoice = self.return_against
-
- for item in self.items:
- if not item.serial_no:
- continue
-
- for serial_no in get_serial_nos(item.serial_no):
- if serial_no and frappe.db.get_value("Serial No", serial_no, "item_code") == item.item_code:
- frappe.db.set_value("Serial No", serial_no, "sales_invoice", invoice)
-
def validate_serial_numbers(self):
"""
validate serial number agains Delivery Note and Sales Invoice
diff --git a/erpnext/accounts/doctype/sales_invoice/test_records.json b/erpnext/accounts/doctype/sales_invoice/test_records.json
index 3781f8c..61e5219 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_records.json
+++ b/erpnext/accounts/doctype/sales_invoice/test_records.json
@@ -6,7 +6,7 @@
"cost_center": "_Test Cost Center - _TC",
"customer": "_Test Customer",
"customer_name": "_Test Customer",
- "debit_to": "_Test Receivable - _TC",
+ "debit_to": "Debtors - _TC",
"doctype": "Sales Invoice",
"items": [
{
@@ -78,7 +78,7 @@
"currency": "INR",
"customer": "_Test Customer",
"customer_name": "_Test Customer",
- "debit_to": "_Test Receivable - _TC",
+ "debit_to": "Debtors - _TC",
"doctype": "Sales Invoice",
"cost_center": "_Test Cost Center - _TC",
"items": [
@@ -137,7 +137,7 @@
"currency": "INR",
"customer": "_Test Customer",
"customer_name": "_Test Customer",
- "debit_to": "_Test Receivable - _TC",
+ "debit_to": "Debtors - _TC",
"doctype": "Sales Invoice",
"cost_center": "_Test Cost Center - _TC",
"items": [
@@ -265,7 +265,7 @@
"currency": "INR",
"customer": "_Test Customer",
"customer_name": "_Test Customer",
- "debit_to": "_Test Receivable - _TC",
+ "debit_to": "Debtors - _TC",
"doctype": "Sales Invoice",
"cost_center": "_Test Cost Center - _TC",
"items": [
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 6051c99..0280c35 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -6,7 +6,6 @@
import frappe
from frappe.model.dynamic_links import get_dynamic_link_map
-from frappe.model.naming import make_autoname
from frappe.tests.utils import change_settings
from frappe.utils import add_days, flt, getdate, nowdate, today
@@ -30,7 +29,11 @@
from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
from erpnext.stock.doctype.item.test_item import create_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
-from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.test_stock_entry import (
get_qty_after_transaction,
make_stock_entry,
@@ -1058,7 +1061,7 @@
self.assertEqual(pos.write_off_amount, 10)
def test_pos_with_no_gl_entry_for_change_amount(self):
- frappe.db.set_value("Accounts Settings", None, "post_change_gl_entries", 0)
+ frappe.db.set_single_value("Accounts Settings", "post_change_gl_entries", 0)
make_pos_profile(
company="_Test Company with perpetual inventory",
@@ -1108,7 +1111,7 @@
self.validate_pos_gl_entry(pos, pos, 60, validate_without_change_gle=True)
- frappe.db.set_value("Accounts Settings", None, "post_change_gl_entries", 1)
+ frappe.db.set_single_value("Accounts Settings", "post_change_gl_entries", 1)
def validate_pos_gl_entry(self, si, pos, cash_amount, validate_without_change_gle=False):
if validate_without_change_gle:
@@ -1348,55 +1351,47 @@
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
se = make_serialized_item()
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ se.load_from_db()
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
si = frappe.copy_doc(test_records[0])
si.update_stock = 1
si.get("items")[0].item_code = "_Test Serialized Item With Series"
si.get("items")[0].qty = 1
- si.get("items")[0].serial_no = serial_nos[0]
+ si.get("items")[0].warehouse = se.get("items")[0].t_warehouse
+ si.get("items")[0].serial_and_batch_bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": si.get("items")[0].item_code,
+ "warehouse": si.get("items")[0].warehouse,
+ "company": si.company,
+ "qty": 1,
+ "voucher_type": "Stock Entry",
+ "serial_nos": [serial_nos[0]],
+ "posting_date": si.posting_date,
+ "posting_time": si.posting_time,
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
si.insert()
si.submit()
self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "warehouse"))
- self.assertEqual(
- frappe.db.get_value("Serial No", serial_nos[0], "delivery_document_no"), si.name
- )
return si
def test_serialized_cancel(self):
- from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-
si = self.test_serialized()
si.cancel()
- serial_nos = get_serial_nos(si.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(si.get("items")[0].serial_and_batch_bundle)
self.assertEqual(
frappe.db.get_value("Serial No", serial_nos[0], "warehouse"), "_Test Warehouse - _TC"
)
- self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "delivery_document_no"))
- self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "sales_invoice"))
-
- def test_serialize_status(self):
- serial_no = frappe.get_doc(
- {
- "doctype": "Serial No",
- "item_code": "_Test Serialized Item With Series",
- "serial_no": make_autoname("SR", "Serial No"),
- }
- )
- serial_no.save()
-
- si = frappe.copy_doc(test_records[0])
- si.update_stock = 1
- si.get("items")[0].item_code = "_Test Serialized Item With Series"
- si.get("items")[0].qty = 1
- si.get("items")[0].serial_no = serial_no.name
- si.insert()
-
- self.assertRaises(SerialNoWarehouseError, si.submit)
def test_serial_numbers_against_delivery_note(self):
"""
@@ -1404,20 +1399,22 @@
serial numbers are same
"""
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
- from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
se = make_serialized_item()
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ se.load_from_db()
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
- dn = create_delivery_note(item=se.get("items")[0].item_code, serial_no=serial_nos[0])
+ dn = create_delivery_note(item=se.get("items")[0].item_code, serial_no=[serial_nos])
dn.submit()
+ dn.load_from_db()
+
+ serial_nos = get_serial_nos_from_bundle(dn.get("items")[0].serial_and_batch_bundle)[0]
+ self.assertTrue(get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0])
si = make_sales_invoice(dn.name)
si.save()
- self.assertEqual(si.get("items")[0].serial_no, dn.get("items")[0].serial_no)
-
def test_return_sales_invoice(self):
make_stock_entry(item_code="_Test Item", target="Stores - TCP1", qty=50, basic_rate=100)
@@ -1727,7 +1724,7 @@
# Party Account currency must be in USD, as there is existing GLE with USD
si4 = create_sales_invoice(
customer="_Test Customer USD",
- debit_to="_Test Receivable - _TC",
+ debit_to="Debtors - _TC",
currency="USD",
conversion_rate=50,
do_not_submit=True,
@@ -1740,7 +1737,7 @@
si3.cancel()
si5 = create_sales_invoice(
customer="_Test Customer USD",
- debit_to="_Test Receivable - _TC",
+ debit_to="Debtors - _TC",
currency="USD",
conversion_rate=50,
do_not_submit=True,
@@ -1819,7 +1816,7 @@
"reference_date": nowdate(),
"received_amount": 300,
"paid_amount": 300,
- "paid_from": "_Test Receivable - _TC",
+ "paid_from": "Debtors - _TC",
"paid_to": "_Test Cash - _TC",
}
)
@@ -2453,7 +2450,7 @@
"Check mapping (expense account) of inter company SI to PI in absence of default warehouse."
# setup
old_negative_stock = frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
old_perpetual_inventory = erpnext.is_perpetual_inventory_enabled("_Test Company 1")
frappe.local.enable_perpetual_inventory["_Test Company 1"] = 1
@@ -2507,7 +2504,7 @@
# tear down
frappe.local.enable_perpetual_inventory["_Test Company 1"] = old_perpetual_inventory
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", old_negative_stock)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", old_negative_stock)
def test_sle_for_target_warehouse(self):
se = make_stock_entry(
@@ -2573,7 +2570,7 @@
"posting_date": si.posting_date,
"posting_time": si.posting_time,
"qty": -1 * flt(d.get("stock_qty")),
- "serial_no": d.serial_no,
+ "serial_and_batch_bundle": d.serial_and_batch_bundle,
"company": si.company,
"voucher_type": "Sales Invoice",
"voucher_no": si.name,
@@ -2899,7 +2896,7 @@
party_link = create_party_link("Supplier", supplier, customer)
# enable common party accounting
- frappe.db.set_value("Accounts Settings", None, "enable_common_party_accounting", 1)
+ frappe.db.set_single_value("Accounts Settings", "enable_common_party_accounting", 1)
# create a sales invoice
si = create_sales_invoice(customer=customer, parent_cost_center="_Test Cost Center - _TC")
@@ -2926,7 +2923,7 @@
self.assertEqual(jv[0], si.grand_total)
party_link.delete()
- frappe.db.set_value("Accounts Settings", None, "enable_common_party_accounting", 0)
+ frappe.db.set_single_value("Accounts Settings", "enable_common_party_accounting", 0)
def test_payment_statuses(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
@@ -2982,7 +2979,7 @@
# Sales Invoice with Payment Schedule
si_with_payment_schedule = create_sales_invoice(do_not_submit=True)
- si_with_payment_schedule.extend(
+ si_with_payment_schedule.set(
"payment_schedule",
[
{
@@ -3046,7 +3043,7 @@
self.assertRaises(frappe.ValidationError, si.save)
def test_sales_invoice_submission_post_account_freezing_date(self):
- frappe.db.set_value("Accounts Settings", None, "acc_frozen_upto", add_days(getdate(), 1))
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", add_days(getdate(), 1))
si = create_sales_invoice(do_not_save=True)
si.posting_date = add_days(getdate(), 1)
si.save()
@@ -3055,7 +3052,7 @@
si.posting_date = getdate()
si.submit()
- frappe.db.set_value("Accounts Settings", None, "acc_frozen_upto", None)
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
def test_over_billing_case_against_delivery_note(self):
"""
@@ -3067,7 +3064,7 @@
over_billing_allowance = frappe.db.get_single_value(
"Accounts Settings", "over_billing_allowance"
)
- frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", 0)
+ frappe.db.set_single_value("Accounts Settings", "over_billing_allowance", 0)
dn = create_delivery_note()
dn.submit()
@@ -3083,7 +3080,7 @@
self.assertTrue("cannot overbill" in str(err.exception).lower())
- frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", over_billing_allowance)
+ frappe.db.set_single_value("Accounts Settings", "over_billing_allowance", over_billing_allowance)
def test_multi_currency_deferred_revenue_via_journal_entry(self):
deferred_account = create_account(
@@ -3122,7 +3119,7 @@
si.save()
si.submit()
- frappe.db.set_value("Accounts Settings", None, "acc_frozen_upto", getdate("2019-01-31"))
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", getdate("2019-01-31"))
pda1 = frappe.get_doc(
dict(
@@ -3167,14 +3164,14 @@
acc_settings.submit_journal_entries = 0
acc_settings.save()
- frappe.db.set_value("Accounts Settings", None, "acc_frozen_upto", None)
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
def test_standalone_serial_no_return(self):
si = create_sales_invoice(
item_code="_Test Serialized Item With Series", update_stock=True, is_return=True, qty=-1
)
si.reload()
- self.assertTrue(si.items[0].serial_no)
+ self.assertTrue(get_serial_nos_from_bundle(si.items[0].serial_and_batch_bundle))
def test_sales_invoice_with_disabled_account(self):
try:
@@ -3217,9 +3214,7 @@
"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice"
)
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", 1
- )
+ frappe.db.set_single_value("Accounts Settings", "unlink_payment_on_cancel_of_invoice", 1)
jv = make_journal_entry("_Test Receivable USD - _TC", "_Test Bank - _TC", -7000, save=False)
@@ -3255,15 +3250,16 @@
si.submit()
expected_gle = [
- ["_Test Receivable USD - _TC", 7500.0, 500],
- ["Exchange Gain/Loss - _TC", 500.0, 0.0],
- ["Sales - _TC", 0.0, 7500.0],
+ ["_Test Exchange Gain/Loss - _TC", 500.0, 0.0, nowdate()],
+ ["_Test Receivable USD - _TC", 7500.0, 0.0, nowdate()],
+ ["_Test Receivable USD - _TC", 0.0, 500.0, nowdate()],
+ ["Sales - _TC", 0.0, 7500.0, nowdate()],
]
check_gl_entries(self, si.name, expected_gle, nowdate())
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled
+ frappe.db.set_single_value(
+ "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled
)
def test_batch_expiry_for_sales_invoice_return(self):
@@ -3283,11 +3279,11 @@
pr = make_purchase_receipt(qty=1, item_code=item.name)
- batch_no = pr.items[0].batch_no
+ batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
si = create_sales_invoice(qty=1, item_code=item.name, update_stock=1, batch_no=batch_no)
si.load_from_db()
- batch_no = si.items[0].batch_no
+ batch_no = get_batch_from_bundle(si.items[0].serial_and_batch_bundle)
self.assertTrue(batch_no)
frappe.db.set_value("Batch", batch_no, "expiry_date", add_days(today(), -1))
@@ -3313,6 +3309,73 @@
)
self.assertRaises(frappe.ValidationError, si.submit)
+ def test_advance_entries_as_liability(self):
+ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
+
+ account = create_account(
+ parent_account="Current Liabilities - _TC",
+ account_name="Advances Received",
+ company="_Test Company",
+ account_type="Receivable",
+ )
+
+ set_advance_flag(company="_Test Company", flag=1, default_account=account)
+
+ pe = create_payment_entry(
+ company="_Test Company",
+ payment_type="Receive",
+ party_type="Customer",
+ party="_Test Customer",
+ paid_from="Debtors - _TC",
+ paid_to="Cash - _TC",
+ paid_amount=1000,
+ )
+ pe.submit()
+
+ si = create_sales_invoice(
+ company="_Test Company",
+ customer="_Test Customer",
+ do_not_save=True,
+ do_not_submit=True,
+ rate=500,
+ price_list_rate=500,
+ )
+ si.base_grand_total = 500
+ si.grand_total = 500
+ si.set_advances()
+ for advance in si.advances:
+ advance.allocated_amount = 500 if advance.reference_name == pe.name else 0
+ si.save()
+ si.submit()
+
+ self.assertEqual(si.advances[0].allocated_amount, 500)
+
+ # Check GL Entry against payment doctype
+ expected_gle = [
+ ["Advances Received - _TC", 500, 0.0, nowdate()],
+ ["Cash - _TC", 1000, 0.0, nowdate()],
+ ["Debtors - _TC", 0.0, 1000, nowdate()],
+ ["Debtors - _TC", 0.0, 500, nowdate()],
+ ]
+
+ check_gl_entries(self, pe.name, expected_gle, nowdate(), voucher_type="Payment Entry")
+
+ si.load_from_db()
+ self.assertEqual(si.outstanding_amount, 0)
+
+ set_advance_flag(company="_Test Company", flag=0, default_account="")
+
+
+def set_advance_flag(company, flag, default_account):
+ frappe.db.set_value(
+ "Company",
+ company,
+ {
+ "book_advance_payments_in_separate_party_account": flag,
+ "default_advance_received_account": default_account,
+ },
+ )
+
def get_sales_invoice_for_e_invoice():
si = make_sales_invoice_for_ewaybill()
@@ -3349,16 +3412,20 @@
return si
-def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
- gl_entries = frappe.db.sql(
- """select account, debit, credit, posting_date
- from `tabGL Entry`
- where voucher_type='Sales Invoice' and voucher_no=%s and posting_date > %s
- and is_cancelled = 0
- order by posting_date asc, account asc""",
- (voucher_no, posting_date),
- as_dict=1,
+def check_gl_entries(doc, voucher_no, expected_gle, posting_date, voucher_type="Sales Invoice"):
+ gl = frappe.qb.DocType("GL Entry")
+ q = (
+ frappe.qb.from_(gl)
+ .select(gl.account, gl.debit, gl.credit, gl.posting_date)
+ .where(
+ (gl.voucher_type == voucher_type)
+ & (gl.voucher_no == voucher_no)
+ & (gl.posting_date >= posting_date)
+ & (gl.is_cancelled == 0)
+ )
+ .orderby(gl.posting_date, gl.account, gl.creation)
)
+ gl_entries = q.run(as_dict=True)
for i, gle in enumerate(gl_entries):
doc.assertEqual(expected_gle[i][0], gle.account)
@@ -3386,6 +3453,33 @@
si.naming_series = args.naming_series or "T-SINV-"
si.cost_center = args.parent_cost_center
+ bundle_id = None
+ if si.update_stock and (args.get("batch_no") or args.get("serial_no")):
+ batches = {}
+ qty = args.qty or 1
+ item_code = args.item or args.item_code or "_Test Item"
+ if args.get("batch_no"):
+ batches = frappe._dict({args.batch_no: qty})
+
+ serial_nos = args.get("serial_no") or []
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": qty,
+ "batches": batches,
+ "voucher_type": "Sales Invoice",
+ "serial_nos": serial_nos,
+ "type_of_transaction": "Outward" if not args.is_return else "Inward",
+ "posting_date": si.posting_date or today(),
+ "posting_time": si.posting_time,
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
si.append(
"items",
{
@@ -3405,10 +3499,9 @@
"discount_amount": args.discount_amount or 0,
"asset": args.asset or None,
"cost_center": args.cost_center or "_Test Cost Center - _TC",
- "serial_no": args.serial_no,
"conversion_factor": args.get("conversion_factor", 1),
"incoming_rate": args.incoming_rate or 0,
- "batch_no": args.batch_no or None,
+ "serial_and_batch_bundle": bundle_id,
},
)
@@ -3418,6 +3511,8 @@
si.submit()
else:
si.payment_schedule = []
+
+ si.load_from_db()
else:
si.payment_schedule = []
@@ -3452,7 +3547,6 @@
"income_account": "Sales - _TC",
"expense_account": "Cost of Goods Sold - _TC",
"cost_center": args.cost_center or "_Test Cost Center - _TC",
- "serial_no": args.serial_no,
},
)
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
index f92b57a..0ae85d9 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -118,7 +118,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-09-26 15:47:46.911595",
+ "modified": "2023-06-23 21:12:57.557731",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Advance",
@@ -126,5 +126,6 @@
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 35d19ed..f3e2185 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -81,6 +81,7 @@
"warehouse",
"target_warehouse",
"quality_inspection",
+ "serial_and_batch_bundle",
"batch_no",
"incoming_rate",
"col_break5",
@@ -600,10 +601,10 @@
{
"fieldname": "batch_no",
"fieldtype": "Link",
- "in_list_view": 1,
+ "hidden": 1,
"label": "Batch No",
"options": "Batch",
- "print_hide": 1
+ "read_only": 1
},
{
"fieldname": "col_break5",
@@ -620,10 +621,11 @@
{
"fieldname": "serial_no",
"fieldtype": "Small Text",
- "in_list_view": 1,
+ "hidden": 1,
"label": "Serial No",
"oldfieldname": "serial_no",
- "oldfieldtype": "Small Text"
+ "oldfieldtype": "Small Text",
+ "read_only": 1
},
{
"fieldname": "item_group",
@@ -885,12 +887,20 @@
"fieldtype": "Check",
"label": "Has Item Scanned",
"read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-12-28 16:17:33.484531",
+ "modified": "2023-03-12 13:42:24.303113",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.json b/erpnext/accounts/doctype/share_transfer/share_transfer.json
index 59a3053..51f2ac1 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.json
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.json
@@ -124,6 +124,7 @@
"fieldname": "rate",
"fieldtype": "Currency",
"label": "Rate",
+ "options": "Company:company:default_currency",
"reqd": 1
},
{
@@ -147,6 +148,7 @@
"fieldname": "amount",
"fieldtype": "Currency",
"label": "Amount",
+ "options": "Company:company:default_currency",
"read_only": 1
},
{
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.js b/erpnext/accounts/doctype/shareholder/shareholder.js
index c6f101e..544d417 100644
--- a/erpnext/accounts/doctype/shareholder/shareholder.js
+++ b/erpnext/accounts/doctype/shareholder/shareholder.js
@@ -3,8 +3,6 @@
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) {
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.json b/erpnext/accounts/doctype/shareholder/shareholder.json
index e94aea9..e80b057 100644
--- a/erpnext/accounts/doctype/shareholder/shareholder.json
+++ b/erpnext/accounts/doctype/shareholder/shareholder.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"autoname": "naming_series:",
"creation": "2017-12-25 16:50:53.878430",
"doctype": "DocType",
@@ -111,11 +112,12 @@
"read_only": 1
}
],
- "modified": "2019-11-17 23:24:11.395882",
+ "links": [],
+ "modified": "2023-04-10 22:02:20.406087",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Shareholder",
- "name_case": "Title Case",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -158,6 +160,7 @@
"search_fields": "folio_no",
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"title_field": "title",
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
index 848e054..335b483 100644
--- a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
@@ -15,7 +15,7 @@
class TestTaxRule(unittest.TestCase):
@classmethod
def setUpClass(cls):
- frappe.db.set_value("Shopping Cart Settings", None, "enabled", 0)
+ frappe.db.set_single_value("Shopping Cart Settings", "enabled", 0)
@classmethod
def tearDownClass(cls):
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
index f0146ea..58792d1 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -3,9 +3,11 @@
import frappe
-from frappe import _
+from frappe import _, qb
from frappe.model.document import Document
-from frappe.utils import cint, getdate
+from frappe.query_builder import Criterion
+from frappe.query_builder.functions import Abs, Sum
+from frappe.utils import cint, flt, getdate
class TaxWithholdingCategory(Document):
@@ -215,7 +217,7 @@
}
-def get_lower_deduction_certificate(tax_details, pan_no):
+def get_lower_deduction_certificate(company, tax_details, pan_no):
ldc_name = frappe.db.get_value(
"Lower Deduction Certificate",
{
@@ -223,6 +225,7 @@
"tax_withholding_category": tax_details.tax_withholding_category,
"valid_from": (">=", tax_details.from_date),
"valid_upto": ("<=", tax_details.to_date),
+ "company": company,
},
"name",
)
@@ -255,7 +258,7 @@
tax_amount = 0
if party_type == "Supplier":
- ldc = get_lower_deduction_certificate(tax_details, pan_no)
+ ldc = get_lower_deduction_certificate(inv.company, tax_details, pan_no)
if tax_deducted:
net_total = inv.tax_withholding_net_total
if ldc:
@@ -301,7 +304,7 @@
"docstatus": 1,
}
- if not tax_details.get("consider_party_ledger_amount") and doctype != "Sales Invoice":
+ if doctype != "Sales Invoice":
filters.update(
{"apply_tds": 1, "tax_withholding_category": tax_details.get("tax_withholding_category")}
)
@@ -345,26 +348,33 @@
def get_advance_vouchers(
parties, company=None, from_date=None, to_date=None, party_type="Supplier"
):
- # for advance vouchers, debit and credit is reversed
- dr_or_cr = "debit" if party_type == "Supplier" else "credit"
+ """
+ Use Payment Ledger to fetch unallocated Advance Payments
+ """
- filters = {
- dr_or_cr: [">", 0],
- "is_opening": "No",
- "is_cancelled": 0,
- "party_type": party_type,
- "party": ["in", parties],
- }
+ ple = qb.DocType("Payment Ledger Entry")
- if party_type == "Customer":
- filters.update({"against_voucher": ["is", "not set"]})
+ conditions = []
+
+ conditions.append(ple.amount.lt(0))
+ conditions.append(ple.delinked == 0)
+ conditions.append(ple.party_type == party_type)
+ conditions.append(ple.party.isin(parties))
+ conditions.append(ple.voucher_no == ple.against_voucher_no)
if company:
- filters["company"] = company
- if from_date and to_date:
- filters["posting_date"] = ["between", (from_date, to_date)]
+ conditions.append(ple.company == company)
- return frappe.get_all("GL Entry", filters=filters, distinct=1, pluck="voucher_no") or [""]
+ if from_date and to_date:
+ conditions.append(ple.posting_date[from_date:to_date])
+
+ advances = (
+ qb.from_(ple).select(ple.voucher_no).distinct().where(Criterion.all(conditions)).run(as_list=1)
+ )
+ if advances:
+ advances = [x[0] for x in advances]
+
+ return advances
def get_taxes_deducted_on_advances_allocated(inv, tax_details):
@@ -498,6 +508,7 @@
def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
tcs_amount = 0
+ ple = qb.DocType("Payment Ledger Entry")
# sum of debit entries made from sales invoices
invoiced_amt = (
@@ -515,18 +526,20 @@
)
# sum of credit entries made from PE / JV with unset 'against voucher'
+
+ conditions = []
+ conditions.append(ple.amount.lt(0))
+ conditions.append(ple.delinked == 0)
+ conditions.append(ple.party.isin(parties))
+ conditions.append(ple.voucher_no == ple.against_voucher_no)
+ conditions.append(ple.company == inv.company)
+
+ advances = (
+ qb.from_(ple).select(Abs(Sum(ple.amount))).where(Criterion.all(conditions)).run(as_list=1)
+ )
+
advance_amt = (
- frappe.db.get_value(
- "GL Entry",
- {
- "is_cancelled": 0,
- "party": ["in", parties],
- "company": inv.company,
- "voucher_no": ["in", adv_vouchers],
- },
- "sum(credit)",
- )
- or 0.0
+ qb.from_(ple).select(Abs(Sum(ple.amount))).where(Criterion.all(conditions)).run()[0][0] or 0.0
)
# sum of credit entries made from sales invoice
@@ -568,7 +581,14 @@
tds_amount = 0
limit_consumed = frappe.db.get_value(
"Purchase Invoice",
- {"supplier": ("in", parties), "apply_tds": 1, "docstatus": 1},
+ {
+ "supplier": ("in", parties),
+ "apply_tds": 1,
+ "docstatus": 1,
+ "tax_withholding_category": ldc.tax_withholding_category,
+ "posting_date": ("between", (ldc.valid_from, ldc.valid_upto)),
+ "company": ldc.company,
+ },
"sum(tax_withholding_net_total)",
)
@@ -583,10 +603,10 @@
def get_ltds_amount(current_amount, deducted_amount, certificate_limit, rate, tax_details):
- if current_amount < (certificate_limit - deducted_amount):
+ if certificate_limit - flt(deducted_amount) - flt(current_amount) >= 0:
return current_amount * rate / 100
else:
- ltds_amount = certificate_limit - deducted_amount
+ ltds_amount = certificate_limit - flt(deducted_amount)
tds_amount = current_amount - ltds_amount
return ltds_amount * rate / 100 + tds_amount * tax_details.rate / 100
@@ -597,9 +617,9 @@
):
valid = False
- if (
- getdate(valid_from) <= getdate(posting_date) <= getdate(valid_upto)
- ) and certificate_limit > deducted_amount:
+ available_amount = flt(certificate_limit) - flt(deducted_amount)
+
+ if (getdate(valid_from) <= getdate(posting_date) <= getdate(valid_upto)) and available_amount > 0:
valid = True
return valid
diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
index 1e86cf5..4580b13 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
@@ -110,9 +110,9 @@
invoices.append(pi1)
# Cumulative threshold is 30000
- # Threshold calculation should be on both the invoices
- # TDS should be applied only on 1000
- self.assertEqual(pi1.taxes[0].tax_amount, 1000)
+ # Threshold calculation should be only on the Second invoice
+ # Second didn't breach, no TDS should be applied
+ self.assertEqual(pi1.taxes, [])
for d in reversed(invoices):
d.cancel()
@@ -152,6 +152,60 @@
for d in reversed(invoices):
d.cancel()
+ def test_tcs_on_unallocated_advance_payments(self):
+ frappe.db.set_value(
+ "Customer", "Test TCS Customer", "tax_withholding_category", "Cumulative Threshold TCS"
+ )
+
+ vouchers = []
+
+ # create advance payment
+ pe = create_payment_entry(
+ payment_type="Receive", party_type="Customer", party="Test TCS Customer", paid_amount=20000
+ )
+ pe.paid_from = "Debtors - _TC"
+ pe.paid_to = "Cash - _TC"
+ pe.submit()
+ vouchers.append(pe)
+
+ # create invoice
+ si1 = create_sales_invoice(customer="Test TCS Customer", rate=5000)
+ si1.submit()
+ vouchers.append(si1)
+
+ # reconcile
+ pr = frappe.get_doc("Payment Reconciliation")
+ pr.company = "_Test Company"
+ pr.party_type = "Customer"
+ pr.party = "Test TCS Customer"
+ pr.receivable_payable_account = "Debtors - _TC"
+ pr.get_unreconciled_entries()
+ invoices = [x.as_dict() for x in pr.get("invoices")]
+ payments = [x.as_dict() for x in pr.get("payments")]
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+ pr.reconcile()
+
+ # make another invoice
+ # sum of unallocated amount from payment entry and this sales invoice will breach cumulative threashold
+ # TDS should be calculated
+ si2 = create_sales_invoice(customer="Test TCS Customer", rate=15000)
+ si2.submit()
+ vouchers.append(si2)
+
+ si3 = create_sales_invoice(customer="Test TCS Customer", rate=10000)
+ si3.submit()
+ vouchers.append(si3)
+
+ # assert tax collection on total invoice amount created until now
+ tcs_charged = sum([d.base_tax_amount for d in si2.taxes if d.account_head == "TCS - _TC"])
+ tcs_charged += sum([d.base_tax_amount for d in si3.taxes if d.account_head == "TCS - _TC"])
+ self.assertEqual(tcs_charged, 1500)
+
+ # cancel invoice and payments to avoid clashing
+ for d in reversed(vouchers):
+ d.reload()
+ d.cancel()
+
def test_tds_calculation_on_net_total(self):
frappe.db.set_value(
"Supplier", "Test TDS Supplier4", "tax_withholding_category", "Cumulative Threshold TDS"
diff --git a/erpnext/accounts/form_tour/sales_invoice/sales_invoice.json b/erpnext/accounts/form_tour/sales_invoice/sales_invoice.json
new file mode 100644
index 0000000..414b897
--- /dev/null
+++ b/erpnext/accounts/form_tour/sales_invoice/sales_invoice.json
@@ -0,0 +1,41 @@
+{
+ "creation": "2023-05-23 09:58:17.235916",
+ "docstatus": 0,
+ "doctype": "Form Tour",
+ "first_document": 0,
+ "idx": 0,
+ "include_name_field": 0,
+ "is_standard": 1,
+ "modified": "2023-05-23 13:10:56.227127",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Sales Invoice",
+ "owner": "Administrator",
+ "reference_doctype": "Sales Invoice",
+ "save_on_complete": 1,
+ "steps": [
+ {
+ "description": "Select a customer for whom this invoice is being prepared.",
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "has_next_condition": 1,
+ "is_table_field": 0,
+ "label": "Customer",
+ "next_step_condition": "eval: doc.customer",
+ "position": "Right",
+ "title": "Select Customer"
+ },
+ {
+ "child_doctype": "Sales Invoice Item",
+ "description": "Select item that you have sold along with quantity and rate.",
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "has_next_condition": 0,
+ "is_table_field": 0,
+ "parent_fieldname": "items",
+ "position": "Top",
+ "title": "Select Item"
+ }
+ ],
+ "title": "Sales Invoice"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 6b2546e..f1dad87 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -223,6 +223,7 @@
"party_type",
"project",
"finance_book",
+ "voucher_no",
]
if dimensions:
@@ -475,7 +476,9 @@
round_off_gle[dimension] = dimension_values.get(dimension)
-def get_round_off_account_and_cost_center(company, voucher_type, voucher_no):
+def get_round_off_account_and_cost_center(
+ company, voucher_type, voucher_no, use_company_default=False
+):
round_off_account, round_off_cost_center = frappe.get_cached_value(
"Company", company, ["round_off_account", "round_off_cost_center"]
) or [None, None]
@@ -483,7 +486,7 @@
meta = frappe.get_meta(voucher_type)
# Give first preference to parent cost center for round off GLE
- if meta.has_field("cost_center"):
+ if not use_company_default and meta.has_field("cost_center"):
parent_cost_center = frappe.db.get_value(voucher_type, voucher_no, "cost_center")
if parent_cost_center:
round_off_cost_center = parent_cost_center
@@ -498,7 +501,12 @@
def make_reverse_gl_entries(
- gl_entries=None, voucher_type=None, voucher_no=None, adv_adj=False, update_outstanding="Yes"
+ gl_entries=None,
+ voucher_type=None,
+ voucher_no=None,
+ adv_adj=False,
+ update_outstanding="Yes",
+ partial_cancel=False,
):
"""
Get original gl entries of the voucher
@@ -518,14 +526,19 @@
if gl_entries:
create_payment_ledger_entry(
- gl_entries, cancel=1, adv_adj=adv_adj, update_outstanding=update_outstanding
+ gl_entries,
+ cancel=1,
+ adv_adj=adv_adj,
+ update_outstanding=update_outstanding,
+ partial_cancel=partial_cancel,
)
validate_accounting_period(gl_entries)
check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
is_opening = any(d.get("is_opening") == "Yes" for d in gl_entries)
validate_against_pcv(is_opening, gl_entries[0]["posting_date"], gl_entries[0]["company"])
- set_as_cancel(gl_entries[0]["voucher_type"], gl_entries[0]["voucher_no"])
+ if not partial_cancel:
+ set_as_cancel(gl_entries[0]["voucher_type"], gl_entries[0]["voucher_no"])
for entry in gl_entries:
new_gle = copy.deepcopy(entry)
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index ac9368e..03cf82a 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -2,6 +2,8 @@
# License: GNU General Public License v3. See license.txt
+from typing import Optional
+
import frappe
from frappe import _, msgprint, scrub
from frappe.contacts.doctype.address.address import (
@@ -259,6 +261,8 @@
)
if doctype in TRANSACTION_TYPES:
+ # required to set correct region
+ frappe.flags.company = company
get_regional_address_details(party_details, doctype, company)
return party_address, shipping_address
@@ -363,7 +367,7 @@
@frappe.whitelist()
-def get_party_account(party_type, party=None, company=None):
+def get_party_account(party_type, party=None, company=None, include_advance=False):
"""Returns the account for the given `party`.
Will first search in party (Customer / Supplier) record, if not found,
will search in group (Customer Group / Supplier Group),
@@ -404,6 +408,40 @@
if (account and account_currency != existing_gle_currency) or not account:
account = get_party_gle_account(party_type, party, company)
+ if include_advance and party_type in ["Customer", "Supplier"]:
+ advance_account = get_party_advance_account(party_type, party, company)
+ if advance_account:
+ return [account, advance_account]
+ else:
+ return [account]
+
+ return account
+
+
+def get_party_advance_account(party_type, party, company):
+ account = frappe.db.get_value(
+ "Party Account",
+ {"parenttype": party_type, "parent": party, "company": company},
+ "advance_account",
+ )
+
+ if not account:
+ party_group_doctype = "Customer Group" if party_type == "Customer" else "Supplier Group"
+ group = frappe.get_cached_value(party_type, party, scrub(party_group_doctype))
+ account = frappe.db.get_value(
+ "Party Account",
+ {"parenttype": party_group_doctype, "parent": group, "company": company},
+ "advance_account",
+ )
+
+ if not account:
+ account_name = (
+ "default_advance_received_account"
+ if party_type == "Customer"
+ else "default_advance_paid_account"
+ )
+ account = frappe.get_cached_value("Company", company, account_name)
+
return account
@@ -513,7 +551,10 @@
)
# validate if account is mapped for same company
- validate_account_head(account.idx, account.account, account.company)
+ if account.account:
+ validate_account_head(account.idx, account.account, account.company)
+ if account.advance_account:
+ validate_account_head(account.idx, account.advance_account, account.company)
@frappe.whitelist()
@@ -645,12 +686,12 @@
else:
args.update(get_party_details(party, party_type))
- if party_type in ("Customer", "Lead"):
+ if party_type in ("Customer", "Lead", "Prospect"):
args.update({"tax_type": "Sales"})
- if party_type == "Lead":
+ if party_type in ["Lead", "Prospect"]:
args["customer"] = None
- del args["lead"]
+ del args[frappe.scrub(party_type)]
else:
args.update({"tax_type": "Purchase"})
@@ -848,7 +889,7 @@
return company_wise_info
-def get_party_shipping_address(doctype, name):
+def get_party_shipping_address(doctype: str, name: str) -> Optional[str]:
"""
Returns an Address name (best guess) for the given doctype and name for which `address_type == 'Shipping'` is true.
and/or `is_shipping_address = 1`.
@@ -859,37 +900,41 @@
:param name: Party name
:return: String
"""
- out = frappe.db.sql(
- "SELECT dl.parent "
- "from `tabDynamic Link` dl join `tabAddress` ta on dl.parent=ta.name "
- "where "
- "dl.link_doctype=%s "
- "and dl.link_name=%s "
- "and dl.parenttype='Address' "
- "and ifnull(ta.disabled, 0) = 0 and"
- "(ta.address_type='Shipping' or ta.is_shipping_address=1) "
- "order by ta.is_shipping_address desc, ta.address_type desc limit 1",
- (doctype, name),
+ shipping_addresses = frappe.get_all(
+ "Address",
+ filters=[
+ ["Dynamic Link", "link_doctype", "=", doctype],
+ ["Dynamic Link", "link_name", "=", name],
+ ["disabled", "=", 0],
+ ],
+ or_filters=[
+ ["is_shipping_address", "=", 1],
+ ["address_type", "=", "Shipping"],
+ ],
+ pluck="name",
+ limit=1,
+ order_by="is_shipping_address DESC",
)
- if out:
- return out[0][0]
- else:
- return ""
+
+ return shipping_addresses[0] if shipping_addresses else None
def get_partywise_advanced_payment_amount(
- party_type, posting_date=None, future_payment=0, company=None
+ party_type, posting_date=None, future_payment=0, company=None, party=None
):
cond = "1=1"
if posting_date:
if future_payment:
- cond = "posting_date <= '{0}' OR DATE(creation) <= '{0}' " "".format(posting_date)
+ cond = "(posting_date <= '{0}' OR DATE(creation) <= '{0}')" "".format(posting_date)
else:
cond = "posting_date <= '{0}'".format(posting_date)
if company:
cond += "and company = {0}".format(frappe.db.escape(company))
+ if party:
+ cond += "and party = {0}".format(frappe.db.escape(party))
+
data = frappe.db.sql(
""" SELECT party, sum({0}) as amount
FROM `tabGL Entry`
@@ -901,36 +946,36 @@
),
party_type,
)
-
if data:
return frappe._dict(data)
-def get_default_contact(doctype, name):
+def get_default_contact(doctype: str, name: str) -> Optional[str]:
"""
- Returns default contact for the given doctype and name.
- Can be ordered by `contact_type` to either is_primary_contact or is_billing_contact.
+ Returns contact name only if there is a primary contact for given doctype and name.
+
+ Else returns None
+
+ :param doctype: Party Doctype
+ :param name: Party name
+ :return: String
"""
- out = frappe.db.sql(
- """
- SELECT dl.parent, c.is_primary_contact, c.is_billing_contact
- FROM `tabDynamic Link` dl
- INNER JOIN `tabContact` c ON c.name = dl.parent
- WHERE
- dl.link_doctype=%s AND
- dl.link_name=%s AND
- dl.parenttype = 'Contact'
- ORDER BY is_primary_contact DESC, is_billing_contact DESC
- """,
- (doctype, name),
+ contacts = frappe.get_all(
+ "Contact",
+ filters=[
+ ["Dynamic Link", "link_doctype", "=", doctype],
+ ["Dynamic Link", "link_name", "=", name],
+ ],
+ or_filters=[
+ ["is_primary_contact", "=", 1],
+ ["is_billing_contact", "=", 1],
+ ],
+ pluck="name",
+ limit=1,
+ order_by="is_primary_contact DESC, is_billing_contact DESC",
)
- if out:
- try:
- return out[0][0]
- except Exception:
- return None
- else:
- return None
+
+ return contacts[0] if contacts else None
def add_party_account(party_type, party, company, account):
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index f2bf942..ed3b991 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -284,4 +284,4 @@
{% } %}
</tbody>
</table>
- <p class="text-right text-muted">{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>
+ <p class="text-right text-muted">{{ __("Printed On ") }}{%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 11de9a0..30f7fb3 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -181,6 +181,16 @@
return
key = (ple.against_voucher_type, ple.against_voucher_no, ple.party)
+
+ # If payment is made against credit note
+ # and credit note is made against a Sales Invoice
+ # then consider the payment against original sales invoice.
+ if ple.against_voucher_type in ("Sales Invoice", "Purchase Invoice"):
+ if ple.against_voucher_no in self.return_entries:
+ return_against = self.return_entries.get(ple.against_voucher_no)
+ if return_against:
+ key = (ple.against_voucher_type, return_against, ple.party)
+
row = self.voucher_balance.get(key)
if not row:
@@ -610,7 +620,7 @@
def get_return_entries(self):
doctype = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
- filters = {"is_return": 1, "docstatus": 1}
+ filters = {"is_return": 1, "docstatus": 1, "company": self.filters.company}
party_field = scrub(self.filters.party_type)
if self.filters.get(party_field):
filters.update({party_field: self.filters.get(party_field)})
diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
index afd02a0..6f1889b 100644
--- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
@@ -210,6 +210,67 @@
],
)
+ def test_payment_against_credit_note(self):
+ """
+ Payment against credit/debit note should be considered against the parent invoice
+ """
+ company = "_Test Company 2"
+ customer = "_Test Customer 2"
+
+ si1 = make_sales_invoice()
+
+ pe = get_payment_entry("Sales Invoice", si1.name, bank_account="Cash - _TC2")
+ pe.paid_from = "Debtors - _TC2"
+ pe.insert()
+ pe.submit()
+
+ cr_note = make_credit_note(si1.name)
+
+ si2 = make_sales_invoice()
+
+ # manually link cr_note with si2 using journal entry
+ je = frappe.new_doc("Journal Entry")
+ je.company = company
+ je.voucher_type = "Credit Note"
+ je.posting_date = today()
+
+ debit_account = "Debtors - _TC2"
+ debit_entry = {
+ "account": debit_account,
+ "party_type": "Customer",
+ "party": customer,
+ "debit": 100,
+ "debit_in_account_currency": 100,
+ "reference_type": cr_note.doctype,
+ "reference_name": cr_note.name,
+ "cost_center": "Main - _TC2",
+ }
+ credit_entry = {
+ "account": debit_account,
+ "party_type": "Customer",
+ "party": customer,
+ "credit": 100,
+ "credit_in_account_currency": 100,
+ "reference_type": si2.doctype,
+ "reference_name": si2.name,
+ "cost_center": "Main - _TC2",
+ }
+
+ je.append("accounts", debit_entry)
+ je.append("accounts", credit_entry)
+ je = je.save().submit()
+
+ filters = {
+ "company": company,
+ "report_date": today(),
+ "range1": 30,
+ "range2": 60,
+ "range3": 90,
+ "range4": 120,
+ }
+ report = execute(filters)
+ self.assertEqual(report[1], [])
+
def make_sales_invoice(no_payment_schedule=False, do_not_submit=False):
frappe.set_user("Administrator")
@@ -256,7 +317,7 @@
def make_credit_note(docname):
- create_sales_invoice(
+ credit_note = create_sales_invoice(
company="_Test Company 2",
customer="_Test Customer 2",
currency="EUR",
@@ -269,3 +330,5 @@
is_return=1,
return_against=docname,
)
+
+ return credit_note
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
index 29217b0..9c01b1a 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -31,7 +31,6 @@
def get_data(self, args):
self.data = []
-
self.receivables = ReceivablePayableReport(self.filters).run(args)[1]
self.get_party_total(args)
@@ -42,6 +41,7 @@
self.filters.report_date,
self.filters.show_future_payments,
self.filters.company,
+ party=self.filters.get(scrub(self.party_type)),
)
or {}
)
@@ -74,6 +74,9 @@
row.gl_balance = gl_balance_map.get(party)
row.diff = flt(row.outstanding) - flt(row.gl_balance)
+ if self.filters.show_future_payments:
+ row.remaining_balance = flt(row.outstanding) - flt(row.future_amount)
+
self.data.append(row)
def get_party_total(self, args):
@@ -106,6 +109,7 @@
"range4": 0.0,
"range5": 0.0,
"total_due": 0.0,
+ "future_amount": 0.0,
"sales_person": [],
}
),
@@ -151,6 +155,10 @@
self.setup_ageing_columns()
+ if self.filters.show_future_payments:
+ self.add_column(label=_("Future Payment Amount"), fieldname="future_amount")
+ self.add_column(label=_("Remaining Balance"), fieldname="remaining_balance")
+
if self.party_type == "Customer":
self.add_column(
label=_("Territory"), fieldname="territory", fieldtype="Link", options="Territory"
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
index 5827697..d67eee3 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
@@ -114,28 +114,6 @@
sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period,
sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period
from (SELECT a.asset_category,
- ifnull(sum(case when ds.schedule_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
- ds.depreciation_amount
- else
- 0
- end), 0) as accumulated_depreciation_as_on_from_date,
- ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s
- and a.disposal_date <= %(to_date)s and ds.schedule_date <= a.disposal_date then
- ds.depreciation_amount
- else
- 0
- end), 0) as depreciation_eliminated_during_the_period,
- ifnull(sum(case when ds.schedule_date >= %(from_date)s and ds.schedule_date <= %(to_date)s
- and (ifnull(a.disposal_date, 0) = 0 or ds.schedule_date <= a.disposal_date) then
- ds.depreciation_amount
- else
- 0
- end), 0) as depreciation_amount_during_the_period
- from `tabAsset` a, `tabAsset Depreciation Schedule` ads, `tabDepreciation Schedule` ds
- where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and ads.asset = a.name and ads.docstatus=1 and ads.name = ds.parent and ifnull(ds.journal_entry, '') != ''
- group by a.asset_category
- union
- SELECT a.asset_category,
ifnull(sum(case when gle.posting_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
gle.debit
else
@@ -160,7 +138,7 @@
aca.parent = a.asset_category and aca.company_name = %(company)s
join `tabCompany` company on
company.name = %(company)s
- where a.docstatus=1 and a.company=%(company)s and a.calculate_depreciation=0 and a.purchase_date <= %(to_date)s and gle.debit != 0 and gle.is_cancelled = 0 and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account)
+ where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and gle.debit != 0 and gle.is_cancelled = 0 and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account)
group by a.asset_category
union
SELECT a.asset_category,
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
index 306af72..7e0bdea 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -4,7 +4,6 @@
import frappe
from frappe import _
-from frappe.query_builder.custom import ConstantColumn
from frappe.utils import getdate, nowdate
@@ -61,7 +60,28 @@
def get_entries(filters):
+ entries = []
+
+ # get entries from all the apps
+ for method_name in frappe.get_hooks("get_entries_for_bank_clearance_summary"):
+ entries += (
+ frappe.get_attr(method_name)(
+ filters,
+ )
+ or []
+ )
+
+ return sorted(
+ entries,
+ key=lambda k: k[2].strftime("%H%M%S") or getdate(nowdate()),
+ )
+
+
+def get_entries_for_bank_clearance_summary(filters):
+ entries = []
+
conditions = get_conditions(filters)
+
journal_entries = frappe.db.sql(
"""SELECT
"Journal Entry", jv.name, jv.posting_date, jv.cheque_no,
@@ -80,7 +100,7 @@
payment_entries = frappe.db.sql(
"""SELECT
"Payment Entry", name, posting_date, reference_no, clearance_date, party,
- if(paid_from=%(account)s, paid_amount * -1, received_amount)
+ if(paid_from=%(account)s, ((paid_amount * -1) - total_taxes_and_charges) , received_amount)
FROM
`tabPayment Entry`
WHERE
@@ -92,65 +112,6 @@
as_list=1,
)
- # Loan Disbursement
- loan_disbursement = frappe.qb.DocType("Loan Disbursement")
+ entries = journal_entries + payment_entries
- query = (
- frappe.qb.from_(loan_disbursement)
- .select(
- ConstantColumn("Loan Disbursement").as_("payment_document_type"),
- loan_disbursement.name.as_("payment_entry"),
- loan_disbursement.disbursement_date.as_("posting_date"),
- loan_disbursement.reference_number.as_("cheque_no"),
- loan_disbursement.clearance_date.as_("clearance_date"),
- loan_disbursement.applicant.as_("against"),
- -loan_disbursement.disbursed_amount.as_("amount"),
- )
- .where(loan_disbursement.docstatus == 1)
- .where(loan_disbursement.disbursement_date >= filters["from_date"])
- .where(loan_disbursement.disbursement_date <= filters["to_date"])
- .where(loan_disbursement.disbursement_account == filters["account"])
- .orderby(loan_disbursement.disbursement_date, order=frappe.qb.desc)
- .orderby(loan_disbursement.name, order=frappe.qb.desc)
- )
-
- if filters.get("from_date"):
- query = query.where(loan_disbursement.disbursement_date >= filters["from_date"])
- if filters.get("to_date"):
- query = query.where(loan_disbursement.disbursement_date <= filters["to_date"])
-
- loan_disbursements = query.run(as_list=1)
-
- # Loan Repayment
- loan_repayment = frappe.qb.DocType("Loan Repayment")
-
- query = (
- frappe.qb.from_(loan_repayment)
- .select(
- ConstantColumn("Loan Repayment").as_("payment_document_type"),
- loan_repayment.name.as_("payment_entry"),
- loan_repayment.posting_date.as_("posting_date"),
- loan_repayment.reference_number.as_("cheque_no"),
- loan_repayment.clearance_date.as_("clearance_date"),
- loan_repayment.applicant.as_("against"),
- loan_repayment.amount_paid.as_("amount"),
- )
- .where(loan_repayment.docstatus == 1)
- .where(loan_repayment.posting_date >= filters["from_date"])
- .where(loan_repayment.posting_date <= filters["to_date"])
- .where(loan_repayment.payment_account == filters["account"])
- .orderby(loan_repayment.posting_date, order=frappe.qb.desc)
- .orderby(loan_repayment.name, order=frappe.qb.desc)
- )
-
- if filters.get("from_date"):
- query = query.where(loan_repayment.posting_date >= filters["from_date"])
- if filters.get("to_date"):
- query = query.where(loan_repayment.posting_date <= filters["to_date"])
-
- loan_repayments = query.run(as_list=1)
-
- return sorted(
- journal_entries + payment_entries + loan_disbursements + loan_repayments,
- key=lambda k: k[2] or getdate(nowdate()),
- )
+ return entries
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index b0a0e05..206654c 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -4,10 +4,7 @@
import frappe
from frappe import _
-from frappe.query_builder.custom import ConstantColumn
-from frappe.query_builder.functions import Sum
from frappe.utils import flt, getdate
-from pypika import CustomFunction
from erpnext.accounts.utils import get_balance_on
@@ -113,20 +110,27 @@
def get_entries(filters):
+ entries = []
+
+ for method_name in frappe.get_hooks("get_entries_for_bank_reconciliation_statement"):
+ entries += frappe.get_attr(method_name)(filters) or []
+
+ return sorted(
+ entries,
+ key=lambda k: getdate(k["posting_date"]),
+ )
+
+
+def get_entries_for_bank_reconciliation_statement(filters):
journal_entries = get_journal_entries(filters)
payment_entries = get_payment_entries(filters)
- loan_entries = get_loan_entries(filters)
-
pos_entries = []
if filters.include_pos_transactions:
pos_entries = get_pos_entries(filters)
- return sorted(
- list(payment_entries) + list(journal_entries + list(pos_entries) + list(loan_entries)),
- key=lambda k: getdate(k["posting_date"]),
- )
+ return list(journal_entries) + list(payment_entries) + list(pos_entries)
def get_journal_entries(filters):
@@ -188,47 +192,19 @@
)
-def get_loan_entries(filters):
- loan_docs = []
- for doctype in ["Loan Disbursement", "Loan Repayment"]:
- loan_doc = frappe.qb.DocType(doctype)
- ifnull = CustomFunction("IFNULL", ["value", "default"])
-
- if doctype == "Loan Disbursement":
- amount_field = (loan_doc.disbursed_amount).as_("credit")
- posting_date = (loan_doc.disbursement_date).as_("posting_date")
- account = loan_doc.disbursement_account
- else:
- amount_field = (loan_doc.amount_paid).as_("debit")
- posting_date = (loan_doc.posting_date).as_("posting_date")
- account = loan_doc.payment_account
-
- query = (
- frappe.qb.from_(loan_doc)
- .select(
- ConstantColumn(doctype).as_("payment_document"),
- (loan_doc.name).as_("payment_entry"),
- (loan_doc.reference_number).as_("reference_no"),
- (loan_doc.reference_date).as_("ref_date"),
- amount_field,
- posting_date,
- )
- .where(loan_doc.docstatus == 1)
- .where(account == filters.get("account"))
- .where(posting_date <= getdate(filters.get("report_date")))
- .where(ifnull(loan_doc.clearance_date, "4000-01-01") > getdate(filters.get("report_date")))
- )
-
- if doctype == "Loan Repayment" and frappe.db.has_column("Loan Repayment", "repay_from_salary"):
- query = query.where((loan_doc.repay_from_salary == 0))
-
- entries = query.run(as_dict=1)
- loan_docs.extend(entries)
-
- return loan_docs
-
-
def get_amounts_not_reflected_in_system(filters):
+ amount = 0.0
+
+ # get amounts from all the apps
+ for method_name in frappe.get_hooks(
+ "get_amounts_not_reflected_in_system_for_bank_reconciliation_statement"
+ ):
+ amount += frappe.get_attr(method_name)(filters) or 0.0
+
+ return amount
+
+
+def get_amounts_not_reflected_in_system_for_bank_reconciliation_statement(filters):
je_amount = frappe.db.sql(
"""
select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency)
@@ -252,42 +228,7 @@
pe_amount = flt(pe_amount[0][0]) if pe_amount else 0.0
- loan_amount = get_loan_amount(filters)
-
- return je_amount + pe_amount + loan_amount
-
-
-def get_loan_amount(filters):
- total_amount = 0
- for doctype in ["Loan Disbursement", "Loan Repayment"]:
- loan_doc = frappe.qb.DocType(doctype)
- ifnull = CustomFunction("IFNULL", ["value", "default"])
-
- if doctype == "Loan Disbursement":
- amount_field = Sum(loan_doc.disbursed_amount)
- posting_date = (loan_doc.disbursement_date).as_("posting_date")
- account = loan_doc.disbursement_account
- else:
- amount_field = Sum(loan_doc.amount_paid)
- posting_date = (loan_doc.posting_date).as_("posting_date")
- account = loan_doc.payment_account
-
- query = (
- frappe.qb.from_(loan_doc)
- .select(amount_field)
- .where(loan_doc.docstatus == 1)
- .where(account == filters.get("account"))
- .where(posting_date > getdate(filters.get("report_date")))
- .where(ifnull(loan_doc.clearance_date, "4000-01-01") <= getdate(filters.get("report_date")))
- )
-
- if doctype == "Loan Repayment" and frappe.db.has_column("Loan Repayment", "repay_from_salary"):
- query = query.where((loan_doc.repay_from_salary == 0))
-
- amount = query.run()[0][0]
- total_amount += flt(amount)
-
- return total_amount
+ return je_amount + pe_amount
def get_balance_row(label, amount, account_currency):
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/test_bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/test_bank_reconciliation_statement.py
index d7c8716..b1753ca 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/test_bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/test_bank_reconciliation_statement.py
@@ -4,28 +4,32 @@
import frappe
from frappe.tests.utils import FrappeTestCase
-from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import (
- create_loan_and_repayment,
-)
from erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement import (
execute,
)
-from erpnext.loan_management.doctype.loan.test_loan import create_loan_accounts
+from erpnext.tests.utils import if_lending_app_installed
class TestBankReconciliationStatement(FrappeTestCase):
def setUp(self):
for dt in [
- "Loan Repayment",
- "Loan Disbursement",
"Journal Entry",
"Journal Entry Account",
"Payment Entry",
]:
frappe.db.delete(dt)
+ clear_loan_transactions()
+ @if_lending_app_installed
def test_loan_entries_in_bank_reco_statement(self):
+ from lending.loan_management.doctype.loan.test_loan import create_loan_accounts
+
+ from erpnext.accounts.doctype.bank_transaction.test_bank_transaction import (
+ create_loan_and_repayment,
+ )
+
create_loan_accounts()
+
repayment_entry = create_loan_and_repayment()
filters = frappe._dict(
@@ -38,3 +42,12 @@
result = execute(filters)
self.assertEqual(result[1][0].payment_entry, repayment_entry.name)
+
+
+@if_lending_app_installed
+def clear_loan_transactions():
+ for dt in [
+ "Loan Disbursement",
+ "Loan Repayment",
+ ]:
+ frappe.db.delete(dt)
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index cb3c78a..d3b0692 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -4,7 +4,7 @@
import frappe
from frappe import _
-from frappe.utils import cint, cstr
+from frappe.utils import cstr
from erpnext.accounts.report.financial_statements import (
get_columns,
@@ -20,11 +20,6 @@
def execute(filters=None):
- if cint(frappe.db.get_single_value("Accounts Settings", "use_custom_cash_flow")):
- from erpnext.accounts.report.cash_flow.custom_cash_flow import execute as execute_custom
-
- return execute_custom(filters=filters)
-
period_list = get_period_list(
filters.from_fiscal_year,
filters.to_fiscal_year,
diff --git a/erpnext/accounts/report/cash_flow/custom_cash_flow.py b/erpnext/accounts/report/cash_flow/custom_cash_flow.py
deleted file mode 100644
index b165c88..0000000
--- a/erpnext/accounts/report/cash_flow/custom_cash_flow.py
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.query_builder.functions import Sum
-from frappe.utils import add_to_date, flt, get_date_str
-
-from erpnext.accounts.report.financial_statements import get_columns, get_data, get_period_list
-from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import (
- get_net_profit_loss,
-)
-
-
-def get_mapper_for(mappers, position):
- mapper_list = list(filter(lambda x: x["position"] == position, mappers))
- return mapper_list[0] if mapper_list else []
-
-
-def get_mappers_from_db():
- return frappe.get_all(
- "Cash Flow Mapper",
- fields=[
- "section_name",
- "section_header",
- "section_leader",
- "section_subtotal",
- "section_footer",
- "name",
- "position",
- ],
- order_by="position",
- )
-
-
-def get_accounts_in_mappers(mapping_names):
- cfm = frappe.qb.DocType("Cash Flow Mapping")
- cfma = frappe.qb.DocType("Cash Flow Mapping Accounts")
- result = (
- frappe.qb.select(
- cfma.name,
- cfm.label,
- cfm.is_working_capital,
- cfm.is_income_tax_liability,
- cfm.is_income_tax_expense,
- cfm.is_finance_cost,
- cfm.is_finance_cost_adjustment,
- cfma.account,
- )
- .from_(cfm)
- .join(cfma)
- .on(cfm.name == cfma.parent)
- .where(cfma.parent.isin(mapping_names))
- ).run()
-
- return result
-
-
-def setup_mappers(mappers):
- cash_flow_accounts = []
-
- for mapping in mappers:
- mapping["account_types"] = []
- mapping["tax_liabilities"] = []
- mapping["tax_expenses"] = []
- mapping["finance_costs"] = []
- mapping["finance_costs_adjustments"] = []
- doc = frappe.get_doc("Cash Flow Mapper", mapping["name"])
- mapping_names = [item.name for item in doc.accounts]
-
- if not mapping_names:
- continue
-
- accounts = get_accounts_in_mappers(mapping_names)
-
- account_types = [
- dict(
- name=account[0],
- account_name=account[7],
- label=account[1],
- is_working_capital=account[2],
- is_income_tax_liability=account[3],
- is_income_tax_expense=account[4],
- )
- for account in accounts
- if not account[3]
- ]
-
- finance_costs_adjustments = [
- dict(
- name=account[0],
- account_name=account[7],
- label=account[1],
- is_finance_cost=account[5],
- is_finance_cost_adjustment=account[6],
- )
- for account in accounts
- if account[6]
- ]
-
- tax_liabilities = [
- dict(
- name=account[0],
- account_name=account[7],
- label=account[1],
- is_income_tax_liability=account[3],
- is_income_tax_expense=account[4],
- )
- for account in accounts
- if account[3]
- ]
-
- tax_expenses = [
- dict(
- name=account[0],
- account_name=account[7],
- label=account[1],
- is_income_tax_liability=account[3],
- is_income_tax_expense=account[4],
- )
- for account in accounts
- if account[4]
- ]
-
- finance_costs = [
- dict(name=account[0], account_name=account[7], label=account[1], is_finance_cost=account[5])
- for account in accounts
- if account[5]
- ]
-
- account_types_labels = sorted(
- set(
- (d["label"], d["is_working_capital"], d["is_income_tax_liability"], d["is_income_tax_expense"])
- for d in account_types
- ),
- key=lambda x: x[1],
- )
-
- fc_adjustment_labels = sorted(
- set(
- [
- (d["label"], d["is_finance_cost"], d["is_finance_cost_adjustment"])
- for d in finance_costs_adjustments
- if d["is_finance_cost_adjustment"]
- ]
- ),
- key=lambda x: x[2],
- )
-
- unique_liability_labels = sorted(
- set(
- [
- (d["label"], d["is_income_tax_liability"], d["is_income_tax_expense"])
- for d in tax_liabilities
- ]
- ),
- key=lambda x: x[0],
- )
-
- unique_expense_labels = sorted(
- set(
- [(d["label"], d["is_income_tax_liability"], d["is_income_tax_expense"]) for d in tax_expenses]
- ),
- key=lambda x: x[0],
- )
-
- unique_finance_costs_labels = sorted(
- set([(d["label"], d["is_finance_cost"]) for d in finance_costs]), key=lambda x: x[0]
- )
-
- for label in account_types_labels:
- names = [d["account_name"] for d in account_types if d["label"] == label[0]]
- m = dict(label=label[0], names=names, is_working_capital=label[1])
- mapping["account_types"].append(m)
-
- for label in fc_adjustment_labels:
- names = [d["account_name"] for d in finance_costs_adjustments if d["label"] == label[0]]
- m = dict(label=label[0], names=names)
- mapping["finance_costs_adjustments"].append(m)
-
- for label in unique_liability_labels:
- names = [d["account_name"] for d in tax_liabilities if d["label"] == label[0]]
- m = dict(label=label[0], names=names, tax_liability=label[1], tax_expense=label[2])
- mapping["tax_liabilities"].append(m)
-
- for label in unique_expense_labels:
- names = [d["account_name"] for d in tax_expenses if d["label"] == label[0]]
- m = dict(label=label[0], names=names, tax_liability=label[1], tax_expense=label[2])
- mapping["tax_expenses"].append(m)
-
- for label in unique_finance_costs_labels:
- names = [d["account_name"] for d in finance_costs if d["label"] == label[0]]
- m = dict(label=label[0], names=names, is_finance_cost=label[1])
- mapping["finance_costs"].append(m)
-
- cash_flow_accounts.append(mapping)
-
- return cash_flow_accounts
-
-
-def add_data_for_operating_activities(
- filters, company_currency, profit_data, period_list, light_mappers, mapper, data
-):
- has_added_working_capital_header = False
- section_data = []
-
- data.append(
- {
- "account_name": mapper["section_header"],
- "parent_account": None,
- "indent": 0.0,
- "account": mapper["section_header"],
- }
- )
-
- if profit_data:
- profit_data.update(
- {"indent": 1, "parent_account": get_mapper_for(light_mappers, position=1)["section_header"]}
- )
- data.append(profit_data)
- section_data.append(profit_data)
-
- data.append(
- {
- "account_name": mapper["section_leader"],
- "parent_account": None,
- "indent": 1.0,
- "account": mapper["section_leader"],
- }
- )
-
- for account in mapper["account_types"]:
- if account["is_working_capital"] and not has_added_working_capital_header:
- data.append(
- {
- "account_name": "Movement in working capital",
- "parent_account": None,
- "indent": 1.0,
- "account": "",
- }
- )
- has_added_working_capital_header = True
-
- account_data = _get_account_type_based_data(
- filters, account["names"], period_list, filters.accumulated_values
- )
-
- if not account["is_working_capital"]:
- for key in account_data:
- if key != "total":
- account_data[key] *= -1
-
- if account_data["total"] != 0:
- account_data.update(
- {
- "account_name": account["label"],
- "account": account["names"],
- "indent": 1.0,
- "parent_account": mapper["section_header"],
- "currency": company_currency,
- }
- )
- data.append(account_data)
- section_data.append(account_data)
-
- _add_total_row_account(
- data, section_data, mapper["section_subtotal"], period_list, company_currency, indent=1
- )
-
- # calculate adjustment for tax paid and add to data
- if not mapper["tax_liabilities"]:
- mapper["tax_liabilities"] = [
- dict(label="Income tax paid", names=[""], tax_liability=1, tax_expense=0)
- ]
-
- for account in mapper["tax_liabilities"]:
- tax_paid = calculate_adjustment(
- filters,
- mapper["tax_liabilities"],
- mapper["tax_expenses"],
- filters.accumulated_values,
- period_list,
- )
-
- if tax_paid:
- tax_paid.update(
- {
- "parent_account": mapper["section_header"],
- "currency": company_currency,
- "account_name": account["label"],
- "indent": 1.0,
- }
- )
- data.append(tax_paid)
- section_data.append(tax_paid)
-
- if not mapper["finance_costs_adjustments"]:
- mapper["finance_costs_adjustments"] = [dict(label="Interest Paid", names=[""])]
-
- for account in mapper["finance_costs_adjustments"]:
- interest_paid = calculate_adjustment(
- filters,
- mapper["finance_costs_adjustments"],
- mapper["finance_costs"],
- filters.accumulated_values,
- period_list,
- )
-
- if interest_paid:
- interest_paid.update(
- {
- "parent_account": mapper["section_header"],
- "currency": company_currency,
- "account_name": account["label"],
- "indent": 1.0,
- }
- )
- data.append(interest_paid)
- section_data.append(interest_paid)
-
- _add_total_row_account(
- data, section_data, mapper["section_footer"], period_list, company_currency
- )
-
-
-def calculate_adjustment(
- filters, non_expense_mapper, expense_mapper, use_accumulated_values, period_list
-):
- liability_accounts = [d["names"] for d in non_expense_mapper]
- expense_accounts = [d["names"] for d in expense_mapper]
-
- non_expense_closing = _get_account_type_based_data(filters, liability_accounts, period_list, 0)
-
- non_expense_opening = _get_account_type_based_data(
- filters, liability_accounts, period_list, use_accumulated_values, opening_balances=1
- )
-
- expense_data = _get_account_type_based_data(
- filters, expense_accounts, period_list, use_accumulated_values
- )
-
- data = _calculate_adjustment(non_expense_closing, non_expense_opening, expense_data)
- return data
-
-
-def _calculate_adjustment(non_expense_closing, non_expense_opening, expense_data):
- account_data = {}
- for month in non_expense_opening.keys():
- if non_expense_opening[month] and non_expense_closing[month]:
- account_data[month] = (
- non_expense_opening[month] - expense_data[month] + non_expense_closing[month]
- )
- elif expense_data[month]:
- account_data[month] = expense_data[month]
-
- return account_data
-
-
-def add_data_for_other_activities(
- filters, company_currency, profit_data, period_list, light_mappers, mapper_list, data
-):
- for mapper in mapper_list:
- section_data = []
- data.append(
- {
- "account_name": mapper["section_header"],
- "parent_account": None,
- "indent": 0.0,
- "account": mapper["section_header"],
- }
- )
-
- for account in mapper["account_types"]:
- account_data = _get_account_type_based_data(
- filters, account["names"], period_list, filters.accumulated_values
- )
- if account_data["total"] != 0:
- account_data.update(
- {
- "account_name": account["label"],
- "account": account["names"],
- "indent": 1,
- "parent_account": mapper["section_header"],
- "currency": company_currency,
- }
- )
- data.append(account_data)
- section_data.append(account_data)
-
- _add_total_row_account(
- data, section_data, mapper["section_footer"], period_list, company_currency
- )
-
-
-def compute_data(filters, company_currency, profit_data, period_list, light_mappers, full_mapper):
- data = []
-
- operating_activities_mapper = get_mapper_for(light_mappers, position=1)
- other_mappers = [
- get_mapper_for(light_mappers, position=2),
- get_mapper_for(light_mappers, position=3),
- ]
-
- if operating_activities_mapper:
- add_data_for_operating_activities(
- filters,
- company_currency,
- profit_data,
- period_list,
- light_mappers,
- operating_activities_mapper,
- data,
- )
-
- if all(other_mappers):
- add_data_for_other_activities(
- filters, company_currency, profit_data, period_list, light_mappers, other_mappers, data
- )
-
- return data
-
-
-def execute(filters=None):
- if not filters.periodicity:
- filters.periodicity = "Monthly"
- period_list = get_period_list(
- filters.from_fiscal_year,
- filters.to_fiscal_year,
- filters.period_start_date,
- filters.period_end_date,
- filters.filter_based_on,
- filters.periodicity,
- company=filters.company,
- )
-
- mappers = get_mappers_from_db()
-
- cash_flow_accounts = setup_mappers(mappers)
-
- # compute net profit / loss
- income = get_data(
- filters.company,
- "Income",
- "Credit",
- period_list,
- filters=filters,
- accumulated_values=filters.accumulated_values,
- ignore_closing_entries=True,
- ignore_accumulated_values_for_fy=True,
- )
-
- expense = get_data(
- filters.company,
- "Expense",
- "Debit",
- period_list,
- filters=filters,
- accumulated_values=filters.accumulated_values,
- ignore_closing_entries=True,
- ignore_accumulated_values_for_fy=True,
- )
-
- net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
-
- company_currency = frappe.get_cached_value("Company", filters.company, "default_currency")
-
- data = compute_data(
- filters, company_currency, net_profit_loss, period_list, mappers, cash_flow_accounts
- )
-
- _add_total_row_account(data, data, _("Net Change in Cash"), period_list, company_currency)
- columns = get_columns(
- filters.periodicity, period_list, filters.accumulated_values, filters.company
- )
-
- return columns, data
-
-
-def _get_account_type_based_data(
- filters, account_names, period_list, accumulated_values, opening_balances=0
-):
- if not account_names or not account_names[0] or not type(account_names[0]) == str:
- # only proceed if account_names is a list of account names
- return {}
-
- from erpnext.accounts.report.cash_flow.cash_flow import get_start_date
-
- company = filters.company
- data = {}
- total = 0
- GLEntry = frappe.qb.DocType("GL Entry")
- Account = frappe.qb.DocType("Account")
-
- for period in period_list:
- start_date = get_start_date(period, accumulated_values, company)
-
- account_subquery = (
- frappe.qb.from_(Account)
- .where((Account.name.isin(account_names)) | (Account.parent_account.isin(account_names)))
- .select(Account.name)
- .as_("account_subquery")
- )
-
- if opening_balances:
- date_info = dict(date=start_date)
- months_map = {"Monthly": -1, "Quarterly": -3, "Half-Yearly": -6}
- years_map = {"Yearly": -1}
-
- if months_map.get(filters.periodicity):
- date_info.update(months=months_map[filters.periodicity])
- else:
- date_info.update(years=years_map[filters.periodicity])
-
- if accumulated_values:
- start, end = add_to_date(start_date, years=-1), add_to_date(period["to_date"], years=-1)
- else:
- start, end = add_to_date(**date_info), add_to_date(**date_info)
-
- start, end = get_date_str(start), get_date_str(end)
-
- else:
- start, end = start_date if accumulated_values else period["from_date"], period["to_date"]
- start, end = get_date_str(start), get_date_str(end)
-
- result = (
- frappe.qb.from_(GLEntry)
- .select(Sum(GLEntry.credit) - Sum(GLEntry.debit))
- .where(
- (GLEntry.company == company)
- & (GLEntry.posting_date >= start)
- & (GLEntry.posting_date <= end)
- & (GLEntry.voucher_type != "Period Closing Voucher")
- & (GLEntry.account.isin(account_subquery))
- )
- ).run()
-
- if result and result[0]:
- gl_sum = result[0][0]
- else:
- gl_sum = 0
-
- total += flt(gl_sum)
- data.setdefault(period["key"], flt(gl_sum))
-
- data["total"] = total
- return data
-
-
-def _add_total_row_account(out, data, label, period_list, currency, indent=0.0):
- total_row = {
- "indent": indent,
- "account_name": "'" + _("{0}").format(label) + "'",
- "account": "'" + _("{0}").format(label) + "'",
- "currency": currency,
- }
- for row in data:
- if row.get("parent_account"):
- for period in period_list:
- total_row.setdefault(period.key, 0.0)
- total_row[period.key] += row.get(period.key, 0.0)
-
- total_row.setdefault("total", 0.0)
- total_row["total"] += row["total"]
-
- out.append(total_row)
- out.append({})
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
index 33da6ff..6e39ee9 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -6,7 +6,7 @@
import frappe
from frappe import _
-from frappe.utils import cint, flt, getdate
+from frappe.utils import flt, getdate
import erpnext
from erpnext.accounts.report.balance_sheet.balance_sheet import (
@@ -58,11 +58,6 @@
fiscal_year, companies, columns, filters
)
else:
- if cint(frappe.db.get_single_value("Accounts Settings", "use_custom_cash_flow")):
- from erpnext.accounts.report.cash_flow.custom_cash_flow import execute as execute_custom
-
- return execute_custom(filters=filters)
-
data, report_summary = get_cash_flow_data(fiscal_year, companies, filters)
return columns, data, message, chart, report_summary
@@ -655,7 +650,7 @@
if filters and filters.get("presentation_currency") != d.default_currency:
currency_info["company"] = d.name
currency_info["company_currency"] = d.default_currency
- convert_to_presentation_currency(gl_entries, currency_info, filters.get("company"))
+ convert_to_presentation_currency(gl_entries, currency_info)
for entry in gl_entries:
if entry.account_number:
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index debe655..f3a892b 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -462,7 +462,7 @@
)
if filters and filters.get("presentation_currency"):
- convert_to_presentation_currency(gl_entries, get_currency(filters), filters.get("company"))
+ convert_to_presentation_currency(gl_entries, get_currency(filters))
for entry in gl_entries:
gl_entries_by_account.setdefault(entry.account, []).append(entry)
@@ -538,13 +538,21 @@
query = query.where(gl_entry.cost_center.isin(filters.cost_center))
if filters.get("include_default_book_entries"):
+ company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
+
+ if filters.finance_book and company_fb and cstr(filters.finance_book) != cstr(company_fb):
+ frappe.throw(
+ _("To use a different finance book, please uncheck 'Include Default Book Entries'")
+ )
+
query = query.where(
- (gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(filters.company_fb), ""]))
+ (gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
| (gl_entry.finance_book.isnull())
)
else:
query = query.where(
- (gl_entry.finance_book.isin([cstr(filters.company_fb), ""])) | (gl_entry.finance_book.isnull())
+ (gl_entry.finance_book.isin([cstr(filters.finance_book), ""]))
+ | (gl_entry.finance_book.isnull())
)
if accounting_dimensions:
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 2100f26..57a9091 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -176,7 +176,8 @@
{
"fieldname": "include_default_book_entries",
"label": __("Include Default Book Entries"),
- "fieldtype": "Check"
+ "fieldtype": "Check",
+ "default": 1
},
{
"fieldname": "show_cancelled_entries",
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 27b84c4..d7af167 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -204,7 +204,7 @@
)
if filters.get("presentation_currency"):
- return convert_to_presentation_currency(gl_entries, currency_map, filters.get("company"))
+ return convert_to_presentation_currency(gl_entries, currency_map)
else:
return gl_entries
@@ -244,13 +244,23 @@
if filters.get("project"):
conditions.append("project in %(project)s")
- if filters.get("finance_book"):
- if filters.get("include_default_book_entries"):
- conditions.append(
- "(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
- )
+ if filters.get("include_default_book_entries"):
+ if filters.get("finance_book"):
+ if filters.get("company_fb") and cstr(filters.get("finance_book")) != cstr(
+ filters.get("company_fb")
+ ):
+ frappe.throw(
+ _("To use a different finance book, please uncheck 'Include Default Book Entries'")
+ )
+ else:
+ conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
else:
- conditions.append("finance_book in (%(finance_book)s)")
+ conditions.append("(finance_book in (%(company_fb)s, '') OR finance_book IS NULL)")
+ else:
+ if filters.get("finance_book"):
+ conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
+ else:
+ conditions.append("(finance_book in ('') OR finance_book IS NULL)")
if not filters.get("show_cancelled_entries"):
conditions.append("is_cancelled = 0")
diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
index 8dc5ab3..92cf36e 100644
--- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
+++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
@@ -13,14 +13,6 @@
frappe.query_reports["Gross and Net Profit Report"]["filters"].push(
{
- "fieldname": "project",
- "label": __("Project"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Project', txt);
- }
- },
- {
"fieldname": "accumulated_values",
"label": __("Accumulated Values"),
"fieldtype": "Check"
diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
index cd5f366..f0ca405 100644
--- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
+++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
@@ -125,12 +125,14 @@
data_to_be_removed = True
while data_to_be_removed:
- revenue, data_to_be_removed = remove_parent_with_no_child(revenue, period_list)
- revenue = adjust_account(revenue, period_list)
+ revenue, data_to_be_removed = remove_parent_with_no_child(revenue)
+
+ adjust_account_totals(revenue, period_list)
+
return copy.deepcopy(revenue)
-def remove_parent_with_no_child(data, period_list):
+def remove_parent_with_no_child(data):
data_to_be_removed = False
for parent in data:
if "is_group" in parent and parent.get("is_group") == 1:
@@ -147,16 +149,19 @@
return data, data_to_be_removed
-def adjust_account(data, period_list, consolidated=False):
- leaf_nodes = [item for item in data if item["is_group"] == 0]
+def adjust_account_totals(data, period_list):
totals = {}
- for node in leaf_nodes:
- set_total(node, node["total"], data, totals)
- for d in data:
- for period in period_list:
- key = period if consolidated else period.key
- d["total"] = totals[d["account"]]
- return data
+ for d in reversed(data):
+ if d.get("is_group"):
+ for period in period_list:
+ # reset totals for group accounts as totals set by get_data doesn't consider include_in_gross check
+ d[period.key] = sum(
+ item[period.key] for item in data if item.get("parent_account") == d.get("account")
+ )
+ else:
+ set_total(d, d["total"], data, totals)
+
+ d["total"] = totals[d["account"]]
def set_total(node, value, complete_list, totals):
@@ -191,6 +196,9 @@
if profit_loss[key]:
has_value = True
+ if not profit_loss.get("total"):
+ profit_loss["total"] = 0
+ profit_loss["total"] += profit_loss[key]
if has_value:
return profit_loss
@@ -229,6 +237,9 @@
if profit_loss[key]:
has_value = True
+ if not profit_loss.get("total"):
+ profit_loss["total"] = 0
+ profit_loss["total"] += profit_loss[key]
if has_value:
return profit_loss
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js
index e89d429..53921dc 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.js
+++ b/erpnext/accounts/report/gross_profit/gross_profit.js
@@ -73,7 +73,7 @@
if (column.fieldname == "sales_invoice" && column.options == "Item" && data && data.indent == 0) {
column._options = "Sales Invoice";
} else {
- column._options = "Item";
+ column._options = "";
}
value = default_formatter(value, row, column, data);
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 01fee28..3324a73 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -1,6 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
+from collections import OrderedDict
import frappe
from frappe import _, qb, scrub
@@ -250,7 +251,7 @@
"label": _("Warehouse"),
"fieldname": "warehouse",
"fieldtype": "Link",
- "options": "warehouse",
+ "options": "Warehouse",
"width": 100,
},
"qty": {"label": _("Qty"), "fieldname": "qty", "fieldtype": "Float", "width": 80},
@@ -305,7 +306,8 @@
"sales_person": {
"label": _("Sales Person"),
"fieldname": "sales_person",
- "fieldtype": "Data",
+ "fieldtype": "Link",
+ "options": "Sales Person",
"width": 100,
},
"allocated_amount": {
@@ -326,14 +328,14 @@
"label": _("Customer Group"),
"fieldname": "customer_group",
"fieldtype": "Link",
- "options": "customer",
+ "options": "Customer Group",
"width": 100,
},
"territory": {
"label": _("Territory"),
"fieldname": "territory",
"fieldtype": "Link",
- "options": "territory",
+ "options": "Territory",
"width": 100,
},
"monthly": {
@@ -701,6 +703,9 @@
}
)
+ if row.serial_and_batch_bundle:
+ args.update({"serial_and_batch_bundle": row.serial_and_batch_bundle})
+
average_buying_rate = get_incoming_rate(args)
self.average_buying_rate[item_code] = flt(average_buying_rate)
@@ -735,7 +740,7 @@
def load_invoice_items(self):
conditions = ""
if self.filters.company:
- conditions += " and company = %(company)s"
+ conditions += " and `tabSales Invoice`.company = %(company)s"
if self.filters.from_date:
conditions += " and posting_date >= %(from_date)s"
if self.filters.to_date:
@@ -803,7 +808,7 @@
`tabSales Invoice Item`.delivery_note, `tabSales Invoice Item`.stock_qty as qty,
`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount,
`tabSales Invoice Item`.name as "item_row", `tabSales Invoice`.is_return,
- `tabSales Invoice Item`.cost_center
+ `tabSales Invoice Item`.cost_center, `tabSales Invoice Item`.serial_and_batch_bundle
{sales_person_cols}
{payment_term_cols}
from
@@ -855,30 +860,30 @@
Turns list of Sales Invoice Items to a tree of Sales Invoices with their Items as children.
"""
- parents = []
+ grouped = OrderedDict()
for row in self.si_list:
- if row.parent not in parents:
- parents.append(row.parent)
+ # initialize list with a header row for each new parent
+ grouped.setdefault(row.parent, [self.get_invoice_row(row)]).append(
+ row.update(
+ {"indent": 1.0, "parent_invoice": row.parent, "invoice_or_item": row.item_code}
+ ) # descendant rows will have indent: 1.0 or greater
+ )
- parents_index = 0
- for index, row in enumerate(self.si_list):
- if parents_index < len(parents) and row.parent == parents[parents_index]:
- invoice = self.get_invoice_row(row)
- self.si_list.insert(index, invoice)
- parents_index += 1
+ # if item is a bundle, add it's components as seperate rows
+ if frappe.db.exists("Product Bundle", row.item_code):
+ bundled_items = self.get_bundle_items(row)
+ for x in bundled_items:
+ bundle_item = self.get_bundle_item_row(row, x)
+ grouped.get(row.parent).append(bundle_item)
- else:
- # skipping the bundle items rows
- if not row.indent:
- row.indent = 1.0
- row.parent_invoice = row.parent
- row.invoice_or_item = row.item_code
+ self.si_list.clear()
- if frappe.db.exists("Product Bundle", row.item_code):
- self.add_bundle_items(row, index)
+ for items in grouped.values():
+ self.si_list.extend(items)
def get_invoice_row(self, row):
+ # header row format
return frappe._dict(
{
"parent_invoice": "",
@@ -907,13 +912,6 @@
}
)
- def add_bundle_items(self, product_bundle, index):
- bundle_items = self.get_bundle_items(product_bundle)
-
- for i, item in enumerate(bundle_items):
- bundle_item = self.get_bundle_item_row(product_bundle, item)
- self.si_list.insert((index + i + 1), bundle_item)
-
def get_bundle_items(self, product_bundle):
return frappe.get_all(
"Product Bundle Item", filters={"parent": product_bundle.item_code}, fields=["item_code", "qty"]
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index d34c213..050e6bc 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -15,21 +15,21 @@
get_group_by_conditions,
get_tax_accounts,
)
-from erpnext.selling.report.item_wise_sales_history.item_wise_sales_history import get_item_details
+from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns
def execute(filters=None):
return _execute(filters)
-def _execute(filters=None, additional_table_columns=None, additional_query_columns=None):
+def _execute(filters=None, additional_table_columns=None):
if not filters:
filters = {}
columns = get_columns(additional_table_columns, filters)
company_currency = erpnext.get_company_currency(filters.company)
- item_list = get_items(filters, additional_query_columns)
+ item_list = get_items(filters, get_query_columns(additional_table_columns))
aii_account_map = get_aii_accounts()
if item_list:
itemised_tax, tax_columns = get_tax_accounts(
@@ -40,6 +40,16 @@
tax_doctype="Purchase Taxes and Charges",
)
+ scrubbed_tax_fields = {}
+
+ for tax in tax_columns:
+ scrubbed_tax_fields.update(
+ {
+ tax + " Rate": frappe.scrub(tax + " Rate"),
+ tax + " Amount": frappe.scrub(tax + " Amount"),
+ }
+ )
+
po_pr_map = get_purchase_receipts_against_purchase_order(item_list)
data = []
@@ -50,11 +60,7 @@
if filters.get("group_by"):
grand_total = get_grand_total(filters, "Purchase Invoice")
- item_details = get_item_details()
-
for d in item_list:
- item_record = item_details.get(d.item_code)
-
purchase_receipt = None
if d.purchase_receipt:
purchase_receipt = d.purchase_receipt
@@ -67,42 +73,34 @@
row = {
"item_code": d.item_code,
- "item_name": item_record.item_name if item_record else d.item_name,
- "item_group": item_record.item_group if item_record else d.item_group,
+ "item_name": d.pi_item_name if d.pi_item_name else d.i_item_name,
+ "item_group": d.pi_item_group if d.pi_item_group else d.i_item_group,
"description": d.description,
"invoice": d.parent,
"posting_date": d.posting_date,
"supplier": d.supplier,
"supplier_name": d.supplier_name,
+ **get_values_for_columns(additional_table_columns, d),
+ "credit_to": d.credit_to,
+ "mode_of_payment": d.mode_of_payment,
+ "project": d.project,
+ "company": d.company,
+ "purchase_order": d.purchase_order,
+ "purchase_receipt": purchase_receipt,
+ "expense_account": expense_account,
+ "stock_qty": d.stock_qty,
+ "stock_uom": d.stock_uom,
+ "rate": d.base_net_amount / d.stock_qty if d.stock_qty else d.base_net_amount,
+ "amount": d.base_net_amount,
}
- if additional_query_columns:
- for col in additional_query_columns:
- row.update({col: d.get(col)})
-
- row.update(
- {
- "credit_to": d.credit_to,
- "mode_of_payment": d.mode_of_payment,
- "project": d.project,
- "company": d.company,
- "purchase_order": d.purchase_order,
- "purchase_receipt": d.purchase_receipt,
- "expense_account": expense_account,
- "stock_qty": d.stock_qty,
- "stock_uom": d.stock_uom,
- "rate": d.base_net_amount / d.stock_qty if d.stock_qty else d.base_net_amount,
- "amount": d.base_net_amount,
- }
- )
-
total_tax = 0
for tax in tax_columns:
item_tax = itemised_tax.get(d.name, {}).get(tax, {})
row.update(
{
- frappe.scrub(tax + " Rate"): item_tax.get("tax_rate", 0),
- frappe.scrub(tax + " Amount"): item_tax.get("tax_amount", 0),
+ scrubbed_tax_fields[tax + " Rate"]: item_tax.get("tax_rate", 0),
+ scrubbed_tax_fields[tax + " Amount"]: item_tax.get("tax_amount", 0),
}
)
total_tax += flt(item_tax.get("tax_amount"))
@@ -241,7 +239,7 @@
},
{
"label": _("Purchase Receipt"),
- "fieldname": "Purchase Receipt",
+ "fieldname": "purchase_receipt",
"fieldtype": "Link",
"options": "Purchase Receipt",
"width": 100,
@@ -312,11 +310,6 @@
def get_items(filters, additional_query_columns):
conditions = get_conditions(filters)
- if additional_query_columns:
- additional_query_columns = ", " + ", ".join(additional_query_columns)
- else:
- additional_query_columns = ""
-
return frappe.db.sql(
"""
select
@@ -325,19 +318,20 @@
`tabPurchase Invoice`.supplier, `tabPurchase Invoice`.remarks, `tabPurchase Invoice`.base_net_total,
`tabPurchase Invoice`.unrealized_profit_loss_account,
`tabPurchase Invoice Item`.`item_code`, `tabPurchase Invoice Item`.description,
- `tabPurchase Invoice Item`.`item_name`, `tabPurchase Invoice Item`.`item_group`,
+ `tabPurchase Invoice Item`.`item_name` as pi_item_name, `tabPurchase Invoice Item`.`item_group` as pi_item_group,
+ `tabItem`.`item_name` as i_item_name, `tabItem`.`item_group` as i_item_group,
`tabPurchase Invoice Item`.`project`, `tabPurchase Invoice Item`.`purchase_order`,
`tabPurchase Invoice Item`.`purchase_receipt`, `tabPurchase Invoice Item`.`po_detail`,
`tabPurchase Invoice Item`.`expense_account`, `tabPurchase Invoice Item`.`stock_qty`,
`tabPurchase Invoice Item`.`stock_uom`, `tabPurchase Invoice Item`.`base_net_amount`,
`tabPurchase Invoice`.`supplier_name`, `tabPurchase Invoice`.`mode_of_payment` {0}
- from `tabPurchase Invoice`, `tabPurchase Invoice Item`
+ from `tabPurchase Invoice`, `tabPurchase Invoice Item`, `tabItem`
where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
- `tabPurchase Invoice`.docstatus = 1 %s
+ `tabItem`.name = `tabPurchase Invoice Item`.`item_code` and
+ `tabPurchase Invoice`.docstatus = 1 {1}
""".format(
- additional_query_columns
- )
- % (conditions),
+ additional_query_columns, conditions
+ ),
filters,
as_dict=1,
)
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 c987231..4d24dd9 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
@@ -9,9 +9,9 @@
from frappe.utils.xlsxutils import handle_html
from erpnext.accounts.report.sales_register.sales_register import get_mode_of_payments
+from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns
from erpnext.selling.report.item_wise_sales_history.item_wise_sales_history import (
get_customer_details,
- get_item_details,
)
@@ -19,17 +19,27 @@
return _execute(filters)
-def _execute(filters=None, additional_table_columns=None, additional_query_columns=None):
+def _execute(filters=None, additional_table_columns=None, additional_conditions=None):
if not filters:
filters = {}
columns = get_columns(additional_table_columns, filters)
company_currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency")
- item_list = get_items(filters, additional_query_columns)
+ item_list = get_items(filters, get_query_columns(additional_table_columns), additional_conditions)
if item_list:
itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency)
+ scrubbed_tax_fields = {}
+
+ for tax in tax_columns:
+ scrubbed_tax_fields.update(
+ {
+ tax + " Rate": frappe.scrub(tax + " Rate"),
+ tax + " Amount": frappe.scrub(tax + " Amount"),
+ }
+ )
+
mode_of_payments = get_mode_of_payments(set(d.parent for d in item_list))
so_dn_map = get_delivery_notes_against_sales_order(item_list)
@@ -42,11 +52,9 @@
grand_total = get_grand_total(filters, "Sales Invoice")
customer_details = get_customer_details()
- item_details = get_item_details()
for d in item_list:
customer_record = customer_details.get(d.customer)
- item_record = item_details.get(d.item_code)
delivery_note = None
if d.delivery_note:
@@ -59,38 +67,30 @@
row = {
"item_code": d.item_code,
- "item_name": item_record.item_name if item_record else d.item_name,
- "item_group": item_record.item_group if item_record else d.item_group,
+ "item_name": d.si_item_name if d.si_item_name else d.i_item_name,
+ "item_group": d.si_item_group if d.si_item_group else d.i_item_group,
"description": d.description,
"invoice": d.parent,
"posting_date": d.posting_date,
"customer": d.customer,
"customer_name": customer_record.customer_name,
"customer_group": customer_record.customer_group,
+ **get_values_for_columns(additional_table_columns, d),
+ "debit_to": d.debit_to,
+ "mode_of_payment": ", ".join(mode_of_payments.get(d.parent, [])),
+ "territory": d.territory,
+ "project": d.project,
+ "company": d.company,
+ "sales_order": d.sales_order,
+ "delivery_note": d.delivery_note,
+ "income_account": d.unrealized_profit_loss_account
+ if d.is_internal_customer == 1
+ else d.income_account,
+ "cost_center": d.cost_center,
+ "stock_qty": d.stock_qty,
+ "stock_uom": d.stock_uom,
}
- if additional_query_columns:
- for col in additional_query_columns:
- row.update({col: d.get(col)})
-
- row.update(
- {
- "debit_to": d.debit_to,
- "mode_of_payment": ", ".join(mode_of_payments.get(d.parent, [])),
- "territory": d.territory,
- "project": d.project,
- "company": d.company,
- "sales_order": d.sales_order,
- "delivery_note": d.delivery_note,
- "income_account": d.unrealized_profit_loss_account
- if d.is_internal_customer == 1
- else d.income_account,
- "cost_center": d.cost_center,
- "stock_qty": d.stock_qty,
- "stock_uom": d.stock_uom,
- }
- )
-
if d.stock_uom != d.uom and d.stock_qty:
row.update({"rate": (d.base_net_rate * d.qty) / d.stock_qty, "amount": d.base_net_amount})
else:
@@ -102,8 +102,8 @@
item_tax = itemised_tax.get(d.name, {}).get(tax, {})
row.update(
{
- frappe.scrub(tax + " Rate"): item_tax.get("tax_rate", 0),
- frappe.scrub(tax + " Amount"): item_tax.get("tax_amount", 0),
+ scrubbed_tax_fields[tax + " Rate"]: item_tax.get("tax_rate", 0),
+ scrubbed_tax_fields[tax + " Amount"]: item_tax.get("tax_amount", 0),
}
)
if item_tax.get("is_other_charges"):
@@ -328,7 +328,7 @@
return columns
-def get_conditions(filters):
+def get_conditions(filters, additional_conditions=None):
conditions = ""
for opts in (
@@ -341,6 +341,9 @@
if filters.get(opts[0]):
conditions += opts[1]
+ if additional_conditions:
+ conditions += additional_conditions
+
if filters.get("mode_of_payment"):
conditions += """ and exists(select name from `tabSales Invoice Payment`
where parent=`tabSales Invoice`.name
@@ -376,13 +379,8 @@
return "ORDER BY `tab{0}`.{1}".format(doctype, frappe.scrub(filters.get("group_by")))
-def get_items(filters, additional_query_columns):
- conditions = get_conditions(filters)
-
- if additional_query_columns:
- additional_query_columns = ", " + ", ".join(additional_query_columns)
- else:
- additional_query_columns = ""
+def get_items(filters, additional_query_columns, additional_conditions=None):
+ conditions = get_conditions(filters, additional_conditions)
return frappe.db.sql(
"""
@@ -391,21 +389,25 @@
`tabSales Invoice`.posting_date, `tabSales Invoice`.debit_to,
`tabSales Invoice`.unrealized_profit_loss_account,
`tabSales Invoice`.is_internal_customer,
- `tabSales Invoice`.project, `tabSales Invoice`.customer, `tabSales Invoice`.remarks,
+ `tabSales Invoice`.customer, `tabSales Invoice`.remarks,
`tabSales Invoice`.territory, `tabSales Invoice`.company, `tabSales Invoice`.base_net_total,
+ `tabSales Invoice Item`.project,
`tabSales Invoice Item`.item_code, `tabSales Invoice Item`.description,
`tabSales Invoice Item`.`item_name`, `tabSales Invoice Item`.`item_group`,
+ `tabSales Invoice Item`.`item_name` as si_item_name, `tabSales Invoice Item`.`item_group` as si_item_group,
+ `tabItem`.`item_name` as i_item_name, `tabItem`.`item_group` as i_item_group,
`tabSales Invoice Item`.sales_order, `tabSales Invoice Item`.delivery_note,
`tabSales Invoice Item`.income_account, `tabSales Invoice Item`.cost_center,
`tabSales Invoice Item`.stock_qty, `tabSales Invoice Item`.stock_uom,
`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount,
`tabSales Invoice`.customer_name, `tabSales Invoice`.customer_group, `tabSales Invoice Item`.so_detail,
`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {0}
- from `tabSales Invoice`, `tabSales Invoice Item`
- where `tabSales Invoice`.name = `tabSales Invoice Item`.parent
- and `tabSales Invoice`.docstatus = 1 {1}
+ from `tabSales Invoice`, `tabSales Invoice Item`, `tabItem`
+ where `tabSales Invoice`.name = `tabSales Invoice Item`.parent and
+ `tabItem`.name = `tabSales Invoice Item`.`item_code` and
+ `tabSales Invoice`.docstatus = 1 {1}
""".format(
- additional_query_columns or "", conditions
+ additional_query_columns, conditions
),
filters,
as_dict=1,
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 1c461ef..e794f27 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
@@ -10,14 +10,6 @@
frappe.query_reports["Profit and Loss Statement"]["filters"].push(
{
- "fieldname": "project",
- "label": __("Project"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Project', txt);
- }
- },
- {
"fieldname": "include_default_book_entries",
"label": __("Include Default Book Entries"),
"fieldtype": "Check",
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
index a05d581..69827ac 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -10,17 +10,18 @@
get_accounting_dimensions,
get_dimension_with_children,
)
+from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns
def execute(filters=None):
return _execute(filters)
-def _execute(filters=None, additional_table_columns=None, additional_query_columns=None):
+def _execute(filters=None, additional_table_columns=None):
if not filters:
filters = {}
- invoice_list = get_invoices(filters, additional_query_columns)
+ invoice_list = get_invoices(filters, get_query_columns(additional_table_columns))
columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns(
invoice_list, additional_table_columns
)
@@ -47,13 +48,12 @@
purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
project = list(set(invoice_po_pr_map.get(inv.name, {}).get("project", [])))
- row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name]
-
- if additional_query_columns:
- for col in additional_query_columns:
- row.append(inv.get(col))
-
- row += [
+ row = [
+ inv.name,
+ inv.posting_date,
+ inv.supplier,
+ inv.supplier_name,
+ *get_values_for_columns(additional_table_columns, inv).values(),
supplier_details.get(inv.supplier), # supplier_group
inv.tax_id,
inv.credit_to,
@@ -244,9 +244,6 @@
def get_invoices(filters, additional_query_columns):
- if additional_query_columns:
- additional_query_columns = ", " + ", ".join(additional_query_columns)
-
conditions = get_conditions(filters)
return frappe.db.sql(
"""
@@ -255,11 +252,10 @@
remarks, base_net_total, base_grand_total, outstanding_amount,
mode_of_payment {0}
from `tabPurchase Invoice`
- where docstatus = 1 %s
+ where docstatus = 1 {1}
order by posting_date desc, name desc""".format(
- additional_query_columns or ""
- )
- % conditions,
+ additional_query_columns, conditions
+ ),
filters,
as_dict=1,
)
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index b333901..291c7d9 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -11,17 +11,18 @@
get_accounting_dimensions,
get_dimension_with_children,
)
+from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns
def execute(filters=None):
return _execute(filters)
-def _execute(filters, additional_table_columns=None, additional_query_columns=None):
+def _execute(filters, additional_table_columns=None):
if not filters:
filters = frappe._dict({})
- invoice_list = get_invoices(filters, additional_query_columns)
+ invoice_list = get_invoices(filters, get_query_columns(additional_table_columns))
columns, income_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns(
invoice_list, additional_table_columns
)
@@ -54,30 +55,22 @@
"posting_date": inv.posting_date,
"customer": inv.customer,
"customer_name": inv.customer_name,
+ **get_values_for_columns(additional_table_columns, inv),
+ "customer_group": inv.get("customer_group"),
+ "territory": inv.get("territory"),
+ "tax_id": inv.get("tax_id"),
+ "receivable_account": inv.debit_to,
+ "mode_of_payment": ", ".join(mode_of_payments.get(inv.name, [])),
+ "project": inv.project,
+ "owner": inv.owner,
+ "remarks": inv.remarks,
+ "sales_order": ", ".join(sales_order),
+ "delivery_note": ", ".join(delivery_note),
+ "cost_center": ", ".join(cost_center),
+ "warehouse": ", ".join(warehouse),
+ "currency": company_currency,
}
- if additional_query_columns:
- for col in additional_query_columns:
- row.update({col: inv.get(col)})
-
- row.update(
- {
- "customer_group": inv.get("customer_group"),
- "territory": inv.get("territory"),
- "tax_id": inv.get("tax_id"),
- "receivable_account": inv.debit_to,
- "mode_of_payment": ", ".join(mode_of_payments.get(inv.name, [])),
- "project": inv.project,
- "owner": inv.owner,
- "remarks": inv.remarks,
- "sales_order": ", ".join(sales_order),
- "delivery_note": ", ".join(delivery_note),
- "cost_center": ", ".join(cost_center),
- "warehouse": ", ".join(warehouse),
- "currency": company_currency,
- }
- )
-
# map income values
base_net_total = 0
for income_acc in income_accounts:
@@ -402,9 +395,6 @@
def get_invoices(filters, additional_query_columns):
- if additional_query_columns:
- additional_query_columns = ", " + ", ".join(additional_query_columns)
-
conditions = get_conditions(filters)
return frappe.db.sql(
"""
@@ -413,10 +403,10 @@
base_net_total, base_grand_total, base_rounded_total, outstanding_amount,
is_internal_customer, represents_company, company {0}
from `tabSales Invoice`
- where docstatus = 1 %s order by posting_date desc, name desc""".format(
- additional_query_columns or ""
- )
- % conditions,
+ where docstatus = 1 {1}
+ order by posting_date desc, name desc""".format(
+ additional_query_columns, conditions
+ ),
filters,
as_dict=1,
)
diff --git a/erpnext/accounts/report/share_ledger/share_ledger.py b/erpnext/accounts/report/share_ledger/share_ledger.py
index d6c3bd0..629528e 100644
--- a/erpnext/accounts/report/share_ledger/share_ledger.py
+++ b/erpnext/accounts/report/share_ledger/share_ledger.py
@@ -67,8 +67,9 @@
# 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})
+ WHERE ((DATE(date) <= %(date)s AND from_shareholder = %(shareholder)s {condition})
+ OR (DATE(date) <= %(date)s AND to_shareholder = %(shareholder)s {condition}))
+ AND docstatus = 1
ORDER BY date""".format(
condition=condition
),
diff --git a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
index bfe2a0f..9883890 100644
--- a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
+++ b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
@@ -4,7 +4,6 @@
import frappe
from frappe import _
-from frappe.utils import flt
def execute(filters=None):
@@ -66,12 +65,6 @@
else:
total_amount_credited += entry.credit
- ## Check if ldc is applied and show rate as per ldc
- actual_rate = (tds_deducted / total_amount_credited) * 100
-
- if flt(actual_rate) < flt(rate):
- rate = actual_rate
-
if tds_deducted:
row = {
"pan"
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 53611ab..7a8b7dc 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -17,6 +17,7 @@
filter_out_zero_value_rows,
set_gl_entries_by_account,
)
+from erpnext.accounts.report.utils import convert_to_presentation_currency, get_currency
value_fields = (
"opening_debit",
@@ -158,6 +159,8 @@
accounting_dimensions,
period_closing_voucher=last_period_closing_voucher[0].name,
)
+
+ # Report getting generate from the mid of a fiscal year
if getdate(last_period_closing_voucher[0].posting_date) < getdate(
add_days(filters.from_date, -1)
):
@@ -178,8 +181,8 @@
"opening_credit": 0.0,
},
)
- opening[d.account]["opening_debit"] += flt(d.opening_debit)
- opening[d.account]["opening_credit"] += flt(d.opening_credit)
+ opening[d.account]["opening_debit"] += flt(d.debit)
+ opening[d.account]["opening_credit"] += flt(d.credit)
return opening
@@ -194,8 +197,11 @@
frappe.qb.from_(closing_balance)
.select(
closing_balance.account,
- Sum(closing_balance.debit).as_("opening_debit"),
- Sum(closing_balance.credit).as_("opening_credit"),
+ closing_balance.account_currency,
+ Sum(closing_balance.debit).as_("debit"),
+ Sum(closing_balance.credit).as_("credit"),
+ Sum(closing_balance.debit_in_account_currency).as_("debit_in_account_currency"),
+ Sum(closing_balance.credit_in_account_currency).as_("credit_in_account_currency"),
)
.where(
(closing_balance.company == filters.company)
@@ -216,7 +222,10 @@
if start_date:
opening_balance = opening_balance.where(closing_balance.posting_date >= start_date)
opening_balance = opening_balance.where(closing_balance.is_opening == "No")
- opening_balance = opening_balance.where(closing_balance.posting_date < filters.from_date)
+ else:
+ opening_balance = opening_balance.where(
+ (closing_balance.posting_date < filters.from_date) | (closing_balance.is_opening == "Yes")
+ )
if (
not filters.show_unclosed_fy_pl_balances
@@ -248,8 +257,15 @@
opening_balance = opening_balance.where(closing_balance.project == filters.project)
if filters.get("include_default_book_entries"):
+ company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
+
+ if filters.finance_book and company_fb and cstr(filters.finance_book) != cstr(company_fb):
+ frappe.throw(
+ _("To use a different finance book, please uncheck 'Include Default Book Entries'")
+ )
+
opening_balance = opening_balance.where(
- (closing_balance.finance_book.isin([cstr(filters.finance_book), cstr(filters.company_fb), ""]))
+ (closing_balance.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
| (closing_balance.finance_book.isnull())
)
else:
@@ -275,6 +291,9 @@
gle = opening_balance.run(as_dict=1)
+ if filters and filters.get("presentation_currency"):
+ convert_to_presentation_currency(gle, get_currency(filters))
+
return gle
diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py
index 97cc1c4..7ea1fac 100644
--- a/erpnext/accounts/report/utils.py
+++ b/erpnext/accounts/report/utils.py
@@ -1,5 +1,5 @@
import frappe
-from frappe.utils import flt, formatdate, get_datetime_str
+from frappe.utils import flt, formatdate, get_datetime_str, get_table_name
from erpnext import get_company_currency, get_default_company
from erpnext.accounts.doctype.fiscal_year.fiscal_year import get_from_and_to_date
@@ -78,7 +78,7 @@
return rate
-def convert_to_presentation_currency(gl_entries, currency_info, company):
+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`.
@@ -93,7 +93,6 @@
account_currencies = list(set(entry["account_currency"] for entry in gl_entries))
for entry in gl_entries:
- account = entry["account"]
debit = flt(entry["debit"])
credit = flt(entry["credit"])
debit_in_account_currency = flt(entry["debit_in_account_currency"])
@@ -151,3 +150,32 @@
result = sum(d.gross_profit for d in result)
return result
+
+
+def get_query_columns(report_columns):
+ if not report_columns:
+ return ""
+
+ columns = []
+ for column in report_columns:
+ fieldname = column["fieldname"]
+
+ if doctype := column.get("_doctype"):
+ columns.append(f"`{get_table_name(doctype)}`.`{fieldname}`")
+ else:
+ columns.append(fieldname)
+
+ return ", " + ", ".join(columns)
+
+
+def get_values_for_columns(report_columns, report_row):
+ values = {}
+
+ if not report_columns:
+ return values
+
+ for column in report_columns:
+ fieldname = column["fieldname"]
+ values[fieldname] = report_row.get(fieldname)
+
+ return values
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/__init__.py b/erpnext/accounts/report/voucher_wise_balance/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/cash_flow_mapper/__init__.py
copy to erpnext/accounts/report/voucher_wise_balance/__init__.py
diff --git a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js
new file mode 100644
index 0000000..0c148f8
--- /dev/null
+++ b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js
@@ -0,0 +1,28 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Voucher-wise Balance"] = {
+ "filters": [
+ {
+ "fieldname": "company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company"
+ },
+ {
+ "fieldname":"from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ "width": "60px"
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.get_today(),
+ "width": "60px"
+ },
+ ]
+};
diff --git a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.json b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.json
new file mode 100644
index 0000000..434e5a3
--- /dev/null
+++ b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.json
@@ -0,0 +1,33 @@
+{
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2023-06-27 16:40:15.109554",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "json": "{}",
+ "letter_head": "LetterHead",
+ "modified": "2023-06-27 16:40:32.493725",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Voucher-wise Balance",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "GL Entry",
+ "report_name": "Voucher-wise Balance",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Accounts User"
+ },
+ {
+ "role": "Accounts Manager"
+ },
+ {
+ "role": "Auditor"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py
new file mode 100644
index 0000000..5ab3611
--- /dev/null
+++ b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py
@@ -0,0 +1,66 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _
+from frappe.query_builder.functions import Sum
+
+
+def execute(filters=None):
+ columns = get_columns()
+ data = get_data(filters)
+ return columns, data
+
+
+def get_columns():
+ return [
+ {"label": _("Voucher Type"), "fieldname": "voucher_type", "width": 300},
+ {
+ "label": _("Voucher No"),
+ "fieldname": "voucher_no",
+ "fieldtype": "Dynamic Link",
+ "options": "voucher_type",
+ "width": 300,
+ },
+ {
+ "fieldname": "debit",
+ "label": _("Debit"),
+ "fieldtype": "Currency",
+ "options": "currency",
+ "width": 300,
+ },
+ {
+ "fieldname": "credit",
+ "label": _("Credit"),
+ "fieldtype": "Currency",
+ "options": "currency",
+ "width": 300,
+ },
+ ]
+
+
+def get_data(filters):
+ gle = frappe.qb.DocType("GL Entry")
+ query = (
+ frappe.qb.from_(gle)
+ .select(
+ gle.voucher_type, gle.voucher_no, Sum(gle.debit).as_("debit"), Sum(gle.credit).as_("credit")
+ )
+ .groupby(gle.voucher_no)
+ )
+ query = apply_filters(query, filters, gle)
+ gl_entries = query.run(as_dict=True)
+ unmatched = [entry for entry in gl_entries if entry.debit != entry.credit]
+ return unmatched
+
+
+def apply_filters(query, filters, gle):
+ if filters.get("company"):
+ query = query.where(gle.company == filters.company)
+ if filters.get("voucher_type"):
+ query = query.where(gle.voucher_type == filters.voucher_type)
+ if filters.get("from_date"):
+ query = query.where(gle.posting_date >= filters.from_date)
+ if filters.get("to_date"):
+ query = query.where(gle.posting_date <= filters.to_date)
+ return query
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 2ab9ef6..8b44b22 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -237,11 +237,6 @@
if not (frappe.flags.ignore_account_permission or ignore_account_permission):
acc.check_permission("read")
- if report_type == "Profit and Loss":
- # for pl accounts, get balance within a fiscal year
- cond.append(
- "posting_date >= '%s' and voucher_type != 'Period Closing Voucher'" % year_start_date
- )
# different filter for group and ledger - improved performance
if acc.is_group:
cond.append(
@@ -436,7 +431,7 @@
return cc.name
-def reconcile_against_document(args): # nosemgrep
+def reconcile_against_document(args, skip_ref_details_update_for_pe=False): # nosemgrep
"""
Cancel PE or JV, Update against document, split if required and resubmit
"""
@@ -465,7 +460,9 @@
if voucher_type == "Journal Entry":
update_reference_in_journal_entry(entry, doc, do_not_save=True)
else:
- update_reference_in_payment_entry(entry, doc, do_not_save=True)
+ update_reference_in_payment_entry(
+ entry, doc, do_not_save=True, skip_ref_details_update_for_pe=skip_ref_details_update_for_pe
+ )
doc.save(ignore_permissions=True)
# re-submit advance entry
@@ -473,6 +470,9 @@
gl_map = doc.build_gl_map()
create_payment_ledger_entry(gl_map, update_outstanding="No", cancel=0, adv_adj=1)
+ if voucher_type == "Payment Entry":
+ doc.make_advance_gl_entries()
+
# Only update outstanding for newly linked vouchers
for entry in entries:
update_voucher_outstanding(
@@ -493,50 +493,53 @@
ret = None
if args.voucher_type == "Journal Entry":
- ret = frappe.db.sql(
- """
- select t2.{dr_or_cr} from `tabJournal Entry` t1, `tabJournal Entry Account` t2
- where t1.name = t2.parent and t2.account = %(account)s
- and t2.party_type = %(party_type)s and t2.party = %(party)s
- and (t2.reference_type is null or t2.reference_type in ('', 'Sales Order', 'Purchase Order'))
- and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
- and t1.docstatus=1 """.format(
- dr_or_cr=args.get("dr_or_cr")
- ),
- args,
+ journal_entry = frappe.qb.DocType("Journal Entry")
+ journal_acc = frappe.qb.DocType("Journal Entry Account")
+
+ q = (
+ frappe.qb.from_(journal_entry)
+ .inner_join(journal_acc)
+ .on(journal_entry.name == journal_acc.parent)
+ .select(journal_acc[args.get("dr_or_cr")])
+ .where(
+ (journal_acc.account == args.get("account"))
+ & ((journal_acc.party_type == args.get("party_type")))
+ & ((journal_acc.party == args.get("party")))
+ & (
+ (journal_acc.reference_type.isnull())
+ | (journal_acc.reference_type.isin(["", "Sales Order", "Purchase Order"]))
+ )
+ & ((journal_entry.name == args.get("voucher_no")))
+ & ((journal_acc.name == args.get("voucher_detail_no")))
+ & ((journal_entry.docstatus == 1))
+ )
)
+
else:
- party_account_field = (
- "paid_from" if erpnext.get_party_account_type(args.party_type) == "Receivable" else "paid_to"
+ payment_entry = frappe.qb.DocType("Payment Entry")
+ payment_ref = frappe.qb.DocType("Payment Entry Reference")
+
+ q = (
+ frappe.qb.from_(payment_entry)
+ .select(payment_entry.name)
+ .where(payment_entry.name == args.get("voucher_no"))
+ .where(payment_entry.docstatus == 1)
+ .where(payment_entry.party_type == args.get("party_type"))
+ .where(payment_entry.party == args.get("party"))
)
if args.voucher_detail_no:
- ret = frappe.db.sql(
- """select t1.name
- from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
- where
- t1.name = t2.parent and t1.docstatus = 1
- and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
- and t1.party_type = %(party_type)s and t1.party = %(party)s and t1.{0} = %(account)s
- and t2.reference_doctype in ('', 'Sales Order', 'Purchase Order')
- and t2.allocated_amount = %(unreconciled_amount)s
- """.format(
- party_account_field
- ),
- args,
+ q = (
+ q.inner_join(payment_ref)
+ .on(payment_entry.name == payment_ref.parent)
+ .where(payment_ref.name == args.get("voucher_detail_no"))
+ .where(payment_ref.reference_doctype.isin(("", "Sales Order", "Purchase Order")))
+ .where(payment_ref.allocated_amount == args.get("unreconciled_amount"))
)
else:
- ret = frappe.db.sql(
- """select name from `tabPayment Entry`
- where
- name = %(voucher_no)s and docstatus = 1
- and party_type = %(party_type)s and party = %(party)s and {0} = %(account)s
- and unallocated_amount = %(unreconciled_amount)s
- """.format(
- party_account_field
- ),
- args,
- )
+ q = q.where(payment_entry.unallocated_amount == args.get("unreconciled_amount"))
+
+ ret = q.run(as_dict=True)
if not ret:
throw(_("""Payment Entry has been modified after you pulled it. Please pull it again."""))
@@ -602,7 +605,9 @@
journal_entry.save(ignore_permissions=True)
-def update_reference_in_payment_entry(d, payment_entry, do_not_save=False):
+def update_reference_in_payment_entry(
+ d, payment_entry, do_not_save=False, skip_ref_details_update_for_pe=False
+):
reference_details = {
"reference_doctype": d.against_voucher_type,
"reference_name": d.against_voucher,
@@ -613,6 +618,7 @@
if not d.exchange_gain_loss
else payment_entry.get_exchange_rate(),
"exchange_gain_loss": d.exchange_gain_loss, # only populated from invoice in case of advance allocation
+ "account": d.account,
}
if d.voucher_detail_no:
@@ -646,6 +652,8 @@
payment_entry.flags.ignore_validate_update_after_submit = True
payment_entry.setup_party_account_field()
payment_entry.set_missing_values()
+ if not skip_ref_details_update_for_pe:
+ payment_entry.set_missing_ref_details()
payment_entry.set_amounts()
if not do_not_save:
@@ -723,6 +731,7 @@
try:
pe_doc = frappe.get_doc("Payment Entry", pe)
pe_doc.set_amounts()
+ pe_doc.make_advance_gl_entries(against_voucher_type=ref_type, against_voucher=ref_no, cancel=1)
pe_doc.clear_unallocated_reference_document_rows()
pe_doc.validate_payment_type_with_outstanding()
except Exception as e:
@@ -841,7 +850,7 @@
if party_type == "Supplier":
held_invoices = frappe.db.sql(
- "select name from `tabPurchase Invoice` where release_date IS NOT NULL and release_date > CURDATE()",
+ "select name from `tabPurchase Invoice` where on_hold = 1 and release_date IS NOT NULL and release_date > CURDATE()",
as_dict=1,
)
held_invoices = set(d["name"] for d in held_invoices)
@@ -914,6 +923,7 @@
"outstanding_amount": outstanding_amount,
"due_date": d.due_date,
"currency": d.currency,
+ "account": d.account,
}
)
)
@@ -1368,10 +1378,7 @@
if wh_details.account == account and not wh_details.is_group
]
- total_stock_value = 0.0
- for warehouse in related_warehouses:
- value = get_stock_value_on(warehouse, posting_date)
- total_stock_value += value
+ total_stock_value = get_stock_value_on(related_warehouses, posting_date)
precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
return flt(account_balance, precision), flt(total_stock_value, precision), related_warehouses
@@ -1401,6 +1408,50 @@
frappe.delete_doc("Desktop Icon", icon)
+def create_err_and_its_journals(companies: list = None) -> None:
+ if companies:
+ for company in companies:
+ err = frappe.new_doc("Exchange Rate Revaluation")
+ err.company = company.name
+ err.posting_date = nowdate()
+ err.rounding_loss_allowance = 0.0
+
+ err.fetch_and_calculate_accounts_data()
+ if err.accounts:
+ err.save().submit()
+ response = err.make_jv_entries()
+
+ if company.submit_err_jv:
+ jv = response.get("revaluation_jv", None)
+ jv and frappe.get_doc("Journal Entry", jv).submit()
+ jv = response.get("zero_balance_jv", None)
+ jv and frappe.get_doc("Journal Entry", jv).submit()
+
+
+def auto_create_exchange_rate_revaluation_daily() -> None:
+ """
+ Executed by background job
+ """
+ companies = frappe.db.get_all(
+ "Company",
+ filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": "Daily"},
+ fields=["name", "submit_err_jv"],
+ )
+ create_err_and_its_journals(companies)
+
+
+def auto_create_exchange_rate_revaluation_weekly() -> None:
+ """
+ Executed by background job
+ """
+ companies = frappe.db.get_all(
+ "Company",
+ filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": "Weekly"},
+ fields=["name", "submit_err_jv"],
+ )
+ create_err_and_its_journals(companies)
+
+
def get_payment_ledger_entries(gl_entries, cancel=0):
ple_map = []
if gl_entries:
@@ -1455,6 +1506,7 @@
due_date=gle.due_date,
voucher_type=gle.voucher_type,
voucher_no=gle.voucher_no,
+ voucher_detail_no=gle.voucher_detail_no,
against_voucher_type=gle.against_voucher_type
if gle.against_voucher_type
else gle.voucher_type,
@@ -1476,7 +1528,7 @@
def create_payment_ledger_entry(
- gl_entries, cancel=0, adv_adj=0, update_outstanding="Yes", from_repost=0
+ gl_entries, cancel=0, adv_adj=0, update_outstanding="Yes", from_repost=0, partial_cancel=False
):
if gl_entries:
ple_map = get_payment_ledger_entries(gl_entries, cancel=cancel)
@@ -1486,7 +1538,7 @@
ple = frappe.get_doc(entry)
if cancel:
- delink_original_entry(ple)
+ delink_original_entry(ple, partial_cancel=partial_cancel)
ple.flags.ignore_permissions = 1
ple.flags.adv_adj = adv_adj
@@ -1533,7 +1585,7 @@
ref_doc.set_status(update=True)
-def delink_original_entry(pl_entry):
+def delink_original_entry(pl_entry, partial_cancel=False):
if pl_entry:
ple = qb.DocType("Payment Ledger Entry")
query = (
@@ -1553,6 +1605,10 @@
& (ple.against_voucher_no == pl_entry.against_voucher_no)
)
)
+
+ if partial_cancel:
+ query = query.where(ple.voucher_detail_no == pl_entry.voucher_detail_no)
+
query.run()
diff --git a/erpnext/accounts/workspace/accounting/accounting.json b/erpnext/accounts/workspace/accounting/accounting.json
index 595efcd..c27ede2 100644
--- a/erpnext/accounts/workspace/accounting/accounting.json
+++ b/erpnext/accounts/workspace/accounting/accounting.json
@@ -5,8 +5,9 @@
"label": "Profit and Loss"
}
],
- "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Accounts\",\"col\":12}},{\"type\":\"chart\",\"data\":{\"chart_name\":\"Profit and Loss\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Chart of Accounts\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Invoice\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Invoice\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Journal Entry\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Payment Entry\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Accounts Receivable\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"General Ledger\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Trial Balance\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Accounting Masters\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"General Ledger\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Accounts Receivable\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Accounts Payable\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Financial Statements\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Multi Currency\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Bank Statement\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Subscription Management\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Share Management\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Cost Center and Budgeting\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Opening and Closing\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Taxes\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Profitability\",\"col\":4}}]",
+ "content": "[{\"id\":\"MmUf9abwxg\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Accounts\",\"col\":12}},{\"id\":\"i0EtSjDAXq\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Profit and Loss\",\"col\":12}},{\"id\":\"X78jcbq1u3\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"vikWSkNm6_\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"pMywM0nhlj\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Chart of Accounts\",\"col\":3}},{\"id\":\"_pRdD6kqUG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Invoice\",\"col\":3}},{\"id\":\"G984SgVRJN\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Invoice\",\"col\":3}},{\"id\":\"1ArNvt9qhz\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Journal Entry\",\"col\":3}},{\"id\":\"F9f4I1viNr\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Payment Entry\",\"col\":3}},{\"id\":\"4IBBOIxfqW\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Accounts Receivable\",\"col\":3}},{\"id\":\"El2anpPaFY\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"General Ledger\",\"col\":3}},{\"id\":\"1nwcM9upJo\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Trial Balance\",\"col\":3}},{\"id\":\"OF9WOi1Ppc\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"iAwpe-Chra\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Accounting\",\"col\":3}},{\"id\":\"B7-uxs8tkU\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"tHb3yxthkR\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"DnNtsmxpty\",\"type\":\"card\",\"data\":{\"card_name\":\"Accounting Masters\",\"col\":4}},{\"id\":\"nKKr6fjgjb\",\"type\":\"card\",\"data\":{\"card_name\":\"General Ledger\",\"col\":4}},{\"id\":\"xOHTyD8b5l\",\"type\":\"card\",\"data\":{\"card_name\":\"Accounts Receivable\",\"col\":4}},{\"id\":\"_Cb7C8XdJJ\",\"type\":\"card\",\"data\":{\"card_name\":\"Accounts Payable\",\"col\":4}},{\"id\":\"p7NY6MHe2Y\",\"type\":\"card\",\"data\":{\"card_name\":\"Financial Statements\",\"col\":4}},{\"id\":\"KlqilF5R_V\",\"type\":\"card\",\"data\":{\"card_name\":\"Taxes\",\"col\":4}},{\"id\":\"jTUy8LB0uw\",\"type\":\"card\",\"data\":{\"card_name\":\"Cost Center and Budgeting\",\"col\":4}},{\"id\":\"Wn2lhs7WLn\",\"type\":\"card\",\"data\":{\"card_name\":\"Multi Currency\",\"col\":4}},{\"id\":\"PAQMqqNkBM\",\"type\":\"card\",\"data\":{\"card_name\":\"Bank Statement\",\"col\":4}},{\"id\":\"Q_hBCnSeJY\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"id\":\"3AK1Zf0oew\",\"type\":\"card\",\"data\":{\"card_name\":\"Profitability\",\"col\":4}},{\"id\":\"kxhoaiqdLq\",\"type\":\"card\",\"data\":{\"card_name\":\"Opening and Closing\",\"col\":4}},{\"id\":\"q0MAlU2j_Z\",\"type\":\"card\",\"data\":{\"card_name\":\"Subscription Management\",\"col\":4}},{\"id\":\"ptm7T6Hwu-\",\"type\":\"card\",\"data\":{\"card_name\":\"Share Management\",\"col\":4}},{\"id\":\"OX7lZHbiTr\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
"creation": "2020-03-02 15:41:59.515192",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
@@ -1060,10 +1061,11 @@
"type": "Link"
}
],
- "modified": "2023-02-23 15:32:12.135355",
+ "modified": "2023-07-04 14:32:15.842044",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
@@ -1073,6 +1075,13 @@
"sequence_id": 2.0,
"shortcuts": [
{
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "Learn Accounting",
+ "type": "URL",
+ "url": "https://frappe.school/courses/erpnext-accounting?utm_source=in_app"
+ },
+ {
"label": "Chart of Accounts",
"link_to": "Account",
"type": "DocType"
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index b9f16a7..43920ad 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -41,6 +41,8 @@
},
setup: function(frm) {
+ frm.ignore_doctypes_on_cancel_all = ['Journal Entry'];
+
frm.make_methods = {
'Asset Movement': () => {
frappe.call({
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 6001254..42f5311 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -783,7 +783,7 @@
je.voucher_type = "Depreciation Entry"
je.naming_series = depreciation_series
je.company = asset.company
- je.remark = "Depreciation Entry against asset {0}".format(asset_name)
+ je.remark = _("Depreciation Entry against asset {0}").format(asset_name)
je.append(
"accounts",
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 028e3d6..e1431ea 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -40,6 +40,7 @@
date = today()
failed_asset_names = []
+ error_log_names = []
for asset_name in get_depreciable_assets(date):
asset_doc = frappe.get_doc("Asset", asset_name)
@@ -50,10 +51,12 @@
except Exception as e:
frappe.db.rollback()
failed_asset_names.append(asset_name)
+ error_log = frappe.log_error(e)
+ error_log_names.append(error_log.name)
if failed_asset_names:
set_depr_entry_posting_status_for_failed_assets(failed_asset_names)
- notify_depr_entry_posting_error(failed_asset_names)
+ notify_depr_entry_posting_error(failed_asset_names, error_log_names)
frappe.db.commit()
@@ -157,16 +160,17 @@
je.append("accounts", debit_entry)
je.flags.ignore_permissions = True
+ je.flags.planned_depr_entry = True
je.save()
- if not je.meta.get_workflow():
- je.submit()
d.db_set("journal_entry", je.name)
- idx = cint(asset_depr_schedule_doc.finance_book_id)
- row = asset.get("finance_books")[idx - 1]
- row.value_after_depreciation -= d.depreciation_amount
- row.db_update()
+ if not je.meta.get_workflow():
+ je.submit()
+ idx = cint(asset_depr_schedule_doc.finance_book_id)
+ row = asset.get("finance_books")[idx - 1]
+ row.value_after_depreciation -= d.depreciation_amount
+ row.db_update()
asset.db_set("depr_entry_posting_status", "Successful")
@@ -238,7 +242,7 @@
frappe.db.set_value("Asset", asset_name, "depr_entry_posting_status", "Failed")
-def notify_depr_entry_posting_error(failed_asset_names):
+def notify_depr_entry_posting_error(failed_asset_names, error_log_names):
recipients = get_users_with_role("Accounts Manager")
if not recipients:
@@ -246,7 +250,8 @@
subject = _("Error while posting depreciation entries")
- asset_links = get_comma_separated_asset_links(failed_asset_names)
+ asset_links = get_comma_separated_links(failed_asset_names, "Asset")
+ error_log_links = get_comma_separated_links(error_log_names, "Error Log")
message = (
_("Hello,")
@@ -256,23 +261,26 @@
)
+ "."
+ "<br><br>"
- + _(
- "Please raise a support ticket and share this email, or forward this email to your development team so that they can find the issue in the developer console by manually creating the depreciation entry via the asset's depreciation schedule table."
+ + _("Here are the error logs for the aforementioned failed depreciation entries: {0}").format(
+ error_log_links
)
+ + "."
+ + "<br><br>"
+ + _("Please share this email with your support team so that they can find and fix the issue.")
)
frappe.sendmail(recipients=recipients, subject=subject, message=message)
-def get_comma_separated_asset_links(asset_names):
- asset_links = []
+def get_comma_separated_links(names, doctype):
+ links = []
- for asset_name in asset_names:
- asset_links.append(get_link_to_form("Asset", asset_name))
+ for name in names:
+ links.append(get_link_to_form(doctype, name))
- asset_links = ", ".join(asset_links)
+ links = ", ".join(links)
- return asset_links
+ return links
@frappe.whitelist()
@@ -306,7 +314,7 @@
je.company = asset.company
je.remark = "Scrap Entry for asset {0}".format(asset_name)
- for entry in get_gl_entries_on_asset_disposal(asset):
+ for entry in get_gl_entries_on_asset_disposal(asset, date):
entry.update({"reference_type": "Asset", "reference_name": asset_name})
je.append("accounts", entry)
@@ -433,8 +441,11 @@
def get_gl_entries_on_asset_regain(
- asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None
+ asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None, date=None
):
+ if not date:
+ date = getdate()
+
(
fixed_asset_account,
asset,
@@ -452,7 +463,7 @@
"debit_in_account_currency": asset.gross_purchase_amount,
"debit": asset.gross_purchase_amount,
"cost_center": depreciation_cost_center,
- "posting_date": getdate(),
+ "posting_date": date,
},
item=asset,
),
@@ -462,7 +473,7 @@
"credit_in_account_currency": accumulated_depr_amount,
"credit": accumulated_depr_amount,
"cost_center": depreciation_cost_center,
- "posting_date": getdate(),
+ "posting_date": date,
},
item=asset,
),
@@ -471,7 +482,7 @@
profit_amount = abs(flt(value_after_depreciation)) - abs(flt(selling_amount))
if profit_amount:
get_profit_gl_entries(
- asset, profit_amount, gl_entries, disposal_account, depreciation_cost_center
+ asset, profit_amount, gl_entries, disposal_account, depreciation_cost_center, date
)
if voucher_type and voucher_no:
@@ -483,8 +494,11 @@
def get_gl_entries_on_asset_disposal(
- asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None
+ asset, selling_amount=0, finance_book=None, voucher_type=None, voucher_no=None, date=None
):
+ if not date:
+ date = getdate()
+
(
fixed_asset_account,
asset,
@@ -502,26 +516,30 @@
"credit_in_account_currency": asset.gross_purchase_amount,
"credit": asset.gross_purchase_amount,
"cost_center": depreciation_cost_center,
- "posting_date": getdate(),
- },
- item=asset,
- ),
- asset.get_gl_dict(
- {
- "account": accumulated_depr_account,
- "debit_in_account_currency": accumulated_depr_amount,
- "debit": accumulated_depr_amount,
- "cost_center": depreciation_cost_center,
- "posting_date": getdate(),
+ "posting_date": date,
},
item=asset,
),
]
+ if accumulated_depr_amount:
+ gl_entries.append(
+ asset.get_gl_dict(
+ {
+ "account": accumulated_depr_account,
+ "debit_in_account_currency": accumulated_depr_amount,
+ "debit": accumulated_depr_amount,
+ "cost_center": depreciation_cost_center,
+ "posting_date": date,
+ },
+ item=asset,
+ ),
+ )
+
profit_amount = flt(selling_amount) - flt(value_after_depreciation)
if profit_amount:
get_profit_gl_entries(
- asset, profit_amount, gl_entries, disposal_account, depreciation_cost_center
+ asset, profit_amount, gl_entries, disposal_account, depreciation_cost_center, date
)
if voucher_type and voucher_no:
@@ -555,8 +573,11 @@
def get_profit_gl_entries(
- asset, profit_amount, gl_entries, disposal_account, depreciation_cost_center
+ asset, profit_amount, gl_entries, disposal_account, depreciation_cost_center, date=None
):
+ if not date:
+ date = getdate()
+
debit_or_credit = "debit" if profit_amount < 0 else "credit"
gl_entries.append(
asset.get_gl_dict(
@@ -565,7 +586,7 @@
"cost_center": depreciation_cost_center,
debit_or_credit: abs(profit_amount),
debit_or_credit + "_in_account_currency": abs(profit_amount),
- "posting_date": getdate(),
+ "posting_date": date,
},
item=asset,
)
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index cde0280..2a74f20 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -356,6 +356,83 @@
si.cancel()
self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Partially Depreciated")
+ def test_gle_made_by_asset_sale_for_existing_asset(self):
+ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+
+ asset = create_asset(
+ calculate_depreciation=1,
+ available_for_use_date="2020-04-01",
+ purchase_date="2020-04-01",
+ expected_value_after_useful_life=0,
+ total_number_of_depreciations=5,
+ number_of_depreciations_booked=2,
+ frequency_of_depreciation=12,
+ depreciation_start_date="2023-03-31",
+ opening_accumulated_depreciation=24000,
+ gross_purchase_amount=60000,
+ submit=1,
+ )
+
+ expected_depr_values = [
+ ["2023-03-31", 12000, 36000],
+ ["2024-03-31", 12000, 48000],
+ ["2025-03-31", 12000, 60000],
+ ]
+
+ first_asset_depr_schedule = get_depr_schedule(asset.name, "Active")
+
+ for i, schedule in enumerate(first_asset_depr_schedule):
+ self.assertEqual(getdate(expected_depr_values[i][0]), schedule.schedule_date)
+ self.assertEqual(expected_depr_values[i][1], schedule.depreciation_amount)
+ self.assertEqual(expected_depr_values[i][2], schedule.accumulated_depreciation_amount)
+
+ post_depreciation_entries(date="2023-03-31")
+
+ si = create_sales_invoice(
+ item_code="Macbook Pro", asset=asset.name, qty=1, rate=40000, posting_date=getdate("2023-05-23")
+ )
+ asset.load_from_db()
+
+ self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
+
+ expected_values = [["2023-03-31", 12000, 36000], ["2023-05-23", 1742.47, 37742.47]]
+
+ second_asset_depr_schedule = get_depr_schedule(asset.name, "Active")
+
+ for i, schedule in enumerate(second_asset_depr_schedule):
+ self.assertEqual(getdate(expected_values[i][0]), schedule.schedule_date)
+ self.assertEqual(expected_values[i][1], schedule.depreciation_amount)
+ self.assertEqual(expected_values[i][2], schedule.accumulated_depreciation_amount)
+ self.assertTrue(schedule.journal_entry)
+
+ expected_gle = (
+ (
+ "_Test Accumulated Depreciations - _TC",
+ 37742.47,
+ 0.0,
+ ),
+ (
+ "_Test Fixed Asset - _TC",
+ 0.0,
+ 60000.0,
+ ),
+ (
+ "_Test Gain/Loss on Asset Disposal - _TC",
+ 0.0,
+ 17742.47,
+ ),
+ ("Debtors - _TC", 40000.0, 0.0),
+ )
+
+ gle = frappe.db.sql(
+ """select account, debit, credit from `tabGL Entry`
+ where voucher_type='Sales Invoice' and voucher_no = %s
+ order by account""",
+ si.name,
+ )
+
+ self.assertSequenceEqual(gle, expected_gle)
+
def test_asset_with_maintenance_required_status_after_sale(self):
asset = create_asset(
calculate_depreciation=1,
@@ -691,7 +768,7 @@
)
self.assertEqual(asset.status, "Draft")
- expected_schedules = [["2032-12-31", 30000.0, 77095.89], ["2033-06-06", 12904.11, 90000.0]]
+ expected_schedules = [["2032-12-31", 42904.11, 90000.0]]
schedules = [
[cstr(d.schedule_date), flt(d.depreciation_amount, 2), d.accumulated_depreciation_amount]
for d in get_depr_schedule(asset.name, "Draft")
@@ -735,14 +812,14 @@
number_of_depreciations_booked=1,
opening_accumulated_depreciation=50000,
expected_value_after_useful_life=10000,
- depreciation_start_date="2030-12-31",
+ depreciation_start_date="2031-12-31",
total_number_of_depreciations=3,
frequency_of_depreciation=12,
)
self.assertEqual(asset.status, "Draft")
- expected_schedules = [["2030-12-31", 33333.50, 83333.50], ["2031-12-31", 6666.50, 90000.0]]
+ expected_schedules = [["2031-12-31", 33333.50, 83333.50], ["2032-12-31", 6666.50, 90000.0]]
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
@@ -1511,7 +1588,7 @@
)
self.assertEqual(asset.status, "Submitted")
- self.assertEqual(asset.get("value_after_depreciation"), 100000)
+ self.assertEqual(asset.get_value_after_depreciation(), 100000)
jv = make_journal_entry(
"_Test Depreciations - _TC", "_Test Accumulated Depreciations - _TC", 100, save=False
@@ -1524,12 +1601,68 @@
jv.submit()
asset.reload()
- self.assertEqual(asset.get("value_after_depreciation"), 99900)
+ self.assertEqual(asset.get_value_after_depreciation(), 99900)
jv.cancel()
asset.reload()
- self.assertEqual(asset.get("value_after_depreciation"), 100000)
+ self.assertEqual(asset.get_value_after_depreciation(), 100000)
+
+ def test_manual_depreciation_for_depreciable_asset(self):
+ asset = create_asset(
+ item_code="Macbook Pro",
+ calculate_depreciation=1,
+ purchase_date="2020-01-30",
+ available_for_use_date="2020-01-30",
+ expected_value_after_useful_life=10000,
+ total_number_of_depreciations=10,
+ frequency_of_depreciation=1,
+ submit=1,
+ )
+
+ self.assertEqual(asset.status, "Submitted")
+ self.assertEqual(asset.get_value_after_depreciation(), 100000)
+
+ jv = make_journal_entry(
+ "_Test Depreciations - _TC", "_Test Accumulated Depreciations - _TC", 100, save=False
+ )
+ for d in jv.accounts:
+ d.reference_type = "Asset"
+ d.reference_name = asset.name
+ jv.voucher_type = "Depreciation Entry"
+ jv.insert()
+ jv.submit()
+
+ asset.reload()
+ self.assertEqual(asset.get_value_after_depreciation(), 99900)
+
+ jv.cancel()
+
+ asset.reload()
+ self.assertEqual(asset.get_value_after_depreciation(), 100000)
+
+ def test_manual_depreciation_with_incorrect_jv_voucher_type(self):
+ asset = create_asset(
+ item_code="Macbook Pro",
+ calculate_depreciation=1,
+ purchase_date="2020-01-30",
+ available_for_use_date="2020-01-30",
+ expected_value_after_useful_life=10000,
+ total_number_of_depreciations=10,
+ frequency_of_depreciation=1,
+ submit=1,
+ )
+
+ jv = make_journal_entry(
+ "_Test Depreciations - _TC", "_Test Accumulated Depreciations - _TC", 100, save=False
+ )
+ for d in jv.accounts:
+ d.reference_type = "Asset"
+ d.reference_name = asset.name
+ d.account_type = "Depreciation"
+ jv.voucher_type = "Journal Entry"
+
+ self.assertRaises(frappe.ValidationError, jv.insert)
def create_asset_data():
@@ -1671,7 +1804,7 @@
company.save()
# Enable booking asset depreciation entry automatically
- frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
+ frappe.db.set_single_value("Accounts Settings", "book_asset_depreciation_entry_automatically", 1)
def enable_cwip_accounting(asset_category, enable=1):
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index 9c7f70b..6d55d77 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -6,6 +6,7 @@
erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.stock.StockController {
setup() {
+ this.frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle'];
this.setup_posting_date_time_check();
}
@@ -14,7 +15,6 @@
}
refresh() {
- erpnext.hide_company();
this.show_general_ledger();
if ((this.frm.doc.stock_items && this.frm.doc.stock_items.length) || !this.frm.doc.target_is_fixed_asset) {
this.show_stock_ledger();
@@ -64,6 +64,18 @@
};
});
+ me.frm.set_query("serial_and_batch_bundle", "stock_items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
me.frm.set_query("item_code", "stock_items", function() {
return erpnext.queries.item({"is_stock_item": 1});
});
@@ -99,16 +111,23 @@
}
};
});
+
+ let sbb_field = me.frm.get_docfield('stock_items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'warehouse': row.doc.warehouse,
+ 'voucher_type': me.frm.doc.doctype,
+ }
+ };
+ }
}
target_item_code() {
return this.get_target_item_details();
}
- target_asset() {
- return this.get_target_asset_details();
- }
-
item_code(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
if (cdt === "Asset Capitalization Stock Item") {
@@ -223,26 +242,6 @@
}
}
- get_target_asset_details() {
- var me = this;
-
- if (me.frm.doc.target_asset) {
- return me.frm.call({
- method: "erpnext.assets.doctype.asset_capitalization.asset_capitalization.get_target_asset_details",
- child: me.frm.doc,
- args: {
- asset: me.frm.doc.target_asset,
- company: me.frm.doc.company,
- },
- callback: function (r) {
- if (!r.exc) {
- me.frm.refresh_fields();
- }
- }
- });
- }
- }
-
get_consumed_stock_item_details(row) {
var me = this;
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
index d1be575..04b0c4e 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
@@ -11,13 +11,14 @@
"naming_series",
"entry_type",
"target_item_code",
+ "target_asset",
"target_item_name",
"target_is_fixed_asset",
"target_has_batch_no",
"target_has_serial_no",
"column_break_9",
- "target_asset",
"target_asset_name",
+ "target_asset_location",
"target_warehouse",
"target_qty",
"target_stock_uom",
@@ -85,14 +86,13 @@
"fieldtype": "Column Break"
},
{
- "depends_on": "eval:doc.entry_type=='Capitalization'",
"fieldname": "target_asset",
"fieldtype": "Link",
"in_standard_filter": 1,
"label": "Target Asset",
- "mandatory_depends_on": "eval:doc.entry_type=='Capitalization'",
"no_copy": 1,
- "options": "Asset"
+ "options": "Asset",
+ "read_only": 1
},
{
"depends_on": "eval:doc.entry_type=='Capitalization'",
@@ -108,11 +108,11 @@
"fieldtype": "Column Break"
},
{
- "fetch_from": "asset.company",
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
+ "remember_last_selected_value": 1,
"reqd": 1
},
{
@@ -158,7 +158,7 @@
"read_only": 1
},
{
- "depends_on": "eval:doc.docstatus == 0 || (doc.stock_items && doc.stock_items.length)",
+ "depends_on": "eval:doc.entry_type=='Capitalization' && (doc.docstatus == 0 || (doc.stock_items && doc.stock_items.length))",
"fieldname": "section_break_16",
"fieldtype": "Section Break",
"label": "Consumed Stock Items"
@@ -189,7 +189,7 @@
"fieldname": "target_qty",
"fieldtype": "Float",
"label": "Target Qty",
- "read_only_depends_on": "target_is_fixed_asset"
+ "read_only_depends_on": "eval:doc.entry_type=='Capitalization'"
},
{
"fetch_from": "target_item_code.stock_uom",
@@ -227,7 +227,7 @@
"depends_on": "eval:doc.docstatus == 0 || (doc.asset_items && doc.asset_items.length)",
"fieldname": "section_break_26",
"fieldtype": "Section Break",
- "label": "Consumed Asset Items"
+ "label": "Consumed Assets"
},
{
"fieldname": "asset_items",
@@ -266,7 +266,7 @@
"options": "Finance Book"
},
{
- "depends_on": "eval:doc.docstatus == 0 || (doc.service_items && doc.service_items.length)",
+ "depends_on": "eval:doc.entry_type=='Capitalization' && (doc.docstatus == 0 || (doc.service_items && doc.service_items.length))",
"fieldname": "service_expenses_section",
"fieldtype": "Section Break",
"label": "Service Expenses"
@@ -329,12 +329,20 @@
"label": "Target Fixed Asset Account",
"options": "Account",
"read_only": 1
+ },
+ {
+ "depends_on": "eval:doc.entry_type=='Capitalization'",
+ "fieldname": "target_asset_location",
+ "fieldtype": "Link",
+ "label": "Target Asset Location",
+ "mandatory_depends_on": "eval:doc.entry_type=='Capitalization'",
+ "options": "Location"
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-12 15:09:40.771332",
+ "modified": "2023-06-22 14:17:07.995120",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Capitalization",
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
index 5b910db..a883bec 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
@@ -19,9 +19,6 @@
reverse_depreciation_entry_made_after_disposal,
)
from erpnext.assets.doctype.asset_category.asset_category import get_asset_category_account
-from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import (
- make_new_active_asset_depr_schedules_and_cancel_current_ones,
-)
from erpnext.controllers.stock_controller import StockController
from erpnext.setup.doctype.brand.brand import get_brand_defaults
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
@@ -45,7 +42,6 @@
"target_has_batch_no",
"target_stock_uom",
"stock_uom",
- "target_fixed_asset_account",
"fixed_asset_account",
"valuation_rate",
]
@@ -56,7 +52,6 @@
self.validate_posting_time()
self.set_missing_values(for_validate=True)
self.validate_target_item()
- self.validate_target_asset()
self.validate_consumed_stock_item()
self.validate_consumed_asset_item()
self.validate_service_item()
@@ -65,19 +60,29 @@
self.calculate_totals()
self.set_title()
+ def on_update(self):
+ if self.stock_items:
+ self.set_serial_and_batch_bundle(table_name="stock_items")
+
def before_submit(self):
self.validate_source_mandatory()
+ if self.entry_type == "Capitalization":
+ self.create_target_asset()
def on_submit(self):
self.update_stock_ledger()
self.make_gl_entries()
- self.update_target_asset()
def on_cancel(self):
- self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
+ self.ignore_linked_doctypes = (
+ "GL Entry",
+ "Stock Ledger Entry",
+ "Repost Item Valuation",
+ "Serial and Batch Bundle",
+ )
self.update_stock_ledger()
self.make_gl_entries()
- self.update_target_asset()
+ self.restore_consumed_asset_items()
def set_title(self):
self.title = self.target_asset_name or self.target_item_name or self.target_item_code
@@ -88,15 +93,6 @@
if self.meta.has_field(k) and (not self.get(k) or k in force_fields):
self.set(k, v)
- # Remove asset if item not a fixed asset
- if not self.target_is_fixed_asset:
- self.target_asset = None
-
- target_asset_details = get_target_asset_details(self.target_asset, self.company)
- for k, v in target_asset_details.items():
- if self.meta.has_field(k) and (not self.get(k) or k in force_fields):
- self.set(k, v)
-
for d in self.stock_items:
args = self.as_dict()
args.update(d.as_dict())
@@ -148,9 +144,6 @@
if not target_item.is_stock_item:
self.target_warehouse = None
- if not target_item.is_fixed_asset:
- self.target_asset = None
- self.target_fixed_asset_account = None
if not target_item.has_batch_no:
self.target_batch_no = None
if not target_item.has_serial_no:
@@ -161,17 +154,6 @@
self.validate_item(target_item)
- def validate_target_asset(self):
- if self.target_asset:
- target_asset = self.get_asset_for_validation(self.target_asset)
-
- if target_asset.item_code != self.target_item_code:
- frappe.throw(
- _("Asset {0} does not belong to Item {1}").format(self.target_asset, self.target_item_code)
- )
-
- self.validate_asset(target_asset)
-
def validate_consumed_stock_item(self):
for d in self.stock_items:
if d.item_code:
@@ -316,9 +298,7 @@
for d in self.stock_items:
sle = self.get_sl_entries(
d,
- {
- "actual_qty": -flt(d.stock_qty),
- },
+ {"actual_qty": -flt(d.stock_qty), "serial_and_batch_bundle": d.serial_and_batch_bundle},
)
sl_entries.append(sle)
@@ -328,8 +308,6 @@
{
"item_code": self.target_item_code,
"warehouse": self.target_warehouse,
- "batch_no": self.target_batch_no,
- "serial_no": self.target_serial_no,
"actual_qty": flt(self.target_qty),
"incoming_rate": flt(self.target_incoming_rate),
},
@@ -381,7 +359,11 @@
gl_entries, target_account, target_against, precision
)
+ if not self.stock_items and not self.service_items and self.are_all_asset_items_non_depreciable:
+ return []
+
self.get_gl_entries_for_target_item(gl_entries, target_against, precision)
+
return gl_entries
def get_target_account(self):
@@ -424,11 +406,14 @@
def get_gl_entries_for_consumed_asset_items(
self, gl_entries, target_account, target_against, precision
):
+ self.are_all_asset_items_non_depreciable = True
+
# Consumed Assets
for item in self.asset_items:
- asset = self.get_asset(item)
+ asset = frappe.get_doc("Asset", item.asset)
if asset.calculate_depreciation:
+ self.are_all_asset_items_non_depreciable = False
notes = _(
"This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
).format(
@@ -443,6 +428,7 @@
item.get("finance_book") or self.get("finance_book"),
self.get("doctype"),
self.get("name"),
+ self.get("posting_date"),
)
asset.db_set("disposal_date", self.posting_date)
@@ -513,40 +499,46 @@
)
)
- def update_target_asset(self):
+ def create_target_asset(self):
total_target_asset_value = flt(self.total_value, self.precision("total_value"))
- if self.docstatus == 1 and self.entry_type == "Capitalization":
- asset_doc = frappe.get_doc("Asset", self.target_asset)
- asset_doc.purchase_date = self.posting_date
- asset_doc.gross_purchase_amount = total_target_asset_value
- asset_doc.purchase_receipt_amount = total_target_asset_value
- notes = _(
- "This schedule was created when target Asset {0} was updated through Asset Capitalization {1}."
- ).format(
- get_link_to_form(asset_doc.doctype, asset_doc.name), get_link_to_form(self.doctype, self.name)
- )
- make_new_active_asset_depr_schedules_and_cancel_current_ones(asset_doc, notes)
- asset_doc.flags.ignore_validate_update_after_submit = True
- asset_doc.save()
- elif self.docstatus == 2:
- for item in self.asset_items:
- asset = self.get_asset(item)
- asset.db_set("disposal_date", None)
- self.set_consumed_asset_status(asset)
+ asset_doc = frappe.new_doc("Asset")
+ asset_doc.company = self.company
+ asset_doc.item_code = self.target_item_code
+ asset_doc.is_existing_asset = 1
+ asset_doc.location = self.target_asset_location
+ asset_doc.available_for_use_date = self.posting_date
+ asset_doc.purchase_date = self.posting_date
+ asset_doc.gross_purchase_amount = total_target_asset_value
+ asset_doc.purchase_receipt_amount = total_target_asset_value
+ asset_doc.flags.ignore_validate = True
+ asset_doc.insert()
- if asset.calculate_depreciation:
- reverse_depreciation_entry_made_after_disposal(asset, self.posting_date)
- notes = _(
- "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
- ).format(
- get_link_to_form(asset.doctype, asset.name), get_link_to_form(self.doctype, self.name)
- )
- reset_depreciation_schedule(asset, self.posting_date, notes)
+ self.target_asset = asset_doc.name
- def get_asset(self, item):
- asset = frappe.get_doc("Asset", item.asset)
- self.check_finance_books(item, asset)
- return asset
+ self.target_fixed_asset_account = get_asset_category_account(
+ "fixed_asset_account", item=self.target_item_code, company=asset_doc.company
+ )
+
+ frappe.msgprint(
+ _(
+ "Asset {0} has been created. Please set the depreciation details if any and submit it."
+ ).format(get_link_to_form("Asset", asset_doc.name))
+ )
+
+ def restore_consumed_asset_items(self):
+ for item in self.asset_items:
+ asset = frappe.get_doc("Asset", item.asset)
+ asset.db_set("disposal_date", None)
+ self.set_consumed_asset_status(asset)
+
+ if asset.calculate_depreciation:
+ reverse_depreciation_entry_made_after_disposal(asset, self.posting_date)
+ notes = _(
+ "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
+ ).format(
+ get_link_to_form(asset.doctype, asset.name), get_link_to_form(self.doctype, self.name)
+ )
+ reset_depreciation_schedule(asset, self.posting_date, notes)
def set_consumed_asset_status(self, asset):
if self.docstatus == 1:
@@ -597,33 +589,6 @@
@frappe.whitelist()
-def get_target_asset_details(asset=None, company=None):
- out = frappe._dict()
-
- # Get Asset Details
- asset_details = frappe._dict()
- if asset:
- asset_details = frappe.db.get_value("Asset", asset, ["asset_name", "item_code"], as_dict=1)
- if not asset_details:
- frappe.throw(_("Asset {0} does not exist").format(asset))
-
- # Re-set item code from Asset
- out.target_item_code = asset_details.item_code
-
- # Set Asset Details
- out.asset_name = asset_details.asset_name
-
- if asset_details.item_code:
- out.target_fixed_asset_account = get_asset_category_account(
- "fixed_asset_account", item=asset_details.item_code, company=company
- )
- else:
- out.target_fixed_asset_account = None
-
- return out
-
-
-@frappe.whitelist()
def get_consumed_stock_item_details(args):
if isinstance(args, str):
args = json.loads(args)
diff --git a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
index 4d519a6..6e0a685 100644
--- a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
+++ b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
@@ -16,6 +16,11 @@
get_asset_depr_schedule_doc,
)
from erpnext.stock.doctype.item.test_item import create_item
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
class TestAssetCapitalization(unittest.TestCase):
@@ -42,13 +47,6 @@
total_amount = 103000
- # Create assets
- target_asset = create_asset(
- asset_name="Asset Capitalization Target Asset",
- submit=1,
- warehouse="Stores - TCP1",
- company=company,
- )
consumed_asset = create_asset(
asset_name="Asset Capitalization Consumable Asset",
asset_value=consumed_asset_value,
@@ -60,7 +58,8 @@
# Create and submit Asset Captitalization
asset_capitalization = create_asset_capitalization(
entry_type="Capitalization",
- target_asset=target_asset.name,
+ target_item_code="Macbook Pro",
+ target_asset_location="Test Location",
stock_qty=stock_qty,
stock_rate=stock_rate,
consumed_asset=consumed_asset.name,
@@ -89,7 +88,7 @@
self.assertEqual(asset_capitalization.target_incoming_rate, total_amount)
# Test Target Asset values
- target_asset.reload()
+ target_asset = frappe.get_doc("Asset", asset_capitalization.target_asset)
self.assertEqual(target_asset.gross_purchase_amount, total_amount)
self.assertEqual(target_asset.purchase_receipt_amount, total_amount)
@@ -137,13 +136,6 @@
total_amount = 103000
- # Create assets
- target_asset = create_asset(
- asset_name="Asset Capitalization Target Asset",
- submit=1,
- warehouse="Stores - _TC",
- company=company,
- )
consumed_asset = create_asset(
asset_name="Asset Capitalization Consumable Asset",
asset_value=consumed_asset_value,
@@ -155,7 +147,8 @@
# Create and submit Asset Captitalization
asset_capitalization = create_asset_capitalization(
entry_type="Capitalization",
- target_asset=target_asset.name,
+ target_item_code="Macbook Pro",
+ target_asset_location="Test Location",
stock_qty=stock_qty,
stock_rate=stock_rate,
consumed_asset=consumed_asset.name,
@@ -184,7 +177,7 @@
self.assertEqual(asset_capitalization.target_incoming_rate, total_amount)
# Test Target Asset values
- target_asset.reload()
+ target_asset = frappe.get_doc("Asset", asset_capitalization.target_asset)
self.assertEqual(target_asset.gross_purchase_amount, total_amount)
self.assertEqual(target_asset.purchase_receipt_amount, total_amount)
@@ -359,6 +352,7 @@
"posting_time": args.posting_time or now.strftime("%H:%M:%S.%f"),
"target_item_code": target_item_code,
"target_asset": target_asset.name,
+ "target_asset_location": "Test Location",
"target_warehouse": target_warehouse,
"target_qty": flt(args.target_qty) or 1,
"target_batch_no": args.target_batch_no,
@@ -371,14 +365,32 @@
asset_capitalization.set_posting_time = 1
if flt(args.stock_rate):
+ bundle = None
+ if args.stock_batch_no or args.stock_serial_no:
+ bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": args.stock_item,
+ "warehouse": source_warehouse,
+ "company": frappe.get_cached_value("Warehouse", source_warehouse, "company"),
+ "qty": (flt(args.stock_qty) or 1) * -1,
+ "voucher_type": "Asset Capitalization",
+ "type_of_transaction": "Outward",
+ "serial_nos": args.stock_serial_no,
+ "posting_date": asset_capitalization.posting_date,
+ "posting_time": asset_capitalization.posting_time,
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
asset_capitalization.append(
"stock_items",
{
"item_code": args.stock_item or "Capitalization Source Stock Item",
"warehouse": source_warehouse,
"stock_qty": flt(args.stock_qty) or 1,
- "batch_no": args.stock_batch_no,
- "serial_no": args.stock_serial_no,
+ "serial_and_batch_bundle": bundle,
},
)
diff --git a/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json b/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
index 14eb0f6..26e1c3c 100644
--- a/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+++ b/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
@@ -17,8 +17,9 @@
"valuation_rate",
"amount",
"batch_and_serial_no_section",
- "batch_no",
+ "serial_and_batch_bundle",
"column_break_13",
+ "batch_no",
"serial_no",
"accounting_dimensions_section",
"cost_center",
@@ -41,7 +42,10 @@
"fieldname": "batch_no",
"fieldtype": "Link",
"label": "Batch No",
- "options": "Batch"
+ "no_copy": 1,
+ "options": "Batch",
+ "print_hide": 1,
+ "read_only": 1
},
{
"fieldname": "section_break_6",
@@ -100,7 +104,10 @@
{
"fieldname": "serial_no",
"fieldtype": "Small Text",
- "label": "Serial No"
+ "hidden": 1,
+ "label": "Serial No",
+ "print_hide": 1,
+ "read_only": 1
},
{
"fieldname": "item_code",
@@ -139,12 +146,20 @@
{
"fieldname": "dimension_col_break",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-09-08 15:56:20.230548",
+ "modified": "2023-04-06 01:10:17.947952",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Capitalization Stock Item",
@@ -152,5 +167,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_category/asset_category.py b/erpnext/assets/doctype/asset_category/asset_category.py
index a4d2c82..2e1def9 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.py
+++ b/erpnext/assets/doctype/asset_category/asset_category.py
@@ -96,7 +96,6 @@
frappe.throw(msg, title=_("Missing Account"))
-@frappe.whitelist()
def get_asset_category_account(
fieldname, item=None, asset=None, account=None, asset_category=None, company=None
):
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
index 116593a..deae8c7 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
@@ -10,6 +10,7 @@
cint,
date_diff,
flt,
+ get_first_day,
get_last_day,
getdate,
is_last_day_of_the_month,
@@ -246,13 +247,12 @@
if should_get_last_day:
schedule_date = get_last_day(schedule_date)
- # schedule date will be a year later from start date
- # so monthly schedule date is calculated by removing 11 months from it
- monthly_schedule_date = add_months(schedule_date, -row.frequency_of_depreciation + 1)
-
# if asset is being sold or scrapped
if date_of_disposal:
- from_date = asset_doc.available_for_use_date
+ from_date = add_months(
+ getdate(asset_doc.available_for_use_date),
+ (asset_doc.number_of_depreciations_booked * row.frequency_of_depreciation),
+ )
if self.depreciation_schedule:
from_date = self.depreciation_schedule[-1].schedule_date
@@ -273,9 +273,9 @@
# For first row
if (
- (has_pro_rata or has_wdv_or_dd_non_yearly_pro_rata)
+ n == 0
+ and (has_pro_rata or has_wdv_or_dd_non_yearly_pro_rata)
and not self.opening_accumulated_depreciation
- and n == 0
):
from_date = add_days(
asset_doc.available_for_use_date, -1
@@ -287,11 +287,26 @@
row.depreciation_start_date,
has_wdv_or_dd_non_yearly_pro_rata,
)
-
- # For first depr schedule date will be the start date
- # so monthly schedule date is calculated by removing
- # month difference between use date and start date
- monthly_schedule_date = add_months(row.depreciation_start_date, -months + 1)
+ elif n == 0 and has_wdv_or_dd_non_yearly_pro_rata and self.opening_accumulated_depreciation:
+ if not is_first_day_of_the_month(getdate(asset_doc.available_for_use_date)):
+ from_date = get_last_day(
+ add_months(
+ getdate(asset_doc.available_for_use_date),
+ ((self.number_of_depreciations_booked - 1) * row.frequency_of_depreciation),
+ )
+ )
+ else:
+ from_date = add_months(
+ getdate(add_days(asset_doc.available_for_use_date, -1)),
+ (self.number_of_depreciations_booked * row.frequency_of_depreciation),
+ )
+ depreciation_amount, days, months = _get_pro_rata_amt(
+ row,
+ depreciation_amount,
+ from_date,
+ row.depreciation_start_date,
+ has_wdv_or_dd_non_yearly_pro_rata,
+ )
# For last row
elif has_pro_rata and n == cint(number_of_pending_depreciations) - 1:
@@ -316,9 +331,7 @@
depreciation_amount_without_pro_rata, depreciation_amount
)
- monthly_schedule_date = add_months(schedule_date, 1)
schedule_date = add_days(schedule_date, days)
- last_schedule_date = schedule_date
if not depreciation_amount:
continue
@@ -337,7 +350,7 @@
depreciation_amount += value_after_depreciation - row.expected_value_after_useful_life
skip_row = True
- if depreciation_amount > 0:
+ if flt(depreciation_amount, asset_doc.precision("gross_purchase_amount")) > 0:
self.add_depr_schedule_row(
schedule_date,
depreciation_amount,
@@ -521,9 +534,11 @@
)
# if the Depreciation Schedule is being prepared for the first time
else:
- return (flt(asset.gross_purchase_amount) - flt(row.expected_value_after_useful_life)) / flt(
- row.total_number_of_depreciations
- )
+ return (
+ flt(asset.gross_purchase_amount)
+ - flt(asset.opening_accumulated_depreciation)
+ - flt(row.expected_value_after_useful_life)
+ ) / flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked)
def get_wdv_or_dd_depr_amount(
@@ -702,3 +717,9 @@
["status", "=", status],
],
)
+
+
+def is_first_day_of_the_month(date):
+ first_day_of_the_month = get_first_day(date)
+
+ return getdate(first_day_of_the_month) == getdate(date)
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
index 8303141..641d35f 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
@@ -42,7 +42,6 @@
maintenance_log.db_set("maintenance_status", "Cancelled")
-@frappe.whitelist()
def assign_tasks(asset_maintenance_name, assign_to_member, maintenance_task, next_due_date):
team_member = frappe.db.get_value("User", assign_to_member, "email")
args = {
diff --git a/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py
index e40a551..23088c9 100644
--- a/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py
+++ b/erpnext/assets/doctype/asset_maintenance/test_asset_maintenance.py
@@ -182,4 +182,4 @@
company.save()
# Enable booking asset depreciation entry automatically
- frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
+ frappe.db.set_single_value("Accounts Settings", "book_asset_depreciation_entry_automatically", 1)
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.js b/erpnext/assets/doctype/asset_movement/asset_movement.js
index 2df7db9..4ccc3f8 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.js
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.js
@@ -63,26 +63,28 @@
fieldnames_to_be_altered = {
target_location: { read_only: 0, reqd: 1 },
source_location: { read_only: 1, reqd: 0 },
- from_employee: { read_only: 0, reqd: 1 },
+ from_employee: { read_only: 0, reqd: 0 },
to_employee: { read_only: 1, reqd: 0 }
};
}
else if (frm.doc.purpose === 'Issue') {
fieldnames_to_be_altered = {
target_location: { read_only: 1, reqd: 0 },
- source_location: { read_only: 1, reqd: 1 },
+ source_location: { read_only: 1, reqd: 0 },
from_employee: { read_only: 1, reqd: 0 },
to_employee: { read_only: 0, reqd: 1 }
};
}
- Object.keys(fieldnames_to_be_altered).forEach(fieldname => {
- let property_to_be_altered = fieldnames_to_be_altered[fieldname];
- Object.keys(property_to_be_altered).forEach(property => {
- let value = property_to_be_altered[property];
- frm.set_df_property(fieldname, property, value, cdn, 'assets');
+ if (fieldnames_to_be_altered) {
+ Object.keys(fieldnames_to_be_altered).forEach(fieldname => {
+ let property_to_be_altered = fieldnames_to_be_altered[fieldname];
+ Object.keys(property_to_be_altered).forEach(property => {
+ let value = property_to_be_altered[property];
+ frm.fields_dict['assets'].grid.update_docfield_property(fieldname, property, value);
+ });
});
- });
- frm.refresh_field('assets');
+ frm.refresh_field('assets');
+ }
}
});
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.json b/erpnext/assets/doctype/asset_movement/asset_movement.json
index bdce639..5382f9e 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.json
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.json
@@ -37,6 +37,7 @@
"reqd": 1
},
{
+ "default": "Now",
"fieldname": "transaction_date",
"fieldtype": "Datetime",
"in_list_view": 1,
@@ -95,10 +96,11 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2021-01-22 12:30:55.295670",
+ "modified": "2023-06-28 16:54:26.571083",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Movement",
+ "naming_rule": "Expression",
"owner": "Administrator",
"permissions": [
{
@@ -148,5 +150,6 @@
}
],
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
index 143f215..22055dc 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.py
@@ -28,25 +28,20 @@
def validate_location(self):
for d in self.assets:
if self.purpose in ["Transfer", "Issue"]:
- if not d.source_location:
- d.source_location = frappe.db.get_value("Asset", d.asset, "location")
-
- if not d.source_location:
- frappe.throw(_("Source Location is required for the Asset {0}").format(d.asset))
-
+ current_location = frappe.db.get_value("Asset", d.asset, "location")
if d.source_location:
- current_location = frappe.db.get_value("Asset", d.asset, "location")
-
if current_location != d.source_location:
frappe.throw(
_("Asset {0} does not belongs to the location {1}").format(d.asset, d.source_location)
)
+ else:
+ d.source_location = current_location
if self.purpose == "Issue":
if d.target_location:
frappe.throw(
_(
- "Issuing cannot be done to a location. Please enter employee who has issued Asset {0}"
+ "Issuing cannot be done to a location. Please enter employee to issue the Asset {0} to"
).format(d.asset),
title=_("Incorrect Movement Purpose"),
)
@@ -67,29 +62,20 @@
frappe.throw(_("Source and Target Location cannot be same"))
if self.purpose == "Receipt":
- # only when asset is bought and first entry is made
- if not d.source_location and not (d.target_location or d.to_employee):
+ if not (d.source_location or d.from_employee) and not (d.target_location or d.to_employee):
frappe.throw(
_("Target Location or To Employee is required while receiving Asset {0}").format(d.asset)
)
- elif d.source_location:
- # when asset is received from an employee
- if d.target_location and not d.from_employee:
- frappe.throw(
- _("From employee is required while receiving Asset {0} to a target location").format(
- d.asset
- )
- )
- if d.from_employee and not d.target_location:
- frappe.throw(
- _("Target Location is required while receiving Asset {0} from an employee").format(d.asset)
- )
- if d.to_employee and d.target_location:
- frappe.throw(
- _(
- "Asset {0} cannot be received at a location and given to employee in a single movement"
- ).format(d.asset)
- )
+ elif d.from_employee and not d.target_location:
+ frappe.throw(
+ _("Target Location is required while receiving Asset {0} from an employee").format(d.asset)
+ )
+ elif d.to_employee and d.target_location:
+ frappe.throw(
+ _(
+ "Asset {0} cannot be received at a location and given to an employee in a single movement"
+ ).format(d.asset)
+ )
def validate_employee(self):
for d in self.assets:
@@ -107,12 +93,12 @@
)
def on_submit(self):
- self.set_latest_location_in_asset()
+ self.set_latest_location_and_custodian_in_asset()
def on_cancel(self):
- self.set_latest_location_in_asset()
+ self.set_latest_location_and_custodian_in_asset()
- def set_latest_location_in_asset(self):
+ def set_latest_location_and_custodian_in_asset(self):
current_location, current_employee = "", ""
cond = "1=1"
diff --git a/erpnext/assets/doctype/asset_movement/test_asset_movement.py b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
index 72c0575..27e7e55 100644
--- a/erpnext/assets/doctype/asset_movement/test_asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
@@ -47,7 +47,7 @@
if not frappe.db.exists("Location", "Test Location 2"):
frappe.get_doc({"doctype": "Location", "location_name": "Test Location 2"}).insert()
- movement1 = create_asset_movement(
+ create_asset_movement(
purpose="Transfer",
company=asset.company,
assets=[
@@ -58,7 +58,7 @@
)
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location 2")
- create_asset_movement(
+ movement1 = create_asset_movement(
purpose="Transfer",
company=asset.company,
assets=[
@@ -70,21 +70,32 @@
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
movement1.cancel()
- self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
+ self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location 2")
employee = make_employee("testassetmovemp@example.com", company="_Test Company")
create_asset_movement(
purpose="Issue",
company=asset.company,
- assets=[{"asset": asset.name, "source_location": "Test Location", "to_employee": employee}],
+ assets=[{"asset": asset.name, "source_location": "Test Location 2", "to_employee": employee}],
reference_doctype="Purchase Receipt",
reference_name=pr.name,
)
- # after issuing asset should belong to an employee not at a location
+ # after issuing, asset should belong to an employee not at a location
self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), None)
self.assertEqual(frappe.db.get_value("Asset", asset.name, "custodian"), employee)
+ create_asset_movement(
+ purpose="Receipt",
+ company=asset.company,
+ assets=[{"asset": asset.name, "from_employee": employee, "target_location": "Test Location"}],
+ reference_doctype="Purchase Receipt",
+ reference_name=pr.name,
+ )
+
+ # after receiving, asset should belong to a location not at an employee
+ self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
+
def test_last_movement_cancellation(self):
pr = make_purchase_receipt(
item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location"
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js
index f9ed2cc..dae993a 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.js
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.js
@@ -28,6 +28,28 @@
}
};
};
+
+ frm.set_query("serial_and_batch_bundle", "stock_items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('stock_items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
},
refresh: function(frm) {
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py
index a913ee4..f649e51 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.py
@@ -147,6 +147,8 @@
)
for stock_item in self.get("stock_items"):
+ self.validate_serial_no(stock_item)
+
stock_entry.append(
"items",
{
@@ -154,7 +156,7 @@
"item_code": stock_item.item_code,
"qty": stock_item.consumed_quantity,
"basic_rate": stock_item.valuation_rate,
- "serial_no": stock_item.serial_no,
+ "serial_no": stock_item.serial_and_batch_bundle,
"cost_center": self.cost_center,
"project": self.project,
},
@@ -165,6 +167,23 @@
self.db_set("stock_entry", stock_entry.name)
+ def validate_serial_no(self, stock_item):
+ if not stock_item.serial_and_batch_bundle and frappe.get_cached_value(
+ "Item", stock_item.item_code, "has_serial_no"
+ ):
+ msg = f"Serial No Bundle is mandatory for Item {stock_item.item_code}"
+ frappe.throw(msg, title=_("Missing Serial No Bundle"))
+
+ if stock_item.serial_and_batch_bundle:
+ values_to_update = {
+ "type_of_transaction": "Outward",
+ "voucher_type": "Stock Entry",
+ }
+
+ frappe.db.set_value(
+ "Serial and Batch Bundle", stock_item.serial_and_batch_bundle, values_to_update
+ )
+
def increase_stock_quantity(self):
if self.stock_entry:
stock_entry = frappe.get_doc("Stock Entry", self.stock_entry)
diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
index a9d0b25..b3e0954 100644
--- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -4,7 +4,7 @@
import unittest
import frappe
-from frappe.utils import flt, nowdate
+from frappe.utils import flt, nowdate, nowtime, today
from erpnext.assets.doctype.asset.asset import (
get_asset_account,
@@ -19,6 +19,10 @@
get_asset_depr_schedule_doc,
)
from erpnext.stock.doctype.item.test_item import create_item
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
class TestAssetRepair(unittest.TestCase):
@@ -84,19 +88,19 @@
self.assertEqual(stock_entry.items[0].qty, asset_repair.stock_items[0].consumed_quantity)
def test_serialized_item_consumption(self):
- from erpnext.stock.doctype.serial_no.serial_no import SerialNoRequiredError
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
stock_entry = make_serialized_item()
- serial_nos = stock_entry.get("items")[0].serial_no
- serial_no = serial_nos.split("\n")[0]
+ bundle_id = stock_entry.get("items")[0].serial_and_batch_bundle
+ serial_nos = get_serial_nos_from_bundle(bundle_id)
+ serial_no = serial_nos[0]
# should not raise any error
create_asset_repair(
stock_consumption=1,
item_code=stock_entry.get("items")[0].item_code,
warehouse="_Test Warehouse - _TC",
- serial_no=serial_no,
+ serial_no=[serial_no],
submit=1,
)
@@ -108,7 +112,7 @@
)
asset_repair.repair_status = "Completed"
- self.assertRaises(SerialNoRequiredError, asset_repair.submit)
+ self.assertRaises(frappe.ValidationError, asset_repair.submit)
def test_increase_in_asset_value_due_to_stock_consumption(self):
asset = create_asset(calculate_depreciation=1, submit=1)
@@ -290,13 +294,32 @@
asset_repair.warehouse = args.warehouse or create_warehouse(
"Test Warehouse", company=asset.company
)
+
+ bundle = None
+ if args.serial_no:
+ bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": args.item_code,
+ "warehouse": asset_repair.warehouse,
+ "company": frappe.get_cached_value("Warehouse", asset_repair.warehouse, "company"),
+ "qty": (flt(args.stock_qty) or 1) * -1,
+ "voucher_type": "Asset Repair",
+ "type_of_transaction": "Asset Repair",
+ "serial_nos": args.serial_no,
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ }
+ )
+ ).name
+
asset_repair.append(
"stock_items",
{
"item_code": args.item_code or "_Test Stock Item",
"valuation_rate": args.rate if args.get("rate") is not None else 100,
"consumed_quantity": args.qty or 1,
- "serial_no": args.serial_no,
+ "serial_and_batch_bundle": bundle,
},
)
diff --git a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
index 4685a09..6910c2e 100644
--- a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
+++ b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
@@ -9,7 +9,8 @@
"valuation_rate",
"consumed_quantity",
"total_value",
- "serial_no"
+ "serial_no",
+ "serial_and_batch_bundle"
],
"fields": [
{
@@ -34,7 +35,9 @@
{
"fieldname": "serial_no",
"fieldtype": "Small Text",
- "label": "Serial No"
+ "hidden": 1,
+ "label": "Serial No",
+ "print_hide": 1
},
{
"fieldname": "item_code",
@@ -42,12 +45,18 @@
"in_list_view": 1,
"label": "Item",
"options": "Item"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "options": "Serial and Batch Bundle"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-02-08 17:37:20.028290",
+ "modified": "2023-04-06 02:24:20.375870",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset Repair Consumed Item",
@@ -55,5 +64,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
index 0213328..8426ed4 100644
--- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
+++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
@@ -150,7 +150,9 @@
if d.depreciation_method in ("Straight Line", "Manual"):
end_date = max(s.schedule_date for s in depr_schedule)
total_days = date_diff(end_date, self.date)
- rate_per_day = flt(d.value_after_depreciation) / flt(total_days)
+ rate_per_day = flt(d.value_after_depreciation - d.expected_value_after_useful_life) / flt(
+ total_days
+ )
from_date = self.date
else:
no_of_depreciations = len([s.name for s in depr_schedule if not s.journal_entry])
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
index 65a4226..b788a32 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
@@ -20,56 +20,6 @@
default: 'In Location'
},
{
- "fieldname":"filter_based_on",
- "label": __("Period Based On"),
- "fieldtype": "Select",
- "options": ["Fiscal Year", "Date Range"],
- "default": "Fiscal Year",
- "reqd": 1
- },
- {
- "fieldname":"from_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
- "depends_on": "eval: doc.filter_based_on == 'Date Range'",
- "reqd": 1
- },
- {
- "fieldname":"to_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.nowdate(),
- "depends_on": "eval: doc.filter_based_on == 'Date Range'",
- "reqd": 1
- },
- {
- "fieldname":"from_fiscal_year",
- "label": __("Start Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": frappe.defaults.get_user_default("fiscal_year"),
- "depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
- "reqd": 1
- },
- {
- "fieldname":"to_fiscal_year",
- "label": __("End Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": frappe.defaults.get_user_default("fiscal_year"),
- "depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
- "reqd": 1
- },
- {
- "fieldname":"date_based_on",
- "label": __("Date Based On"),
- "fieldtype": "Select",
- "options": ["Purchase Date", "Available For Use Date"],
- "default": "Purchase Date",
- "reqd": 1
- },
- {
fieldname:"asset_category",
label: __("Asset Category"),
fieldtype: "Link",
@@ -90,21 +40,66 @@
reqd: 1
},
{
+ fieldname:"only_existing_assets",
+ label: __("Only existing assets"),
+ fieldtype: "Check"
+ },
+ {
fieldname:"finance_book",
label: __("Finance Book"),
fieldtype: "Link",
options: "Finance Book",
- depends_on: "eval: doc.only_depreciable_assets == 1",
},
{
- fieldname:"only_depreciable_assets",
- label: __("Only depreciable assets"),
- fieldtype: "Check"
+ "fieldname": "include_default_book_assets",
+ "label": __("Include Default Book Assets"),
+ "fieldtype": "Check",
+ "default": 1
},
{
- fieldname:"only_existing_assets",
- label: __("Only existing assets"),
- fieldtype: "Check"
+ "fieldname":"filter_based_on",
+ "label": __("Period Based On"),
+ "fieldtype": "Select",
+ "options": ["--Select a period--", "Fiscal Year", "Date Range"],
+ "default": "--Select a period--",
+ },
+ {
+ "fieldname":"from_date",
+ "label": __("Start Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
+ "depends_on": "eval: doc.filter_based_on == 'Date Range'",
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("End Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.nowdate(),
+ "depends_on": "eval: doc.filter_based_on == 'Date Range'",
+ },
+ {
+ "fieldname":"from_fiscal_year",
+ "label": __("Start Year"),
+ "fieldtype": "Link",
+ "options": "Fiscal Year",
+ "default": frappe.defaults.get_user_default("fiscal_year"),
+ "depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
+ },
+ {
+ "fieldname":"to_fiscal_year",
+ "label": __("End Year"),
+ "fieldtype": "Link",
+ "options": "Fiscal Year",
+ "default": frappe.defaults.get_user_default("fiscal_year"),
+ "depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
+ },
+ {
+ "fieldname":"date_based_on",
+ "label": __("Date Based On"),
+ "fieldtype": "Select",
+ "options": ["Purchase Date", "Available For Use Date"],
+ "default": "Purchase Date",
+ "depends_on": "eval: doc.filter_based_on == 'Date Range' || doc.filter_based_on == 'Fiscal Year'",
},
]
};
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
index 5fbcbe2..6911f94 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@@ -2,9 +2,11 @@
# For license information, please see license.txt
+from itertools import chain
+
import frappe
from frappe import _
-from frappe.query_builder.functions import Sum
+from frappe.query_builder.functions import IfNull, Sum
from frappe.utils import cstr, flt, formatdate, getdate
from erpnext.accounts.report.financial_statements import (
@@ -13,7 +15,6 @@
validate_fiscal_year,
)
from erpnext.assets.doctype.asset.asset import get_asset_value_after_depreciation
-from erpnext.assets.doctype.asset.depreciation import get_depreciation_accounts
def execute(filters=None):
@@ -45,8 +46,6 @@
filters.year_end_date = getdate(fiscal_year.year_end_date)
conditions[date_field] = ["between", [filters.year_start_date, filters.year_end_date]]
- if filters.get("only_depreciable_assets"):
- conditions["calculate_depreciation"] = filters.get("only_depreciable_assets")
if filters.get("only_existing_assets"):
conditions["is_existing_asset"] = filters.get("only_existing_assets")
if filters.get("asset_category"):
@@ -66,11 +65,9 @@
def get_data(filters):
-
data = []
conditions = get_conditions(filters)
- depreciation_amount_map = get_finance_book_value_map(filters)
pr_supplier_map = get_purchase_receipt_supplier_map()
pi_supplier_map = get_purchase_invoice_supplier_map()
@@ -104,20 +101,31 @@
]
assets_record = frappe.db.get_all("Asset", filters=conditions, fields=fields)
- assets_linked_to_fb = None
+ assets_linked_to_fb = get_assets_linked_to_fb(filters)
- if filters.only_depreciable_assets:
- assets_linked_to_fb = frappe.db.get_all(
- doctype="Asset Finance Book",
- filters={"finance_book": filters.finance_book or ("is", "not set")},
- pluck="parent",
- )
+ company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
+
+ if filters.include_default_book_assets and company_fb:
+ finance_book = company_fb
+ elif filters.finance_book:
+ finance_book = filters.finance_book
+ else:
+ finance_book = None
+
+ depreciation_amount_map = get_asset_depreciation_amount_map(filters, finance_book)
for asset in assets_record:
- if assets_linked_to_fb and asset.asset_id not in assets_linked_to_fb:
+ if (
+ assets_linked_to_fb
+ and asset.calculate_depreciation
+ and asset.asset_id not in assets_linked_to_fb
+ ):
continue
- asset_value = get_asset_value_after_depreciation(asset.asset_id, filters.finance_book)
+ asset_value = get_asset_value_after_depreciation(
+ asset.asset_id, finance_book
+ ) or get_asset_value_after_depreciation(asset.asset_id)
+
row = {
"asset_id": asset.asset_id,
"asset_name": asset.asset_name,
@@ -128,7 +136,7 @@
or pi_supplier_map.get(asset.purchase_invoice),
"gross_purchase_amount": asset.gross_purchase_amount,
"opening_accumulated_depreciation": asset.opening_accumulated_depreciation,
- "depreciated_amount": get_depreciation_amount_of_asset(asset, depreciation_amount_map, filters),
+ "depreciated_amount": get_depreciation_amount_of_asset(asset, depreciation_amount_map),
"available_for_use_date": asset.available_for_use_date,
"location": asset.location,
"asset_category": asset.asset_category,
@@ -142,14 +150,23 @@
def prepare_chart_data(data, filters):
labels_values_map = {}
- date_field = frappe.scrub(filters.date_based_on)
+ if filters.filter_based_on not in ("Date Range", "Fiscal Year"):
+ filters_filter_based_on = "Date Range"
+ date_field = "purchase_date"
+ filters_from_date = min(data, key=lambda a: a.get(date_field)).get(date_field)
+ filters_to_date = max(data, key=lambda a: a.get(date_field)).get(date_field)
+ else:
+ filters_filter_based_on = filters.filter_based_on
+ date_field = frappe.scrub(filters.date_based_on)
+ filters_from_date = filters.from_date
+ filters_to_date = filters.to_date
period_list = get_period_list(
filters.from_fiscal_year,
filters.to_fiscal_year,
- filters.from_date,
- filters.to_date,
- filters.filter_based_on,
+ filters_from_date,
+ filters_to_date,
+ filters_filter_based_on,
"Monthly",
company=filters.company,
ignore_fiscal_year=True,
@@ -186,59 +203,76 @@
}
-def get_depreciation_amount_of_asset(asset, depreciation_amount_map, filters):
- if asset.calculate_depreciation:
- depr_amount = depreciation_amount_map.get(asset.asset_id) or 0.0
- else:
- depr_amount = get_manual_depreciation_amount_of_asset(asset, filters)
+def get_assets_linked_to_fb(filters):
+ afb = frappe.qb.DocType("Asset Finance Book")
- return flt(depr_amount, 2)
-
-
-def get_finance_book_value_map(filters):
- date = filters.to_date if filters.filter_based_on == "Date Range" else filters.year_end_date
-
- return frappe._dict(
- frappe.db.sql(
- """ Select
- ads.asset, SUM(depreciation_amount)
- FROM `tabAsset Depreciation Schedule` ads, `tabDepreciation Schedule` ds
- WHERE
- ds.parent = ads.name
- AND ifnull(ads.finance_book, '')=%s
- AND ads.docstatus=1
- AND ds.parentfield='depreciation_schedule'
- AND ds.schedule_date<=%s
- AND ds.journal_entry IS NOT NULL
- GROUP BY ads.asset""",
- (cstr(filters.finance_book or ""), date),
- )
+ query = frappe.qb.from_(afb).select(
+ afb.parent,
)
+ if filters.include_default_book_assets:
+ company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
-def get_manual_depreciation_amount_of_asset(asset, filters):
+ if filters.finance_book and company_fb and cstr(filters.finance_book) != cstr(company_fb):
+ frappe.throw(_("To use a different finance book, please uncheck 'Include Default Book Assets'"))
+
+ query = query.where(
+ (afb.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
+ | (afb.finance_book.isnull())
+ )
+ else:
+ query = query.where(
+ (afb.finance_book.isin([cstr(filters.finance_book), ""])) | (afb.finance_book.isnull())
+ )
+
+ assets_linked_to_fb = list(chain(*query.run(as_list=1)))
+
+ return assets_linked_to_fb
+
+
+def get_depreciation_amount_of_asset(asset, depreciation_amount_map):
+ return depreciation_amount_map.get(asset.asset_id) or 0.0
+
+
+def get_asset_depreciation_amount_map(filters, finance_book):
date = filters.to_date if filters.filter_based_on == "Date Range" else filters.year_end_date
- (_, _, depreciation_expense_account) = get_depreciation_accounts(asset)
-
+ asset = frappe.qb.DocType("Asset")
gle = frappe.qb.DocType("GL Entry")
+ aca = frappe.qb.DocType("Asset Category Account")
+ company = frappe.qb.DocType("Company")
- result = (
+ query = (
frappe.qb.from_(gle)
- .select(Sum(gle.debit))
- .where(gle.against_voucher == asset.asset_id)
- .where(gle.account == depreciation_expense_account)
+ .join(asset)
+ .on(gle.against_voucher == asset.name)
+ .join(aca)
+ .on((aca.parent == asset.asset_category) & (aca.company_name == asset.company))
+ .join(company)
+ .on(company.name == asset.company)
+ .select(asset.name.as_("asset"), Sum(gle.debit).as_("depreciation_amount"))
+ .where(
+ gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
+ )
.where(gle.debit != 0)
.where(gle.is_cancelled == 0)
- .where(gle.posting_date <= date)
- ).run()
+ .where(asset.docstatus == 1)
+ .groupby(asset.name)
+ )
- if result and result[0] and result[0][0]:
- depr_amount = result[0][0]
+ if finance_book:
+ query = query.where(
+ (gle.finance_book.isin([cstr(finance_book), ""])) | (gle.finance_book.isnull())
+ )
else:
- depr_amount = 0
+ query = query.where((gle.finance_book.isin([""])) | (gle.finance_book.isnull()))
- return depr_amount
+ if filters.filter_based_on in ("Date Range", "Fiscal Year"):
+ query = query.where(gle.posting_date <= date)
+
+ asset_depr_amount_map = query.run()
+
+ return dict(asset_depr_amount_map)
def get_purchase_receipt_supplier_map():
diff --git a/erpnext/assets/workspace/assets/assets.json b/erpnext/assets/workspace/assets/assets.json
index c07155e..d810eff 100644
--- a/erpnext/assets/workspace/assets/assets.json
+++ b/erpnext/assets/workspace/assets/assets.json
@@ -7,12 +7,14 @@
],
"content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Assets\",\"col\":12}},{\"type\":\"chart\",\"data\":{\"chart_name\":\"Asset Value Analytics\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Asset\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Asset Category\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Fixed Asset Register\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Assets\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Maintenance\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
"creation": "2020-03-02 15:43:27.634865",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "assets",
"idx": 0,
+ "is_hidden": 0,
"label": "Assets",
"links": [
{
@@ -183,13 +185,15 @@
"type": "Link"
}
],
- "modified": "2022-01-13 18:25:41.730628",
+ "modified": "2023-05-24 14:47:20.243146",
"modified_by": "Administrator",
"module": "Assets",
"name": "Assets",
+ "number_cards": [],
"owner": "Administrator",
- "parent_page": "",
+ "parent_page": "Accounting",
"public": 1,
+ "quick_lists": [],
"restrict_to_domain": "",
"roles": [],
"sequence_id": 4.0,
@@ -216,4 +220,4 @@
}
],
"title": "Assets"
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index c6c9f1f..8fa8f30 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -286,7 +286,7 @@
source_name: this.frm.doc.supplier,
target: this.frm,
setters: {
- company: me.frm.doc.company
+ company: this.frm.doc.company
},
get_query_filters: {
docstatus: ["!=", 2],
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 29afc84..b242108 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -157,7 +157,7 @@
"party_account_currency",
"inter_company_order_reference",
"is_old_subcontracting_flow",
- "dashboard"
+ "connections_tab"
],
"fields": [
{
@@ -322,6 +322,7 @@
"fieldtype": "Small Text",
"hidden": 1,
"label": "Customer Mobile No",
+ "options": "Phone",
"print_hide": 1
},
{
@@ -368,6 +369,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Contact Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -495,6 +497,7 @@
"allow_bulk_edit": 1,
"fieldname": "items",
"fieldtype": "Table",
+ "label": "Items",
"oldfieldname": "po_details",
"oldfieldtype": "Table",
"options": "Purchase Order Item",
@@ -1100,8 +1103,7 @@
{
"fieldname": "before_items_section",
"fieldtype": "Section Break",
- "hide_border": 1,
- "label": "Items"
+ "hide_border": 1
},
{
"fieldname": "items_col_break",
@@ -1185,12 +1187,6 @@
"label": "More Info"
},
{
- "fieldname": "dashboard",
- "fieldtype": "Tab Break",
- "label": "Dashboard",
- "show_dashboard": 1
- },
- {
"fieldname": "column_break_7",
"fieldtype": "Column Break"
},
@@ -1265,13 +1261,19 @@
"fieldname": "shipping_address_section",
"fieldtype": "Section Break",
"label": "Shipping Address"
+ },
+ {
+ "fieldname": "connections_tab",
+ "fieldtype": "Tab Break",
+ "label": "Connections",
+ "show_dashboard": 1
}
],
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2023-01-28 18:59:16.322824",
+ "modified": "2023-06-03 16:19:45.710444",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
index d7907e4..6594746 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -43,7 +43,7 @@
});
listview.page.add_action_item(__("Advance Payment"), ()=>{
- erpnext.bulk_transaction_processing.create(listview, "Purchase Order", "Advance Payment");
+ erpnext.bulk_transaction_processing.create(listview, "Purchase Order", "Payment Entry");
});
}
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 920486a..3edaffa 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -92,7 +92,7 @@
frappe.db.set_value("Item", "_Test Item", "over_delivery_receipt_allowance", 0)
frappe.db.set_value("Item", "_Test Item", "over_billing_allowance", 0)
- frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", 0)
+ frappe.db.set_single_value("Accounts Settings", "over_billing_allowance", 0)
def test_update_remove_child_linked_to_mr(self):
"""Test impact on linked PO and MR on deleting/updating row."""
@@ -581,7 +581,7 @@
)
def test_group_same_items(self):
- frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+ frappe.db.set_single_value("Buying Settings", "allow_multiple_items", 1)
frappe.get_doc(
{
"doctype": "Purchase Order",
@@ -836,8 +836,8 @@
)
from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
- frappe.db.set_value("Selling Settings", None, "maintain_same_sales_rate", 1)
- frappe.db.set_value("Buying Settings", None, "maintain_same_rate", 1)
+ frappe.db.set_single_value("Selling Settings", "maintain_same_sales_rate", 1)
+ frappe.db.set_single_value("Buying Settings", "maintain_same_rate", 1)
prepare_data_for_internal_transfer()
supplier = "_Test Internal Supplier 2"
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/__init__.py b/erpnext/buying/doctype/supplier/patches/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/cash_flow_mapper/__init__.py
copy to erpnext/buying/doctype/supplier/patches/__init__.py
diff --git a/erpnext/buying/doctype/supplier/patches/migrate_supplier_portal_users.py b/erpnext/buying/doctype/supplier/patches/migrate_supplier_portal_users.py
new file mode 100644
index 0000000..5834952
--- /dev/null
+++ b/erpnext/buying/doctype/supplier/patches/migrate_supplier_portal_users.py
@@ -0,0 +1,56 @@
+import os
+
+import frappe
+
+in_ci = os.environ.get("CI")
+
+
+def execute():
+ try:
+ contacts = get_portal_user_contacts()
+ add_portal_users(contacts)
+ except Exception:
+ frappe.db.rollback()
+ frappe.log_error("Failed to migrate portal users")
+
+ if in_ci: # TODO: better way to handle this.
+ raise
+
+
+def get_portal_user_contacts():
+ contact = frappe.qb.DocType("Contact")
+ dynamic_link = frappe.qb.DocType("Dynamic Link")
+
+ return (
+ frappe.qb.from_(contact)
+ .inner_join(dynamic_link)
+ .on(contact.name == dynamic_link.parent)
+ .select(
+ (dynamic_link.link_doctype).as_("doctype"),
+ (dynamic_link.link_name).as_("parent"),
+ (contact.email_id).as_("portal_user"),
+ )
+ .where(
+ (dynamic_link.parenttype == "Contact")
+ & (dynamic_link.link_doctype.isin(["Supplier", "Customer"]))
+ )
+ ).run(as_dict=True)
+
+
+def add_portal_users(contacts):
+ for contact in contacts:
+ user = frappe.db.get_value("User", {"email": contact.portal_user}, "name")
+ if not user:
+ continue
+
+ roles = frappe.get_roles(user)
+ required_role = contact.doctype
+ if required_role not in roles:
+ continue
+
+ portal_user_doc = frappe.new_doc("Portal User")
+ portal_user_doc.parenttype = contact.doctype
+ portal_user_doc.parentfield = "portal_users"
+ portal_user_doc.parent = contact.parent
+ portal_user_doc.user = user
+ portal_user_doc.insert()
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 1ae6f03..372ca56 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -8,7 +8,7 @@
frm.set_value("represents_company", "");
}
frm.set_query('account', 'accounts', function (doc, cdt, cdn) {
- var d = locals[cdt][cdn];
+ let d = locals[cdt][cdn];
return {
filters: {
'account_type': 'Payable',
@@ -17,6 +17,19 @@
}
}
});
+
+ frm.set_query('advance_account', 'accounts', function (doc, cdt, cdn) {
+ let d = locals[cdt][cdn];
+ return {
+ filters: {
+ "account_type": "Payable",
+ "root_type": "Asset",
+ "company": d.company,
+ "is_group": 0
+ }
+ }
+ });
+
frm.set_query("default_bank_account", function() {
return {
filters: {
@@ -42,11 +55,17 @@
}
};
});
+
+ frm.set_query("user", "portal_users", function(doc) {
+ return {
+ filters: {
+ "ignore_user_type": true,
+ }
+ };
+ });
},
refresh: function (frm) {
- frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Supplier' }
-
if (frappe.defaults.get_default("supp_master_name") != "Naming Series") {
frm.toggle_display("naming_series", false);
} else {
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 1bf7f58..a07af71 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -53,6 +53,7 @@
"primary_address",
"accounting_tab",
"payment_terms",
+ "default_accounts_section",
"accounts",
"settings_tab",
"allow_purchase_invoice_creation_without_purchase_order",
@@ -68,7 +69,10 @@
"on_hold",
"hold_type",
"column_break_59",
- "release_date"
+ "release_date",
+ "portal_users_tab",
+ "portal_users",
+ "column_break_1mqv"
],
"fields": [
{
@@ -445,6 +449,26 @@
{
"fieldname": "column_break_59",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "default_accounts_section",
+ "fieldtype": "Section Break",
+ "label": "Default Accounts"
+ },
+ {
+ "fieldname": "portal_users_tab",
+ "fieldtype": "Tab Break",
+ "label": "Portal Users"
+ },
+ {
+ "fieldname": "portal_users",
+ "fieldtype": "Table",
+ "label": "Supplier Portal Users",
+ "options": "Portal User"
+ },
+ {
+ "fieldname": "column_break_1mqv",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-user",
@@ -457,7 +481,7 @@
"link_fieldname": "party"
}
],
- "modified": "2023-02-18 11:05:50.592270",
+ "modified": "2023-06-26 14:20:00.961554",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
@@ -489,7 +513,6 @@
"read": 1,
"report": 1,
"role": "Purchase Master Manager",
- "set_user_permissions": 1,
"share": 1,
"write": 1
},
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 01b5c8f..31bf439 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -16,6 +16,7 @@
get_timeline_data,
validate_party_accounts,
)
+from erpnext.controllers.website_list_for_contact import add_role_for_portal_user
from erpnext.utilities.transaction_base import TransactionBase
@@ -46,12 +47,35 @@
self.name = set_name_from_naming_options(frappe.get_meta(self.doctype).autoname, self)
def on_update(self):
- if not self.naming_series:
- self.naming_series = ""
-
self.create_primary_contact()
self.create_primary_address()
+ def add_role_for_user(self):
+ for portal_user in self.portal_users:
+ add_role_for_portal_user(portal_user, "Supplier")
+
+ def _add_supplier_role(self, portal_user):
+ if not portal_user.is_new():
+ return
+
+ user_doc = frappe.get_doc("User", portal_user.user)
+ roles = {r.role for r in user_doc.roles}
+
+ if "Supplier" in roles:
+ return
+
+ if "System Manager" not in frappe.get_roles():
+ frappe.msgprint(
+ _("Please add 'Supplier' role to user {0}.").format(portal_user.user),
+ alert=True,
+ )
+ return
+
+ user_doc.add_roles("Supplier")
+ frappe.msgprint(
+ _("Added Supplier Role to User {0}.").format(frappe.bold(user_doc.name)), alert=True
+ )
+
def validate(self):
self.flags.is_new_doc = self.is_new()
@@ -62,6 +86,7 @@
validate_party_accounts(self)
self.validate_internal_supplier()
+ self.add_role_for_user()
@frappe.whitelist()
def get_supplier_group_details(self):
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index b9fc344..7be1d83 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -7,6 +7,7 @@
from frappe.test_runner import make_test_records
from erpnext.accounts.party import get_due_date
+from erpnext.controllers.website_list_for_contact import get_customers_suppliers
from erpnext.exceptions import PartyDisabled
test_dependencies = ["Payment Term", "Payment Terms Template"]
@@ -156,7 +157,7 @@
def test_serach_fields_for_supplier(self):
from erpnext.controllers.queries import supplier_query
- frappe.db.set_value("Buying Settings", None, "supp_master_name", "Naming Series")
+ frappe.db.set_single_value("Buying Settings", "supp_master_name", "Naming Series")
supplier_name = create_supplier(supplier_name="Test Supplier 1").name
@@ -189,12 +190,15 @@
self.assertEqual(data[0].supplier_type, "Company")
self.assertTrue("supplier_type" in data[0])
- frappe.db.set_value("Buying Settings", None, "supp_master_name", "Supplier Name")
+ frappe.db.set_single_value("Buying Settings", "supp_master_name", "Supplier Name")
def create_supplier(**args):
args = frappe._dict(args)
+ if not args.supplier_name:
+ args.supplier_name = frappe.generate_hash()
+
if frappe.db.exists("Supplier", args.supplier_name):
return frappe.get_doc("Supplier", args.supplier_name)
@@ -209,3 +213,25 @@
).insert()
return doc
+
+
+class TestSupplierPortal(FrappeTestCase):
+ def test_portal_user_can_access_supplier_data(self):
+
+ supplier = create_supplier()
+
+ user = frappe.generate_hash() + "@example.com"
+ frappe.new_doc(
+ "User",
+ first_name="Supplier Portal User",
+ email=user,
+ send_welcome_email=False,
+ ).insert()
+
+ supplier.append("portal_users", {"user": user})
+ supplier.save()
+
+ frappe.set_user(user)
+ _, suppliers = get_customers_suppliers("Purchase Order", user)
+
+ self.assertIn(supplier.name, suppliers)
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index c5b369b..7b635b3 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -230,6 +230,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -310,7 +311,6 @@
"fieldname": "items_section",
"fieldtype": "Section Break",
"hide_border": 1,
- "label": "Items",
"oldfieldtype": "Section Break",
"options": "fa fa-shopping-cart"
},
@@ -318,6 +318,7 @@
"allow_bulk_edit": 1,
"fieldname": "items",
"fieldtype": "Table",
+ "label": "Items",
"oldfieldname": "po_details",
"oldfieldtype": "Table",
"options": "Supplier Quotation Item",
@@ -844,7 +845,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-12-12 18:35:39.740974",
+ "modified": "2023-06-03 16:20:15.880114",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",
diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
index 486bf23..58da851 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
@@ -329,6 +329,11 @@
"variable_label": "Total Shipments",
"path": "get_total_shipments",
},
+ {
+ "param_name": "total_ordered",
+ "variable_label": "Total Ordered",
+ "path": "get_ordered_qty",
+ },
]
install_standing_docs = [
{
diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
index a8b76db..1967df2 100644
--- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
+++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
@@ -99,7 +99,6 @@
return mod
-@frappe.whitelist()
def make_supplier_scorecard(source_name, target_doc=None):
def update_criteria_fields(obj, target, source_parent):
target.max_score, target.formula = frappe.db.get_value(
diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py
index fb8819e..4080d1f 100644
--- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py
+++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py
@@ -7,6 +7,7 @@
import frappe
from frappe import _
from frappe.model.document import Document
+from frappe.query_builder.functions import Sum
from frappe.utils import getdate
@@ -422,6 +423,23 @@
return data
+def get_ordered_qty(scorecard):
+ """Returns the total number of ordered quantity (based on Purchase Orders)"""
+
+ po = frappe.qb.DocType("Purchase Order")
+
+ return (
+ frappe.qb.from_(po)
+ .select(Sum(po.total_qty))
+ .where(
+ (po.supplier == scorecard.supplier)
+ & (po.docstatus == 1)
+ & (po.transaction_date >= scorecard.get("start_date"))
+ & (po.transaction_date <= scorecard.get("end_date"))
+ )
+ ).run(as_list=True)[0][0] or 0
+
+
def get_rfq_total_number(scorecard):
"""Gets the total number of RFQs sent to supplier"""
supplier = frappe.get_doc("Supplier", scorecard.supplier)
diff --git a/erpnext/buying/workspace/buying/buying.json b/erpnext/buying/workspace/buying/buying.json
index 5ad93f0..1394fc4 100644
--- a/erpnext/buying/workspace/buying/buying.json
+++ b/erpnext/buying/workspace/buying/buying.json
@@ -5,14 +5,16 @@
"label": "Purchase Order Trends"
}
],
- "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Buying\",\"col\":12}},{\"type\":\"chart\",\"data\":{\"chart_name\":\"Purchase Order Trends\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Material Request\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Order\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Analytics\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Order Analysis\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Buying\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Items & Pricing\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Supplier\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Supplier Scorecard\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Regional\",\"col\":4}}]",
+ "content": "[{\"id\":\"I3JijHOxil\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Buying\",\"col\":12}},{\"id\":\"j3dJGo8Ok6\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Purchase Order Trends\",\"col\":12}},{\"id\":\"oN7lXSwQji\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"Ivw1PI_wEJ\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"RrWFEi4kCf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"RFIakryyJP\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Material Request\",\"col\":3}},{\"id\":\"bM10abFmf6\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Order\",\"col\":3}},{\"id\":\"lR0Hw_37Pu\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Analytics\",\"col\":3}},{\"id\":\"_HN0Ljw1lX\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Order Analysis\",\"col\":3}},{\"id\":\"kuLuiMRdnX\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"tQFeiKptW2\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Procurement\",\"col\":3}},{\"id\":\"0NiuFE_EGS\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"Xe2GVLOq8J\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"QwqyG6XuUt\",\"type\":\"card\",\"data\":{\"card_name\":\"Buying\",\"col\":4}},{\"id\":\"bTPjOxC_N_\",\"type\":\"card\",\"data\":{\"card_name\":\"Items & Pricing\",\"col\":4}},{\"id\":\"87ht0HIneb\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"id\":\"EDOsBOmwgw\",\"type\":\"card\",\"data\":{\"card_name\":\"Supplier\",\"col\":4}},{\"id\":\"oWNNIiNb2i\",\"type\":\"card\",\"data\":{\"card_name\":\"Supplier Scorecard\",\"col\":4}},{\"id\":\"7F_13-ihHB\",\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"id\":\"pfwiLvionl\",\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}},{\"id\":\"8ySDy6s4qn\",\"type\":\"card\",\"data\":{\"card_name\":\"Regional\",\"col\":4}}]",
"creation": "2020-01-28 11:50:26.195467",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "buying",
"idx": 0,
+ "is_hidden": 0,
"label": "Buying",
"links": [
{
@@ -509,16 +511,18 @@
"type": "Link"
}
],
- "modified": "2022-01-13 17:26:39.090190",
+ "modified": "2023-07-04 14:43:30.387683",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
+ "quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 6.0,
+ "sequence_id": 5.0,
"shortcuts": [
{
"color": "Green",
@@ -529,6 +533,13 @@
"type": "DocType"
},
{
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "Learn Procurement",
+ "type": "URL",
+ "url": "https://frappe.school/courses/procurement?utm_source=in_app"
+ },
+ {
"color": "Yellow",
"format": "{} Pending",
"label": "Material Request",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 7fcc28b..4193b53 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -5,8 +5,9 @@
import json
import frappe
-from frappe import _, throw
+from frappe import _, bold, throw
from frappe.model.workflow import get_workflow_name, is_transition_condition_satisfied
+from frappe.query_builder.custom import ConstantColumn
from frappe.query_builder.functions import Abs, Sum
from frappe.utils import (
add_days,
@@ -273,8 +274,8 @@
self.validate_payment_schedule_dates()
self.set_due_date()
self.set_payment_schedule()
- self.validate_payment_schedule_amount()
if not self.get("ignore_default_payment_terms_template"):
+ self.validate_payment_schedule_amount()
self.validate_due_date()
self.validate_advance_entries()
@@ -392,6 +393,9 @@
)
def validate_inter_company_reference(self):
+ if self.get("is_return"):
+ return
+
if self.doctype not in ("Purchase Invoice", "Purchase Receipt"):
return
@@ -405,6 +409,15 @@
msg += _("Please create purchase from internal sale or delivery document itself")
frappe.throw(msg, title=_("Internal Sales Reference Missing"))
+ label = "Delivery Note Item" if self.doctype == "Purchase Receipt" else "Sales Invoice Item"
+
+ field = frappe.scrub(label)
+
+ for row in self.get("items"):
+ if not row.get(field):
+ msg = f"At Row {row.idx}: The field {bold(label)} is mandatory for internal transfer"
+ frappe.throw(_(msg), title=_("Internal Transfer Reference Missing"))
+
def disable_pricing_rule_on_internal_transfer(self):
if not self.get("ignore_pricing_rule") and self.is_internal_transfer():
self.ignore_pricing_rule = 1
@@ -743,9 +756,11 @@
"party": None,
"project": self.get("project"),
"post_net_value": args.get("post_net_value"),
+ "voucher_detail_no": args.get("voucher_detail_no"),
}
)
+ update_gl_dict_with_regional_fields(self, gl_dict)
accounting_dimensions = get_accounting_dimensions()
dimension_dict = frappe._dict()
@@ -845,7 +860,6 @@
amount = self.get("base_rounded_total") or self.base_grand_total
else:
amount = self.get("rounded_total") or self.grand_total
-
allocated_amount = min(amount - advance_allocated, d.amount)
advance_allocated += flt(allocated_amount)
@@ -859,25 +873,31 @@
"allocated_amount": allocated_amount,
"ref_exchange_rate": flt(d.exchange_rate), # exchange_rate of advance entry
}
+ if d.get("paid_from"):
+ advance_row["account"] = d.paid_from
+ if d.get("paid_to"):
+ advance_row["account"] = d.paid_to
self.append("advances", advance_row)
def get_advance_entries(self, include_unallocated=True):
if self.doctype == "Sales Invoice":
- party_account = self.debit_to
party_type = "Customer"
party = self.customer
amount_field = "credit_in_account_currency"
order_field = "sales_order"
order_doctype = "Sales Order"
else:
- party_account = self.credit_to
party_type = "Supplier"
party = self.supplier
amount_field = "debit_in_account_currency"
order_field = "purchase_order"
order_doctype = "Purchase Order"
+ party_account = get_party_account(
+ party_type, party=party, company=self.company, include_advance=True
+ )
+
order_list = list(set(d.get(order_field) for d in self.get("items") if d.get(order_field)))
journal_entries = get_advance_journal_entries(
@@ -904,6 +924,9 @@
return is_inclusive
+ def should_show_taxes_as_table_in_print(self):
+ return cint(frappe.db.get_single_value("Accounts Settings", "show_taxes_as_table_in_print"))
+
def validate_advance_entries(self):
order_field = "sales_order" if self.doctype == "Sales Invoice" else "purchase_order"
order_list = list(set(d.get(order_field) for d in self.get("items") if d.get(order_field)))
@@ -1607,6 +1630,7 @@
base_grand_total = self.get("base_rounded_total") or self.base_grand_total
grand_total = self.get("rounded_total") or self.grand_total
+ automatically_fetch_payment_terms = 0
if self.doctype in ("Sales Invoice", "Purchase Invoice"):
base_grand_total = base_grand_total - flt(self.base_write_off_amount)
@@ -1652,19 +1676,26 @@
)
self.append("payment_schedule", data)
- for d in self.get("payment_schedule"):
- if d.invoice_portion:
- d.payment_amount = flt(
- grand_total * flt(d.invoice_portion / 100), d.precision("payment_amount")
- )
- d.base_payment_amount = flt(
- base_grand_total * flt(d.invoice_portion / 100), d.precision("base_payment_amount")
- )
- d.outstanding = d.payment_amount
- elif not d.invoice_portion:
- d.base_payment_amount = flt(
- d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
- )
+ if not (
+ automatically_fetch_payment_terms
+ and self.linked_order_has_payment_terms(po_or_so, fieldname, doctype)
+ ):
+ for d in self.get("payment_schedule"):
+ if d.invoice_portion:
+ d.payment_amount = flt(
+ grand_total * flt(d.invoice_portion / 100), d.precision("payment_amount")
+ )
+ d.base_payment_amount = flt(
+ base_grand_total * flt(d.invoice_portion / 100), d.precision("base_payment_amount")
+ )
+ d.outstanding = d.payment_amount
+ elif not d.invoice_portion:
+ d.base_payment_amount = flt(
+ d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
+ )
+ else:
+ self.fetch_payment_terms_from_order(po_or_so, doctype)
+ self.ignore_default_payment_terms_template = 1
def get_order_details(self):
if self.doctype == "Sales Invoice":
@@ -1717,6 +1748,10 @@
"invoice_portion": schedule.invoice_portion,
"mode_of_payment": schedule.mode_of_payment,
"description": schedule.description,
+ "payment_amount": schedule.payment_amount,
+ "base_payment_amount": schedule.base_payment_amount,
+ "outstanding": schedule.outstanding,
+ "paid_amount": schedule.paid_amount,
}
if schedule.discount_type == "Percentage":
@@ -1886,12 +1921,14 @@
reconcilation_entry.party = secondary_party
reconcilation_entry.reference_type = self.doctype
reconcilation_entry.reference_name = self.name
- reconcilation_entry.cost_center = self.cost_center
+ reconcilation_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(
+ self.company
+ )
advance_entry.account = primary_account
advance_entry.party_type = primary_party_type
advance_entry.party = primary_party
- advance_entry.cost_center = self.cost_center
+ advance_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(self.company)
advance_entry.is_advance = "Yes"
if self.doctype == "Sales Invoice":
@@ -2110,45 +2147,46 @@
order_list,
include_unallocated=True,
):
- dr_or_cr = (
- "credit_in_account_currency" if party_type == "Customer" else "debit_in_account_currency"
+ journal_entry = frappe.qb.DocType("Journal Entry")
+ journal_acc = frappe.qb.DocType("Journal Entry Account")
+ q = (
+ frappe.qb.from_(journal_entry)
+ .inner_join(journal_acc)
+ .on(journal_entry.name == journal_acc.parent)
+ .select(
+ ConstantColumn("Journal Entry").as_("reference_type"),
+ (journal_entry.name).as_("reference_name"),
+ (journal_entry.remark).as_("remarks"),
+ (journal_acc[amount_field]).as_("amount"),
+ (journal_acc.name).as_("reference_row"),
+ (journal_acc.reference_name).as_("against_order"),
+ (journal_acc.exchange_rate),
+ )
+ .where(
+ journal_acc.account.isin(party_account)
+ & (journal_acc.party_type == party_type)
+ & (journal_acc.party == party)
+ & (journal_acc.is_advance == "Yes")
+ & (journal_entry.docstatus == 1)
+ )
)
+ if party_type == "Customer":
+ q = q.where(journal_acc.credit_in_account_currency > 0)
- conditions = []
+ else:
+ q = q.where(journal_acc.debit_in_account_currency > 0)
+
if include_unallocated:
- conditions.append("ifnull(t2.reference_name, '')=''")
+ q = q.where((journal_acc.reference_name.isnull()) | (journal_acc.reference_name == ""))
if order_list:
- order_condition = ", ".join(["%s"] * len(order_list))
- conditions.append(
- " (t2.reference_type = '{0}' and ifnull(t2.reference_name, '') in ({1}))".format(
- order_doctype, order_condition
- )
+ q = q.where(
+ (journal_acc.reference_type == order_doctype) & ((journal_acc.reference_type).isin(order_list))
)
- reference_condition = " and (" + " or ".join(conditions) + ")" if conditions else ""
+ q = q.orderby(journal_entry.posting_date)
- # nosemgrep
- journal_entries = frappe.db.sql(
- """
- select
- 'Journal Entry' as reference_type, t1.name as reference_name,
- t1.remark as remarks, t2.{0} as amount, t2.name as reference_row,
- t2.reference_name as against_order, t2.exchange_rate
- from
- `tabJournal Entry` t1, `tabJournal Entry Account` t2
- where
- t1.name = t2.parent and t2.account = %s
- and t2.party_type = %s and t2.party = %s
- and t2.is_advance = 'Yes' and t1.docstatus = 1
- and {1} > 0 {2}
- order by t1.posting_date""".format(
- amount_field, dr_or_cr, reference_condition
- ),
- [party_account, party_type, party] + order_list,
- as_dict=1,
- )
-
+ journal_entries = q.run(as_dict=True)
return list(journal_entries)
@@ -2163,65 +2201,131 @@
limit=None,
condition=None,
):
- party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
- currency_field = (
- "paid_from_account_currency" if party_type == "Customer" else "paid_to_account_currency"
- )
- payment_type = "Receive" if party_type == "Customer" else "Pay"
- exchange_rate_field = (
- "source_exchange_rate" if payment_type == "Receive" else "target_exchange_rate"
- )
- payment_entries_against_order, unallocated_payment_entries = [], []
- limit_cond = "limit %s" % limit if limit else ""
+ payment_entries = []
+ payment_entry = frappe.qb.DocType("Payment Entry")
if order_list or against_all_orders:
+ q = get_common_query(
+ party_type,
+ party,
+ party_account,
+ limit,
+ condition,
+ )
+ payment_ref = frappe.qb.DocType("Payment Entry Reference")
+
+ q = q.inner_join(payment_ref).on(payment_entry.name == payment_ref.parent)
+ q = q.select(
+ (payment_ref.allocated_amount).as_("amount"),
+ (payment_ref.name).as_("reference_row"),
+ (payment_ref.reference_name).as_("against_order"),
+ )
+
+ q = q.where(payment_ref.reference_doctype == order_doctype)
if order_list:
- reference_condition = " and t2.reference_name in ({0})".format(
- ", ".join(["%s"] * len(order_list))
+ q = q.where(payment_ref.reference_name.isin(order_list))
+
+ allocated = list(q.run(as_dict=True))
+ payment_entries += allocated
+ if include_unallocated:
+ q = get_common_query(
+ party_type,
+ party,
+ party_account,
+ limit,
+ condition,
+ )
+ q = q.select((payment_entry.unallocated_amount).as_("amount"))
+ q = q.where(payment_entry.unallocated_amount > 0)
+
+ unallocated = list(q.run(as_dict=True))
+ payment_entries += unallocated
+ return payment_entries
+
+
+def get_common_query(
+ party_type,
+ party,
+ party_account,
+ limit,
+ condition,
+):
+ payment_type = "Receive" if party_type == "Customer" else "Pay"
+ payment_entry = frappe.qb.DocType("Payment Entry")
+
+ q = (
+ frappe.qb.from_(payment_entry)
+ .select(
+ ConstantColumn("Payment Entry").as_("reference_type"),
+ (payment_entry.name).as_("reference_name"),
+ payment_entry.posting_date,
+ (payment_entry.remarks).as_("remarks"),
+ )
+ .where(payment_entry.payment_type == payment_type)
+ .where(payment_entry.party_type == party_type)
+ .where(payment_entry.party == party)
+ .where(payment_entry.docstatus == 1)
+ )
+
+ if party_type == "Customer":
+ q = q.select((payment_entry.paid_from_account_currency).as_("currency"))
+ q = q.select(payment_entry.paid_from)
+ q = q.where(payment_entry.paid_from.isin(party_account))
+ else:
+ q = q.select((payment_entry.paid_to_account_currency).as_("currency"))
+ q = q.select(payment_entry.paid_to)
+ q = q.where(payment_entry.paid_to.isin(party_account))
+
+ if payment_type == "Receive":
+ q = q.select((payment_entry.source_exchange_rate).as_("exchange_rate"))
+ else:
+ q = q.select((payment_entry.target_exchange_rate).as_("exchange_rate"))
+
+ if condition:
+ q = q.where(payment_entry.company == condition["company"])
+ q = (
+ q.where(payment_entry.posting_date >= condition["from_payment_date"])
+ if condition.get("from_payment_date")
+ else q
+ )
+ q = (
+ q.where(payment_entry.posting_date <= condition["to_payment_date"])
+ if condition.get("to_payment_date")
+ else q
+ )
+ if condition.get("get_payments") == True:
+ q = (
+ q.where(payment_entry.cost_center == condition["cost_center"])
+ if condition.get("cost_center")
+ else q
+ )
+ q = (
+ q.where(payment_entry.unallocated_amount >= condition["minimum_payment_amount"])
+ if condition.get("minimum_payment_amount")
+ else q
+ )
+ q = (
+ q.where(payment_entry.unallocated_amount <= condition["maximum_payment_amount"])
+ if condition.get("maximum_payment_amount")
+ else q
)
else:
- reference_condition = ""
- order_list = []
+ q = (
+ q.where(payment_entry.total_debit >= condition["minimum_payment_amount"])
+ if condition.get("minimum_payment_amount")
+ else q
+ )
+ q = (
+ q.where(payment_entry.total_debit <= condition["maximum_payment_amount"])
+ if condition.get("maximum_payment_amount")
+ else q
+ )
- payment_entries_against_order = frappe.db.sql(
- """
- select
- 'Payment Entry' as reference_type, t1.name as reference_name,
- t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
- t2.reference_name as against_order, t1.posting_date,
- t1.{0} as currency, t1.{4} as exchange_rate
- from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
- where
- t1.name = t2.parent and t1.{1} = %s and t1.payment_type = %s
- and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
- and t2.reference_doctype = %s {2}
- order by t1.posting_date {3}
- """.format(
- currency_field, party_account_field, reference_condition, limit_cond, exchange_rate_field
- ),
- [party_account, payment_type, party_type, party, order_doctype] + order_list,
- as_dict=1,
- )
+ q = q.orderby(payment_entry.posting_date)
+ q = q.limit(limit) if limit else q
- if include_unallocated:
- unallocated_payment_entries = frappe.db.sql(
- """
- select 'Payment Entry' as reference_type, name as reference_name, posting_date,
- remarks, unallocated_amount as amount, {2} as exchange_rate, {3} as currency
- from `tabPayment Entry`
- where
- {0} = %s and party_type = %s and party = %s and payment_type = %s
- and docstatus = 1 and unallocated_amount > 0 {condition}
- order by posting_date {1}
- """.format(
- party_account_field, limit_cond, exchange_rate_field, currency_field, condition=condition or ""
- ),
- (party_account, party_type, party, payment_type),
- as_dict=1,
- )
-
- return list(payment_entries_against_order) + list(unallocated_payment_entries)
+ return q
def update_invoice_status():
@@ -2418,7 +2522,7 @@
Returns a Sales/Purchase Order Item child item containing the default values
"""
p_doc = frappe.get_doc(parent_doctype, parent_doctype_name)
- child_item = frappe.new_doc(child_doctype, p_doc, child_docname)
+ child_item = frappe.new_doc(child_doctype, parent_doc=p_doc, parentfield=child_docname)
item = frappe.get_doc("Item", trans_item.get("item_code"))
for field in ("item_code", "item_name", "description", "item_group"):
@@ -2800,6 +2904,17 @@
parent.update_billing_percentage()
parent.set_status()
+ # Cancel and Recreate Stock Reservation Entries.
+ if parent_doctype == "Sales Order":
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ cancel_stock_reservation_entries,
+ has_reserved_stock,
+ )
+
+ if has_reserved_stock(parent.doctype, parent.name):
+ cancel_stock_reservation_entries(parent.doctype, parent.name)
+ parent.create_stock_reservation_entries()
+
@erpnext.allow_regional
def validate_regional(doc):
@@ -2809,3 +2924,8 @@
@erpnext.allow_regional
def validate_einvoice_fields(doc):
pass
+
+
+@erpnext.allow_regional
+def update_gl_dict_with_regional_fields(doc, gl_dict):
+ pass
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index e15b612..7b7c53e 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -5,7 +5,7 @@
import frappe
from frappe import ValidationError, _, msgprint
from frappe.contacts.doctype.address.address import get_address_display
-from frappe.utils import cint, cstr, flt, getdate
+from frappe.utils import cint, flt, getdate
from frappe.utils.data import nowtime
from erpnext.accounts.doctype.budget.budget import validate_expense_against_budget
@@ -26,6 +26,8 @@
self.flags.ignore_permlevel_for_fields = ["buying_price_list", "price_list_currency"]
def validate(self):
+ self.set_rate_for_standalone_debit_note()
+
super(BuyingController, self).validate()
if getattr(self, "supplier", None) and not self.supplier_name:
self.supplier_name = frappe.db.get_value("Supplier", self.supplier, "supplier_name")
@@ -38,6 +40,7 @@
self.set_supplier_address()
self.validate_asset_return()
self.validate_auto_repeat_subscription_dates()
+ self.create_package_for_transfer()
if self.doctype == "Purchase Invoice":
self.validate_purchase_receipt_if_update_stock()
@@ -58,6 +61,7 @@
if self.doctype in ("Purchase Receipt", "Purchase Invoice"):
self.update_valuation_rate()
+ self.set_serial_and_batch_bundle()
def onload(self):
super(BuyingController, self).onload()
@@ -68,6 +72,60 @@
),
)
+ def create_package_for_transfer(self) -> None:
+ """Create serial and batch package for Sourece Warehouse in case of inter transfer."""
+
+ if self.is_internal_transfer() and (
+ self.doctype == "Purchase Receipt" or (self.doctype == "Purchase Invoice" and self.update_stock)
+ ):
+ field = "delivery_note_item" if self.doctype == "Purchase Receipt" else "sales_invoice_item"
+
+ doctype = "Delivery Note Item" if self.doctype == "Purchase Receipt" else "Sales Invoice Item"
+
+ ids = [d.get(field) for d in self.get("items") if d.get(field)]
+ bundle_ids = {}
+ if ids:
+ for bundle in frappe.get_all(
+ doctype, filters={"name": ("in", ids)}, fields=["serial_and_batch_bundle", "name"]
+ ):
+ bundle_ids[bundle.name] = bundle.serial_and_batch_bundle
+
+ if not bundle_ids:
+ return
+
+ for item in self.get("items"):
+ if item.get(field) and not item.serial_and_batch_bundle and bundle_ids.get(item.get(field)):
+ item.serial_and_batch_bundle = self.make_package_for_transfer(
+ bundle_ids.get(item.get(field)),
+ item.from_warehouse,
+ type_of_transaction="Outward",
+ do_not_submit=True,
+ )
+
+ def set_rate_for_standalone_debit_note(self):
+ if self.get("is_return") and self.get("update_stock") and not self.return_against:
+ for row in self.items:
+
+ # override the rate with valuation rate
+ row.rate = get_incoming_rate(
+ {
+ "item_code": row.item_code,
+ "warehouse": row.warehouse,
+ "posting_date": self.get("posting_date"),
+ "posting_time": self.get("posting_time"),
+ "qty": row.qty,
+ "serial_and_batch_bundle": row.get("serial_and_batch_bundle"),
+ "company": self.company,
+ "voucher_type": self.doctype,
+ "voucher_no": self.name,
+ },
+ raise_error_if_no_rate=False,
+ )
+
+ row.discount_percentage = 0.0
+ row.discount_amount = 0.0
+ row.margin_rate_or_amount = 0.0
+
def set_missing_values(self, for_validate=False):
super(BuyingController, self).set_missing_values(for_validate)
@@ -180,6 +238,7 @@
address_dict = {
"supplier_address": "address_display",
"shipping_address": "shipping_address_display",
+ "billing_address": "billing_address_display",
}
for address_field, address_display_field in address_dict.items():
@@ -304,8 +363,7 @@
"posting_date": self.get("posting_date") or self.get("transation_date"),
"posting_time": posting_time,
"qty": -1 * flt(d.get("stock_qty")),
- "serial_no": d.get("serial_no"),
- "batch_no": d.get("batch_no"),
+ "serial_and_batch_bundle": d.get("serial_and_batch_bundle"),
"company": self.company,
"voucher_type": self.doctype,
"voucher_no": self.name,
@@ -379,18 +437,23 @@
# validate rate with ref PR
def validate_rejected_warehouse(self):
- for d in self.get("items"):
- if flt(d.rejected_qty) and not d.rejected_warehouse:
+ for item in self.get("items"):
+ if flt(item.rejected_qty) and not item.rejected_warehouse:
if self.rejected_warehouse:
- d.rejected_warehouse = self.rejected_warehouse
+ item.rejected_warehouse = self.rejected_warehouse
- if not d.rejected_warehouse:
+ if not item.rejected_warehouse:
frappe.throw(
- _("Row #{0}: Rejected Warehouse is mandatory against rejected Item {1}").format(
- d.idx, d.item_code
+ _("Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}").format(
+ item.idx, item.item_code
)
)
+ if item.get("rejected_warehouse") and (item.get("rejected_warehouse") == item.get("warehouse")):
+ frappe.throw(
+ _("Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same").format(item.idx)
+ )
+
# validate accepted and rejected qty
def validate_accepted_rejected_qty(self):
for d in self.get("items"):
@@ -440,7 +503,7 @@
continue
if d.warehouse:
- pr_qty = flt(d.qty) * flt(d.conversion_factor)
+ pr_qty = flt(flt(d.qty) * flt(d.conversion_factor), d.precision("stock_qty"))
if pr_qty:
@@ -462,7 +525,15 @@
sl_entries.append(from_warehouse_sle)
sle = self.get_sl_entries(
- d, {"actual_qty": flt(pr_qty), "serial_no": cstr(d.serial_no).strip()}
+ d,
+ {
+ "actual_qty": flt(pr_qty),
+ "serial_and_batch_bundle": (
+ d.serial_and_batch_bundle
+ if not self.is_internal_transfer()
+ else self.get_package_for_target_warehouse(d)
+ ),
+ },
)
if self.is_return:
@@ -470,7 +541,13 @@
self.doctype, self.name, d.item_code, self.return_against, item_row=d
)
- sle.update({"outgoing_rate": outgoing_rate, "recalculate_rate": 1})
+ sle.update(
+ {
+ "outgoing_rate": outgoing_rate,
+ "recalculate_rate": 1,
+ "serial_and_batch_bundle": d.serial_and_batch_bundle,
+ }
+ )
if d.from_warehouse:
sle.dependant_sle_voucher_detail_no = d.name
else:
@@ -502,21 +579,31 @@
d,
{
"warehouse": d.rejected_warehouse,
- "actual_qty": flt(d.rejected_qty) * flt(d.conversion_factor),
- "serial_no": cstr(d.rejected_serial_no).strip(),
+ "actual_qty": flt(flt(d.rejected_qty) * flt(d.conversion_factor), d.precision("stock_qty")),
"incoming_rate": 0.0,
+ "serial_and_batch_bundle": d.rejected_serial_and_batch_bundle,
},
)
)
if self.get("is_old_subcontracting_flow"):
self.make_sl_entries_for_supplier_warehouse(sl_entries)
+
self.make_sl_entries(
sl_entries,
allow_negative_stock=allow_negative_stock,
via_landed_cost_voucher=via_landed_cost_voucher,
)
+ def get_package_for_target_warehouse(self, item) -> str:
+ if not item.serial_and_batch_bundle:
+ return ""
+
+ return self.make_package_for_transfer(
+ item.serial_and_batch_bundle,
+ item.warehouse,
+ )
+
def update_ordered_and_reserved_qty(self):
po_map = {}
for d in self.get("items"):
diff --git a/erpnext/controllers/print_settings.py b/erpnext/controllers/print_settings.py
index d2c8096..d86607d 100644
--- a/erpnext/controllers/print_settings.py
+++ b/erpnext/controllers/print_settings.py
@@ -10,6 +10,7 @@
doc.child_print_templates = {
"items": {
"qty": "templates/print_formats/includes/item_table_qty.html",
+ "serial_and_batch_bundle": "templates/print_formats/includes/serial_and_batch_bundle.html",
}
}
@@ -30,10 +31,16 @@
doc.print_templates.update(
{
"total": "templates/print_formats/includes/total.html",
- "taxes": "templates/print_formats/includes/taxes.html",
}
)
+ if not doc.should_show_taxes_as_table_in_print():
+ doc.print_templates.update(
+ {
+ "taxes": "templates/print_formats/includes/taxes.html",
+ }
+ )
+
def format_columns(display_columns, compact_fields):
compact_fields = compact_fields + ["image", "item_code", "item_name"]
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index b0cf724..3bb1128 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -3,12 +3,13 @@
import json
-from collections import defaultdict
+from collections import OrderedDict, defaultdict
import frappe
from frappe import scrub
from frappe.desk.reportview import get_filters_cond, get_match_cond
-from frappe.utils import nowdate, unique
+from frappe.query_builder.functions import Concat, Sum
+from frappe.utils import nowdate, today, unique
import erpnext
from erpnext.stock.get_item_details import _get_item_tax_template
@@ -53,13 +54,17 @@
doctype = "Lead"
fields = get_fields(doctype, ["name", "lead_name", "company_name"])
+ searchfields = frappe.get_meta(doctype).get_search_fields()
+ searchfields = " or ".join(field + " like %(txt)s" for field in searchfields)
+
return frappe.db.sql(
"""select {fields} from `tabLead`
where docstatus < 2
and ifnull(status, '') != 'Converted'
and ({key} like %(txt)s
or lead_name like %(txt)s
- or company_name like %(txt)s)
+ or company_name like %(txt)s
+ or {scond})
{mcond}
order by
(case when locate(%(_txt)s, name) > 0 then locate(%(_txt)s, name) else 99999 end),
@@ -68,7 +73,12 @@
idx desc,
name, lead_name
limit %(page_len)s offset %(start)s""".format(
- **{"fields": ", ".join(fields), "key": searchfield, "mcond": get_match_cond(doctype)}
+ **{
+ "fields": ", ".join(fields),
+ "key": searchfield,
+ "scond": searchfields,
+ "mcond": get_match_cond(doctype),
+ }
),
{"txt": "%%%s%%" % txt, "_txt": txt.replace("%", ""), "start": start, "page_len": page_len},
)
@@ -403,95 +413,136 @@
@frappe.validate_and_sanitize_search_inputs
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
doctype = "Batch"
- cond = ""
- if filters.get("posting_date"):
- cond = "and (batch.expiry_date is null or batch.expiry_date >= %(posting_date)s)"
-
- batch_nos = None
- args = {
- "item_code": filters.get("item_code"),
- "warehouse": filters.get("warehouse"),
- "posting_date": filters.get("posting_date"),
- "txt": "%{0}%".format(txt),
- "start": start,
- "page_len": page_len,
- }
-
- having_clause = "having sum(sle.actual_qty) > 0"
- if filters.get("is_return"):
- having_clause = ""
-
meta = frappe.get_meta(doctype, cached=True)
searchfields = meta.get_search_fields()
- search_columns = ""
- search_cond = ""
+ query = get_batches_from_stock_ledger_entries(searchfields, txt, filters)
+ bundle_query = get_batches_from_serial_and_batch_bundle(searchfields, txt, filters)
- if searchfields:
- search_columns = ", " + ", ".join(searchfields)
- search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
+ data = (
+ frappe.qb.from_((query) + (bundle_query))
+ .select("batch_no", "qty", "manufacturing_date", "expiry_date")
+ .offset(start)
+ .limit(page_len)
+ )
- if args.get("warehouse"):
- searchfields = ["batch." + field for field in searchfields]
- if searchfields:
- search_columns = ", " + ", ".join(searchfields)
- search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
+ for field in searchfields:
+ data = data.select(field)
- 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)
- {search_columns}
- from `tabStock Ledger Entry` sle
- INNER JOIN `tabBatch` batch on sle.batch_no = batch.name
- where
- batch.disabled = 0
- and sle.is_cancelled = 0
- and sle.item_code = %(item_code)s
- and sle.warehouse = %(warehouse)s
- and (sle.batch_no like %(txt)s
- or batch.expiry_date like %(txt)s
- or batch.manufacturing_date like %(txt)s
- {search_cond})
- and batch.docstatus < 2
- {cond}
- {match_conditions}
- group by batch_no {having_clause}
- order by batch.expiry_date, sle.batch_no desc
- limit %(page_len)s offset %(start)s""".format(
- search_columns=search_columns,
- cond=cond,
- match_conditions=get_match_cond(doctype),
- having_clause=having_clause,
- search_cond=search_cond,
- ),
- args,
+ data = data.run()
+ data = get_filterd_batches(data)
+
+ return data
+
+
+def get_filterd_batches(data):
+ batches = OrderedDict()
+
+ for batch_data in data:
+ if batch_data[0] not in batches:
+ batches[batch_data[0]] = list(batch_data)
+ else:
+ batches[batch_data[0]][1] += batch_data[1]
+
+ filterd_batch = []
+ for batch, batch_data in batches.items():
+ if batch_data[1] > 0:
+ filterd_batch.append(tuple(batch_data))
+
+ return filterd_batch
+
+
+def get_batches_from_stock_ledger_entries(searchfields, txt, filters):
+ stock_ledger_entry = frappe.qb.DocType("Stock Ledger Entry")
+ batch_table = frappe.qb.DocType("Batch")
+
+ expiry_date = filters.get("posting_date") or today()
+
+ query = (
+ frappe.qb.from_(stock_ledger_entry)
+ .inner_join(batch_table)
+ .on(batch_table.name == stock_ledger_entry.batch_no)
+ .select(
+ stock_ledger_entry.batch_no,
+ Sum(stock_ledger_entry.actual_qty).as_("qty"),
)
-
- return batch_nos
- else:
- return frappe.db.sql(
- """select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date)
- {search_columns}
- from `tabBatch` batch
- where batch.disabled = 0
- and item = %(item_code)s
- and (name like %(txt)s
- or expiry_date like %(txt)s
- or manufacturing_date like %(txt)s
- {search_cond})
- and docstatus < 2
- {0}
- {match_conditions}
-
- order by expiry_date, name desc
- limit %(page_len)s offset %(start)s""".format(
- cond,
- search_columns=search_columns,
- search_cond=search_cond,
- match_conditions=get_match_cond(doctype),
- ),
- args,
+ .where(((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())))
+ .where(stock_ledger_entry.is_cancelled == 0)
+ .where(
+ (stock_ledger_entry.item_code == filters.get("item_code"))
+ & (batch_table.disabled == 0)
+ & (stock_ledger_entry.batch_no.isnotnull())
)
+ .groupby(stock_ledger_entry.batch_no, stock_ledger_entry.warehouse)
+ )
+
+ query = query.select(
+ Concat("MFG-", batch_table.manufacturing_date).as_("manufacturing_date"),
+ Concat("EXP-", batch_table.expiry_date).as_("expiry_date"),
+ )
+
+ if filters.get("warehouse"):
+ query = query.where(stock_ledger_entry.warehouse == filters.get("warehouse"))
+
+ for field in searchfields:
+ query = query.select(batch_table[field])
+
+ if txt:
+ txt_condition = batch_table.name.like(txt)
+ for field in searchfields + ["name"]:
+ txt_condition |= batch_table[field].like(txt)
+
+ query = query.where(txt_condition)
+
+ return query
+
+
+def get_batches_from_serial_and_batch_bundle(searchfields, txt, filters):
+ bundle = frappe.qb.DocType("Serial and Batch Entry")
+ stock_ledger_entry = frappe.qb.DocType("Stock Ledger Entry")
+ batch_table = frappe.qb.DocType("Batch")
+
+ expiry_date = filters.get("posting_date") or today()
+
+ bundle_query = (
+ frappe.qb.from_(bundle)
+ .inner_join(stock_ledger_entry)
+ .on(bundle.parent == stock_ledger_entry.serial_and_batch_bundle)
+ .inner_join(batch_table)
+ .on(batch_table.name == bundle.batch_no)
+ .select(
+ bundle.batch_no,
+ Sum(bundle.qty).as_("qty"),
+ )
+ .where(((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())))
+ .where(stock_ledger_entry.is_cancelled == 0)
+ .where(
+ (stock_ledger_entry.item_code == filters.get("item_code"))
+ & (batch_table.disabled == 0)
+ & (stock_ledger_entry.serial_and_batch_bundle.isnotnull())
+ )
+ .groupby(bundle.batch_no, bundle.warehouse)
+ )
+
+ bundle_query = bundle_query.select(
+ Concat("MFG-", batch_table.manufacturing_date),
+ Concat("EXP-", batch_table.expiry_date),
+ )
+
+ if filters.get("warehouse"):
+ bundle_query = bundle_query.where(stock_ledger_entry.warehouse == filters.get("warehouse"))
+
+ for field in searchfields:
+ bundle_query = bundle_query.select(batch_table[field])
+
+ if txt:
+ txt_condition = batch_table.name.like(txt)
+ for field in searchfields + ["name"]:
+ txt_condition |= batch_table[field].like(txt)
+
+ bundle_query = bundle_query.where(txt_condition)
+
+ return bundle_query
@frappe.whitelist()
@@ -576,7 +627,9 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
-def get_filtered_dimensions(doctype, txt, searchfield, start, page_len, filters):
+def get_filtered_dimensions(
+ doctype, txt, searchfield, start, page_len, filters, reference_doctype=None
+):
from erpnext.accounts.doctype.accounting_dimension_filter.accounting_dimension_filter import (
get_dimension_filter_map,
)
@@ -617,7 +670,12 @@
query_filters.append(["name", query_selector, dimensions])
output = frappe.get_list(
- doctype, fields=fields, filters=query_filters, or_filters=or_filters, as_list=1
+ doctype,
+ fields=fields,
+ filters=query_filters,
+ or_filters=or_filters,
+ as_list=1,
+ reference_doctype=reference_doctype,
)
return [tuple(d) for d in set(output)]
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 15c270e..173e812 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -320,11 +320,11 @@
return data[0]
-def make_return_doc(doctype: str, source_name: str, target_doc=None):
+def make_return_doc(
+ doctype: str, source_name: str, target_doc=None, return_against_rejected_qty=False
+):
from frappe.model.mapper import get_mapped_doc
- from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-
company = frappe.db.get_value("Delivery Note", source_name, "company")
default_warehouse_for_sales_return = frappe.get_cached_value(
"Company", company, "default_warehouse_for_sales_return"
@@ -392,23 +392,69 @@
doc.run_method("calculate_taxes_and_totals")
def update_item(source_doc, target_doc, source_parent):
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
+
target_doc.qty = -1 * source_doc.qty
+ item_details = frappe.get_cached_value(
+ "Item", source_doc.item_code, ["has_batch_no", "has_serial_no"], as_dict=1
+ )
- if source_doc.serial_no:
- returned_serial_nos = get_returned_serial_nos(source_doc, source_parent)
- serial_nos = list(set(get_serial_nos(source_doc.serial_no)) - set(returned_serial_nos))
- if serial_nos:
- target_doc.serial_no = "\n".join(serial_nos)
+ returned_serial_nos = []
+ if source_doc.get("serial_and_batch_bundle"):
+ if item_details.has_serial_no:
+ returned_serial_nos = get_returned_serial_nos(source_doc, source_parent)
- if source_doc.get("rejected_serial_no"):
- returned_serial_nos = get_returned_serial_nos(
- source_doc, source_parent, serial_no_field="rejected_serial_no"
+ type_of_transaction = "Inward"
+ if (
+ frappe.db.get_value(
+ "Serial and Batch Bundle", source_doc.serial_and_batch_bundle, "type_of_transaction"
+ )
+ == "Inward"
+ ):
+ type_of_transaction = "Outward"
+
+ cls_obj = SerialBatchCreation(
+ {
+ "type_of_transaction": type_of_transaction,
+ "serial_and_batch_bundle": source_doc.serial_and_batch_bundle,
+ "returned_against": source_doc.name,
+ "item_code": source_doc.item_code,
+ "returned_serial_nos": returned_serial_nos,
+ }
)
- rejected_serial_nos = list(
- set(get_serial_nos(source_doc.rejected_serial_no)) - set(returned_serial_nos)
+
+ cls_obj.duplicate_package()
+ if cls_obj.serial_and_batch_bundle:
+ target_doc.serial_and_batch_bundle = cls_obj.serial_and_batch_bundle
+
+ if source_doc.get("rejected_serial_and_batch_bundle"):
+ if item_details.has_serial_no:
+ returned_serial_nos = get_returned_serial_nos(
+ source_doc, source_parent, serial_no_field="rejected_serial_and_batch_bundle"
+ )
+
+ type_of_transaction = "Inward"
+ if (
+ frappe.db.get_value(
+ "Serial and Batch Bundle", source_doc.rejected_serial_and_batch_bundle, "type_of_transaction"
+ )
+ == "Inward"
+ ):
+ type_of_transaction = "Outward"
+
+ cls_obj = SerialBatchCreation(
+ {
+ "type_of_transaction": type_of_transaction,
+ "serial_and_batch_bundle": source_doc.rejected_serial_and_batch_bundle,
+ "returned_against": source_doc.name,
+ "item_code": source_doc.item_code,
+ "returned_serial_nos": returned_serial_nos,
+ }
)
- if rejected_serial_nos:
- target_doc.rejected_serial_no = "\n".join(rejected_serial_nos)
+
+ cls_obj.duplicate_package()
+ if cls_obj.serial_and_batch_bundle:
+ target_doc.serial_and_batch_bundle = cls_obj.serial_and_batch_bundle
if doctype in ["Purchase Receipt", "Subcontracting Receipt"]:
returned_qty_map = get_returned_qty_map_for_row(
@@ -427,7 +473,7 @@
target_doc.qty = -1 * flt(source_doc.qty - (returned_qty_map.get("qty") or 0))
- if hasattr(target_doc, "stock_qty"):
+ if hasattr(target_doc, "stock_qty") and not return_against_rejected_qty:
target_doc.stock_qty = -1 * flt(
source_doc.stock_qty - (returned_qty_map.get("stock_qty") or 0)
)
@@ -446,6 +492,13 @@
target_doc.rejected_warehouse = source_doc.rejected_warehouse
target_doc.purchase_receipt_item = source_doc.name
+ if doctype == "Purchase Receipt" and return_against_rejected_qty:
+ target_doc.qty = -1 * flt(source_doc.rejected_qty - (returned_qty_map.get("qty") or 0))
+ target_doc.rejected_qty = 0.0
+ target_doc.rejected_warehouse = ""
+ target_doc.warehouse = source_doc.rejected_warehouse
+ target_doc.received_qty = target_doc.qty
+
elif doctype == "Purchase Invoice":
returned_qty_map = get_returned_qty_map_for_row(
source_parent.name, source_parent.supplier, source_doc.name, doctype
@@ -573,8 +626,7 @@
"posting_date": sle.get("posting_date"),
"posting_time": sle.get("posting_time"),
"qty": sle.actual_qty,
- "serial_no": sle.get("serial_no"),
- "batch_no": sle.get("batch_no"),
+ "serial_and_batch_bundle": sle.get("serial_and_batch_bundle"),
"company": sle.company,
"voucher_type": sle.voucher_type,
"voucher_no": sle.voucher_no,
@@ -617,11 +669,30 @@
if reference_voucher_detail_no:
filters["voucher_detail_no"] = reference_voucher_detail_no
+ if (
+ voucher_type in ["Purchase Receipt", "Purchase Invoice"]
+ and item_row
+ and item_row.get("warehouse")
+ ):
+ filters["warehouse"] = item_row.get("warehouse")
+
return filters
-def get_returned_serial_nos(child_doc, parent_doc, serial_no_field="serial_no"):
- from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+def get_returned_serial_nos(
+ child_doc, parent_doc, serial_no_field=None, ignore_voucher_detail_no=None
+):
+ from erpnext.stock.doctype.serial_no.serial_no import (
+ get_serial_nos as get_serial_nos_from_serial_no,
+ )
+ from erpnext.stock.serial_batch_bundle import get_serial_nos
+
+ if not serial_no_field:
+ serial_no_field = "serial_and_batch_bundle"
+
+ old_field = "serial_no"
+ if serial_no_field == "rejected_serial_and_batch_bundle":
+ old_field = "rejected_serial_no"
return_ref_field = frappe.scrub(child_doc.doctype)
if child_doc.doctype == "Delivery Note Item":
@@ -629,7 +700,10 @@
serial_nos = []
- fields = [f"`{'tab' + child_doc.doctype}`.`{serial_no_field}`"]
+ fields = [
+ f"`{'tab' + child_doc.doctype}`.`{serial_no_field}`",
+ f"`{'tab' + child_doc.doctype}`.`{old_field}`",
+ ]
filters = [
[parent_doc.doctype, "return_against", "=", parent_doc.name],
@@ -638,7 +712,16 @@
[parent_doc.doctype, "docstatus", "=", 1],
]
+ # Required for POS Invoice
+ if ignore_voucher_detail_no:
+ filters.append([child_doc.doctype, "name", "!=", ignore_voucher_detail_no])
+
+ ids = []
for row in frappe.get_all(parent_doc.doctype, fields=fields, filters=filters):
- serial_nos.extend(get_serial_nos(row.get(serial_no_field)))
+ ids.append(row.get("serial_and_batch_bundle"))
+ if row.get(old_field):
+ serial_nos.extend(get_serial_nos_from_serial_no(row.get(old_field)))
+
+ serial_nos.extend(get_serial_nos(ids))
return serial_nos
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index fc16a91..6f1a50d 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -5,7 +5,7 @@
import frappe
from frappe import _, bold, throw
from frappe.contacts.doctype.address.address import get_address_display
-from frappe.utils import cint, cstr, flt, get_link_to_form, nowtime
+from frappe.utils import cint, flt, get_link_to_form, nowtime
from erpnext.controllers.accounts_controller import get_taxes_and_charges
from erpnext.controllers.sales_and_purchase_return import get_rate_for_return
@@ -38,9 +38,11 @@
self.validate_for_duplicate_items()
self.validate_target_warehouse()
self.validate_auto_repeat_subscription_dates()
+ for table_field in ["items", "packed_items"]:
+ if self.get(table_field):
+ self.set_serial_and_batch_bundle(table_field)
def set_missing_values(self, for_validate=False):
-
super(SellingController, self).set_missing_values(for_validate)
# set contact and address details for customer, if they are not mentioned
@@ -59,7 +61,7 @@
elif self.doctype == "Quotation" and self.party_name:
if self.quotation_to == "Customer":
customer = self.party_name
- else:
+ elif self.quotation_to == "Lead":
lead = self.party_name
if customer:
@@ -168,7 +170,7 @@
self.round_floats_in(sales_person)
sales_person.allocated_amount = flt(
- self.amount_eligible_for_commission * sales_person.allocated_percentage / 100.0,
+ flt(self.amount_eligible_for_commission) * sales_person.allocated_percentage / 100.0,
self.precision("allocated_amount", sales_person),
)
@@ -299,8 +301,8 @@
"item_code": p.item_code,
"qty": flt(p.qty),
"uom": p.uom,
- "batch_no": cstr(p.batch_no).strip(),
- "serial_no": cstr(p.serial_no).strip(),
+ "serial_and_batch_bundle": p.serial_and_batch_bundle
+ or get_serial_and_batch_bundle(p, self),
"name": d.name,
"target_warehouse": p.target_warehouse,
"company": self.company,
@@ -323,8 +325,7 @@
"uom": d.uom,
"stock_uom": d.stock_uom,
"conversion_factor": d.conversion_factor,
- "batch_no": cstr(d.get("batch_no")).strip(),
- "serial_no": cstr(d.get("serial_no")).strip(),
+ "serial_and_batch_bundle": d.serial_and_batch_bundle,
"name": d.name,
"target_warehouse": d.target_warehouse,
"company": self.company,
@@ -337,6 +338,7 @@
}
)
)
+
return il
def has_product_bundle(self, item_code):
@@ -427,8 +429,7 @@
"posting_date": self.get("posting_date") or self.get("transaction_date"),
"posting_time": self.get("posting_time") or nowtime(),
"qty": qty if cint(self.get("is_return")) else (-1 * qty),
- "serial_no": d.get("serial_no"),
- "batch_no": d.get("batch_no"),
+ "serial_and_batch_bundle": d.serial_and_batch_bundle,
"company": self.company,
"voucher_type": self.doctype,
"voucher_no": self.name,
@@ -511,6 +512,7 @@
"actual_qty": -1 * flt(item_row.qty),
"incoming_rate": item_row.incoming_rate,
"recalculate_rate": cint(self.is_return),
+ "serial_and_batch_bundle": item_row.serial_and_batch_bundle,
},
)
if item_row.target_warehouse and not cint(self.is_return):
@@ -531,6 +533,11 @@
if item_row.warehouse:
sle.dependant_sle_voucher_detail_no = item_row.name
+ if item_row.serial_and_batch_bundle:
+ sle["serial_and_batch_bundle"] = self.make_package_for_transfer(
+ item_row.serial_and_batch_bundle, item_row.target_warehouse
+ )
+
return sle
def set_po_nos(self, for_validate=False):
@@ -669,3 +676,40 @@
if d.item_code:
if getattr(d, "income_account", None):
set_item_default(d.item_code, obj.company, "income_account", d.income_account)
+
+
+def get_serial_and_batch_bundle(child, parent):
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
+
+ if not frappe.db.get_single_value(
+ "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"
+ ):
+ return
+
+ item_details = frappe.db.get_value(
+ "Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1
+ )
+
+ if not item_details.has_serial_no and not item_details.has_batch_no:
+ return
+
+ sn_doc = SerialBatchCreation(
+ {
+ "item_code": child.item_code,
+ "warehouse": child.warehouse,
+ "voucher_type": parent.doctype,
+ "voucher_no": parent.name,
+ "voucher_detail_no": child.name,
+ "posting_date": parent.posting_date,
+ "posting_time": parent.posting_time,
+ "qty": child.qty,
+ "type_of_transaction": "Outward" if child.qty > 0 else "Inward",
+ "company": parent.company,
+ "do_not_submit": "True",
+ }
+ )
+
+ doc = sn_doc.make_serial_and_batch_bundle()
+ child.db_set("serial_and_batch_bundle", doc.name)
+
+ return doc.name
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 1e4fabe..caf4b6f 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -7,7 +7,7 @@
import frappe
from frappe import _
-from frappe.utils import cint, cstr, flt, get_link_to_form, getdate
+from frappe.utils import cint, flt, get_link_to_form, getdate
import erpnext
from erpnext.accounts.general_ledger import (
@@ -201,6 +201,12 @@
warehouse_asset_account = warehouse_account[item_row.get("warehouse")]["account"]
expense_account = frappe.get_cached_value("Company", self.company, "default_expense_account")
+ if not expense_account:
+ frappe.throw(
+ _(
+ "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer"
+ ).format(frappe.bold(self.company))
+ )
gl_list.append(
self.get_gl_dict(
@@ -325,28 +331,6 @@
stock_ledger.setdefault(sle.voucher_detail_no, []).append(sle)
return stock_ledger
- def make_batches(self, warehouse_field):
- """Create batches if required. Called before submit"""
- for d in self.items:
- if d.get(warehouse_field) and not d.batch_no:
- has_batch_no, create_new_batch = frappe.db.get_value(
- "Item", d.item_code, ["has_batch_no", "create_new_batch"]
- )
- if has_batch_no and create_new_batch:
- d.batch_no = (
- frappe.get_doc(
- dict(
- doctype="Batch",
- item=d.item_code,
- supplier=getattr(self, "supplier", None),
- reference_doctype=self.doctype,
- reference_name=self.name,
- )
- )
- .insert()
- .name
- )
-
def check_expense_account(self, item):
if not item.get("expense_account"):
msg = _("Please set an Expense Account in the Items table")
@@ -386,27 +370,73 @@
)
def delete_auto_created_batches(self):
- for d in self.items:
- if not d.batch_no:
- continue
+ for row in self.items:
+ if row.serial_and_batch_bundle:
+ frappe.db.set_value(
+ "Serial and Batch Bundle", row.serial_and_batch_bundle, {"is_cancelled": 1}
+ )
- frappe.db.set_value(
- "Serial No", {"batch_no": d.batch_no, "status": "Inactive"}, "batch_no", None
- )
+ row.db_set("serial_and_batch_bundle", None)
- d.batch_no = None
- d.db_set("batch_no", None)
+ def set_serial_and_batch_bundle(self, table_name=None, ignore_validate=False):
+ if not table_name:
+ table_name = "items"
- for data in frappe.get_all(
- "Batch", {"reference_name": self.name, "reference_doctype": self.doctype}
- ):
- frappe.delete_doc("Batch", data.name)
+ QTY_FIELD = {
+ "serial_and_batch_bundle": "qty",
+ "current_serial_and_batch_bundle": "current_qty",
+ "rejected_serial_and_batch_bundle": "rejected_qty",
+ }
+
+ for row in self.get(table_name):
+ for field in [
+ "serial_and_batch_bundle",
+ "current_serial_and_batch_bundle",
+ "rejected_serial_and_batch_bundle",
+ ]:
+ if row.get(field):
+ frappe.get_doc("Serial and Batch Bundle", row.get(field)).set_serial_and_batch_values(
+ self, row, qty_field=QTY_FIELD[field]
+ )
+
+ def make_package_for_transfer(
+ self, serial_and_batch_bundle, warehouse, type_of_transaction=None, do_not_submit=None
+ ):
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", serial_and_batch_bundle)
+
+ if not type_of_transaction:
+ type_of_transaction = "Inward"
+
+ bundle_doc = frappe.copy_doc(bundle_doc)
+ bundle_doc.warehouse = warehouse
+ bundle_doc.type_of_transaction = type_of_transaction
+ bundle_doc.voucher_type = self.doctype
+ bundle_doc.voucher_no = self.name
+ bundle_doc.is_cancelled = 0
+
+ for row in bundle_doc.entries:
+ row.is_outward = 0
+ row.qty = abs(row.qty)
+ row.stock_value_difference = abs(row.stock_value_difference)
+ if type_of_transaction == "Outward":
+ row.qty *= -1
+ row.stock_value_difference *= row.stock_value_difference
+ row.is_outward = 1
+
+ row.warehouse = warehouse
+
+ bundle_doc.calculate_qty_and_amount()
+ bundle_doc.flags.ignore_permissions = True
+ bundle_doc.save(ignore_permissions=True)
+
+ return bundle_doc.name
def get_sl_entries(self, d, args):
sl_dict = frappe._dict(
{
"item_code": d.get("item_code", None),
"warehouse": d.get("warehouse", None),
+ "serial_and_batch_bundle": d.get("serial_and_batch_bundle"),
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"fiscal_year": get_fiscal_year(self.posting_date, company=self.company)[0],
@@ -414,13 +444,11 @@
"voucher_no": self.name,
"voucher_detail_no": d.name,
"actual_qty": (self.docstatus == 1 and 1 or -1) * flt(d.get("stock_qty")),
- "stock_uom": frappe.db.get_value(
+ "stock_uom": frappe.get_cached_value(
"Item", args.get("item_code") or d.get("item_code"), "stock_uom"
),
"incoming_rate": 0,
"company": self.company,
- "batch_no": cstr(d.get("batch_no")).strip(),
- "serial_no": d.get("serial_no"),
"project": d.get("project") or self.get("project"),
"is_cancelled": 1 if self.docstatus == 2 else 0,
}
@@ -441,7 +469,43 @@
if not dimension:
continue
- if row.get(dimension.source_fieldname):
+ if self.doctype in [
+ "Purchase Invoice",
+ "Purchase Receipt",
+ "Sales Invoice",
+ "Delivery Note",
+ "Stock Entry",
+ ]:
+ if (
+ (
+ sl_dict.actual_qty > 0
+ and not self.get("is_return")
+ or sl_dict.actual_qty < 0
+ and self.get("is_return")
+ )
+ and self.doctype in ["Purchase Invoice", "Purchase Receipt"]
+ ) or (
+ (
+ sl_dict.actual_qty < 0
+ and not self.get("is_return")
+ or sl_dict.actual_qty > 0
+ and self.get("is_return")
+ )
+ and self.doctype in ["Sales Invoice", "Delivery Note", "Stock Entry"]
+ ):
+ sl_dict[dimension.target_fieldname] = row.get(dimension.source_fieldname)
+ else:
+ fieldname_start_with = "to"
+ if self.doctype in ["Purchase Invoice", "Purchase Receipt"]:
+ fieldname_start_with = "from"
+
+ fieldname = f"{fieldname_start_with}_{dimension.source_fieldname}"
+ sl_dict[dimension.target_fieldname] = row.get(fieldname)
+
+ if not sl_dict.get(dimension.target_fieldname):
+ sl_dict[dimension.target_fieldname] = row.get(dimension.source_fieldname)
+
+ elif row.get(dimension.source_fieldname):
sl_dict[dimension.target_fieldname] = row.get(dimension.source_fieldname)
if not sl_dict.get(dimension.target_fieldname) and dimension.fetch_from_parent:
@@ -609,7 +673,7 @@
def validate_customer_provided_item(self):
for d in self.get("items"):
# Customer Provided parts will have zero valuation rate
- if frappe.db.get_value("Item", d.item_code, "is_customer_provided_item"):
+ if frappe.get_cached_value("Item", d.item_code, "is_customer_provided_item"):
d.allow_zero_valuation_rate = 1
def set_rate_of_stock_uom(self):
@@ -722,7 +786,7 @@
message += _("Please adjust the qty or edit {0} to proceed.").format(rule_link)
return message
- def repost_future_sle_and_gle(self):
+ def repost_future_sle_and_gle(self, force=False):
args = frappe._dict(
{
"posting_date": self.posting_date,
@@ -733,7 +797,10 @@
}
)
- if future_sle_exists(args) or repost_required_for_queue(self):
+ if self.docstatus == 2:
+ force = True
+
+ if force or future_sle_exists(args) or repost_required_for_queue(self):
item_based_reposting = cint(
frappe.db.get_single_value("Stock Reposting Settings", "item_based_reposting")
)
@@ -784,6 +851,149 @@
gl_entries.append(self.get_gl_dict(gl_entry, item=item))
+@frappe.whitelist()
+def show_accounting_ledger_preview(company, doctype, docname):
+ filters = {"company": company, "include_dimensions": 1}
+ doc = frappe.get_doc(doctype, docname)
+
+ gl_columns, gl_data = get_accounting_ledger_preview(doc, filters)
+
+ frappe.db.rollback()
+
+ return {"gl_columns": gl_columns, "gl_data": gl_data}
+
+
+@frappe.whitelist()
+def show_stock_ledger_preview(company, doctype, docname):
+ filters = {"company": company}
+ doc = frappe.get_doc(doctype, docname)
+
+ sl_columns, sl_data = get_stock_ledger_preview(doc, filters)
+
+ frappe.db.rollback()
+
+ return {
+ "sl_columns": sl_columns,
+ "sl_data": sl_data,
+ }
+
+
+def get_accounting_ledger_preview(doc, filters):
+ from erpnext.accounts.report.general_ledger.general_ledger import get_columns as get_gl_columns
+
+ gl_columns, gl_data = [], []
+ fields = [
+ "posting_date",
+ "account",
+ "debit",
+ "credit",
+ "against",
+ "party",
+ "party_type",
+ "cost_center",
+ "against_voucher_type",
+ "against_voucher",
+ ]
+
+ doc.docstatus = 1
+
+ if doc.get("update_stock") or doc.doctype in ("Purchase Receipt", "Delivery Note"):
+ doc.update_stock_ledger()
+
+ doc.make_gl_entries()
+ columns = get_gl_columns(filters)
+ gl_entries = get_gl_entries_for_preview(doc.doctype, doc.name, fields)
+
+ gl_columns = get_columns(columns, fields)
+ gl_data = get_data(fields, gl_entries)
+
+ return gl_columns, gl_data
+
+
+def get_stock_ledger_preview(doc, filters):
+ from erpnext.stock.report.stock_ledger.stock_ledger import get_columns as get_sl_columns
+
+ sl_columns, sl_data = [], []
+ fields = [
+ "item_code",
+ "stock_uom",
+ "actual_qty",
+ "qty_after_transaction",
+ "warehouse",
+ "incoming_rate",
+ "valuation_rate",
+ "stock_value",
+ "stock_value_difference",
+ ]
+ columns_fields = [
+ "item_code",
+ "stock_uom",
+ "in_qty",
+ "out_qty",
+ "qty_after_transaction",
+ "warehouse",
+ "incoming_rate",
+ "in_out_rate",
+ "stock_value",
+ "stock_value_difference",
+ ]
+
+ if doc.get("update_stock") or doc.doctype in ("Purchase Receipt", "Delivery Note"):
+ doc.docstatus = 1
+ doc.update_stock_ledger()
+ columns = get_sl_columns(filters)
+ sl_entries = get_sl_entries_for_preview(doc.doctype, doc.name, fields)
+
+ sl_columns = get_columns(columns, columns_fields)
+ sl_data = get_data(columns_fields, sl_entries)
+
+ return sl_columns, sl_data
+
+
+def get_sl_entries_for_preview(doctype, docname, fields):
+ sl_entries = frappe.get_all(
+ "Stock Ledger Entry", filters={"voucher_type": doctype, "voucher_no": docname}, fields=fields
+ )
+
+ for entry in sl_entries:
+ if entry.actual_qty > 0:
+ entry["in_qty"] = entry.actual_qty
+ entry["out_qty"] = 0
+ else:
+ entry["out_qty"] = abs(entry.actual_qty)
+ entry["in_qty"] = 0
+
+ entry["in_out_rate"] = entry["valuation_rate"]
+
+ return sl_entries
+
+
+def get_gl_entries_for_preview(doctype, docname, fields):
+ return frappe.get_all(
+ "GL Entry", filters={"voucher_type": doctype, "voucher_no": docname}, fields=fields
+ )
+
+
+def get_columns(raw_columns, fields):
+ return [
+ {"name": d.get("label"), "editable": False, "width": 110}
+ for d in raw_columns
+ if not d.get("hidden") and d.get("fieldname") in fields
+ ]
+
+
+def get_data(raw_columns, raw_data):
+ datatable_data = []
+ for row in raw_data:
+ data_row = []
+ for column in raw_columns:
+ data_row.append(row.get(column) or "")
+
+ datatable_data.append(data_row)
+
+ return datatable_data
+
+
def repost_required_for_queue(doc: StockController) -> bool:
"""check if stock document contains repeated item-warehouse with queue based valuation.
@@ -859,6 +1069,8 @@
def future_sle_exists(args, sl_entries=None):
key = (args.voucher_type, args.voucher_no)
+ if not hasattr(frappe.local, "future_sle"):
+ frappe.local.future_sle = {}
if validate_future_sle_not_exists(args, key, sl_entries):
return False
@@ -903,6 +1115,9 @@
item_key = (args.get("item_code"), args.get("warehouse"))
if not sl_entries and hasattr(frappe.local, "future_sle"):
+ if key not in frappe.local.future_sle:
+ return False
+
if not frappe.local.future_sle.get(key) or (
item_key and item_key not in frappe.local.future_sle.get(key)
):
@@ -910,9 +1125,6 @@
def get_cached_data(args, key):
- if not hasattr(frappe.local, "future_sle"):
- frappe.local.future_sle = {}
-
if key not in frappe.local.future_sle:
frappe.local.future_sle[key] = frappe._dict({})
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index 0575429..57339bf 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -8,10 +8,14 @@
import frappe
from frappe import _
from frappe.model.mapper import get_mapped_doc
-from frappe.utils import cint, cstr, flt, get_link_to_form
+from frappe.utils import cint, flt, get_link_to_form
from erpnext.controllers.stock_controller import StockController
+from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_voucher_wise_serial_batch_from_bundle,
+)
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+from erpnext.stock.serial_batch_bundle import SerialBatchCreation, get_serial_nos_from_bundle
from erpnext.stock.utils import get_incoming_rate
@@ -169,45 +173,52 @@
self.qty_to_be_received[(row.item_code, row.parent)] += row.qty
def __get_transferred_items(self):
- fields = [f"`tabStock Entry`.`{self.subcontract_data.order_field}`"]
- alias_dict = {
- "item_code": "rm_item_code",
- "subcontracted_item": "main_item_code",
- "basic_rate": "rate",
- }
+ se = frappe.qb.DocType("Stock Entry")
+ se_detail = frappe.qb.DocType("Stock Entry Detail")
- child_table_fields = [
- "item_code",
- "item_name",
- "description",
- "qty",
- "basic_rate",
- "amount",
- "serial_no",
- "uom",
- "subcontracted_item",
- "stock_uom",
- "batch_no",
- "conversion_factor",
- "s_warehouse",
- "t_warehouse",
- "item_group",
- self.subcontract_data.rm_detail_field,
- ]
+ query = (
+ frappe.qb.from_(se)
+ .inner_join(se_detail)
+ .on(se.name == se_detail.parent)
+ .select(
+ se[self.subcontract_data.order_field],
+ se.name.as_("voucher_no"),
+ se_detail.item_code.as_("rm_item_code"),
+ se_detail.item_name,
+ se_detail.description,
+ (
+ frappe.qb.terms.Case()
+ .when(((se.purpose == "Material Transfer") & (se.is_return == 1)), -1 * se_detail.qty)
+ .else_(se_detail.qty)
+ ).as_("qty"),
+ se_detail.basic_rate.as_("rate"),
+ se_detail.amount,
+ se_detail.serial_no,
+ se_detail.serial_and_batch_bundle,
+ se_detail.uom,
+ se_detail.subcontracted_item.as_("main_item_code"),
+ se_detail.stock_uom,
+ se_detail.batch_no,
+ se_detail.conversion_factor,
+ se_detail.s_warehouse,
+ se_detail.t_warehouse,
+ se_detail.item_group,
+ se_detail[self.subcontract_data.rm_detail_field],
+ )
+ .where(
+ (se.docstatus == 1)
+ & (se[self.subcontract_data.order_field].isin(self.subcontract_orders))
+ & (
+ (se.purpose == "Send to Subcontractor")
+ | ((se.purpose == "Material Transfer") & (se.is_return == 1))
+ )
+ )
+ )
if self.backflush_based_on == "BOM":
- child_table_fields.append("original_item")
+ query = query.select(se_detail.original_item)
- for field in child_table_fields:
- fields.append(f"`tabStock Entry Detail`.`{field}` As {alias_dict.get(field, field)}")
-
- filters = [
- ["Stock Entry", "docstatus", "=", 1],
- ["Stock Entry", "purpose", "=", "Send to Subcontractor"],
- ["Stock Entry", self.subcontract_data.order_field, "in", self.subcontract_orders],
- ]
-
- return frappe.get_all("Stock Entry", fields=fields, filters=filters)
+ return query.run(as_dict=True)
def __set_alternative_item_details(self, row):
if row.get("original_item"):
@@ -234,9 +245,11 @@
"serial_no",
"rm_item_code",
"reference_name",
+ "serial_and_batch_bundle",
"batch_no",
"consumed_qty",
"main_item_code",
+ "parent as voucher_no",
],
filters={"docstatus": 1, "reference_name": ("in", list(receipt_items)), "parenttype": doctype},
)
@@ -253,6 +266,13 @@
}
consumed_materials = self.__get_consumed_items(doctype, receipt_items.keys())
+ voucher_nos = [d.voucher_no for d in consumed_materials if d.voucher_no]
+ voucher_bundle_data = get_voucher_wise_serial_batch_from_bundle(
+ voucher_no=voucher_nos,
+ is_outward=1,
+ get_subcontracted_item=("Subcontracting Receipt Supplied Item", "main_item_code"),
+ )
+
if return_consumed_items:
return (consumed_materials, receipt_items)
@@ -262,11 +282,29 @@
continue
self.available_materials[key]["qty"] -= row.consumed_qty
+
+ bundle_key = (row.rm_item_code, row.main_item_code, self.supplier_warehouse, row.voucher_no)
+ consumed_bundles = voucher_bundle_data.get(bundle_key, frappe._dict())
+
+ if consumed_bundles.serial_nos:
+ self.available_materials[key]["serial_no"] = list(
+ set(self.available_materials[key]["serial_no"]) - set(consumed_bundles.serial_nos)
+ )
+
+ if consumed_bundles.batch_nos:
+ for batch_no, qty in consumed_bundles.batch_nos.items():
+ if qty:
+ # Conumed qty is negative therefore added it instead of subtracting
+ self.available_materials[key]["batch_no"][batch_no] += qty
+ consumed_bundles.batch_nos[batch_no] += abs(qty)
+
+ # Will be deprecated in v16
if row.serial_no:
self.available_materials[key]["serial_no"] = list(
set(self.available_materials[key]["serial_no"]) - set(get_serial_nos(row.serial_no))
)
+ # Will be deprecated in v16
if row.batch_no:
self.available_materials[key]["batch_no"][row.batch_no] -= row.consumed_qty
@@ -281,7 +319,16 @@
if not self.subcontract_orders:
return
- for row in self.__get_transferred_items():
+ transferred_items = self.__get_transferred_items()
+
+ voucher_nos = [row.voucher_no for row in transferred_items]
+ voucher_bundle_data = get_voucher_wise_serial_batch_from_bundle(
+ voucher_no=voucher_nos,
+ is_outward=0,
+ get_subcontracted_item=("Stock Entry Detail", "subcontracted_item"),
+ )
+
+ for row in transferred_items:
key = (row.rm_item_code, row.main_item_code, row.get(self.subcontract_data.order_field))
if key not in self.available_materials:
@@ -310,6 +357,20 @@
if row.batch_no:
details.batch_no[row.batch_no] += row.qty
+ if voucher_bundle_data:
+ bundle_key = (row.rm_item_code, row.main_item_code, row.t_warehouse, row.voucher_no)
+
+ bundle_data = voucher_bundle_data.get(bundle_key, frappe._dict())
+ if bundle_data.serial_nos:
+ details.serial_no.extend(bundle_data.serial_nos)
+ bundle_data.serial_nos = []
+
+ if bundle_data.batch_nos:
+ for batch_no, qty in bundle_data.batch_nos.items():
+ if qty > 0:
+ details.batch_no[batch_no] += qty
+ bundle_data.batch_nos[batch_no] -= qty
+
self.__set_alternative_item_details(row)
self.__transferred_items = copy.deepcopy(self.available_materials)
@@ -327,6 +388,7 @@
self.set(self.raw_material_table, [])
for item in self._doc_before_save.supplied_items:
if item.reference_name in self.__changed_name:
+ self.__remove_serial_and_batch_bundle(item)
continue
if item.reference_name not in self.__reference_name:
@@ -337,6 +399,10 @@
i += 1
+ def __remove_serial_and_batch_bundle(self, item):
+ if item.serial_and_batch_bundle:
+ frappe.delete_doc("Serial and Batch Bundle", item.serial_and_batch_bundle, force=True)
+
def __get_materials_from_bom(self, item_code, bom_no, exploded_item=0):
doctype = "BOM Item" if not exploded_item else "BOM Explosion Item"
fields = [f"`tab{doctype}`.`stock_qty` / `tabBOM`.`quantity` as qty_consumed_per_unit"]
@@ -377,68 +443,89 @@
if self.alternative_item_details.get(bom_item.rm_item_code):
bom_item.update(self.alternative_item_details[bom_item.rm_item_code])
- def __set_serial_nos(self, item_row, rm_obj):
+ def __set_serial_and_batch_bundle(self, item_row, rm_obj, qty):
key = (rm_obj.rm_item_code, item_row.item_code, item_row.get(self.subcontract_data.order_field))
+ if not self.available_materials.get(key):
+ return
+
+ if (
+ not self.available_materials[key]["serial_no"] and not self.available_materials[key]["batch_no"]
+ ):
+ return
+
+ serial_nos = []
+ batches = frappe._dict({})
+
if self.available_materials.get(key) and self.available_materials[key]["serial_no"]:
- used_serial_nos = self.available_materials[key]["serial_no"][0 : cint(rm_obj.consumed_qty)]
- rm_obj.serial_no = "\n".join(used_serial_nos)
+ serial_nos = self.__get_serial_nos_for_bundle(qty, key)
- # Removed the used serial nos from the list
- for sn in used_serial_nos:
- self.available_materials[key]["serial_no"].remove(sn)
+ elif self.available_materials.get(key) and self.available_materials[key]["batch_no"]:
+ batches = self.__get_batch_nos_for_bundle(qty, key)
- def __set_batch_no_as_per_qty(self, item_row, rm_obj, batch_no, qty):
- rm_obj.update(
- {
- "consumed_qty": qty,
- "batch_no": batch_no,
- "required_qty": qty,
- self.subcontract_data.order_field: item_row.get(self.subcontract_data.order_field),
- }
- )
+ bundle = SerialBatchCreation(
+ frappe._dict(
+ {
+ "company": self.company,
+ "item_code": rm_obj.rm_item_code,
+ "warehouse": self.supplier_warehouse,
+ "qty": qty,
+ "serial_nos": serial_nos,
+ "batches": batches,
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ "voucher_type": "Subcontracting Receipt",
+ "do_not_submit": True,
+ "type_of_transaction": "Outward" if qty > 0 else "Inward",
+ }
+ )
+ ).make_serial_and_batch_bundle()
- self.__set_serial_nos(item_row, rm_obj)
+ return bundle.name
- def __set_consumed_qty(self, rm_obj, consumed_qty, required_qty=0):
- rm_obj.required_qty = required_qty
- rm_obj.consumed_qty = consumed_qty
+ def __get_batch_nos_for_bundle(self, qty, key):
+ available_batches = defaultdict(float)
- def __set_batch_nos(self, bom_item, item_row, rm_obj, qty):
- key = (rm_obj.rm_item_code, item_row.item_code, item_row.get(self.subcontract_data.order_field))
+ for batch_no, batch_qty in self.available_materials[key]["batch_no"].items():
+ qty_to_consumed = 0
+ if qty > 0:
+ if batch_qty >= qty:
+ qty_to_consumed = qty
+ else:
+ qty_to_consumed = batch_qty
- if self.available_materials.get(key) and self.available_materials[key]["batch_no"]:
- new_rm_obj = None
- for batch_no, batch_qty in self.available_materials[key]["batch_no"].items():
- if batch_qty >= qty or (
- rm_obj.consumed_qty == 0
- and self.backflush_based_on == "BOM"
- and len(self.available_materials[key]["batch_no"]) == 1
- ):
- if rm_obj.consumed_qty == 0:
- self.__set_consumed_qty(rm_obj, qty)
+ qty -= qty_to_consumed
+ if qty_to_consumed > 0:
+ available_batches[batch_no] += qty_to_consumed
+ self.available_materials[key]["batch_no"][batch_no] -= qty_to_consumed
- self.__set_batch_no_as_per_qty(item_row, rm_obj, batch_no, qty)
- self.available_materials[key]["batch_no"][batch_no] -= qty
- return
+ return available_batches
- elif qty > 0 and batch_qty > 0:
- qty -= batch_qty
- new_rm_obj = self.append(self.raw_material_table, bom_item)
- new_rm_obj.reference_name = item_row.name
- self.__set_batch_no_as_per_qty(item_row, new_rm_obj, batch_no, batch_qty)
- self.available_materials[key]["batch_no"][batch_no] = 0
+ def __get_serial_nos_for_bundle(self, qty, key):
+ available_sns = sorted(self.available_materials[key]["serial_no"])[0 : cint(qty)]
+ serial_nos = []
- if abs(qty) > 0 and not new_rm_obj:
- self.__set_consumed_qty(rm_obj, qty)
- else:
- self.__set_consumed_qty(rm_obj, qty, bom_item.required_qty or qty)
- self.__set_serial_nos(item_row, rm_obj)
+ for serial_no in available_sns:
+ serial_nos.append(serial_no)
+
+ self.available_materials[key]["serial_no"].remove(serial_no)
+
+ return serial_nos
def __add_supplied_item(self, item_row, bom_item, qty):
bom_item.conversion_factor = item_row.conversion_factor
rm_obj = self.append(self.raw_material_table, bom_item)
rm_obj.reference_name = item_row.name
+ if self.doctype == self.subcontract_data.order_doctype:
+ rm_obj.required_qty = qty
+ rm_obj.amount = rm_obj.required_qty * rm_obj.rate
+ else:
+ rm_obj.consumed_qty = qty
+ rm_obj.required_qty = bom_item.required_qty or qty
+ setattr(
+ rm_obj, self.subcontract_data.order_field, item_row.get(self.subcontract_data.order_field)
+ )
+
if self.doctype == "Subcontracting Receipt":
args = frappe._dict(
{
@@ -447,25 +534,23 @@
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"qty": -1 * flt(rm_obj.consumed_qty),
- "serial_no": rm_obj.serial_no,
- "batch_no": rm_obj.batch_no,
+ "actual_qty": -1 * flt(rm_obj.consumed_qty),
"voucher_type": self.doctype,
"voucher_no": self.name,
+ "voucher_detail_no": item_row.name,
"company": self.company,
"allow_zero_valuation": 1,
}
)
- rm_obj.rate = bom_item.rate if self.backflush_based_on == "BOM" else get_incoming_rate(args)
- if self.doctype == self.subcontract_data.order_doctype:
- rm_obj.required_qty = qty
- rm_obj.amount = rm_obj.required_qty * rm_obj.rate
- else:
- rm_obj.consumed_qty = 0
- setattr(
- rm_obj, self.subcontract_data.order_field, item_row.get(self.subcontract_data.order_field)
+ rm_obj.serial_and_batch_bundle = self.__set_serial_and_batch_bundle(
+ item_row, rm_obj, rm_obj.consumed_qty
)
- self.__set_batch_nos(bom_item, item_row, rm_obj, qty)
+
+ if rm_obj.serial_and_batch_bundle:
+ args["serial_and_batch_bundle"] = rm_obj.serial_and_batch_bundle
+
+ rm_obj.rate = bom_item.rate if self.backflush_based_on == "BOM" else get_incoming_rate(args)
def __get_qty_based_on_material_transfer(self, item_row, transfer_item):
key = (item_row.item_code, item_row.get(self.subcontract_data.order_field))
@@ -520,6 +605,53 @@
(row.item_code, row.get(self.subcontract_data.order_field))
] -= row.qty
+ def __modify_serial_and_batch_bundle(self):
+ if self.is_new():
+ return
+
+ if self.doctype != "Subcontracting Receipt":
+ return
+
+ for item_row in self.items:
+ if self.__changed_name and item_row.name in self.__changed_name:
+ continue
+
+ modified_data = self.__get_bundle_to_modify(item_row.name)
+ if modified_data:
+ serial_nos = []
+ batches = frappe._dict({})
+ key = (
+ modified_data.rm_item_code,
+ item_row.item_code,
+ item_row.get(self.subcontract_data.order_field),
+ )
+
+ if self.available_materials.get(key) and self.available_materials[key]["serial_no"]:
+ serial_nos = self.__get_serial_nos_for_bundle(modified_data.consumed_qty, key)
+
+ elif self.available_materials.get(key) and self.available_materials[key]["batch_no"]:
+ batches = self.__get_batch_nos_for_bundle(modified_data.consumed_qty, key)
+
+ SerialBatchCreation(
+ {
+ "item_code": modified_data.rm_item_code,
+ "warehouse": self.supplier_warehouse,
+ "serial_and_batch_bundle": modified_data.serial_and_batch_bundle,
+ "type_of_transaction": "Outward",
+ "serial_nos": serial_nos,
+ "batches": batches,
+ "qty": modified_data.consumed_qty * -1,
+ }
+ ).update_serial_and_batch_entries()
+
+ def __get_bundle_to_modify(self, name):
+ for row in self.get("supplied_items"):
+ if row.reference_name == name and row.serial_and_batch_bundle:
+ if row.consumed_qty != abs(
+ frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty")
+ ):
+ return row
+
def __prepare_supplied_items(self):
self.initialized_fields()
self.__get_subcontract_orders()
@@ -527,6 +659,7 @@
self.get_available_materials()
self.__remove_changed_rows()
self.__set_supplied_items()
+ self.__modify_serial_and_batch_bundle()
def __validate_batch_no(self, row, key):
if row.get("batch_no") and row.get("batch_no") not in self.__transferred_items.get(key).get(
@@ -539,8 +672,8 @@
frappe.throw(_(msg), title=_("Incorrect Batch Consumed"))
def __validate_serial_no(self, row, key):
- if row.get("serial_no"):
- serial_nos = get_serial_nos(row.get("serial_no"))
+ if row.get("serial_and_batch_bundle") and self.__transferred_items.get(key).get("serial_no"):
+ serial_nos = get_serial_nos_from_bundle(row.get("serial_and_batch_bundle"))
incorrect_sn = set(serial_nos).difference(self.__transferred_items.get(key).get("serial_no"))
if incorrect_sn:
@@ -667,9 +800,7 @@
scr_qty = flt(item.qty) * flt(item.conversion_factor)
if scr_qty:
- sle = self.get_sl_entries(
- item, {"actual_qty": flt(scr_qty), "serial_no": cstr(item.serial_no).strip()}
- )
+ sle = self.get_sl_entries(item, {"actual_qty": flt(scr_qty)})
rate_db_precision = 6 if cint(self.precision("rate", item)) <= 6 else 9
incoming_rate = flt(item.rate, rate_db_precision)
sle.update(
@@ -687,9 +818,7 @@
{
"warehouse": item.rejected_warehouse,
"actual_qty": flt(item.rejected_qty) * flt(item.conversion_factor),
- "serial_no": cstr(item.rejected_serial_no).strip(),
"incoming_rate": 0.0,
- "recalculate_rate": 1,
},
)
)
@@ -717,8 +846,7 @@
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"qty": -1 * item.consumed_qty,
- "serial_no": item.serial_no,
- "batch_no": item.batch_no,
+ "serial_and_batch_bundle": item.serial_and_batch_bundle,
}
)
@@ -741,7 +869,7 @@
sco_doc = frappe.get_doc("Subcontracting Order", sco)
sco_doc.update_status()
- def set_missing_values_in_additional_costs(self):
+ def calculate_additional_costs(self):
self.total_additional_costs = sum(flt(item.amount) for item in self.get("additional_costs"))
if self.total_additional_costs:
@@ -866,7 +994,6 @@
if rm_item.get("main_item_code") == fg_item_code or rm_item.get("item_code") == fg_item_code:
rm_item_code = rm_item.get("rm_item_code")
-
items_dict = {
rm_item_code: {
rm_detail_field: rm_item.get("name"),
@@ -878,8 +1005,7 @@
"from_warehouse": rm_item.get("warehouse") or rm_item.get("reserve_warehouse"),
"to_warehouse": subcontract_order.supplier_warehouse,
"stock_uom": rm_item.get("stock_uom"),
- "serial_no": rm_item.get("serial_no"),
- "batch_no": rm_item.get("batch_no"),
+ "serial_and_batch_bundle": rm_item.get("serial_and_batch_bundle"),
"main_item_code": fg_item_code,
"allow_alternative_item": item_wh.get(rm_item_code, {}).get("allow_alternative_item"),
}
@@ -954,7 +1080,6 @@
add_items_in_ste(ste_doc, value, value.qty, rm_details, rm_detail_field)
ste_doc.set_stock_entry_type()
- ste_doc.calculate_rate_and_amount()
return ste_doc
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 1edd7bf..4661c5c 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -976,6 +976,8 @@
@frappe.whitelist()
def get_round_off_applicable_accounts(company, account_list):
+ # required to set correct region
+ frappe.flags.company = company
account_list = get_regional_round_off_accounts(company, account_list)
return account_list
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index 0e6fe95..eeb35c4 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -15,6 +15,11 @@
)
from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
from erpnext.stock.doctype.item.test_item import make_item
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import (
@@ -36,7 +41,7 @@
sco.remove_empty_rows()
self.assertEqual((len_before - 1), len(sco.service_items))
- def test_set_missing_values_in_additional_costs(self):
+ def test_calculate_additional_costs(self):
sco = get_subcontracting_order(do_not_submit=1)
rate_without_additional_cost = sco.items[0].rate
@@ -311,9 +316,6 @@
scr1 = make_subcontracting_receipt(sco.name)
scr1.save()
scr1.supplied_items[0].consumed_qty = 5
- scr1.supplied_items[0].serial_no = "\n".join(
- sorted(itemwise_details.get("Subcontracted SRM Item 2").get("serial_no")[0:5])
- )
scr1.submit()
for key, value in get_supplied_items(scr1).items():
@@ -341,6 +343,7 @@
- Create the 3 SCR against the SCO and split Subcontracted Items into two batches.
- Keep the qty as 2 for Subcontracted Item in the SCR.
"""
+ from erpnext.stock.serial_batch_bundle import get_batch_nos
set_backflush_based_on("BOM")
service_items = [
@@ -426,6 +429,7 @@
for key, value in get_supplied_items(scr1).items():
self.assertEqual(value.qty, 4)
+ frappe.flags.add_debugger = True
scr2 = make_subcontracting_receipt(sco.name)
scr2.items[0].qty = 2
add_second_row_in_scr(scr2)
@@ -612,9 +616,6 @@
scr1.load_from_db()
scr1.supplied_items[0].consumed_qty = 5
- scr1.supplied_items[0].serial_no = "\n".join(
- itemwise_details[scr1.supplied_items[0].rm_item_code]["serial_no"]
- )
scr1.save()
scr1.submit()
@@ -651,6 +652,16 @@
- System should throw the error and not allowed to save the SCR.
"""
+ serial_no = "ABC"
+ if not frappe.db.exists("Serial No", serial_no):
+ frappe.get_doc(
+ {
+ "doctype": "Serial No",
+ "item_code": "Subcontracted SRM Item 2",
+ "serial_no": serial_no,
+ }
+ ).insert()
+
set_backflush_based_on("Material Transferred for Subcontract")
service_items = [
{
@@ -677,10 +688,39 @@
scr1 = make_subcontracting_receipt(sco.name)
scr1.save()
- scr1.supplied_items[0].serial_no = "ABCD"
+ bundle = frappe.get_doc(
+ "Serial and Batch Bundle", scr1.supplied_items[0].serial_and_batch_bundle
+ )
+ original_serial_no = ""
+ for row in bundle.entries:
+ if row.idx == 1:
+ original_serial_no = row.serial_no
+ row.serial_no = "ABC"
+ break
+
+ bundle.save()
+
self.assertRaises(frappe.ValidationError, scr1.save)
+ bundle.load_from_db()
+ for row in bundle.entries:
+ if row.idx == 1:
+ row.serial_no = original_serial_no
+ break
+
+ bundle.save()
+ scr1.load_from_db()
+ scr1.save()
+ self.delete_bundle_from_scr(scr1)
scr1.delete()
+ @staticmethod
+ def delete_bundle_from_scr(scr):
+ for row in scr.supplied_items:
+ if not row.serial_and_batch_bundle:
+ continue
+
+ frappe.delete_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+
def test_partial_transfer_batch_based_on_material_transfer(self):
"""
- Set backflush based on Material Transferred for Subcontract.
@@ -724,12 +764,9 @@
for key, value in get_supplied_items(scr1).items():
details = itemwise_details.get(key)
self.assertEqual(value.qty, 3)
- transferred_batch_no = details.batch_no
- self.assertEqual(value.batch_no, details.batch_no)
scr1.load_from_db()
scr1.supplied_items[0].consumed_qty = 5
- scr1.supplied_items[0].batch_no = list(transferred_batch_no.keys())[0]
scr1.save()
scr1.submit()
@@ -883,6 +920,15 @@
if child_row.batch_no:
details.batch_no[child_row.batch_no] += child_row.get("qty") or child_row.get("consumed_qty")
+ if child_row.serial_and_batch_bundle:
+ doc = frappe.get_doc("Serial and Batch Bundle", child_row.serial_and_batch_bundle)
+ for row in doc.get("entries"):
+ if row.serial_no:
+ details.serial_no.append(row.serial_no)
+
+ if row.batch_no:
+ details.batch_no[row.batch_no] += row.qty * (-1 if doc.type_of_transaction == "Outward" else 1)
+
def make_stock_transfer_entry(**args):
args = frappe._dict(args)
@@ -903,18 +949,35 @@
item_details = args.itemwise_details.get(row.item_code)
+ serial_nos = []
+ batches = defaultdict(float)
if item_details and item_details.serial_no:
serial_nos = item_details.serial_no[0 : cint(row.qty)]
- item["serial_no"] = "\n".join(serial_nos)
item_details.serial_no = list(set(item_details.serial_no) - set(serial_nos))
if item_details and item_details.batch_no:
for batch_no, batch_qty in item_details.batch_no.items():
if batch_qty >= row.qty:
- item["batch_no"] = batch_no
+ batches[batch_no] = row.qty
item_details.batch_no[batch_no] -= row.qty
break
+ if serial_nos or batches:
+ item["serial_and_batch_bundle"] = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": row.item_code,
+ "warehouse": row.warehouse or "_Test Warehouse - _TC",
+ "qty": (row.qty or 1) * -1,
+ "batches": batches,
+ "serial_nos": serial_nos,
+ "voucher_type": "Delivery Note",
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
items.append(item)
ste_dict = make_rm_stock_entry(args.sco_no, items)
@@ -956,7 +1019,7 @@
"batch_number_series": "BAT.####",
},
"Subcontracted SRM Item 4": {"has_serial_no": 1, "serial_no_series": "SRII.####"},
- "Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRII.####"},
+ "Subcontracted SRM Item 5": {"has_serial_no": 1, "serial_no_series": "SRIID.####"},
}
for item, properties in raw_materials.items():
@@ -1011,8 +1074,8 @@
def set_backflush_based_on(based_on):
- frappe.db.set_value(
- "Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", based_on
+ frappe.db.set_single_value(
+ "Buying Settings", "backflush_raw_materials_of_subcontract_based_on", based_on
)
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 7c3c387..642722a 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -232,22 +232,8 @@
has_supplier_field = meta.has_field("supplier")
if has_common(["Supplier", "Customer"], frappe.get_roles(user)):
- contacts = frappe.db.sql(
- """
- select
- `tabContact`.email_id,
- `tabDynamic Link`.link_doctype,
- `tabDynamic Link`.link_name
- from
- `tabContact`, `tabDynamic Link`
- where
- `tabContact`.name=`tabDynamic Link`.parent and `tabContact`.email_id =%s
- """,
- user,
- as_dict=1,
- )
- customers = [c.link_name for c in contacts if c.link_doctype == "Customer"]
- suppliers = [c.link_name for c in contacts if c.link_doctype == "Supplier"]
+ suppliers = get_parents_for_user("Supplier")
+ customers = get_parents_for_user("Customer")
elif frappe.has_permission(doctype, "read", user=user):
customer_list = frappe.get_list("Customer")
customers = suppliers = [customer.name for customer in customer_list]
@@ -255,6 +241,17 @@
return customers if has_customer_field else None, suppliers if has_supplier_field else None
+def get_parents_for_user(parenttype: str) -> list[str]:
+ portal_user = frappe.qb.DocType("Portal User")
+
+ return (
+ frappe.qb.from_(portal_user)
+ .select(portal_user.parent)
+ .where(portal_user.user == frappe.session.user)
+ .where(portal_user.parenttype == parenttype)
+ ).run(pluck="name")
+
+
def has_website_permission(doc, ptype, user, verbose=False):
doctype = doc.doctype
customers, suppliers = get_customers_suppliers(doctype, user)
@@ -282,3 +279,28 @@
return "party_name"
else:
return "customer"
+
+
+def add_role_for_portal_user(portal_user, role):
+ """When a new portal user is added, give appropriate roles to user if
+ posssible, else warn user to add roles."""
+ if not portal_user.is_new():
+ return
+
+ user_doc = frappe.get_doc("User", portal_user.user)
+ roles = {r.role for r in user_doc.roles}
+
+ if role in roles:
+ return
+
+ if "System Manager" not in frappe.get_roles():
+ frappe.msgprint(
+ _("Please add {1} role to user {0}.").format(portal_user.user, role),
+ alert=True,
+ )
+ return
+
+ user_doc.add_roles(role)
+ frappe.msgprint(
+ _("Added {1} Role to User {0}.").format(frappe.bold(user_doc.name), role), alert=True
+ )
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index b98a27e..9ac5418 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -30,11 +30,6 @@
var me = this;
let doc = this.frm.doc;
erpnext.toggle_naming_series();
- frappe.dynamic_link = {
- doc: doc,
- fieldname: 'name',
- doctype: 'Lead'
- };
if (!this.frm.is_new() && doc.__onload && !doc.__onload.is_customer) {
this.frm.add_custom_button(__("Customer"), this.make_customer, __("Create"));
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 077e7fa..0cb8824 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -2,6 +2,7 @@
"actions": [],
"allow_events_in_timeline": 1,
"allow_import": 1,
+ "allow_rename": 1,
"autoname": "naming_series:",
"creation": "2022-02-08 13:14:41.083327",
"doctype": "DocType",
@@ -515,7 +516,7 @@
"idx": 5,
"image_field": "image",
"links": [],
- "modified": "2023-01-24 18:20:05.044791",
+ "modified": "2023-04-14 18:20:05.044791",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead",
@@ -582,4 +583,4 @@
"states": [],
"subject_field": "title",
"title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 2a588d8..a98886c 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -3,7 +3,10 @@
import frappe
from frappe import _
-from frappe.contacts.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import (
+ delete_contact_and_address,
+ load_address_and_contact,
+)
from frappe.email.inbox import link_communication_to_document
from frappe.model.mapper import get_mapped_doc
from frappe.utils import comma_and, get_link_to_form, has_gravatar, validate_email_address
@@ -40,9 +43,8 @@
self.update_prospect()
def on_trash(self):
- frappe.db.sql("""update `tabIssue` set lead='' where lead=%s""", self.name)
-
- self.unlink_dynamic_links()
+ frappe.db.set_value("Issue", {"lead": self.name}, "lead", None)
+ delete_contact_and_address(self.doctype, self.name)
self.remove_link_from_prospect()
def set_full_name(self):
@@ -119,27 +121,6 @@
)
lead_row.db_update()
- def unlink_dynamic_links(self):
- links = frappe.get_all(
- "Dynamic Link",
- filters={"link_doctype": self.doctype, "link_name": self.name},
- fields=["parent", "parenttype"],
- )
-
- for link in links:
- linked_doc = frappe.get_doc(link["parenttype"], link["parent"])
-
- if len(linked_doc.get("links")) == 1:
- linked_doc.delete(ignore_permissions=True)
- else:
- to_remove = None
- for d in linked_doc.get("links"):
- if d.link_doctype == self.doctype and d.link_name == self.name:
- to_remove = d
- if to_remove:
- linked_doc.remove(to_remove)
- linked_doc.save(ignore_permissions=True)
-
def remove_link_from_prospect(self):
prospects = self.get_linked_prospects()
diff --git a/erpnext/crm/doctype/linkedin_settings/linkedin_settings.js b/erpnext/crm/doctype/linkedin_settings/linkedin_settings.js
index d532236..7d6b395 100644
--- a/erpnext/crm/doctype/linkedin_settings/linkedin_settings.js
+++ b/erpnext/crm/doctype/linkedin_settings/linkedin_settings.js
@@ -5,7 +5,7 @@
onload: function(frm) {
if (frm.doc.session_status == 'Expired' && frm.doc.consumer_key && frm.doc.consumer_secret) {
frappe.confirm(
- __('Session not valid, Do you want to login?'),
+ __('Session not valid. Do you want to login?'),
function(){
frm.trigger("login");
},
@@ -14,11 +14,11 @@
}
);
}
- frm.dashboard.set_headline(__("For more information, {0}.", [`<a target='_blank' href='https://docs.erpnext.com/docs/user/manual/en/CRM/linkedin-settings'>${__('Click here')}</a>`]));
+ frm.dashboard.set_headline(__("For more information, {0}.", [`<a target='_blank' href='https://docs.erpnext.com/docs/user/manual/en/CRM/linkedin-settings'>${__('click here')}</a>`]));
},
refresh: function(frm) {
if (frm.doc.session_status=="Expired"){
- let msg = __("Session Not Active. Save doc to login.");
+ let msg = __("Session not active. Save document to login.");
frm.dashboard.set_headline_alert(
`<div class="row">
<div class="col-xs-12">
@@ -37,7 +37,7 @@
let msg,color;
if (days>0){
- msg = __("Your Session will be expire in {0} days.", [days]);
+ msg = __("Your session will be expire in {0} days.", [days]);
color = "green";
}
else {
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 6a5fead..2a8d65f 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -59,7 +59,7 @@
if not self.get(field) and frappe.db.field_exists(self.opportunity_from, field):
try:
value = frappe.db.get_value(self.opportunity_from, self.party_name, field)
- self.db_set(field, value)
+ self.set(field, value)
except Exception:
continue
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 1ff3267..247e20d 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -53,9 +53,7 @@
self.assertEqual(opportunity_doc.total, 2200)
def test_carry_forward_of_email_and_comments(self):
- frappe.db.set_value(
- "CRM Settings", "CRM Settings", "carry_forward_communication_and_comments", 1
- )
+ frappe.db.set_single_value("CRM Settings", "carry_forward_communication_and_comments", 1)
lead_doc = make_lead()
lead_doc.add_comment("Comment", text="Test Comment 1")
lead_doc.add_comment("Comment", text="Test Comment 2")
diff --git a/erpnext/crm/doctype/prospect/prospect.js b/erpnext/crm/doctype/prospect/prospect.js
index 495ed29..c1a7ff5 100644
--- a/erpnext/crm/doctype/prospect/prospect.js
+++ b/erpnext/crm/doctype/prospect/prospect.js
@@ -3,8 +3,6 @@
frappe.ui.form.on('Prospect', {
refresh (frm) {
- frappe.dynamic_link = { doc: frm.doc, fieldname: "name", doctype: frm.doctype };
-
if (!frm.is_new() && frappe.boot.user.can_create.includes("Customer")) {
frm.add_custom_button(__("Customer"), function() {
frappe.model.open_mapped_doc({
diff --git a/erpnext/crm/doctype/prospect/prospect.py b/erpnext/crm/doctype/prospect/prospect.py
index fbb1158..8b66a83 100644
--- a/erpnext/crm/doctype/prospect/prospect.py
+++ b/erpnext/crm/doctype/prospect/prospect.py
@@ -2,7 +2,10 @@
# For license information, please see license.txt
import frappe
-from frappe.contacts.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import (
+ delete_contact_and_address,
+ load_address_and_contact,
+)
from frappe.model.mapper import get_mapped_doc
from erpnext.crm.utils import CRMNote, copy_comments, link_communications, link_open_events
@@ -16,7 +19,7 @@
self.link_with_lead_contact_and_address()
def on_trash(self):
- self.unlink_dynamic_links()
+ delete_contact_and_address(self.doctype, self.name)
def after_insert(self):
carry_forward_communication_and_comments = frappe.db.get_single_value(
@@ -54,27 +57,6 @@
linked_doc.append("links", {"link_doctype": self.doctype, "link_name": self.name})
linked_doc.save(ignore_permissions=True)
- def unlink_dynamic_links(self):
- links = frappe.get_all(
- "Dynamic Link",
- filters={"link_doctype": self.doctype, "link_name": self.name},
- fields=["parent", "parenttype"],
- )
-
- for link in links:
- linked_doc = frappe.get_doc(link["parenttype"], link["parent"])
-
- if len(linked_doc.get("links")) == 1:
- linked_doc.delete(ignore_permissions=True)
- else:
- to_remove = None
- for d in linked_doc.get("links"):
- if d.link_doctype == self.doctype and d.link_name == self.name:
- to_remove = d
- if to_remove:
- linked_doc.remove(to_remove)
- linked_doc.save(ignore_permissions=True)
-
@frappe.whitelist()
def make_customer(source_name, target_doc=None):
diff --git a/erpnext/crm/doctype/social_media_post/social_media_post.py b/erpnext/crm/doctype/social_media_post/social_media_post.py
index 55db29a..3654d29 100644
--- a/erpnext/crm/doctype/social_media_post/social_media_post.py
+++ b/erpnext/crm/doctype/social_media_post/social_media_post.py
@@ -74,7 +74,7 @@
def process_scheduled_social_media_posts():
- posts = frappe.get_list(
+ posts = frappe.get_all(
"Social Media Post",
filters={"post_status": "Scheduled", "docstatus": 1},
fields=["name", "scheduled_time"],
diff --git a/erpnext/crm/doctype/twitter_settings/twitter_settings.js b/erpnext/crm/doctype/twitter_settings/twitter_settings.js
index 112f3d4..c322092 100644
--- a/erpnext/crm/doctype/twitter_settings/twitter_settings.js
+++ b/erpnext/crm/doctype/twitter_settings/twitter_settings.js
@@ -14,7 +14,7 @@
}
);
}
- frm.dashboard.set_headline(__("For more information, {0}.", [`<a target='_blank' href='https://docs.erpnext.com/docs/user/manual/en/CRM/twitter-settings'>${__('Click here')}</a>`]));
+ frm.dashboard.set_headline(__("For more information, {0}.", [`<a target='_blank' href='https://docs.erpnext.com/docs/user/manual/en/CRM/twitter-settings'>${__('click here')}</a>`]));
},
refresh: function(frm) {
let msg, color, flag=false;
diff --git a/erpnext/crm/workspace/crm/crm.json b/erpnext/crm/workspace/crm/crm.json
index 318754b..b107df7 100644
--- a/erpnext/crm/workspace/crm/crm.json
+++ b/erpnext/crm/workspace/crm/crm.json
@@ -5,180 +5,21 @@
"label": "Territory Wise Sales"
}
],
- "content": "[{\"type\":\"chart\",\"data\":{\"chart_name\":\"Territory Wise Sales\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Lead\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Opportunity\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customer\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Analytics\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Sales Pipeline\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Campaign\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Maintenance\",\"col\":4}}]",
+ "content": "[{\"id\":\"Cj2TyhgiWy\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Territory Wise Sales\",\"col\":12}},{\"id\":\"LAKRmpYMRA\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"XGIwEUStw_\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"69RN0XsiJK\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Lead\",\"col\":3}},{\"id\":\"t6PQ0vY-Iw\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Opportunity\",\"col\":3}},{\"id\":\"VOFE0hqXRD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customer\",\"col\":3}},{\"id\":\"0ik53fuemG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Analytics\",\"col\":3}},{\"id\":\"wdROEmB_XG\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"-I9HhcgUKE\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"ttpROKW9vk\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"-76QPdbBHy\",\"type\":\"card\",\"data\":{\"card_name\":\"Sales Pipeline\",\"col\":4}},{\"id\":\"_YmGwzVWRr\",\"type\":\"card\",\"data\":{\"card_name\":\"Masters\",\"col\":4}},{\"id\":\"Bma1PxoXk3\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"id\":\"80viA0R83a\",\"type\":\"card\",\"data\":{\"card_name\":\"Campaign\",\"col\":4}},{\"id\":\"Buo5HtKRFN\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"id\":\"sLS_x4FMK2\",\"type\":\"card\",\"data\":{\"card_name\":\"Maintenance\",\"col\":4}}]",
"creation": "2020-01-23 14:48:30.183272",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "crm",
"idx": 0,
+ "is_hidden": 0,
"label": "CRM",
"links": [
{
"hidden": 0,
"is_query_report": 0,
- "label": "Sales Pipeline",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Lead",
- "link_count": 0,
- "link_to": "Lead",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Opportunity",
- "link_count": 0,
- "link_to": "Opportunity",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Prospect",
- "link_count": 0,
- "link_to": "Prospect",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Customer",
- "link_count": 0,
- "link_to": "Customer",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Contact",
- "link_count": 0,
- "link_to": "Contact",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Communication",
- "link_count": 0,
- "link_to": "Communication",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Contract",
- "link_count": 0,
- "link_to": "Contract",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Appointment",
- "link_count": 0,
- "link_to": "Appointment",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Newsletter",
- "link_count": 0,
- "link_to": "Newsletter",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Lead Source",
- "link_count": 0,
- "link_to": "Lead Source",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Territory",
- "link_count": 0,
- "link_to": "Territory",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Customer Group",
- "link_count": 0,
- "link_to": "Customer Group",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Sales Person",
- "link_count": 0,
- "link_to": "Sales Person",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Sales Stage",
- "link_count": 0,
- "link_to": "Sales Stage",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
"label": "Reports",
"link_count": 0,
"onboard": 0,
@@ -446,19 +287,183 @@
"link_type": "DocType",
"onboard": 0,
"type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Masters",
+ "link_count": 7,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Territory",
+ "link_count": 0,
+ "link_to": "Territory",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Customer Group",
+ "link_count": 0,
+ "link_to": "Customer Group",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Contact",
+ "link_count": 0,
+ "link_to": "Contact",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Prospect",
+ "link_count": 0,
+ "link_to": "Prospect",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Sales Person",
+ "link_count": 0,
+ "link_to": "Sales Person",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Sales Stage",
+ "link_count": 0,
+ "link_to": "Sales Stage",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Lead Source",
+ "link_count": 0,
+ "link_to": "Lead Source",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Sales Pipeline",
+ "link_count": 7,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Lead",
+ "link_count": 0,
+ "link_to": "Lead",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Opportunity",
+ "link_count": 0,
+ "link_to": "Opportunity",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Customer",
+ "link_count": 0,
+ "link_to": "Customer",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Contract",
+ "link_count": 0,
+ "link_to": "Contract",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Appointment",
+ "link_count": 0,
+ "link_to": "Appointment",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Newsletter",
+ "link_count": 0,
+ "link_to": "Newsletter",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Communication",
+ "link_count": 0,
+ "link_to": "Communication",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
}
],
- "modified": "2022-07-22 15:03:30.755417",
+ "modified": "2023-05-26 16:49:04.298122",
"modified_by": "Administrator",
"module": "CRM",
"name": "CRM",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
"quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 7.0,
+ "sequence_id": 10.0,
"shortcuts": [
{
"color": "Blue",
diff --git a/erpnext/e_commerce/doctype/website_item/website_item.py b/erpnext/e_commerce/doctype/website_item/website_item.py
index 3e5d5f7..81b8eca 100644
--- a/erpnext/e_commerce/doctype/website_item/website_item.py
+++ b/erpnext/e_commerce/doctype/website_item/website_item.py
@@ -315,6 +315,7 @@
self.item_code, skip_quotation_creation=True
)
+ @frappe.whitelist()
def copy_specification_from_item_group(self):
self.set("website_specifications", [])
if self.item_group:
diff --git a/erpnext/e_commerce/product_ui/list.js b/erpnext/e_commerce/product_ui/list.js
index 894a7cb..c8fd767 100644
--- a/erpnext/e_commerce/product_ui/list.js
+++ b/erpnext/e_commerce/product_ui/list.js
@@ -78,9 +78,10 @@
let title_html = `<div style="display: flex; margin-left: -15px;">`;
title_html += `
<div class="col-8" style="margin-right: -15px;">
- <a class="" href="/${ item.route || '#' }"
- style="color: var(--gray-800); font-weight: 500;">
+ <a href="/${ item.route || '#' }">
+ <div class="product-title">
${ title }
+ </div>
</a>
</div>
`;
@@ -201,4 +202,4 @@
}
}
-};
\ No newline at end of file
+};
diff --git a/erpnext/e_commerce/shopping_cart/test_shopping_cart.py b/erpnext/e_commerce/shopping_cart/test_shopping_cart.py
index f44f8fe..951039d 100644
--- a/erpnext/e_commerce/shopping_cart/test_shopping_cart.py
+++ b/erpnext/e_commerce/shopping_cart/test_shopping_cart.py
@@ -205,7 +205,7 @@
self.assertEqual(quote_doctstatus, 0)
- frappe.db.set_value("E Commerce Settings", None, "save_quotations_as_draft", 0)
+ frappe.db.set_single_value("E Commerce Settings", "save_quotations_as_draft", 0)
frappe.local.shopping_cart_settings = None
update_cart("_Test Item", 1)
quote_name = request_for_quotation() # Request for Quote
diff --git a/erpnext/e_commerce/variant_selector/utils.py b/erpnext/e_commerce/variant_selector/utils.py
index 1a3e737..4466c45 100644
--- a/erpnext/e_commerce/variant_selector/utils.py
+++ b/erpnext/e_commerce/variant_selector/utils.py
@@ -162,6 +162,7 @@
product_info = get_item_variant_price_dict(exact_match[0], cart_settings)
if product_info:
+ product_info["is_stock_item"] = frappe.get_cached_value("Item", exact_match[0], "is_stock_item")
product_info["allow_items_not_in_stock"] = cint(cart_settings.allow_items_not_in_stock)
else:
product_info = None
diff --git a/erpnext/e_commerce/web_template/hero_slider/hero_slider.json b/erpnext/e_commerce/web_template/hero_slider/hero_slider.json
index 2b1807c..39b2b3e 100644
--- a/erpnext/e_commerce/web_template/hero_slider/hero_slider.json
+++ b/erpnext/e_commerce/web_template/hero_slider/hero_slider.json
@@ -165,6 +165,7 @@
"fieldname": "slide_3_content_align",
"fieldtype": "Select",
"label": "Content Align",
+ "options": "Left\nCentre\nRight",
"reqd": 0
},
{
@@ -214,6 +215,7 @@
"fieldname": "slide_4_content_align",
"fieldtype": "Select",
"label": "Content Align",
+ "options": "Left\nCentre\nRight",
"reqd": 0
},
{
@@ -263,6 +265,7 @@
"fieldname": "slide_5_content_align",
"fieldtype": "Select",
"label": "Content Align",
+ "options": "Left\nCentre\nRight",
"reqd": 0
},
{
@@ -274,7 +277,7 @@
}
],
"idx": 2,
- "modified": "2021-02-24 15:57:05.889709",
+ "modified": "2023-05-12 15:03:57.604060",
"modified_by": "Administrator",
"module": "E-commerce",
"name": "Hero Slider",
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
index e57a30a..61d2ace 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
@@ -161,7 +161,6 @@
frappe.throw(frappe.get_traceback())
-@frappe.whitelist()
def sync_transactions(bank, bank_account):
"""Sync transactions based on the last integration date as the start date, after sync is completed
add the transaction date of the oldest transaction as the last integration date."""
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
index 6d34a20..86e1b31 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
@@ -32,7 +32,7 @@
frappe.delete_doc(doctype, d.name, force=True)
def test_plaid_disabled(self):
- frappe.db.set_value("Plaid Settings", None, "enabled", 0)
+ frappe.db.set_single_value("Plaid Settings", "enabled", 0)
self.assertTrue(get_plaid_configuration() == "disabled")
def test_add_account_type(self):
diff --git a/erpnext/erpnext_integrations/workspace/erpnext_integrations/erpnext_integrations.json b/erpnext/erpnext_integrations/workspace/erpnext_integrations/erpnext_integrations.json
index c5faa2d..6737713 100644
--- a/erpnext/erpnext_integrations/workspace/erpnext_integrations/erpnext_integrations.json
+++ b/erpnext/erpnext_integrations/workspace/erpnext_integrations/erpnext_integrations.json
@@ -1,30 +1,185 @@
{
"charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Marketplace\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Payments\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
+ "content": "[{\"id\":\"e88ADOJ7WC\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Integrations</b></span>\",\"col\":12}},{\"id\":\"G0tyx9WOfm\",\"type\":\"card\",\"data\":{\"card_name\":\"Backup\",\"col\":4}},{\"id\":\"nu4oSjH5Rd\",\"type\":\"card\",\"data\":{\"card_name\":\"Authentication\",\"col\":4}},{\"id\":\"nG8cdkpzoc\",\"type\":\"card\",\"data\":{\"card_name\":\"Google Services\",\"col\":4}},{\"id\":\"4hwuQn6E95\",\"type\":\"card\",\"data\":{\"card_name\":\"Communication Channels\",\"col\":4}},{\"id\":\"sEGAzTJRmq\",\"type\":\"card\",\"data\":{\"card_name\":\"Payments\",\"col\":4}},{\"id\":\"ZC6xu-cLBR\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
"creation": "2020-08-20 19:30:48.138801",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "integration",
"idx": 0,
+ "is_hidden": 0,
"label": "ERPNext Integrations",
"links": [
{
"hidden": 0,
"is_query_report": 0,
- "label": "Marketplace",
- "link_count": 0,
+ "label": "Backup",
+ "link_count": 3,
"onboard": 0,
"type": "Card Break"
},
{
- "dependencies": "",
"hidden": 0,
"is_query_report": 0,
- "label": "Woocommerce Settings",
+ "label": "Dropbox Settings",
"link_count": 0,
- "link_to": "Woocommerce Settings",
+ "link_to": "Dropbox Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "S3 Backup Settings",
+ "link_count": 0,
+ "link_to": "S3 Backup Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Google Drive",
+ "link_count": 0,
+ "link_to": "Google Drive",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Authentication",
+ "link_count": 4,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Social Login",
+ "link_count": 0,
+ "link_to": "Social Login Key",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "LDAP Settings",
+ "link_count": 0,
+ "link_to": "LDAP Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "OAuth Client",
+ "link_count": 0,
+ "link_to": "OAuth Client",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "OAuth Provider Settings",
+ "link_count": 0,
+ "link_to": "OAuth Provider Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Communication Channels",
+ "link_count": 3,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Webhook",
+ "link_count": 0,
+ "link_to": "Webhook",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "SMS Settings",
+ "link_count": 0,
+ "link_to": "SMS Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Slack Webhook URL",
+ "link_count": 0,
+ "link_to": "Slack Webhook URL",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Google Services",
+ "link_count": 4,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Google Settings",
+ "link_count": 0,
+ "link_to": "Google Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Google Contacts",
+ "link_count": 0,
+ "link_to": "Google Contacts",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Google Calendar",
+ "link_count": 0,
+ "link_to": "Google Calendar",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Google Drive",
+ "link_count": 0,
+ "link_to": "Google Drive",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
@@ -33,12 +188,11 @@
"hidden": 0,
"is_query_report": 0,
"label": "Payments",
- "link_count": 0,
+ "link_count": 3,
"onboard": 0,
"type": "Card Break"
},
{
- "dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "GoCardless Settings",
@@ -49,10 +203,9 @@
"type": "Link"
},
{
- "dependencies": "",
"hidden": 0,
"is_query_report": 0,
- "label": "M-Pesa Settings",
+ "label": "Mpesa Settings",
"link_count": 0,
"link_to": "Mpesa Settings",
"link_type": "DocType",
@@ -62,33 +215,44 @@
{
"hidden": 0,
"is_query_report": 0,
- "label": "Settings",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
"label": "Plaid Settings",
"link_count": 0,
"link_to": "Plaid Settings",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Settings",
+ "link_count": 2,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Woocommerce Settings",
+ "link_count": 0,
+ "link_to": "Woocommerce Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
}
],
- "modified": "2022-01-13 17:35:35.508718",
+ "modified": "2023-05-24 14:47:25.984717",
"modified_by": "Administrator",
"module": "ERPNext Integrations",
"name": "ERPNext Integrations",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
+ "quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 10.0,
+ "sequence_id": 21.0,
"shortcuts": [],
"title": "ERPNext Integrations"
-}
+}
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 862a546..d02d318 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -39,7 +39,10 @@
setup_wizard_stages = "erpnext.setup.setup_wizard.setup_wizard.get_setup_stages"
setup_wizard_test = "erpnext.setup.setup_wizard.test_setup_wizard.run_setup_wizard_test"
-before_install = "erpnext.setup.install.check_setup_wizard_not_completed"
+before_install = [
+ "erpnext.setup.install.check_setup_wizard_not_completed",
+ "erpnext.setup.install.check_frappe_version",
+]
after_install = "erpnext.setup.install.after_install"
boot_session = "erpnext.startup.boot.boot_session"
@@ -67,6 +70,12 @@
"Department",
]
+jinja = {
+ "methods": [
+ "erpnext.stock.serial_batch_bundle.get_serial_or_batch_nos",
+ ],
+}
+
# website
update_website_context = [
"erpnext.e_commerce.shopping_cart.utils.update_website_context",
@@ -74,13 +83,7 @@
my_account_context = "erpnext.e_commerce.shopping_cart.utils.update_my_account_context"
webform_list_context = "erpnext.controllers.website_list_for_contact.get_webform_list_context"
-calendars = [
- "Task",
- "Work Order",
- "Leave Application",
- "Sales Order",
- "Holiday List",
-]
+calendars = ["Task", "Work Order", "Leave Application", "Sales Order", "Holiday List", "ToDo"]
website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner"]
@@ -362,6 +365,7 @@
"cron": {
"0/15 * * * *": [
"erpnext.manufacturing.doctype.bom_update_log.bom_update_log.resume_bom_cost_update_jobs",
+ "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_reconciliation_for_queued_docs",
],
"0/30 * * * *": [
"erpnext.utilities.doctype.video.video.update_youtube_data",
@@ -411,17 +415,18 @@
"erpnext.selling.doctype.quotation.quotation.set_expired_status",
"erpnext.buying.doctype.supplier_quotation.supplier_quotation.set_expired_status",
"erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email",
+ "erpnext.accounts.utils.auto_create_exchange_rate_revaluation_daily",
+ ],
+ "weekly": [
+ "erpnext.accounts.utils.auto_create_exchange_rate_revaluation_weekly",
],
"daily_long": [
"erpnext.setup.doctype.email_digest.email_digest.send",
"erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.auto_update_latest_price_in_all_boms",
- "erpnext.loan_management.doctype.process_loan_security_shortfall.process_loan_security_shortfall.create_process_loan_security_shortfall",
- "erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual.process_loan_interest_accrual_for_term_loans",
"erpnext.crm.utils.open_leads_opportunities_based_on_todays_event",
],
"monthly_long": [
"erpnext.accounts.deferred_revenue.process_deferred_accounting",
- "erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual.process_loan_interest_accrual_for_demand_loans",
],
}
@@ -467,9 +472,6 @@
"Payment Entry",
"Journal Entry",
"Purchase Invoice",
- "Sales Invoice",
- "Loan Repayment",
- "Loan Disbursement",
]
accounting_dimension_doctypes = [
@@ -517,11 +519,22 @@
"Account Closing Balance",
]
-# get matching queries for Bank Reconciliation
get_matching_queries = (
"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_matching_queries"
)
+get_matching_vouchers_for_bank_reconciliation = "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_matching_vouchers_for_bank_reconciliation"
+
+get_amounts_not_reflected_in_system_for_bank_reconciliation_statement = "erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement.get_amounts_not_reflected_in_system_for_bank_reconciliation_statement"
+
+get_payment_entries_for_bank_clearance = (
+ "erpnext.accounts.doctype.bank_clearance.bank_clearance.get_payment_entries_for_bank_clearance"
+)
+
+get_entries_for_bank_clearance_summary = "erpnext.accounts.report.bank_clearance_summary.bank_clearance_summary.get_entries_for_bank_clearance_summary"
+
+get_entries_for_bank_reconciliation_statement = "erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement.get_entries_for_bank_reconciliation_statement"
+
regional_overrides = {
"France": {
"erpnext.tests.test_regional.test_method": "erpnext.regional.france.utils.test_method"
@@ -589,7 +602,6 @@
{"doctype": "Branch", "index": 35},
{"doctype": "Department", "index": 36},
{"doctype": "Designation", "index": 38},
- {"doctype": "Loan", "index": 44},
{"doctype": "Maintenance Schedule", "index": 45},
{"doctype": "Maintenance Visit", "index": 46},
{"doctype": "Warranty Claim", "index": 47},
diff --git a/erpnext/loan_management/dashboard_chart/loan_disbursements/loan_disbursements.json b/erpnext/loan_management/dashboard_chart/loan_disbursements/loan_disbursements.json
deleted file mode 100644
index b8abf21..0000000
--- a/erpnext/loan_management/dashboard_chart/loan_disbursements/loan_disbursements.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "based_on": "disbursement_date",
- "chart_name": "Loan Disbursements",
- "chart_type": "Sum",
- "creation": "2021-02-06 18:40:36.148470",
- "docstatus": 0,
- "doctype": "Dashboard Chart",
- "document_type": "Loan Disbursement",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Disbursement\",\"docstatus\",\"=\",\"1\",false]]",
- "group_by_type": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "modified": "2021-02-06 18:40:49.308663",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Disbursements",
- "number_of_groups": 0,
- "owner": "Administrator",
- "source": "",
- "time_interval": "Daily",
- "timeseries": 1,
- "timespan": "Last Month",
- "type": "Line",
- "use_report_chart": 0,
- "value_based_on": "disbursed_amount",
- "y_axis": []
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/dashboard_chart/loan_interest_accrual/loan_interest_accrual.json b/erpnext/loan_management/dashboard_chart/loan_interest_accrual/loan_interest_accrual.json
deleted file mode 100644
index aa0f78a..0000000
--- a/erpnext/loan_management/dashboard_chart/loan_interest_accrual/loan_interest_accrual.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "based_on": "posting_date",
- "chart_name": "Loan Interest Accrual",
- "chart_type": "Sum",
- "color": "#39E4A5",
- "creation": "2021-02-18 20:07:04.843876",
- "docstatus": 0,
- "doctype": "Dashboard Chart",
- "document_type": "Loan Interest Accrual",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Interest Accrual\",\"docstatus\",\"=\",\"1\",false]]",
- "group_by_type": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "last_synced_on": "2021-02-21 21:01:26.022634",
- "modified": "2021-02-21 21:01:44.930712",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Interest Accrual",
- "number_of_groups": 0,
- "owner": "Administrator",
- "source": "",
- "time_interval": "Monthly",
- "timeseries": 1,
- "timespan": "Last Year",
- "type": "Line",
- "use_report_chart": 0,
- "value_based_on": "interest_amount",
- "y_axis": []
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/dashboard_chart/new_loans/new_loans.json b/erpnext/loan_management/dashboard_chart/new_loans/new_loans.json
deleted file mode 100644
index 35bd43b..0000000
--- a/erpnext/loan_management/dashboard_chart/new_loans/new_loans.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "based_on": "creation",
- "chart_name": "New Loans",
- "chart_type": "Count",
- "color": "#449CF0",
- "creation": "2021-02-06 16:59:27.509170",
- "docstatus": 0,
- "doctype": "Dashboard Chart",
- "document_type": "Loan",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan\",\"docstatus\",\"=\",\"1\",false]]",
- "group_by_type": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "last_synced_on": "2021-02-21 20:55:33.515025",
- "modified": "2021-02-21 21:00:33.900821",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "New Loans",
- "number_of_groups": 0,
- "owner": "Administrator",
- "source": "",
- "time_interval": "Daily",
- "timeseries": 1,
- "timespan": "Last Month",
- "type": "Bar",
- "use_report_chart": 0,
- "value_based_on": "",
- "y_axis": []
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/dashboard_chart/top_10_pledged_loan_securities/top_10_pledged_loan_securities.json b/erpnext/loan_management/dashboard_chart/top_10_pledged_loan_securities/top_10_pledged_loan_securities.json
deleted file mode 100644
index 76c27b0..0000000
--- a/erpnext/loan_management/dashboard_chart/top_10_pledged_loan_securities/top_10_pledged_loan_securities.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "based_on": "",
- "chart_name": "Top 10 Pledged Loan Securities",
- "chart_type": "Custom",
- "color": "#EC864B",
- "creation": "2021-02-06 22:02:46.284479",
- "docstatus": 0,
- "doctype": "Dashboard Chart",
- "document_type": "",
- "dynamic_filters_json": "[]",
- "filters_json": "[]",
- "group_by_type": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "last_synced_on": "2021-02-21 21:00:57.043034",
- "modified": "2021-02-21 21:01:10.048623",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Top 10 Pledged Loan Securities",
- "number_of_groups": 0,
- "owner": "Administrator",
- "source": "Top 10 Pledged Loan Securities",
- "time_interval": "Yearly",
- "timeseries": 0,
- "timespan": "Last Year",
- "type": "Bar",
- "use_report_chart": 0,
- "value_based_on": "",
- "y_axis": []
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/__init__.py b/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.js b/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.js
deleted file mode 100644
index 5817941..0000000
--- a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.js
+++ /dev/null
@@ -1,14 +0,0 @@
-frappe.provide('frappe.dashboards.chart_sources');
-
-frappe.dashboards.chart_sources["Top 10 Pledged Loan Securities"] = {
- method: "erpnext.loan_management.dashboard_chart_source.top_10_pledged_loan_securities.top_10_pledged_loan_securities.get_data",
- filters: [
- {
- fieldname: "company",
- label: __("Company"),
- fieldtype: "Link",
- options: "Company",
- default: frappe.defaults.get_user_default("Company")
- }
- ]
-};
diff --git a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.json b/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.json
deleted file mode 100644
index 42c9b1c..0000000
--- a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "creation": "2021-02-06 22:01:01.332628",
- "docstatus": 0,
- "doctype": "Dashboard Chart Source",
- "idx": 0,
- "modified": "2021-02-06 22:01:01.332628",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Top 10 Pledged Loan Securities",
- "owner": "Administrator",
- "source_name": "Top 10 Pledged Loan Securities ",
- "timeseries": 0
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py b/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py
deleted file mode 100644
index aab3d8c..0000000
--- a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-
-import frappe
-from frappe.utils.dashboard import cache_source
-
-from erpnext.loan_management.report.applicant_wise_loan_security_exposure.applicant_wise_loan_security_exposure import (
- get_loan_security_details,
-)
-
-
-@frappe.whitelist()
-@cache_source
-def get_data(
- chart_name=None,
- chart=None,
- no_cache=None,
- filters=None,
- from_date=None,
- to_date=None,
- timespan=None,
- time_interval=None,
- heatmap_year=None,
-):
- if chart_name:
- chart = frappe.get_doc("Dashboard Chart", chart_name)
- else:
- chart = frappe._dict(frappe.parse_json(chart))
-
- filters = {}
- current_pledges = {}
-
- if filters:
- filters = frappe.parse_json(filters)[0]
-
- conditions = ""
- labels = []
- values = []
-
- if filters.get("company"):
- conditions = "AND company = %(company)s"
-
- loan_security_details = get_loan_security_details()
-
- unpledges = frappe._dict(
- frappe.db.sql(
- """
- SELECT u.loan_security, sum(u.qty) as qty
- FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
- WHERE u.parent = up.name
- AND up.status = 'Approved'
- {conditions}
- GROUP BY u.loan_security
- """.format(
- conditions=conditions
- ),
- filters,
- as_list=1,
- )
- )
-
- pledges = frappe._dict(
- frappe.db.sql(
- """
- SELECT p.loan_security, sum(p.qty) as qty
- FROM `tabLoan Security Pledge` lp, `tabPledge`p
- WHERE p.parent = lp.name
- AND lp.status = 'Pledged'
- {conditions}
- GROUP BY p.loan_security
- """.format(
- conditions=conditions
- ),
- filters,
- as_list=1,
- )
- )
-
- for security, qty in pledges.items():
- current_pledges.setdefault(security, qty)
- current_pledges[security] -= unpledges.get(security, 0.0)
-
- sorted_pledges = dict(sorted(current_pledges.items(), key=lambda item: item[1], reverse=True))
-
- count = 0
- for security, qty in sorted_pledges.items():
- values.append(qty * loan_security_details.get(security, {}).get("latest_price", 0))
- labels.append(security)
- count += 1
-
- ## Just need top 10 securities
- if count == 10:
- break
-
- return {
- "labels": labels,
- "datasets": [{"name": "Top 10 Securities", "chartType": "bar", "values": values}],
- }
diff --git a/erpnext/loan_management/doctype/__init__.py b/erpnext/loan_management/doctype/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan/__init__.py b/erpnext/loan_management/doctype/loan/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan/loan.js b/erpnext/loan_management/doctype/loan/loan.js
deleted file mode 100644
index 20e2b0b..0000000
--- a/erpnext/loan_management/doctype/loan/loan.js
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-{% include 'erpnext/loan_management/loan_common.js' %};
-
-frappe.ui.form.on('Loan', {
- setup: function(frm) {
- frm.make_methods = {
- 'Loan Disbursement': function() { frm.trigger('make_loan_disbursement') },
- 'Loan Security Unpledge': function() { frm.trigger('create_loan_security_unpledge') },
- 'Loan Write Off': function() { frm.trigger('make_loan_write_off_entry') }
- }
- },
- onload: function (frm) {
- // Ignore loan security pledge on cancel of loan
- frm.ignore_doctypes_on_cancel_all = ["Loan Security Pledge"];
-
- frm.set_query("loan_application", function () {
- return {
- "filters": {
- "applicant": frm.doc.applicant,
- "docstatus": 1,
- "status": "Approved"
- }
- };
- });
-
- frm.set_query("loan_type", function () {
- return {
- "filters": {
- "docstatus": 1,
- "company": frm.doc.company
- }
- };
- });
-
- $.each(["penalty_income_account", "interest_income_account"], function(i, field) {
- frm.set_query(field, function () {
- return {
- "filters": {
- "company": frm.doc.company,
- "root_type": "Income",
- "is_group": 0
- }
- };
- });
- });
-
- $.each(["payment_account", "loan_account", "disbursement_account"], function (i, field) {
- frm.set_query(field, function () {
- return {
- "filters": {
- "company": frm.doc.company,
- "root_type": "Asset",
- "is_group": 0
- }
- };
- });
- })
-
- },
-
- refresh: function (frm) {
- if (frm.doc.repayment_schedule_type == "Pro-rated calendar months") {
- frm.set_df_property("repayment_start_date", "label", "Interest Calculation Start Date");
- }
-
- if (frm.doc.docstatus == 1) {
- if (["Disbursed", "Partially Disbursed"].includes(frm.doc.status) && (!frm.doc.repay_from_salary)) {
- frm.add_custom_button(__('Request Loan Closure'), function() {
- frm.trigger("request_loan_closure");
- },__('Status'));
-
- frm.add_custom_button(__('Loan Repayment'), function() {
- frm.trigger("make_repayment_entry");
- },__('Create'));
- }
-
- if (["Sanctioned", "Partially Disbursed"].includes(frm.doc.status)) {
- frm.add_custom_button(__('Loan Disbursement'), function() {
- frm.trigger("make_loan_disbursement");
- },__('Create'));
- }
-
- if (frm.doc.status == "Loan Closure Requested") {
- frm.add_custom_button(__('Loan Security Unpledge'), function() {
- frm.trigger("create_loan_security_unpledge");
- },__('Create'));
- }
-
- if (["Loan Closure Requested", "Disbursed", "Partially Disbursed"].includes(frm.doc.status)) {
- frm.add_custom_button(__('Loan Write Off'), function() {
- frm.trigger("make_loan_write_off_entry");
- },__('Create'));
-
- frm.add_custom_button(__('Loan Refund'), function() {
- frm.trigger("make_loan_refund");
- },__('Create'));
- }
-
- if (frm.doc.status == "Loan Closure Requested" && frm.doc.is_term_loan && !frm.doc.is_secured_loan) {
- frm.add_custom_button(__('Close Loan'), function() {
- frm.trigger("close_unsecured_term_loan");
- },__('Status'));
- }
- }
- frm.trigger("toggle_fields");
- },
-
- repayment_schedule_type: function(frm) {
- if (frm.doc.repayment_schedule_type == "Pro-rated calendar months") {
- frm.set_df_property("repayment_start_date", "label", "Interest Calculation Start Date");
- } else {
- frm.set_df_property("repayment_start_date", "label", "Repayment Start Date");
- }
- },
-
- loan_type: function(frm) {
- frm.toggle_reqd("repayment_method", frm.doc.is_term_loan);
- frm.toggle_display("repayment_method", frm.doc.is_term_loan);
- frm.toggle_display("repayment_periods", frm.doc.is_term_loan);
- },
-
-
- make_loan_disbursement: function (frm) {
- frappe.call({
- args: {
- "loan": frm.doc.name,
- "company": frm.doc.company,
- "applicant_type": frm.doc.applicant_type,
- "applicant": frm.doc.applicant,
- "pending_amount": frm.doc.loan_amount - frm.doc.disbursed_amount > 0 ?
- frm.doc.loan_amount - frm.doc.disbursed_amount : 0,
- "as_dict": 1
- },
- method: "erpnext.loan_management.doctype.loan.loan.make_loan_disbursement",
- callback: function (r) {
- if (r.message)
- var doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- })
- },
-
- make_repayment_entry: function(frm) {
- frappe.call({
- args: {
- "loan": frm.doc.name,
- "applicant_type": frm.doc.applicant_type,
- "applicant": frm.doc.applicant,
- "loan_type": frm.doc.loan_type,
- "company": frm.doc.company,
- "as_dict": 1
- },
- method: "erpnext.loan_management.doctype.loan.loan.make_repayment_entry",
- callback: function (r) {
- if (r.message)
- var doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- })
- },
-
- make_loan_write_off_entry: function(frm) {
- frappe.call({
- args: {
- "loan": frm.doc.name,
- "company": frm.doc.company,
- "as_dict": 1
- },
- method: "erpnext.loan_management.doctype.loan.loan.make_loan_write_off",
- callback: function (r) {
- if (r.message)
- var doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- })
- },
-
- make_loan_refund: function(frm) {
- frappe.call({
- args: {
- "loan": frm.doc.name
- },
- method: "erpnext.loan_management.doctype.loan.loan.make_refund_jv",
- callback: function (r) {
- if (r.message) {
- let doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- }
- })
- },
-
- close_unsecured_term_loan: function(frm) {
- frappe.call({
- args: {
- "loan": frm.doc.name
- },
- method: "erpnext.loan_management.doctype.loan.loan.close_unsecured_term_loan",
- callback: function () {
- frm.refresh();
- }
- })
- },
-
- request_loan_closure: function(frm) {
- frappe.confirm(__("Do you really want to close this loan"),
- function() {
- frappe.call({
- args: {
- 'loan': frm.doc.name
- },
- method: "erpnext.loan_management.doctype.loan.loan.request_loan_closure",
- callback: function() {
- frm.reload_doc();
- }
- });
- }
- );
- },
-
- create_loan_security_unpledge: function(frm) {
- frappe.call({
- method: "erpnext.loan_management.doctype.loan.loan.unpledge_security",
- args : {
- "loan": frm.doc.name,
- "as_dict": 1
- },
- callback: function(r) {
- if (r.message)
- var doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- })
- },
-
- loan_application: function (frm) {
- if(frm.doc.loan_application){
- return frappe.call({
- method: "erpnext.loan_management.doctype.loan.loan.get_loan_application",
- args: {
- "loan_application": frm.doc.loan_application
- },
- callback: function (r) {
- if (!r.exc && r.message) {
-
- let loan_fields = ["loan_type", "loan_amount", "repayment_method",
- "monthly_repayment_amount", "repayment_periods", "rate_of_interest", "is_secured_loan"]
-
- loan_fields.forEach(field => {
- frm.set_value(field, r.message[field]);
- });
-
- if (frm.doc.is_secured_loan) {
- $.each(r.message.proposed_pledges, function(i, d) {
- let row = frm.add_child("securities");
- row.loan_security = d.loan_security;
- row.qty = d.qty;
- row.loan_security_price = d.loan_security_price;
- row.amount = d.amount;
- row.haircut = d.haircut;
- });
-
- frm.refresh_fields("securities");
- }
- }
- }
- });
- }
- },
-
- repayment_method: function (frm) {
- frm.trigger("toggle_fields")
- },
-
- toggle_fields: function (frm) {
- frm.toggle_enable("monthly_repayment_amount", frm.doc.repayment_method == "Repay Fixed Amount per Period")
- frm.toggle_enable("repayment_periods", frm.doc.repayment_method == "Repay Over Number of Periods")
- }
-});
diff --git a/erpnext/loan_management/doctype/loan/loan.json b/erpnext/loan_management/doctype/loan/loan.json
deleted file mode 100644
index dc8b03e..0000000
--- a/erpnext/loan_management/doctype/loan/loan.json
+++ /dev/null
@@ -1,452 +0,0 @@
-{
- "actions": [],
- "allow_import": 1,
- "autoname": "ACC-LOAN-.YYYY.-.#####",
- "creation": "2022-01-25 10:30:02.294967",
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "applicant_type",
- "applicant",
- "applicant_name",
- "loan_application",
- "column_break_3",
- "company",
- "posting_date",
- "status",
- "section_break_8",
- "loan_type",
- "repayment_schedule_type",
- "loan_amount",
- "rate_of_interest",
- "is_secured_loan",
- "disbursement_date",
- "closure_date",
- "disbursed_amount",
- "column_break_11",
- "maximum_loan_amount",
- "repayment_method",
- "repayment_periods",
- "monthly_repayment_amount",
- "repayment_start_date",
- "is_term_loan",
- "accounting_dimensions_section",
- "cost_center",
- "account_info",
- "mode_of_payment",
- "disbursement_account",
- "payment_account",
- "column_break_9",
- "loan_account",
- "interest_income_account",
- "penalty_income_account",
- "section_break_15",
- "repayment_schedule",
- "section_break_17",
- "total_payment",
- "total_principal_paid",
- "written_off_amount",
- "refund_amount",
- "debit_adjustment_amount",
- "credit_adjustment_amount",
- "is_npa",
- "column_break_19",
- "total_interest_payable",
- "total_amount_paid",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "reqd": 1
- },
- {
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_standard_filter": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "reqd": 1
- },
- {
- "fieldname": "applicant_name",
- "fieldtype": "Data",
- "in_global_search": 1,
- "label": "Applicant Name",
- "read_only": 1
- },
- {
- "fieldname": "loan_application",
- "fieldtype": "Link",
- "label": "Loan Application",
- "no_copy": 1,
- "options": "Loan Application"
- },
- {
- "fieldname": "loan_type",
- "fieldtype": "Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Loan Type",
- "options": "Loan Type",
- "reqd": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date",
- "no_copy": 1,
- "reqd": 1
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_standard_filter": 1,
- "label": "Company",
- "options": "Company",
- "remember_last_selected_value": 1,
- "reqd": 1
- },
- {
- "default": "Sanctioned",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_standard_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "options": "Sanctioned\nPartially Disbursed\nDisbursed\nLoan Closure Requested\nClosed",
- "read_only": 1
- },
- {
- "fieldname": "section_break_8",
- "fieldtype": "Section Break",
- "label": "Loan Details"
- },
- {
- "fieldname": "loan_amount",
- "fieldtype": "Currency",
- "label": "Loan Amount",
- "non_negative": 1,
- "options": "Company:company:default_currency"
- },
- {
- "fetch_from": "loan_type.rate_of_interest",
- "fieldname": "rate_of_interest",
- "fieldtype": "Percent",
- "label": "Rate of Interest (%) / Year",
- "read_only": 1,
- "reqd": 1
- },
- {
- "depends_on": "eval:doc.status==\"Disbursed\"",
- "fieldname": "disbursement_date",
- "fieldtype": "Date",
- "label": "Disbursement Date",
- "no_copy": 1
- },
- {
- "depends_on": "is_term_loan",
- "fieldname": "repayment_start_date",
- "fieldtype": "Date",
- "label": "Repayment Start Date",
- "mandatory_depends_on": "is_term_loan"
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "is_term_loan",
- "fieldname": "repayment_method",
- "fieldtype": "Select",
- "label": "Repayment Method",
- "options": "\nRepay Fixed Amount per Period\nRepay Over Number of Periods"
- },
- {
- "depends_on": "is_term_loan",
- "fieldname": "repayment_periods",
- "fieldtype": "Int",
- "label": "Repayment Period in Months"
- },
- {
- "depends_on": "is_term_loan",
- "fetch_from": "loan_application.repayment_amount",
- "fetch_if_empty": 1,
- "fieldname": "monthly_repayment_amount",
- "fieldtype": "Currency",
- "label": "Monthly Repayment Amount",
- "options": "Company:company:default_currency"
- },
- {
- "collapsible": 1,
- "fieldname": "account_info",
- "fieldtype": "Section Break",
- "label": "Account Info"
- },
- {
- "fetch_from": "loan_type.mode_of_payment",
- "fieldname": "mode_of_payment",
- "fieldtype": "Link",
- "label": "Mode of Payment",
- "options": "Mode of Payment",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fetch_from": "loan_type.payment_account",
- "fieldname": "payment_account",
- "fieldtype": "Link",
- "label": "Payment Account",
- "options": "Account",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "column_break_9",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "loan_type.loan_account",
- "fieldname": "loan_account",
- "fieldtype": "Link",
- "label": "Loan Account",
- "options": "Account",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fetch_from": "loan_type.interest_income_account",
- "fieldname": "interest_income_account",
- "fieldtype": "Link",
- "label": "Interest Income Account",
- "options": "Account",
- "read_only": 1,
- "reqd": 1
- },
- {
- "depends_on": "is_term_loan",
- "fieldname": "section_break_15",
- "fieldtype": "Section Break",
- "label": "Repayment Schedule"
- },
- {
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_term_loan == 1",
- "fieldname": "repayment_schedule",
- "fieldtype": "Table",
- "label": "Repayment Schedule",
- "no_copy": 1,
- "options": "Repayment Schedule",
- "read_only": 1
- },
- {
- "fieldname": "section_break_17",
- "fieldtype": "Section Break",
- "label": "Totals"
- },
- {
- "default": "0",
- "fieldname": "total_payment",
- "fieldtype": "Currency",
- "label": "Total Payable Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "column_break_19",
- "fieldtype": "Column Break"
- },
- {
- "default": "0",
- "depends_on": "is_term_loan",
- "fieldname": "total_interest_payable",
- "fieldtype": "Currency",
- "label": "Total Interest Payable",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "allow_on_submit": 1,
- "fieldname": "total_amount_paid",
- "fieldtype": "Currency",
- "label": "Total Amount Paid",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "default": "0",
- "fieldname": "is_secured_loan",
- "fieldtype": "Check",
- "label": "Is Secured Loan"
- },
- {
- "default": "0",
- "fetch_from": "loan_type.is_term_loan",
- "fieldname": "is_term_loan",
- "fieldtype": "Check",
- "label": "Is Term Loan",
- "read_only": 1
- },
- {
- "fetch_from": "loan_type.penalty_income_account",
- "fieldname": "penalty_income_account",
- "fieldtype": "Link",
- "label": "Penalty Income Account",
- "options": "Account",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "total_principal_paid",
- "fieldtype": "Currency",
- "label": "Total Principal Paid",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "disbursed_amount",
- "fieldtype": "Currency",
- "label": "Disbursed Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "depends_on": "eval:doc.is_secured_loan",
- "fieldname": "maximum_loan_amount",
- "fieldtype": "Currency",
- "label": "Maximum Loan Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "written_off_amount",
- "fieldtype": "Currency",
- "label": "Written Off Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "closure_date",
- "fieldtype": "Date",
- "label": "Closure Date",
- "read_only": 1
- },
- {
- "fetch_from": "loan_type.disbursement_account",
- "fieldname": "disbursement_account",
- "fieldtype": "Link",
- "label": "Disbursement Account",
- "options": "Account",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "refund_amount",
- "fieldtype": "Currency",
- "label": "Refund amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "credit_adjustment_amount",
- "fieldtype": "Currency",
- "label": "Credit Adjustment Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "debit_adjustment_amount",
- "fieldtype": "Currency",
- "label": "Debit Adjustment Amount",
- "options": "Company:company:default_currency"
- },
- {
- "default": "0",
- "description": "Mark Loan as a Nonperforming asset",
- "fieldname": "is_npa",
- "fieldtype": "Check",
- "label": "Is NPA"
- },
- {
- "depends_on": "is_term_loan",
- "fetch_from": "loan_type.repayment_schedule_type",
- "fieldname": "repayment_schedule_type",
- "fieldtype": "Data",
- "label": "Repayment Schedule Type",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-09-30 10:36:47.902903",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "read": 1,
- "role": "Employee"
- }
- ],
- "search_fields": "posting_date",
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan/loan.py b/erpnext/loan_management/doctype/loan/loan.py
deleted file mode 100644
index 0c9c97f..0000000
--- a/erpnext/loan_management/doctype/loan/loan.py
+++ /dev/null
@@ -1,611 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import json
-import math
-
-import frappe
-from frappe import _
-from frappe.utils import (
- add_days,
- add_months,
- date_diff,
- flt,
- get_last_day,
- getdate,
- now_datetime,
- nowdate,
-)
-
-import erpnext
-from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.loan_management.doctype.loan_repayment.loan_repayment import calculate_amounts
-from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import (
- get_pledged_security_qty,
-)
-
-
-class Loan(AccountsController):
- def validate(self):
- self.set_loan_amount()
- self.validate_loan_amount()
- self.set_missing_fields()
- self.validate_cost_center()
- self.validate_accounts()
- self.check_sanctioned_amount_limit()
-
- if self.is_term_loan:
- validate_repayment_method(
- self.repayment_method,
- self.loan_amount,
- self.monthly_repayment_amount,
- self.repayment_periods,
- self.is_term_loan,
- )
- self.make_repayment_schedule()
- self.set_repayment_period()
-
- self.calculate_totals()
-
- def validate_accounts(self):
- for fieldname in [
- "payment_account",
- "loan_account",
- "interest_income_account",
- "penalty_income_account",
- ]:
- company = frappe.get_value("Account", self.get(fieldname), "company")
-
- if company != self.company:
- frappe.throw(
- _("Account {0} does not belongs to company {1}").format(
- frappe.bold(self.get(fieldname)), frappe.bold(self.company)
- )
- )
-
- def validate_cost_center(self):
- if not self.cost_center and self.rate_of_interest != 0.0:
- self.cost_center = frappe.db.get_value("Company", self.company, "cost_center")
-
- if not self.cost_center:
- frappe.throw(_("Cost center is mandatory for loans having rate of interest greater than 0"))
-
- def on_submit(self):
- self.link_loan_security_pledge()
- # Interest accrual for backdated term loans
- self.accrue_loan_interest()
-
- def on_cancel(self):
- self.unlink_loan_security_pledge()
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
-
- def set_missing_fields(self):
- if not self.company:
- self.company = erpnext.get_default_company()
-
- if not self.posting_date:
- self.posting_date = nowdate()
-
- if self.loan_type and not self.rate_of_interest:
- self.rate_of_interest = frappe.db.get_value("Loan Type", self.loan_type, "rate_of_interest")
-
- if self.repayment_method == "Repay Over Number of Periods":
- self.monthly_repayment_amount = get_monthly_repayment_amount(
- self.loan_amount, self.rate_of_interest, self.repayment_periods
- )
-
- def check_sanctioned_amount_limit(self):
- sanctioned_amount_limit = get_sanctioned_amount_limit(
- self.applicant_type, self.applicant, self.company
- )
- if sanctioned_amount_limit:
- total_loan_amount = get_total_loan_amount(self.applicant_type, self.applicant, self.company)
-
- if sanctioned_amount_limit and flt(self.loan_amount) + flt(total_loan_amount) > flt(
- sanctioned_amount_limit
- ):
- frappe.throw(
- _("Sanctioned Amount limit crossed for {0} {1}").format(
- self.applicant_type, frappe.bold(self.applicant)
- )
- )
-
- def make_repayment_schedule(self):
- if not self.repayment_start_date:
- frappe.throw(_("Repayment Start Date is mandatory for term loans"))
-
- schedule_type_details = frappe.db.get_value(
- "Loan Type", self.loan_type, ["repayment_schedule_type", "repayment_date_on"], as_dict=1
- )
-
- self.repayment_schedule = []
- payment_date = self.repayment_start_date
- balance_amount = self.loan_amount
-
- while balance_amount > 0:
- interest_amount, principal_amount, balance_amount, total_payment = self.get_amounts(
- payment_date,
- balance_amount,
- schedule_type_details.repayment_schedule_type,
- schedule_type_details.repayment_date_on,
- )
-
- if schedule_type_details.repayment_schedule_type == "Pro-rated calendar months":
- next_payment_date = get_last_day(payment_date)
- if schedule_type_details.repayment_date_on == "Start of the next month":
- next_payment_date = add_days(next_payment_date, 1)
-
- payment_date = next_payment_date
-
- self.add_repayment_schedule_row(
- payment_date, principal_amount, interest_amount, total_payment, balance_amount
- )
-
- if (
- schedule_type_details.repayment_schedule_type == "Monthly as per repayment start date"
- or schedule_type_details.repayment_date_on == "End of the current month"
- ):
- next_payment_date = add_single_month(payment_date)
- payment_date = next_payment_date
-
- def get_amounts(self, payment_date, balance_amount, schedule_type, repayment_date_on):
- if schedule_type == "Monthly as per repayment start date":
- days = 1
- months = 12
- else:
- expected_payment_date = get_last_day(payment_date)
- if repayment_date_on == "Start of the next month":
- expected_payment_date = add_days(expected_payment_date, 1)
-
- if expected_payment_date == payment_date:
- # using 30 days for calculating interest for all full months
- days = 30
- months = 365
- else:
- days = date_diff(get_last_day(payment_date), payment_date)
- months = 365
-
- interest_amount = flt(balance_amount * flt(self.rate_of_interest) * days / (months * 100))
- principal_amount = self.monthly_repayment_amount - interest_amount
- balance_amount = flt(balance_amount + interest_amount - self.monthly_repayment_amount)
- if balance_amount < 0:
- principal_amount += balance_amount
- balance_amount = 0.0
-
- total_payment = principal_amount + interest_amount
-
- return interest_amount, principal_amount, balance_amount, total_payment
-
- def add_repayment_schedule_row(
- self, payment_date, principal_amount, interest_amount, total_payment, balance_loan_amount
- ):
- self.append(
- "repayment_schedule",
- {
- "payment_date": payment_date,
- "principal_amount": principal_amount,
- "interest_amount": interest_amount,
- "total_payment": total_payment,
- "balance_loan_amount": balance_loan_amount,
- },
- )
-
- def set_repayment_period(self):
- if self.repayment_method == "Repay Fixed Amount per Period":
- repayment_periods = len(self.repayment_schedule)
-
- self.repayment_periods = repayment_periods
-
- def calculate_totals(self):
- self.total_payment = 0
- self.total_interest_payable = 0
- self.total_amount_paid = 0
-
- if self.is_term_loan:
- for data in self.repayment_schedule:
- self.total_payment += data.total_payment
- self.total_interest_payable += data.interest_amount
- else:
- self.total_payment = self.loan_amount
-
- def set_loan_amount(self):
- if self.loan_application and not self.loan_amount:
- self.loan_amount = frappe.db.get_value("Loan Application", self.loan_application, "loan_amount")
-
- def validate_loan_amount(self):
- if self.maximum_loan_amount and self.loan_amount > self.maximum_loan_amount:
- msg = _("Loan amount cannot be greater than {0}").format(self.maximum_loan_amount)
- frappe.throw(msg)
-
- if not self.loan_amount:
- frappe.throw(_("Loan amount is mandatory"))
-
- def link_loan_security_pledge(self):
- if self.is_secured_loan and self.loan_application:
- maximum_loan_value = frappe.db.get_value(
- "Loan Security Pledge",
- {"loan_application": self.loan_application, "status": "Requested"},
- "sum(maximum_loan_value)",
- )
-
- if maximum_loan_value:
- frappe.db.sql(
- """
- UPDATE `tabLoan Security Pledge`
- SET loan = %s, pledge_time = %s, status = 'Pledged'
- WHERE status = 'Requested' and loan_application = %s
- """,
- (self.name, now_datetime(), self.loan_application),
- )
-
- self.db_set("maximum_loan_amount", maximum_loan_value)
-
- def accrue_loan_interest(self):
- from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_term_loans,
- )
-
- if getdate(self.repayment_start_date) < getdate() and self.is_term_loan:
- process_loan_interest_accrual_for_term_loans(
- posting_date=getdate(), loan_type=self.loan_type, loan=self.name
- )
-
- def unlink_loan_security_pledge(self):
- pledges = frappe.get_all("Loan Security Pledge", fields=["name"], filters={"loan": self.name})
- pledge_list = [d.name for d in pledges]
- if pledge_list:
- frappe.db.sql(
- """UPDATE `tabLoan Security Pledge` SET
- loan = '', status = 'Unpledged'
- where name in (%s) """
- % (", ".join(["%s"] * len(pledge_list))),
- tuple(pledge_list),
- ) # nosec
-
-
-def update_total_amount_paid(doc):
- total_amount_paid = 0
- for data in doc.repayment_schedule:
- if data.paid:
- total_amount_paid += data.total_payment
- frappe.db.set_value("Loan", doc.name, "total_amount_paid", total_amount_paid)
-
-
-def get_total_loan_amount(applicant_type, applicant, company):
- pending_amount = 0
- loan_details = frappe.db.get_all(
- "Loan",
- filters={
- "applicant_type": applicant_type,
- "company": company,
- "applicant": applicant,
- "docstatus": 1,
- "status": ("!=", "Closed"),
- },
- fields=[
- "status",
- "total_payment",
- "disbursed_amount",
- "total_interest_payable",
- "total_principal_paid",
- "written_off_amount",
- ],
- )
-
- interest_amount = flt(
- frappe.db.get_value(
- "Loan Interest Accrual",
- {"applicant_type": applicant_type, "company": company, "applicant": applicant, "docstatus": 1},
- "sum(interest_amount - paid_interest_amount)",
- )
- )
-
- for loan in loan_details:
- if loan.status in ("Disbursed", "Loan Closure Requested"):
- pending_amount += (
- flt(loan.total_payment)
- - flt(loan.total_interest_payable)
- - flt(loan.total_principal_paid)
- - flt(loan.written_off_amount)
- )
- elif loan.status == "Partially Disbursed":
- pending_amount += (
- flt(loan.disbursed_amount)
- - flt(loan.total_interest_payable)
- - flt(loan.total_principal_paid)
- - flt(loan.written_off_amount)
- )
- elif loan.status == "Sanctioned":
- pending_amount += flt(loan.total_payment)
-
- pending_amount += interest_amount
-
- return pending_amount
-
-
-def get_sanctioned_amount_limit(applicant_type, applicant, company):
- return frappe.db.get_value(
- "Sanctioned Loan Amount",
- {"applicant_type": applicant_type, "company": company, "applicant": applicant},
- "sanctioned_amount_limit",
- )
-
-
-def validate_repayment_method(
- repayment_method, loan_amount, monthly_repayment_amount, repayment_periods, is_term_loan
-):
-
- if is_term_loan and not repayment_method:
- frappe.throw(_("Repayment Method is mandatory for term loans"))
-
- if repayment_method == "Repay Over Number of Periods" and not repayment_periods:
- frappe.throw(_("Please enter Repayment Periods"))
-
- if repayment_method == "Repay Fixed Amount per Period":
- if not monthly_repayment_amount:
- frappe.throw(_("Please enter repayment Amount"))
- if monthly_repayment_amount > loan_amount:
- frappe.throw(_("Monthly Repayment Amount cannot be greater than Loan Amount"))
-
-
-def get_monthly_repayment_amount(loan_amount, rate_of_interest, repayment_periods):
- if rate_of_interest:
- monthly_interest_rate = flt(rate_of_interest) / (12 * 100)
- monthly_repayment_amount = math.ceil(
- (loan_amount * monthly_interest_rate * (1 + monthly_interest_rate) ** repayment_periods)
- / ((1 + monthly_interest_rate) ** repayment_periods - 1)
- )
- else:
- monthly_repayment_amount = math.ceil(flt(loan_amount) / repayment_periods)
- return monthly_repayment_amount
-
-
-@frappe.whitelist()
-def request_loan_closure(loan, posting_date=None):
- if not posting_date:
- posting_date = getdate()
-
- amounts = calculate_amounts(loan, posting_date)
- pending_amount = (
- amounts["pending_principal_amount"]
- + amounts["unaccrued_interest"]
- + amounts["interest_amount"]
- + amounts["penalty_amount"]
- )
-
- loan_type = frappe.get_value("Loan", loan, "loan_type")
- write_off_limit = frappe.get_value("Loan Type", loan_type, "write_off_amount")
-
- if pending_amount and abs(pending_amount) < write_off_limit:
- # Auto create loan write off and update status as loan closure requested
- write_off = make_loan_write_off(loan)
- write_off.submit()
- elif pending_amount > 0:
- frappe.throw(_("Cannot close loan as there is an outstanding of {0}").format(pending_amount))
-
- frappe.db.set_value("Loan", loan, "status", "Loan Closure Requested")
-
-
-@frappe.whitelist()
-def get_loan_application(loan_application):
- loan = frappe.get_doc("Loan Application", loan_application)
- if loan:
- return loan.as_dict()
-
-
-@frappe.whitelist()
-def close_unsecured_term_loan(loan):
- loan_details = frappe.db.get_value(
- "Loan", {"name": loan}, ["status", "is_term_loan", "is_secured_loan"], as_dict=1
- )
-
- if (
- loan_details.status == "Loan Closure Requested"
- and loan_details.is_term_loan
- and not loan_details.is_secured_loan
- ):
- frappe.db.set_value("Loan", loan, "status", "Closed")
- else:
- frappe.throw(_("Cannot close this loan until full repayment"))
-
-
-def close_loan(loan, total_amount_paid):
- frappe.db.set_value("Loan", loan, "total_amount_paid", total_amount_paid)
- frappe.db.set_value("Loan", loan, "status", "Closed")
-
-
-@frappe.whitelist()
-def make_loan_disbursement(loan, company, applicant_type, applicant, pending_amount=0, as_dict=0):
- disbursement_entry = frappe.new_doc("Loan Disbursement")
- disbursement_entry.against_loan = loan
- disbursement_entry.applicant_type = applicant_type
- disbursement_entry.applicant = applicant
- disbursement_entry.company = company
- disbursement_entry.disbursement_date = nowdate()
- disbursement_entry.posting_date = nowdate()
-
- disbursement_entry.disbursed_amount = pending_amount
- if as_dict:
- return disbursement_entry.as_dict()
- else:
- return disbursement_entry
-
-
-@frappe.whitelist()
-def make_repayment_entry(loan, applicant_type, applicant, loan_type, company, as_dict=0):
- repayment_entry = frappe.new_doc("Loan Repayment")
- repayment_entry.against_loan = loan
- repayment_entry.applicant_type = applicant_type
- repayment_entry.applicant = applicant
- repayment_entry.company = company
- repayment_entry.loan_type = loan_type
- repayment_entry.posting_date = nowdate()
-
- if as_dict:
- return repayment_entry.as_dict()
- else:
- return repayment_entry
-
-
-@frappe.whitelist()
-def make_loan_write_off(loan, company=None, posting_date=None, amount=0, as_dict=0):
- if not company:
- company = frappe.get_value("Loan", loan, "company")
-
- if not posting_date:
- posting_date = getdate()
-
- amounts = calculate_amounts(loan, posting_date)
- pending_amount = amounts["pending_principal_amount"]
-
- if amount and (amount > pending_amount):
- frappe.throw(_("Write Off amount cannot be greater than pending loan amount"))
-
- if not amount:
- amount = pending_amount
-
- # get default write off account from company master
- write_off_account = frappe.get_value("Company", company, "write_off_account")
-
- write_off = frappe.new_doc("Loan Write Off")
- write_off.loan = loan
- write_off.posting_date = posting_date
- write_off.write_off_account = write_off_account
- write_off.write_off_amount = amount
- write_off.save()
-
- if as_dict:
- return write_off.as_dict()
- else:
- return write_off
-
-
-@frappe.whitelist()
-def unpledge_security(
- loan=None, loan_security_pledge=None, security_map=None, as_dict=0, save=0, submit=0, approve=0
-):
- # if no security_map is passed it will be considered as full unpledge
- if security_map and isinstance(security_map, str):
- security_map = json.loads(security_map)
-
- if loan:
- pledge_qty_map = security_map or get_pledged_security_qty(loan)
- loan_doc = frappe.get_doc("Loan", loan)
- unpledge_request = create_loan_security_unpledge(
- pledge_qty_map, loan_doc.name, loan_doc.company, loan_doc.applicant_type, loan_doc.applicant
- )
- # will unpledge qty based on loan security pledge
- elif loan_security_pledge:
- security_map = {}
- pledge_doc = frappe.get_doc("Loan Security Pledge", loan_security_pledge)
- for security in pledge_doc.securities:
- security_map.setdefault(security.loan_security, security.qty)
-
- unpledge_request = create_loan_security_unpledge(
- security_map,
- pledge_doc.loan,
- pledge_doc.company,
- pledge_doc.applicant_type,
- pledge_doc.applicant,
- )
-
- if save:
- unpledge_request.save()
-
- if submit:
- unpledge_request.submit()
-
- if approve:
- if unpledge_request.docstatus == 1:
- unpledge_request.status = "Approved"
- unpledge_request.save()
- else:
- frappe.throw(_("Only submittted unpledge requests can be approved"))
-
- if as_dict:
- return unpledge_request
- else:
- return unpledge_request
-
-
-def create_loan_security_unpledge(unpledge_map, loan, company, applicant_type, applicant):
- unpledge_request = frappe.new_doc("Loan Security Unpledge")
- unpledge_request.applicant_type = applicant_type
- unpledge_request.applicant = applicant
- unpledge_request.loan = loan
- unpledge_request.company = company
-
- for security, qty in unpledge_map.items():
- if qty:
- unpledge_request.append("securities", {"loan_security": security, "qty": qty})
-
- return unpledge_request
-
-
-@frappe.whitelist()
-def get_shortfall_applicants():
- loans = frappe.get_all("Loan Security Shortfall", {"status": "Pending"}, pluck="loan")
- applicants = set(frappe.get_all("Loan", {"name": ("in", loans)}, pluck="name"))
-
- return {"value": len(applicants), "fieldtype": "Int"}
-
-
-def add_single_month(date):
- if getdate(date) == get_last_day(date):
- return get_last_day(add_months(date, 1))
- else:
- return add_months(date, 1)
-
-
-@frappe.whitelist()
-def make_refund_jv(loan, amount=0, reference_number=None, reference_date=None, submit=0):
- loan_details = frappe.db.get_value(
- "Loan",
- loan,
- [
- "applicant_type",
- "applicant",
- "loan_account",
- "payment_account",
- "posting_date",
- "company",
- "name",
- "total_payment",
- "total_principal_paid",
- ],
- as_dict=1,
- )
-
- loan_details.doctype = "Loan"
- loan_details[loan_details.applicant_type.lower()] = loan_details.applicant
-
- if not amount:
- amount = flt(loan_details.total_principal_paid - loan_details.total_payment)
-
- if amount < 0:
- frappe.throw(_("No excess amount pending for refund"))
-
- refund_jv = get_payment_entry(
- loan_details,
- {
- "party_type": loan_details.applicant_type,
- "party_account": loan_details.loan_account,
- "amount_field_party": "debit_in_account_currency",
- "amount_field_bank": "credit_in_account_currency",
- "amount": amount,
- "bank_account": loan_details.payment_account,
- },
- )
-
- if reference_number:
- refund_jv.cheque_no = reference_number
-
- if reference_date:
- refund_jv.cheque_date = reference_date
-
- if submit:
- refund_jv.submit()
-
- return refund_jv
diff --git a/erpnext/loan_management/doctype/loan/loan_dashboard.py b/erpnext/loan_management/doctype/loan/loan_dashboard.py
deleted file mode 100644
index 971d545..0000000
--- a/erpnext/loan_management/doctype/loan/loan_dashboard.py
+++ /dev/null
@@ -1,19 +0,0 @@
-def get_data():
- return {
- "fieldname": "loan",
- "non_standard_fieldnames": {
- "Loan Disbursement": "against_loan",
- "Loan Repayment": "against_loan",
- },
- "transactions": [
- {"items": ["Loan Security Pledge", "Loan Security Shortfall", "Loan Disbursement"]},
- {
- "items": [
- "Loan Repayment",
- "Loan Interest Accrual",
- "Loan Write Off",
- "Loan Security Unpledge",
- ]
- },
- ],
- }
diff --git a/erpnext/loan_management/doctype/loan/loan_list.js b/erpnext/loan_management/doctype/loan/loan_list.js
deleted file mode 100644
index 6591b72..0000000
--- a/erpnext/loan_management/doctype/loan/loan_list.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.listview_settings['Loan'] = {
- get_indicator: function(doc) {
- var status_color = {
- "Draft": "red",
- "Sanctioned": "blue",
- "Disbursed": "orange",
- "Partially Disbursed": "yellow",
- "Loan Closure Requested": "green",
- "Closed": "green"
- };
- return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
- },
-};
diff --git a/erpnext/loan_management/doctype/loan/test_loan.py b/erpnext/loan_management/doctype/loan/test_loan.py
deleted file mode 100644
index 388e65d..0000000
--- a/erpnext/loan_management/doctype/loan/test_loan.py
+++ /dev/null
@@ -1,1433 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-import frappe
-from frappe.utils import (
- add_days,
- add_months,
- add_to_date,
- date_diff,
- flt,
- format_date,
- get_datetime,
- nowdate,
-)
-
-from erpnext.loan_management.doctype.loan.loan import (
- make_loan_write_off,
- request_loan_closure,
- unpledge_security,
-)
-from erpnext.loan_management.doctype.loan_application.loan_application import create_pledge
-from erpnext.loan_management.doctype.loan_disbursement.loan_disbursement import (
- get_disbursal_amount,
-)
-from erpnext.loan_management.doctype.loan_interest_accrual.loan_interest_accrual import (
- days_in_year,
-)
-from erpnext.loan_management.doctype.loan_repayment.loan_repayment import calculate_amounts
-from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import (
- get_pledged_security_qty,
-)
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_demand_loans,
- process_loan_interest_accrual_for_term_loans,
-)
-from erpnext.loan_management.doctype.process_loan_security_shortfall.process_loan_security_shortfall import (
- create_process_loan_security_shortfall,
-)
-from erpnext.selling.doctype.customer.test_customer import get_customer_dict
-from erpnext.setup.doctype.employee.test_employee import make_employee
-
-
-class TestLoan(unittest.TestCase):
- def setUp(self):
- create_loan_accounts()
- create_loan_type(
- "Personal Loan",
- 500000,
- 8.4,
- is_term_loan=1,
- mode_of_payment="Cash",
- disbursement_account="Disbursement Account - _TC",
- payment_account="Payment Account - _TC",
- loan_account="Loan Account - _TC",
- interest_income_account="Interest Income Account - _TC",
- penalty_income_account="Penalty Income Account - _TC",
- repayment_schedule_type="Monthly as per repayment start date",
- )
-
- create_loan_type(
- "Term Loan Type 1",
- 12000,
- 7.5,
- is_term_loan=1,
- mode_of_payment="Cash",
- disbursement_account="Disbursement Account - _TC",
- payment_account="Payment Account - _TC",
- loan_account="Loan Account - _TC",
- interest_income_account="Interest Income Account - _TC",
- penalty_income_account="Penalty Income Account - _TC",
- repayment_schedule_type="Monthly as per repayment start date",
- )
-
- create_loan_type(
- "Term Loan Type 2",
- 12000,
- 7.5,
- is_term_loan=1,
- mode_of_payment="Cash",
- disbursement_account="Disbursement Account - _TC",
- payment_account="Payment Account - _TC",
- loan_account="Loan Account - _TC",
- interest_income_account="Interest Income Account - _TC",
- penalty_income_account="Penalty Income Account - _TC",
- repayment_schedule_type="Pro-rated calendar months",
- repayment_date_on="Start of the next month",
- )
-
- create_loan_type(
- "Term Loan Type 3",
- 12000,
- 7.5,
- is_term_loan=1,
- mode_of_payment="Cash",
- disbursement_account="Disbursement Account - _TC",
- payment_account="Payment Account - _TC",
- loan_account="Loan Account - _TC",
- interest_income_account="Interest Income Account - _TC",
- penalty_income_account="Penalty Income Account - _TC",
- repayment_schedule_type="Pro-rated calendar months",
- repayment_date_on="End of the current month",
- )
-
- create_loan_type(
- "Stock Loan",
- 2000000,
- 13.5,
- 25,
- 1,
- 5,
- "Cash",
- "Disbursement Account - _TC",
- "Payment Account - _TC",
- "Loan Account - _TC",
- "Interest Income Account - _TC",
- "Penalty Income Account - _TC",
- repayment_schedule_type="Monthly as per repayment start date",
- )
-
- create_loan_type(
- "Demand Loan",
- 2000000,
- 13.5,
- 25,
- 0,
- 5,
- "Cash",
- "Disbursement Account - _TC",
- "Payment Account - _TC",
- "Loan Account - _TC",
- "Interest Income Account - _TC",
- "Penalty Income Account - _TC",
- )
-
- create_loan_security_type()
- create_loan_security()
-
- create_loan_security_price(
- "Test Security 1", 500, "Nos", get_datetime(), get_datetime(add_to_date(nowdate(), hours=24))
- )
- create_loan_security_price(
- "Test Security 2", 250, "Nos", get_datetime(), get_datetime(add_to_date(nowdate(), hours=24))
- )
-
- self.applicant1 = make_employee("robert_loan@loan.com")
- if not frappe.db.exists("Customer", "_Test Loan Customer"):
- frappe.get_doc(get_customer_dict("_Test Loan Customer")).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Customer", "_Test Loan Customer 1"):
- frappe.get_doc(get_customer_dict("_Test Loan Customer 1")).insert(ignore_permissions=True)
-
- self.applicant2 = frappe.db.get_value("Customer", {"name": "_Test Loan Customer"}, "name")
- self.applicant3 = frappe.db.get_value("Customer", {"name": "_Test Loan Customer 1"}, "name")
-
- create_loan(self.applicant1, "Personal Loan", 280000, "Repay Over Number of Periods", 20)
-
- def test_loan(self):
- loan = frappe.get_doc("Loan", {"applicant": self.applicant1})
- self.assertEqual(loan.monthly_repayment_amount, 15052)
- self.assertEqual(flt(loan.total_interest_payable, 0), 21034)
- self.assertEqual(flt(loan.total_payment, 0), 301034)
-
- schedule = loan.repayment_schedule
-
- self.assertEqual(len(schedule), 20)
-
- for idx, principal_amount, interest_amount, balance_loan_amount in [
- [3, 13369, 1683, 227080],
- [19, 14941, 105, 0],
- [17, 14740, 312, 29785],
- ]:
- self.assertEqual(flt(schedule[idx].principal_amount, 0), principal_amount)
- self.assertEqual(flt(schedule[idx].interest_amount, 0), interest_amount)
- self.assertEqual(flt(schedule[idx].balance_loan_amount, 0), balance_loan_amount)
-
- loan.repayment_method = "Repay Fixed Amount per Period"
- loan.monthly_repayment_amount = 14000
- loan.save()
-
- self.assertEqual(len(loan.repayment_schedule), 22)
- self.assertEqual(flt(loan.total_interest_payable, 0), 22712)
- self.assertEqual(flt(loan.total_payment, 0), 302712)
-
- def test_loan_with_security(self):
-
- pledge = [
- {
- "loan_security": "Test Security 1",
- "qty": 4000.00,
- }
- ]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Stock Loan", pledge, "Repay Over Number of Periods", 12
- )
- create_pledge(loan_application)
-
- loan = create_loan_with_security(
- self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application
- )
- self.assertEqual(loan.loan_amount, 1000000)
-
- def test_loan_disbursement(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Stock Loan", pledge, "Repay Over Number of Periods", 12
- )
-
- create_pledge(loan_application)
-
- loan = create_loan_with_security(
- self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application
- )
- self.assertEqual(loan.loan_amount, 1000000)
-
- loan.submit()
-
- loan_disbursement_entry1 = make_loan_disbursement_entry(loan.name, 500000)
- loan_disbursement_entry2 = make_loan_disbursement_entry(loan.name, 500000)
-
- loan = frappe.get_doc("Loan", loan.name)
- gl_entries1 = frappe.db.get_all(
- "GL Entry",
- fields=["name"],
- filters={"voucher_type": "Loan Disbursement", "voucher_no": loan_disbursement_entry1.name},
- )
-
- gl_entries2 = frappe.db.get_all(
- "GL Entry",
- fields=["name"],
- filters={"voucher_type": "Loan Disbursement", "voucher_no": loan_disbursement_entry2.name},
- )
-
- self.assertEqual(loan.status, "Disbursed")
- self.assertEqual(loan.disbursed_amount, 1000000)
- self.assertTrue(gl_entries1)
- self.assertTrue(gl_entries2)
-
- def test_sanctioned_amount_limit(self):
- # Clear loan docs before checking
- frappe.db.sql("DELETE FROM `tabLoan` where applicant = '_Test Loan Customer 1'")
- frappe.db.sql("DELETE FROM `tabLoan Application` where applicant = '_Test Loan Customer 1'")
- frappe.db.sql("DELETE FROM `tabLoan Security Pledge` where applicant = '_Test Loan Customer 1'")
-
- if not frappe.db.get_value(
- "Sanctioned Loan Amount",
- filters={
- "applicant_type": "Customer",
- "applicant": "_Test Loan Customer 1",
- "company": "_Test Company",
- },
- ):
- frappe.get_doc(
- {
- "doctype": "Sanctioned Loan Amount",
- "applicant_type": "Customer",
- "applicant": "_Test Loan Customer 1",
- "sanctioned_amount_limit": 1500000,
- "company": "_Test Company",
- }
- ).insert(ignore_permissions=True)
-
- # Make First Loan
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant3, "Demand Loan", pledge
- )
- create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant3, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- # Make second loan greater than the sanctioned amount
- loan_application = create_loan_application(
- "_Test Company", self.applicant3, "Demand Loan", pledge, do_not_save=True
- )
- self.assertRaises(frappe.ValidationError, loan_application.save)
-
- def test_regular_loan_repayment(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- accrued_interest_amount = flt(
- (loan.loan_amount * loan.rate_of_interest * no_of_days)
- / (days_in_year(get_datetime(first_date).year) * 100),
- 2,
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
-
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 10), 111119
- )
- repayment_entry.save()
- repayment_entry.submit()
-
- penalty_amount = (accrued_interest_amount * 5 * 25) / 100
- self.assertEqual(flt(repayment_entry.penalty_amount, 0), flt(penalty_amount, 0))
-
- amounts = frappe.db.get_all(
- "Loan Interest Accrual", {"loan": loan.name}, ["paid_interest_amount"]
- )
-
- loan.load_from_db()
-
- total_interest_paid = amounts[0]["paid_interest_amount"] + amounts[1]["paid_interest_amount"]
- self.assertEqual(amounts[1]["paid_interest_amount"], repayment_entry.interest_payable)
- self.assertEqual(
- flt(loan.total_principal_paid, 0),
- flt(repayment_entry.amount_paid - penalty_amount - total_interest_paid, 0),
- )
-
- # Check Repayment Entry cancel
- repayment_entry.load_from_db()
- repayment_entry.cancel()
-
- loan.load_from_db()
- self.assertEqual(loan.total_principal_paid, 0)
- self.assertEqual(loan.total_principal_paid, 0)
-
- def test_loan_closure(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- # Adding 5 since repayment is made 5 days late after due date
- # and since payment type is loan closure so interest should be considered for those
- # 5 days as well though in grace period
- no_of_days += 5
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- repayment_entry = create_repayment_entry(
- loan.name,
- self.applicant2,
- add_days(last_date, 5),
- flt(loan.loan_amount + accrued_interest_amount),
- )
-
- repayment_entry.submit()
-
- amount = frappe.db.get_value(
- "Loan Interest Accrual", {"loan": loan.name}, ["sum(paid_interest_amount)"]
- )
-
- self.assertEqual(flt(amount, 0), flt(accrued_interest_amount, 0))
- self.assertEqual(flt(repayment_entry.penalty_amount, 5), 0)
-
- request_loan_closure(loan.name)
- loan.load_from_db()
- self.assertEqual(loan.status, "Loan Closure Requested")
-
- def test_loan_repayment_for_term_loan(self):
- pledges = [
- {"loan_security": "Test Security 2", "qty": 4000.00},
- {"loan_security": "Test Security 1", "qty": 2000.00},
- ]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Stock Loan", pledges, "Repay Over Number of Periods", 12
- )
- create_pledge(loan_application)
-
- loan = create_loan_with_security(
- self.applicant2,
- "Stock Loan",
- "Repay Over Number of Periods",
- 12,
- loan_application,
- posting_date=add_months(nowdate(), -1),
- )
-
- loan.submit()
-
- make_loan_disbursement_entry(
- loan.name, loan.loan_amount, disbursement_date=add_months(nowdate(), -1)
- )
-
- process_loan_interest_accrual_for_term_loans(posting_date=nowdate())
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(nowdate(), 5), 89768.75
- )
-
- repayment_entry.submit()
-
- amounts = frappe.db.get_value(
- "Loan Interest Accrual", {"loan": loan.name}, ["paid_interest_amount", "paid_principal_amount"]
- )
-
- self.assertEqual(amounts[0], 11250.00)
- self.assertEqual(amounts[1], 78303.00)
-
- def test_repayment_schedule_update(self):
- loan = create_loan(
- self.applicant2,
- "Personal Loan",
- 200000,
- "Repay Over Number of Periods",
- 4,
- applicant_type="Customer",
- repayment_start_date="2021-04-30",
- posting_date="2021-04-01",
- )
-
- loan.submit()
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date="2021-04-01")
-
- process_loan_interest_accrual_for_term_loans(posting_date="2021-05-01")
- process_loan_interest_accrual_for_term_loans(posting_date="2021-06-01")
-
- repayment_entry = create_repayment_entry(loan.name, self.applicant2, "2021-06-05", 120000)
- repayment_entry.submit()
-
- loan.load_from_db()
-
- self.assertEqual(flt(loan.get("repayment_schedule")[3].principal_amount, 2), 41369.83)
- self.assertEqual(flt(loan.get("repayment_schedule")[3].interest_amount, 2), 289.59)
- self.assertEqual(flt(loan.get("repayment_schedule")[3].total_payment, 2), 41659.41)
- self.assertEqual(flt(loan.get("repayment_schedule")[3].balance_loan_amount, 2), 0)
-
- def test_security_shortfall(self):
- pledges = [
- {
- "loan_security": "Test Security 2",
- "qty": 8000.00,
- "haircut": 50,
- }
- ]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Stock Loan", pledges, "Repay Over Number of Periods", 12
- )
-
- create_pledge(loan_application)
-
- loan = create_loan_with_security(
- self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application
- )
- loan.submit()
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount)
-
- frappe.db.sql(
- """UPDATE `tabLoan Security Price` SET loan_security_price = 100
- where loan_security='Test Security 2'"""
- )
-
- create_process_loan_security_shortfall()
- loan_security_shortfall = frappe.get_doc("Loan Security Shortfall", {"loan": loan.name})
- self.assertTrue(loan_security_shortfall)
-
- self.assertEqual(loan_security_shortfall.loan_amount, 1000000.00)
- self.assertEqual(loan_security_shortfall.security_value, 800000.00)
- self.assertEqual(loan_security_shortfall.shortfall_amount, 600000.00)
-
- frappe.db.sql(
- """ UPDATE `tabLoan Security Price` SET loan_security_price = 250
- where loan_security='Test Security 2'"""
- )
-
- create_process_loan_security_shortfall()
- loan_security_shortfall = frappe.get_doc("Loan Security Shortfall", {"loan": loan.name})
- self.assertEqual(loan_security_shortfall.status, "Completed")
- self.assertEqual(loan_security_shortfall.shortfall_amount, 0)
-
- def test_loan_security_unpledge(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- no_of_days += 5
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- repayment_entry = create_repayment_entry(
- loan.name,
- self.applicant2,
- add_days(last_date, 5),
- flt(loan.loan_amount + accrued_interest_amount),
- )
- repayment_entry.submit()
-
- request_loan_closure(loan.name)
- loan.load_from_db()
- self.assertEqual(loan.status, "Loan Closure Requested")
-
- unpledge_request = unpledge_security(loan=loan.name, save=1)
- unpledge_request.submit()
- unpledge_request.status = "Approved"
- unpledge_request.save()
- loan.load_from_db()
-
- pledged_qty = get_pledged_security_qty(loan.name)
-
- self.assertEqual(loan.status, "Closed")
- self.assertEqual(sum(pledged_qty.values()), 0)
-
- amounts = amounts = calculate_amounts(loan.name, add_days(last_date, 5))
- self.assertEqual(amounts["pending_principal_amount"], 0)
- self.assertEqual(amounts["payable_principal_amount"], 0.0)
- self.assertEqual(amounts["interest_amount"], 0)
-
- def test_partial_loan_security_unpledge(self):
- pledge = [
- {"loan_security": "Test Security 1", "qty": 2000.00},
- {"loan_security": "Test Security 2", "qty": 4000.00},
- ]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 5), 600000
- )
- repayment_entry.submit()
-
- unpledge_map = {"Test Security 2": 2000}
-
- unpledge_request = unpledge_security(loan=loan.name, security_map=unpledge_map, save=1)
- unpledge_request.submit()
- unpledge_request.status = "Approved"
- unpledge_request.save()
- unpledge_request.submit()
- unpledge_request.load_from_db()
- self.assertEqual(unpledge_request.docstatus, 1)
-
- def test_sanctioned_loan_security_unpledge(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- unpledge_map = {"Test Security 1": 4000}
- unpledge_request = unpledge_security(loan=loan.name, security_map=unpledge_map, save=1)
- unpledge_request.submit()
- unpledge_request.status = "Approved"
- unpledge_request.save()
- unpledge_request.submit()
-
- def test_disbursal_check_with_shortfall(self):
- pledges = [
- {
- "loan_security": "Test Security 2",
- "qty": 8000.00,
- "haircut": 50,
- }
- ]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Stock Loan", pledges, "Repay Over Number of Periods", 12
- )
-
- create_pledge(loan_application)
-
- loan = create_loan_with_security(
- self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application
- )
- loan.submit()
-
- # Disbursing 7,00,000 from the allowed 10,00,000 according to security pledge
- make_loan_disbursement_entry(loan.name, 700000)
-
- frappe.db.sql(
- """UPDATE `tabLoan Security Price` SET loan_security_price = 100
- where loan_security='Test Security 2'"""
- )
-
- create_process_loan_security_shortfall()
- loan_security_shortfall = frappe.get_doc("Loan Security Shortfall", {"loan": loan.name})
- self.assertTrue(loan_security_shortfall)
-
- self.assertEqual(get_disbursal_amount(loan.name), 0)
-
- frappe.db.sql(
- """ UPDATE `tabLoan Security Price` SET loan_security_price = 250
- where loan_security='Test Security 2'"""
- )
-
- def test_disbursal_check_without_shortfall(self):
- pledges = [
- {
- "loan_security": "Test Security 2",
- "qty": 8000.00,
- "haircut": 50,
- }
- ]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Stock Loan", pledges, "Repay Over Number of Periods", 12
- )
-
- create_pledge(loan_application)
-
- loan = create_loan_with_security(
- self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application
- )
- loan.submit()
-
- # Disbursing 7,00,000 from the allowed 10,00,000 according to security pledge
- make_loan_disbursement_entry(loan.name, 700000)
-
- self.assertEqual(get_disbursal_amount(loan.name), 300000)
-
- def test_pending_loan_amount_after_closure_request(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- no_of_days += 5
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 5))
-
- repayment_entry = create_repayment_entry(
- loan.name,
- self.applicant2,
- add_days(last_date, 5),
- flt(loan.loan_amount + accrued_interest_amount),
- )
- repayment_entry.submit()
-
- amounts = frappe.db.get_value(
- "Loan Interest Accrual", {"loan": loan.name}, ["paid_interest_amount", "paid_principal_amount"]
- )
-
- request_loan_closure(loan.name)
- loan.load_from_db()
- self.assertEqual(loan.status, "Loan Closure Requested")
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 5))
- self.assertEqual(amounts["pending_principal_amount"], 0.0)
-
- def test_partial_unaccrued_interest_payment(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- no_of_days += 5.5
-
- # get partial unaccrued interest amount
- paid_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 5))
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 5), paid_amount
- )
-
- repayment_entry.submit()
- repayment_entry.load_from_db()
-
- partial_accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * 5) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- interest_amount = flt(amounts["interest_amount"] + partial_accrued_interest_amount, 2)
- self.assertEqual(flt(repayment_entry.total_interest_paid, 0), flt(interest_amount, 0))
-
- def test_penalty(self):
- loan, amounts = create_loan_scenario_for_penalty(self)
- # 30 days - grace period
- penalty_days = 30 - 4
- penalty_applicable_amount = flt(amounts["interest_amount"] / 2)
- penalty_amount = flt((((penalty_applicable_amount * 25) / 100) * penalty_days), 2)
- process = process_loan_interest_accrual_for_demand_loans(posting_date="2019-11-30")
-
- calculated_penalty_amount = frappe.db.get_value(
- "Loan Interest Accrual",
- {"process_loan_interest_accrual": process, "loan": loan.name},
- "penalty_amount",
- )
-
- self.assertEqual(loan.loan_amount, 1000000)
- self.assertEqual(calculated_penalty_amount, penalty_amount)
-
- def test_penalty_repayment(self):
- loan, dummy = create_loan_scenario_for_penalty(self)
- amounts = calculate_amounts(loan.name, "2019-11-30 00:00:00")
-
- first_penalty = 10000
- second_penalty = amounts["penalty_amount"] - 10000
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, "2019-11-30 00:00:00", 10000
- )
- repayment_entry.submit()
-
- amounts = calculate_amounts(loan.name, "2019-11-30 00:00:01")
- self.assertEqual(amounts["penalty_amount"], second_penalty)
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, "2019-11-30 00:00:01", second_penalty
- )
- repayment_entry.submit()
-
- amounts = calculate_amounts(loan.name, "2019-11-30 00:00:02")
- self.assertEqual(amounts["penalty_amount"], 0)
-
- def test_loan_write_off_limit(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
- no_of_days += 5
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- # repay 50 less so that it can be automatically written off
- repayment_entry = create_repayment_entry(
- loan.name,
- self.applicant2,
- add_days(last_date, 5),
- flt(loan.loan_amount + accrued_interest_amount - 50),
- )
-
- repayment_entry.submit()
-
- amount = frappe.db.get_value(
- "Loan Interest Accrual", {"loan": loan.name}, ["sum(paid_interest_amount)"]
- )
-
- self.assertEqual(flt(amount, 0), flt(accrued_interest_amount, 0))
- self.assertEqual(flt(repayment_entry.penalty_amount, 5), 0)
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 5))
- self.assertEqual(flt(amounts["pending_principal_amount"], 0), 50)
-
- request_loan_closure(loan.name)
- loan.load_from_db()
- self.assertEqual(loan.status, "Loan Closure Requested")
-
- def test_loan_repayment_against_partially_disbursed_loan(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount / 2, disbursement_date=first_date)
-
- loan.load_from_db()
-
- self.assertEqual(loan.status, "Partially Disbursed")
- create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 5), flt(loan.loan_amount / 3)
- )
-
- def test_loan_amount_write_off(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
- no_of_days += 5
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- # repay 100 less so that it can be automatically written off
- repayment_entry = create_repayment_entry(
- loan.name,
- self.applicant2,
- add_days(last_date, 5),
- flt(loan.loan_amount + accrued_interest_amount - 100),
- )
-
- repayment_entry.submit()
-
- amount = frappe.db.get_value(
- "Loan Interest Accrual", {"loan": loan.name}, ["sum(paid_interest_amount)"]
- )
-
- self.assertEqual(flt(amount, 0), flt(accrued_interest_amount, 0))
- self.assertEqual(flt(repayment_entry.penalty_amount, 5), 0)
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 5))
- self.assertEqual(flt(amounts["pending_principal_amount"], 0), 100)
-
- we = make_loan_write_off(loan.name, amount=amounts["pending_principal_amount"])
- we.submit()
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 5))
- self.assertEqual(flt(amounts["pending_principal_amount"], 0), 0)
-
- def test_term_loan_schedule_types(self):
- loan = create_loan(
- self.applicant1,
- "Term Loan Type 1",
- 12000,
- "Repay Over Number of Periods",
- 12,
- repayment_start_date="2022-10-17",
- )
-
- # Check for first, second and last installment date
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[0].payment_date, "dd-MM-yyyy"), "17-10-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[1].payment_date, "dd-MM-yyyy"), "17-11-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[-1].payment_date, "dd-MM-yyyy"), "17-09-2023"
- )
-
- loan.loan_type = "Term Loan Type 2"
- loan.save()
-
- # Check for first, second and last installment date
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[0].payment_date, "dd-MM-yyyy"), "01-11-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[1].payment_date, "dd-MM-yyyy"), "01-12-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[-1].payment_date, "dd-MM-yyyy"), "01-10-2023"
- )
-
- loan.loan_type = "Term Loan Type 3"
- loan.save()
-
- # Check for first, second and last installment date
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[0].payment_date, "dd-MM-yyyy"), "31-10-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[1].payment_date, "dd-MM-yyyy"), "30-11-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[-1].payment_date, "dd-MM-yyyy"), "30-09-2023"
- )
-
- loan.repayment_method = "Repay Fixed Amount per Period"
- loan.monthly_repayment_amount = 1042
- loan.save()
-
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[0].payment_date, "dd-MM-yyyy"), "31-10-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[1].payment_date, "dd-MM-yyyy"), "30-11-2022"
- )
- self.assertEqual(
- format_date(loan.get("repayment_schedule")[-1].payment_date, "dd-MM-yyyy"), "30-09-2023"
- )
-
-
-def create_loan_scenario_for_penalty(doc):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application("_Test Company", doc.applicant2, "Demand Loan", pledge)
- create_pledge(loan_application)
- loan = create_demand_loan(
- doc.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
-
- amounts = calculate_amounts(loan.name, add_days(last_date, 1))
- paid_amount = amounts["interest_amount"] / 2
-
- repayment_entry = create_repayment_entry(
- loan.name, doc.applicant2, add_days(last_date, 5), paid_amount
- )
-
- repayment_entry.submit()
-
- return loan, amounts
-
-
-def create_loan_accounts():
- if not frappe.db.exists("Account", "Loans and Advances (Assets) - _TC"):
- frappe.get_doc(
- {
- "doctype": "Account",
- "account_name": "Loans and Advances (Assets)",
- "company": "_Test Company",
- "root_type": "Asset",
- "report_type": "Balance Sheet",
- "currency": "INR",
- "parent_account": "Current Assets - _TC",
- "account_type": "Bank",
- "is_group": 1,
- }
- ).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Account", "Loan Account - _TC"):
- frappe.get_doc(
- {
- "doctype": "Account",
- "company": "_Test Company",
- "account_name": "Loan Account",
- "root_type": "Asset",
- "report_type": "Balance Sheet",
- "currency": "INR",
- "parent_account": "Loans and Advances (Assets) - _TC",
- "account_type": "Bank",
- }
- ).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Account", "Payment Account - _TC"):
- frappe.get_doc(
- {
- "doctype": "Account",
- "company": "_Test Company",
- "account_name": "Payment Account",
- "root_type": "Asset",
- "report_type": "Balance Sheet",
- "currency": "INR",
- "parent_account": "Bank Accounts - _TC",
- "account_type": "Bank",
- }
- ).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Account", "Disbursement Account - _TC"):
- frappe.get_doc(
- {
- "doctype": "Account",
- "company": "_Test Company",
- "account_name": "Disbursement Account",
- "root_type": "Asset",
- "report_type": "Balance Sheet",
- "currency": "INR",
- "parent_account": "Bank Accounts - _TC",
- "account_type": "Bank",
- }
- ).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Account", "Interest Income Account - _TC"):
- frappe.get_doc(
- {
- "doctype": "Account",
- "company": "_Test Company",
- "root_type": "Income",
- "account_name": "Interest Income Account",
- "report_type": "Profit and Loss",
- "currency": "INR",
- "parent_account": "Direct Income - _TC",
- "account_type": "Income Account",
- }
- ).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Account", "Penalty Income Account - _TC"):
- frappe.get_doc(
- {
- "doctype": "Account",
- "company": "_Test Company",
- "account_name": "Penalty Income Account",
- "root_type": "Income",
- "report_type": "Profit and Loss",
- "currency": "INR",
- "parent_account": "Direct Income - _TC",
- "account_type": "Income Account",
- }
- ).insert(ignore_permissions=True)
-
-
-def create_loan_type(
- loan_name,
- maximum_loan_amount,
- rate_of_interest,
- penalty_interest_rate=None,
- is_term_loan=None,
- grace_period_in_days=None,
- mode_of_payment=None,
- disbursement_account=None,
- payment_account=None,
- loan_account=None,
- interest_income_account=None,
- penalty_income_account=None,
- repayment_method=None,
- repayment_periods=None,
- repayment_schedule_type=None,
- repayment_date_on=None,
-):
-
- if not frappe.db.exists("Loan Type", loan_name):
- loan_type = frappe.get_doc(
- {
- "doctype": "Loan Type",
- "company": "_Test Company",
- "loan_name": loan_name,
- "is_term_loan": is_term_loan,
- "repayment_schedule_type": "Monthly as per repayment start date",
- "maximum_loan_amount": maximum_loan_amount,
- "rate_of_interest": rate_of_interest,
- "penalty_interest_rate": penalty_interest_rate,
- "grace_period_in_days": grace_period_in_days,
- "mode_of_payment": mode_of_payment,
- "disbursement_account": disbursement_account,
- "payment_account": payment_account,
- "loan_account": loan_account,
- "interest_income_account": interest_income_account,
- "penalty_income_account": penalty_income_account,
- "repayment_method": repayment_method,
- "repayment_periods": repayment_periods,
- "write_off_amount": 100,
- }
- )
-
- if loan_type.is_term_loan:
- loan_type.repayment_schedule_type = repayment_schedule_type
- if loan_type.repayment_schedule_type != "Monthly as per repayment start date":
- loan_type.repayment_date_on = repayment_date_on
-
- loan_type.insert()
- loan_type.submit()
-
-
-def create_loan_security_type():
- if not frappe.db.exists("Loan Security Type", "Stock"):
- frappe.get_doc(
- {
- "doctype": "Loan Security Type",
- "loan_security_type": "Stock",
- "unit_of_measure": "Nos",
- "haircut": 50.00,
- "loan_to_value_ratio": 50,
- }
- ).insert(ignore_permissions=True)
-
-
-def create_loan_security():
- if not frappe.db.exists("Loan Security", "Test Security 1"):
- frappe.get_doc(
- {
- "doctype": "Loan Security",
- "loan_security_type": "Stock",
- "loan_security_code": "532779",
- "loan_security_name": "Test Security 1",
- "unit_of_measure": "Nos",
- "haircut": 50.00,
- }
- ).insert(ignore_permissions=True)
-
- if not frappe.db.exists("Loan Security", "Test Security 2"):
- frappe.get_doc(
- {
- "doctype": "Loan Security",
- "loan_security_type": "Stock",
- "loan_security_code": "531335",
- "loan_security_name": "Test Security 2",
- "unit_of_measure": "Nos",
- "haircut": 50.00,
- }
- ).insert(ignore_permissions=True)
-
-
-def create_loan_security_pledge(applicant, pledges, loan_application=None, loan=None):
-
- lsp = frappe.new_doc("Loan Security Pledge")
- lsp.applicant_type = "Customer"
- lsp.applicant = applicant
- lsp.company = "_Test Company"
- lsp.loan_application = loan_application
-
- if loan:
- lsp.loan = loan
-
- for pledge in pledges:
- lsp.append("securities", {"loan_security": pledge["loan_security"], "qty": pledge["qty"]})
-
- lsp.save()
- lsp.submit()
-
- return lsp
-
-
-def make_loan_disbursement_entry(loan, amount, disbursement_date=None):
-
- loan_disbursement_entry = frappe.get_doc(
- {
- "doctype": "Loan Disbursement",
- "against_loan": loan,
- "disbursement_date": disbursement_date,
- "company": "_Test Company",
- "disbursed_amount": amount,
- "cost_center": "Main - _TC",
- }
- ).insert(ignore_permissions=True)
-
- loan_disbursement_entry.save()
- loan_disbursement_entry.submit()
-
- return loan_disbursement_entry
-
-
-def create_loan_security_price(loan_security, loan_security_price, uom, from_date, to_date):
-
- if not frappe.db.get_value(
- "Loan Security Price",
- {"loan_security": loan_security, "valid_from": ("<=", from_date), "valid_upto": (">=", to_date)},
- "name",
- ):
-
- lsp = frappe.get_doc(
- {
- "doctype": "Loan Security Price",
- "loan_security": loan_security,
- "loan_security_price": loan_security_price,
- "uom": uom,
- "valid_from": from_date,
- "valid_upto": to_date,
- }
- ).insert(ignore_permissions=True)
-
-
-def create_repayment_entry(loan, applicant, posting_date, paid_amount):
-
- lr = frappe.get_doc(
- {
- "doctype": "Loan Repayment",
- "against_loan": loan,
- "company": "_Test Company",
- "posting_date": posting_date or nowdate(),
- "applicant": applicant,
- "amount_paid": paid_amount,
- "loan_type": "Stock Loan",
- }
- ).insert(ignore_permissions=True)
-
- return lr
-
-
-def create_loan_application(
- company,
- applicant,
- loan_type,
- proposed_pledges,
- repayment_method=None,
- repayment_periods=None,
- posting_date=None,
- do_not_save=False,
-):
- loan_application = frappe.new_doc("Loan Application")
- loan_application.applicant_type = "Customer"
- loan_application.company = company
- loan_application.applicant = applicant
- loan_application.loan_type = loan_type
- loan_application.posting_date = posting_date or nowdate()
- loan_application.is_secured_loan = 1
-
- if repayment_method:
- loan_application.repayment_method = repayment_method
- loan_application.repayment_periods = repayment_periods
-
- for pledge in proposed_pledges:
- loan_application.append("proposed_pledges", pledge)
-
- if do_not_save:
- return loan_application
-
- loan_application.save()
- loan_application.submit()
-
- loan_application.status = "Approved"
- loan_application.save()
-
- return loan_application.name
-
-
-def create_loan(
- applicant,
- loan_type,
- loan_amount,
- repayment_method,
- repayment_periods,
- applicant_type=None,
- repayment_start_date=None,
- posting_date=None,
-):
-
- loan = frappe.get_doc(
- {
- "doctype": "Loan",
- "applicant_type": applicant_type or "Employee",
- "company": "_Test Company",
- "applicant": applicant,
- "loan_type": loan_type,
- "loan_amount": loan_amount,
- "repayment_method": repayment_method,
- "repayment_periods": repayment_periods,
- "repayment_start_date": repayment_start_date or nowdate(),
- "is_term_loan": 1,
- "posting_date": posting_date or nowdate(),
- }
- )
-
- loan.save()
- return loan
-
-
-def create_loan_with_security(
- applicant,
- loan_type,
- repayment_method,
- repayment_periods,
- loan_application,
- posting_date=None,
- repayment_start_date=None,
-):
- loan = frappe.get_doc(
- {
- "doctype": "Loan",
- "company": "_Test Company",
- "applicant_type": "Customer",
- "posting_date": posting_date or nowdate(),
- "loan_application": loan_application,
- "applicant": applicant,
- "loan_type": loan_type,
- "is_term_loan": 1,
- "is_secured_loan": 1,
- "repayment_method": repayment_method,
- "repayment_periods": repayment_periods,
- "repayment_start_date": repayment_start_date or nowdate(),
- "mode_of_payment": frappe.db.get_value("Mode of Payment", {"type": "Cash"}, "name"),
- "payment_account": "Payment Account - _TC",
- "loan_account": "Loan Account - _TC",
- "interest_income_account": "Interest Income Account - _TC",
- "penalty_income_account": "Penalty Income Account - _TC",
- }
- )
-
- loan.save()
-
- return loan
-
-
-def create_demand_loan(applicant, loan_type, loan_application, posting_date=None):
-
- loan = frappe.get_doc(
- {
- "doctype": "Loan",
- "company": "_Test Company",
- "applicant_type": "Customer",
- "posting_date": posting_date or nowdate(),
- "loan_application": loan_application,
- "applicant": applicant,
- "loan_type": loan_type,
- "is_term_loan": 0,
- "is_secured_loan": 1,
- "mode_of_payment": frappe.db.get_value("Mode of Payment", {"type": "Cash"}, "name"),
- "payment_account": "Payment Account - _TC",
- "loan_account": "Loan Account - _TC",
- "interest_income_account": "Interest Income Account - _TC",
- "penalty_income_account": "Penalty Income Account - _TC",
- }
- )
-
- loan.save()
-
- return loan
diff --git a/erpnext/loan_management/doctype/loan_application/__init__.py b/erpnext/loan_management/doctype/loan_application/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_application/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.js b/erpnext/loan_management/doctype/loan_application/loan_application.js
deleted file mode 100644
index 5142178..0000000
--- a/erpnext/loan_management/doctype/loan_application/loan_application.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-{% include 'erpnext/loan_management/loan_common.js' %};
-
-frappe.ui.form.on('Loan Application', {
-
- setup: function(frm) {
- frm.make_methods = {
- 'Loan': function() { frm.trigger('create_loan') },
- 'Loan Security Pledge': function() { frm.trigger('create_loan_security_pledge') },
- }
- },
- refresh: function(frm) {
- frm.trigger("toggle_fields");
- frm.trigger("add_toolbar_buttons");
- frm.set_query('loan_type', () => {
- return {
- filters: {
- company: frm.doc.company
- }
- };
- });
- },
- repayment_method: function(frm) {
- frm.doc.repayment_amount = frm.doc.repayment_periods = "";
- frm.trigger("toggle_fields");
- frm.trigger("toggle_required");
- },
- toggle_fields: function(frm) {
- frm.toggle_enable("repayment_amount", frm.doc.repayment_method=="Repay Fixed Amount per Period")
- frm.toggle_enable("repayment_periods", frm.doc.repayment_method=="Repay Over Number of Periods")
- },
- toggle_required: function(frm){
- frm.toggle_reqd("repayment_amount", cint(frm.doc.repayment_method=='Repay Fixed Amount per Period'))
- frm.toggle_reqd("repayment_periods", cint(frm.doc.repayment_method=='Repay Over Number of Periods'))
- },
- add_toolbar_buttons: function(frm) {
- if (frm.doc.status == "Approved") {
-
- if (frm.doc.is_secured_loan) {
- frappe.db.get_value("Loan Security Pledge", {"loan_application": frm.doc.name, "docstatus": 1}, "name", (r) => {
- if (Object.keys(r).length === 0) {
- frm.add_custom_button(__('Loan Security Pledge'), function() {
- frm.trigger('create_loan_security_pledge');
- },__('Create'))
- }
- });
- }
-
- frappe.db.get_value("Loan", {"loan_application": frm.doc.name, "docstatus": 1}, "name", (r) => {
- if (Object.keys(r).length === 0) {
- frm.add_custom_button(__('Loan'), function() {
- frm.trigger('create_loan');
- },__('Create'))
- } else {
- frm.set_df_property('status', 'read_only', 1);
- }
- });
- }
- },
- create_loan: function(frm) {
- if (frm.doc.status != "Approved") {
- frappe.throw(__("Cannot create loan until application is approved"));
- }
-
- frappe.model.open_mapped_doc({
- method: 'erpnext.loan_management.doctype.loan_application.loan_application.create_loan',
- frm: frm
- });
- },
- create_loan_security_pledge: function(frm) {
-
- if(!frm.doc.is_secured_loan) {
- frappe.throw(__("Loan Security Pledge can only be created for secured loans"));
- }
-
- frappe.call({
- method: "erpnext.loan_management.doctype.loan_application.loan_application.create_pledge",
- args: {
- loan_application: frm.doc.name
- },
- callback: function(r) {
- frappe.set_route("Form", "Loan Security Pledge", r.message);
- }
- })
- },
- is_term_loan: function(frm) {
- frm.set_df_property('repayment_method', 'hidden', 1 - frm.doc.is_term_loan);
- frm.set_df_property('repayment_method', 'reqd', frm.doc.is_term_loan);
- },
- is_secured_loan: function(frm) {
- frm.set_df_property('proposed_pledges', 'reqd', frm.doc.is_secured_loan);
- },
-
- calculate_amounts: function(frm, cdt, cdn) {
- let row = locals[cdt][cdn];
- if (row.qty) {
- frappe.model.set_value(cdt, cdn, 'amount', row.qty * row.loan_security_price);
- frappe.model.set_value(cdt, cdn, 'post_haircut_amount', cint(row.amount - (row.amount * row.haircut/100)));
- } else if (row.amount) {
- frappe.model.set_value(cdt, cdn, 'qty', cint(row.amount / row.loan_security_price));
- frappe.model.set_value(cdt, cdn, 'amount', row.qty * row.loan_security_price);
- frappe.model.set_value(cdt, cdn, 'post_haircut_amount', cint(row.amount - (row.amount * row.haircut/100)));
- }
-
- let maximum_amount = 0;
-
- $.each(frm.doc.proposed_pledges || [], function(i, item){
- maximum_amount += item.post_haircut_amount;
- });
-
- if (flt(maximum_amount)) {
- frm.set_value('maximum_loan_amount', flt(maximum_amount));
- }
- }
-});
-
-frappe.ui.form.on("Proposed Pledge", {
- loan_security: function(frm, cdt, cdn) {
- let row = locals[cdt][cdn];
-
- if (row.loan_security) {
- frappe.call({
- method: "erpnext.loan_management.doctype.loan_security_price.loan_security_price.get_loan_security_price",
- args: {
- loan_security: row.loan_security
- },
- callback: function(r) {
- frappe.model.set_value(cdt, cdn, 'loan_security_price', r.message);
- frm.events.calculate_amounts(frm, cdt, cdn);
- }
- })
- }
- },
-
- amount: function(frm, cdt, cdn) {
- frm.events.calculate_amounts(frm, cdt, cdn);
- },
-
- qty: function(frm, cdt, cdn) {
- frm.events.calculate_amounts(frm, cdt, cdn);
- },
-})
diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.json b/erpnext/loan_management/doctype/loan_application/loan_application.json
deleted file mode 100644
index f91fa07..0000000
--- a/erpnext/loan_management/doctype/loan_application/loan_application.json
+++ /dev/null
@@ -1,282 +0,0 @@
-{
- "actions": [],
- "autoname": "ACC-LOAP-.YYYY.-.#####",
- "creation": "2019-08-29 17:46:49.201740",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "applicant_type",
- "applicant",
- "applicant_name",
- "column_break_2",
- "company",
- "posting_date",
- "status",
- "section_break_4",
- "loan_type",
- "is_term_loan",
- "loan_amount",
- "is_secured_loan",
- "rate_of_interest",
- "column_break_7",
- "description",
- "loan_security_details_section",
- "proposed_pledges",
- "maximum_loan_amount",
- "repayment_info",
- "repayment_method",
- "total_payable_amount",
- "column_break_11",
- "repayment_periods",
- "repayment_amount",
- "total_payable_interest",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "reqd": 1
- },
- {
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_global_search": 1,
- "in_standard_filter": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "reqd": 1
- },
- {
- "depends_on": "applicant",
- "fieldname": "applicant_name",
- "fieldtype": "Data",
- "in_global_search": 1,
- "label": "Applicant Name",
- "read_only": 1
- },
- {
- "fieldname": "column_break_2",
- "fieldtype": "Column Break"
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "label": "Posting Date"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "status",
- "fieldtype": "Select",
- "label": "Status",
- "no_copy": 1,
- "options": "Open\nApproved\nRejected",
- "permlevel": 1
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "reqd": 1
- },
- {
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "label": "Loan Info"
- },
- {
- "fieldname": "loan_type",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan Type",
- "options": "Loan Type",
- "reqd": 1
- },
- {
- "bold": 1,
- "fieldname": "loan_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Loan Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "column_break_7",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "description",
- "fieldtype": "Small Text",
- "label": "Reason"
- },
- {
- "depends_on": "eval: doc.is_term_loan == 1",
- "fieldname": "repayment_info",
- "fieldtype": "Section Break",
- "label": "Repayment Info"
- },
- {
- "depends_on": "eval: doc.is_term_loan == 1",
- "fetch_if_empty": 1,
- "fieldname": "repayment_method",
- "fieldtype": "Select",
- "label": "Repayment Method",
- "options": "\nRepay Fixed Amount per Period\nRepay Over Number of Periods"
- },
- {
- "fetch_from": "loan_type.rate_of_interest",
- "fieldname": "rate_of_interest",
- "fieldtype": "Percent",
- "label": "Rate of Interest",
- "read_only": 1
- },
- {
- "depends_on": "is_term_loan",
- "fieldname": "total_payable_interest",
- "fieldtype": "Currency",
- "label": "Total Payable Interest",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "repayment_method",
- "fieldname": "repayment_amount",
- "fieldtype": "Currency",
- "label": "Monthly Repayment Amount",
- "options": "Company:company:default_currency"
- },
- {
- "depends_on": "repayment_method",
- "fieldname": "repayment_periods",
- "fieldtype": "Int",
- "label": "Repayment Period in Months"
- },
- {
- "fieldname": "total_payable_amount",
- "fieldtype": "Currency",
- "label": "Total Payable Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Application",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "default": "0",
- "fieldname": "is_secured_loan",
- "fieldtype": "Check",
- "label": "Is Secured Loan"
- },
- {
- "depends_on": "eval:doc.is_secured_loan == 1",
- "fieldname": "loan_security_details_section",
- "fieldtype": "Section Break",
- "label": "Loan Security Details"
- },
- {
- "depends_on": "eval:doc.is_secured_loan == 1",
- "fieldname": "proposed_pledges",
- "fieldtype": "Table",
- "label": "Proposed Pledges",
- "options": "Proposed Pledge"
- },
- {
- "fieldname": "maximum_loan_amount",
- "fieldtype": "Currency",
- "label": "Maximum Loan Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "default": "0",
- "fetch_from": "loan_type.is_term_loan",
- "fieldname": "is_term_loan",
- "fieldtype": "Check",
- "label": "Is Term Loan",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2021-04-19 18:24:40.119647",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Application",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Employee",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "delete": 1,
- "email": 1,
- "export": 1,
- "permlevel": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- },
- {
- "email": 1,
- "export": 1,
- "permlevel": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Employee",
- "share": 1
- }
- ],
- "search_fields": "applicant_type, applicant, loan_type, loan_amount",
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "applicant",
- "title_field": "applicant",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.py b/erpnext/loan_management/doctype/loan_application/loan_application.py
deleted file mode 100644
index 5f040e2..0000000
--- a/erpnext/loan_management/doctype/loan_application/loan_application.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import json
-import math
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from frappe.model.mapper import get_mapped_doc
-from frappe.utils import cint, flt, rounded
-
-from erpnext.loan_management.doctype.loan.loan import (
- get_monthly_repayment_amount,
- get_sanctioned_amount_limit,
- get_total_loan_amount,
- validate_repayment_method,
-)
-from erpnext.loan_management.doctype.loan_security_price.loan_security_price import (
- get_loan_security_price,
-)
-
-
-class LoanApplication(Document):
- def validate(self):
- self.set_pledge_amount()
- self.set_loan_amount()
- self.validate_loan_amount()
-
- if self.is_term_loan:
- validate_repayment_method(
- self.repayment_method,
- self.loan_amount,
- self.repayment_amount,
- self.repayment_periods,
- self.is_term_loan,
- )
-
- self.validate_loan_type()
-
- self.get_repayment_details()
- self.check_sanctioned_amount_limit()
-
- def validate_loan_type(self):
- company = frappe.get_value("Loan Type", self.loan_type, "company")
- if company != self.company:
- frappe.throw(_("Please select Loan Type for company {0}").format(frappe.bold(self.company)))
-
- def validate_loan_amount(self):
- if not self.loan_amount:
- frappe.throw(_("Loan Amount is mandatory"))
-
- maximum_loan_limit = frappe.db.get_value("Loan Type", self.loan_type, "maximum_loan_amount")
- if maximum_loan_limit and self.loan_amount > maximum_loan_limit:
- frappe.throw(
- _("Loan Amount cannot exceed Maximum Loan Amount of {0}").format(maximum_loan_limit)
- )
-
- if self.maximum_loan_amount and self.loan_amount > self.maximum_loan_amount:
- frappe.throw(
- _("Loan Amount exceeds maximum loan amount of {0} as per proposed securities").format(
- self.maximum_loan_amount
- )
- )
-
- def check_sanctioned_amount_limit(self):
- sanctioned_amount_limit = get_sanctioned_amount_limit(
- self.applicant_type, self.applicant, self.company
- )
-
- if sanctioned_amount_limit:
- total_loan_amount = get_total_loan_amount(self.applicant_type, self.applicant, self.company)
-
- if sanctioned_amount_limit and flt(self.loan_amount) + flt(total_loan_amount) > flt(
- sanctioned_amount_limit
- ):
- frappe.throw(
- _("Sanctioned Amount limit crossed for {0} {1}").format(
- self.applicant_type, frappe.bold(self.applicant)
- )
- )
-
- def set_pledge_amount(self):
- for proposed_pledge in self.proposed_pledges:
-
- if not proposed_pledge.qty and not proposed_pledge.amount:
- frappe.throw(_("Qty or Amount is mandatroy for loan security"))
-
- proposed_pledge.loan_security_price = get_loan_security_price(proposed_pledge.loan_security)
-
- if not proposed_pledge.qty:
- proposed_pledge.qty = cint(proposed_pledge.amount / proposed_pledge.loan_security_price)
-
- proposed_pledge.amount = proposed_pledge.qty * proposed_pledge.loan_security_price
- proposed_pledge.post_haircut_amount = cint(
- proposed_pledge.amount - (proposed_pledge.amount * proposed_pledge.haircut / 100)
- )
-
- def get_repayment_details(self):
-
- if self.is_term_loan:
- if self.repayment_method == "Repay Over Number of Periods":
- self.repayment_amount = get_monthly_repayment_amount(
- self.loan_amount, self.rate_of_interest, self.repayment_periods
- )
-
- if self.repayment_method == "Repay Fixed Amount per Period":
- monthly_interest_rate = flt(self.rate_of_interest) / (12 * 100)
- if monthly_interest_rate:
- min_repayment_amount = self.loan_amount * monthly_interest_rate
- if self.repayment_amount - min_repayment_amount <= 0:
- frappe.throw(_("Repayment Amount must be greater than " + str(flt(min_repayment_amount, 2))))
- self.repayment_periods = math.ceil(
- (math.log(self.repayment_amount) - math.log(self.repayment_amount - min_repayment_amount))
- / (math.log(1 + monthly_interest_rate))
- )
- else:
- self.repayment_periods = self.loan_amount / self.repayment_amount
-
- self.calculate_payable_amount()
- else:
- self.total_payable_amount = self.loan_amount
-
- def calculate_payable_amount(self):
- balance_amount = self.loan_amount
- self.total_payable_amount = 0
- self.total_payable_interest = 0
-
- while balance_amount > 0:
- interest_amount = rounded(balance_amount * flt(self.rate_of_interest) / (12 * 100))
- balance_amount = rounded(balance_amount + interest_amount - self.repayment_amount)
-
- self.total_payable_interest += interest_amount
-
- self.total_payable_amount = self.loan_amount + self.total_payable_interest
-
- def set_loan_amount(self):
- if self.is_secured_loan and not self.proposed_pledges:
- frappe.throw(_("Proposed Pledges are mandatory for secured Loans"))
-
- if self.is_secured_loan and self.proposed_pledges:
- self.maximum_loan_amount = 0
- for security in self.proposed_pledges:
- self.maximum_loan_amount += flt(security.post_haircut_amount)
-
- if not self.loan_amount and self.is_secured_loan and self.proposed_pledges:
- self.loan_amount = self.maximum_loan_amount
-
-
-@frappe.whitelist()
-def create_loan(source_name, target_doc=None, submit=0):
- def update_accounts(source_doc, target_doc, source_parent):
- account_details = frappe.get_all(
- "Loan Type",
- fields=[
- "mode_of_payment",
- "payment_account",
- "loan_account",
- "interest_income_account",
- "penalty_income_account",
- ],
- filters={"name": source_doc.loan_type},
- )[0]
-
- if source_doc.is_secured_loan:
- target_doc.maximum_loan_amount = 0
-
- target_doc.mode_of_payment = account_details.mode_of_payment
- target_doc.payment_account = account_details.payment_account
- target_doc.loan_account = account_details.loan_account
- target_doc.interest_income_account = account_details.interest_income_account
- target_doc.penalty_income_account = account_details.penalty_income_account
- target_doc.loan_application = source_name
-
- doclist = get_mapped_doc(
- "Loan Application",
- source_name,
- {
- "Loan Application": {
- "doctype": "Loan",
- "validation": {"docstatus": ["=", 1]},
- "postprocess": update_accounts,
- }
- },
- target_doc,
- )
-
- if submit:
- doclist.submit()
-
- return doclist
-
-
-@frappe.whitelist()
-def create_pledge(loan_application, loan=None):
- loan_application_doc = frappe.get_doc("Loan Application", loan_application)
-
- lsp = frappe.new_doc("Loan Security Pledge")
- lsp.applicant_type = loan_application_doc.applicant_type
- lsp.applicant = loan_application_doc.applicant
- lsp.loan_application = loan_application_doc.name
- lsp.company = loan_application_doc.company
-
- if loan:
- lsp.loan = loan
-
- for pledge in loan_application_doc.proposed_pledges:
-
- lsp.append(
- "securities",
- {
- "loan_security": pledge.loan_security,
- "qty": pledge.qty,
- "loan_security_price": pledge.loan_security_price,
- "haircut": pledge.haircut,
- },
- )
-
- lsp.save()
- lsp.submit()
-
- message = _("Loan Security Pledge Created : {0}").format(lsp.name)
- frappe.msgprint(message)
-
- return lsp.name
-
-
-# This is a sandbox method to get the proposed pledges
-@frappe.whitelist()
-def get_proposed_pledge(securities):
- if isinstance(securities, str):
- securities = json.loads(securities)
-
- proposed_pledges = {"securities": []}
- maximum_loan_amount = 0
-
- for security in securities:
- security = frappe._dict(security)
- if not security.qty and not security.amount:
- frappe.throw(_("Qty or Amount is mandatroy for loan security"))
-
- security.loan_security_price = get_loan_security_price(security.loan_security)
-
- if not security.qty:
- security.qty = cint(security.amount / security.loan_security_price)
-
- security.amount = security.qty * security.loan_security_price
- security.post_haircut_amount = cint(security.amount - (security.amount * security.haircut / 100))
-
- maximum_loan_amount += security.post_haircut_amount
-
- proposed_pledges["securities"].append(security)
-
- proposed_pledges["maximum_loan_amount"] = maximum_loan_amount
-
- return proposed_pledges
diff --git a/erpnext/loan_management/doctype/loan_application/loan_application_dashboard.py b/erpnext/loan_management/doctype/loan_application/loan_application_dashboard.py
deleted file mode 100644
index 1d90e9b..0000000
--- a/erpnext/loan_management/doctype/loan_application/loan_application_dashboard.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def get_data():
- return {
- "fieldname": "loan_application",
- "transactions": [
- {"items": ["Loan", "Loan Security Pledge"]},
- ],
- }
diff --git a/erpnext/loan_management/doctype/loan_application/test_loan_application.py b/erpnext/loan_management/doctype/loan_application/test_loan_application.py
deleted file mode 100644
index 13bb4af..0000000
--- a/erpnext/loan_management/doctype/loan_application/test_loan_application.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-import frappe
-
-from erpnext.loan_management.doctype.loan.test_loan import create_loan_accounts, create_loan_type
-from erpnext.setup.doctype.employee.test_employee import make_employee
-
-
-class TestLoanApplication(unittest.TestCase):
- def setUp(self):
- create_loan_accounts()
- create_loan_type(
- "Home Loan",
- 500000,
- 9.2,
- 0,
- 1,
- 0,
- "Cash",
- "Disbursement Account - _TC",
- "Payment Account - _TC",
- "Loan Account - _TC",
- "Interest Income Account - _TC",
- "Penalty Income Account - _TC",
- "Repay Over Number of Periods",
- 18,
- )
- self.applicant = make_employee("kate_loan@loan.com", "_Test Company")
- self.create_loan_application()
-
- def create_loan_application(self):
- loan_application = frappe.new_doc("Loan Application")
- loan_application.update(
- {
- "applicant": self.applicant,
- "loan_type": "Home Loan",
- "rate_of_interest": 9.2,
- "loan_amount": 250000,
- "repayment_method": "Repay Over Number of Periods",
- "repayment_periods": 18,
- "company": "_Test Company",
- }
- )
- loan_application.insert()
-
- def test_loan_totals(self):
- loan_application = frappe.get_doc("Loan Application", {"applicant": self.applicant})
-
- self.assertEqual(loan_application.total_payable_interest, 18599)
- self.assertEqual(loan_application.total_payable_amount, 268599)
- self.assertEqual(loan_application.repayment_amount, 14923)
-
- loan_application.repayment_periods = 24
- loan_application.save()
- loan_application.reload()
-
- self.assertEqual(loan_application.total_payable_interest, 24657)
- self.assertEqual(loan_application.total_payable_amount, 274657)
- self.assertEqual(loan_application.repayment_amount, 11445)
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/__init__.py b/erpnext/loan_management/doctype/loan_balance_adjustment/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.js b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.js
deleted file mode 100644
index 8aec63a..0000000
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Balance Adjustment', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.json b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.json
deleted file mode 100644
index 80c3389..0000000
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.json
+++ /dev/null
@@ -1,189 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-ADJ-.#####",
- "creation": "2022-06-28 14:48:47.736269",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan",
- "applicant_type",
- "applicant",
- "column_break_3",
- "company",
- "posting_date",
- "accounting_dimensions_section",
- "cost_center",
- "section_break_9",
- "adjustment_account",
- "column_break_11",
- "adjustment_type",
- "amount",
- "reference_number",
- "remarks",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan",
- "options": "Loan",
- "reqd": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "read_only": 1
- },
- {
- "fetch_from": "loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "label": "Applicant ",
- "options": "applicant_type",
- "read_only": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "loan.company",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "read_only": 1,
- "reqd": 1
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date",
- "reqd": 1
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "section_break_9",
- "fieldtype": "Section Break",
- "label": "Adjustment Details"
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "reference_number",
- "fieldtype": "Data",
- "label": "Reference Number"
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Balance Adjustment",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Balance Adjustment",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "adjustment_account",
- "fieldtype": "Link",
- "label": "Adjustment Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "fieldname": "amount",
- "fieldtype": "Currency",
- "label": "Amount",
- "options": "Company:company:default_currency",
- "reqd": 1
- },
- {
- "fieldname": "adjustment_type",
- "fieldtype": "Select",
- "label": "Adjustment Type",
- "options": "Credit Adjustment\nDebit Adjustment",
- "reqd": 1
- },
- {
- "fieldname": "remarks",
- "fieldtype": "Data",
- "label": "Remarks"
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-07-08 16:48:54.480066",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Balance Adjustment",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
deleted file mode 100644
index 514a5fc..0000000
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe import _
-from frappe.utils import add_days, nowdate
-
-import erpnext
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_demand_loans,
-)
-
-
-class LoanBalanceAdjustment(AccountsController):
- """
- Add credit/debit adjustments to loan ledger.
- """
-
- def validate(self):
- if self.amount == 0:
- frappe.throw(_("Amount cannot be zero"))
- if self.amount < 0:
- frappe.throw(_("Amount cannot be negative"))
- self.set_missing_values()
-
- def on_submit(self):
- self.set_status_and_amounts()
- self.make_gl_entries()
-
- def on_cancel(self):
- self.set_status_and_amounts(cancel=1)
- self.make_gl_entries(cancel=1)
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
-
- def set_missing_values(self):
- if not self.posting_date:
- self.posting_date = nowdate()
-
- if not self.cost_center:
- self.cost_center = erpnext.get_default_cost_center(self.company)
-
- def set_status_and_amounts(self, cancel=0):
- loan_details = frappe.db.get_value(
- "Loan",
- self.loan,
- [
- "loan_amount",
- "credit_adjustment_amount",
- "debit_adjustment_amount",
- "total_payment",
- "total_principal_paid",
- "total_interest_payable",
- "status",
- "is_term_loan",
- "is_secured_loan",
- ],
- as_dict=1,
- )
-
- if cancel:
- adjustment_amount = self.get_values_on_cancel(loan_details)
- else:
- adjustment_amount = self.get_values_on_submit(loan_details)
-
- if self.adjustment_type == "Credit Adjustment":
- adj_field = "credit_adjustment_amount"
- elif self.adjustment_type == "Debit Adjustment":
- adj_field = "debit_adjustment_amount"
-
- frappe.db.set_value("Loan", self.loan, {adj_field: adjustment_amount})
-
- def get_values_on_cancel(self, loan_details):
- if self.adjustment_type == "Credit Adjustment":
- adjustment_amount = loan_details.credit_adjustment_amount - self.amount
- elif self.adjustment_type == "Debit Adjustment":
- adjustment_amount = loan_details.debit_adjustment_amount - self.amount
-
- return adjustment_amount
-
- def get_values_on_submit(self, loan_details):
- if self.adjustment_type == "Credit Adjustment":
- adjustment_amount = loan_details.credit_adjustment_amount + self.amount
- elif self.adjustment_type == "Debit Adjustment":
- adjustment_amount = loan_details.debit_adjustment_amount + self.amount
-
- if loan_details.status in ("Disbursed", "Partially Disbursed") and not loan_details.is_term_loan:
- process_loan_interest_accrual_for_demand_loans(
- posting_date=add_days(self.posting_date, -1),
- loan=self.loan,
- accrual_type=self.adjustment_type,
- )
-
- return adjustment_amount
-
- def make_gl_entries(self, cancel=0, adv_adj=0):
- gle_map = []
- loan_account = frappe.db.get_value("Loan", self.loan, "loan_account")
- remarks = "{} against loan {}".format(self.adjustment_type.capitalize(), self.loan)
- if self.reference_number:
- remarks += " with reference no. {}".format(self.reference_number)
-
- loan_entry = {
- "account": loan_account,
- "against": self.adjustment_account,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _(remarks),
- "cost_center": self.cost_center,
- "party_type": self.applicant_type,
- "party": self.applicant,
- "posting_date": self.posting_date,
- }
- company_entry = {
- "account": self.adjustment_account,
- "against": loan_account,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _(remarks),
- "cost_center": self.cost_center,
- "posting_date": self.posting_date,
- }
- if self.adjustment_type == "Credit Adjustment":
- loan_entry["credit"] = self.amount
- loan_entry["credit_in_account_currency"] = self.amount
-
- company_entry["debit"] = self.amount
- company_entry["debit_in_account_currency"] = self.amount
-
- elif self.adjustment_type == "Debit Adjustment":
- loan_entry["debit"] = self.amount
- loan_entry["debit_in_account_currency"] = self.amount
-
- company_entry["credit"] = self.amount
- company_entry["credit_in_account_currency"] = self.amount
-
- gle_map.append(self.get_gl_dict(loan_entry))
-
- gle_map.append(self.get_gl_dict(company_entry))
-
- if gle_map:
- make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj, merge_entries=False)
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/test_loan_balance_adjustment.py b/erpnext/loan_management/doctype/loan_balance_adjustment/test_loan_balance_adjustment.py
deleted file mode 100644
index 7658d7b..0000000
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/test_loan_balance_adjustment.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests.utils import FrappeTestCase
-
-
-class TestLoanBalanceAdjustment(FrappeTestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_disbursement/__init__.py b/erpnext/loan_management/doctype/loan_disbursement/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_disbursement/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.js b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.js
deleted file mode 100644
index 487ef23..0000000
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-{% include 'erpnext/loan_management/loan_common.js' %};
-
-frappe.ui.form.on('Loan Disbursement', {
- refresh: function(frm) {
- frm.set_query('against_loan', function() {
- return {
- 'filters': {
- 'docstatus': 1,
- 'status': 'Sanctioned'
- }
- }
- })
- }
-});
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json
deleted file mode 100644
index c7b5c03..0000000
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json
+++ /dev/null
@@ -1,231 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-DIS-.#####",
- "creation": "2019-09-07 12:44:49.125452",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "against_loan",
- "posting_date",
- "applicant_type",
- "column_break_4",
- "company",
- "applicant",
- "section_break_7",
- "disbursement_date",
- "clearance_date",
- "column_break_8",
- "disbursed_amount",
- "accounting_dimensions_section",
- "cost_center",
- "accounting_details",
- "disbursement_account",
- "column_break_16",
- "loan_account",
- "bank_account",
- "disbursement_references_section",
- "reference_date",
- "column_break_17",
- "reference_number",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "against_loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Against Loan ",
- "options": "Loan",
- "reqd": 1
- },
- {
- "fieldname": "disbursement_date",
- "fieldtype": "Date",
- "label": "Disbursement Date",
- "reqd": 1
- },
- {
- "fieldname": "disbursed_amount",
- "fieldtype": "Currency",
- "label": "Disbursed Amount",
- "non_negative": 1,
- "options": "Company:company:default_currency",
- "reqd": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Disbursement",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fetch_from": "against_loan.company",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fetch_from": "against_loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "read_only": 1,
- "reqd": 1
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "hidden": 1,
- "label": "Posting Date",
- "read_only": 1
- },
- {
- "fieldname": "column_break_4",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
- "label": "Disbursement Details"
- },
- {
- "fetch_from": "against_loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fieldname": "bank_account",
- "fieldtype": "Link",
- "label": "Bank Account",
- "options": "Bank Account"
- },
- {
- "fieldname": "column_break_8",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "disbursement_references_section",
- "fieldtype": "Section Break",
- "label": "Disbursement References"
- },
- {
- "fieldname": "reference_date",
- "fieldtype": "Date",
- "label": "Reference Date"
- },
- {
- "fieldname": "column_break_17",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "reference_number",
- "fieldtype": "Data",
- "label": "Reference Number"
- },
- {
- "fieldname": "clearance_date",
- "fieldtype": "Date",
- "label": "Clearance Date",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "accounting_details",
- "fieldtype": "Section Break",
- "label": "Accounting Details"
- },
- {
- "fetch_from": "against_loan.disbursement_account",
- "fetch_if_empty": 1,
- "fieldname": "disbursement_account",
- "fieldtype": "Link",
- "label": "Disbursement Account",
- "options": "Account"
- },
- {
- "fieldname": "column_break_16",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "against_loan.loan_account",
- "fieldname": "loan_account",
- "fieldtype": "Link",
- "label": "Loan Account",
- "options": "Account",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-08-04 17:16:04.922444",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Disbursement",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
deleted file mode 100644
index 51bf327..0000000
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.utils import add_days, flt, get_datetime, nowdate
-
-import erpnext
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import (
- get_pledged_security_qty,
-)
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_demand_loans,
-)
-
-
-class LoanDisbursement(AccountsController):
- def validate(self):
- self.set_missing_values()
- self.validate_disbursal_amount()
-
- def on_submit(self):
- self.set_status_and_amounts()
- self.make_gl_entries()
-
- def on_cancel(self):
- self.set_status_and_amounts(cancel=1)
- self.make_gl_entries(cancel=1)
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
-
- def set_missing_values(self):
- if not self.disbursement_date:
- self.disbursement_date = nowdate()
-
- if not self.cost_center:
- self.cost_center = erpnext.get_default_cost_center(self.company)
-
- if not self.posting_date:
- self.posting_date = self.disbursement_date or nowdate()
-
- def validate_disbursal_amount(self):
- possible_disbursal_amount = get_disbursal_amount(self.against_loan)
-
- if self.disbursed_amount > possible_disbursal_amount:
- frappe.throw(_("Disbursed Amount cannot be greater than {0}").format(possible_disbursal_amount))
-
- def set_status_and_amounts(self, cancel=0):
- loan_details = frappe.get_all(
- "Loan",
- fields=[
- "loan_amount",
- "disbursed_amount",
- "total_payment",
- "total_principal_paid",
- "total_interest_payable",
- "status",
- "is_term_loan",
- "is_secured_loan",
- ],
- filters={"name": self.against_loan},
- )[0]
-
- if cancel:
- disbursed_amount, status, total_payment = self.get_values_on_cancel(loan_details)
- else:
- disbursed_amount, status, total_payment = self.get_values_on_submit(loan_details)
-
- frappe.db.set_value(
- "Loan",
- self.against_loan,
- {
- "disbursement_date": self.disbursement_date,
- "disbursed_amount": disbursed_amount,
- "status": status,
- "total_payment": total_payment,
- },
- )
-
- def get_values_on_cancel(self, loan_details):
- disbursed_amount = loan_details.disbursed_amount - self.disbursed_amount
- total_payment = loan_details.total_payment
-
- if loan_details.disbursed_amount > loan_details.loan_amount:
- topup_amount = loan_details.disbursed_amount - loan_details.loan_amount
- if topup_amount > self.disbursed_amount:
- topup_amount = self.disbursed_amount
-
- total_payment = total_payment - topup_amount
-
- if disbursed_amount == 0:
- status = "Sanctioned"
-
- elif disbursed_amount >= loan_details.loan_amount:
- status = "Disbursed"
- else:
- status = "Partially Disbursed"
-
- return disbursed_amount, status, total_payment
-
- def get_values_on_submit(self, loan_details):
- disbursed_amount = self.disbursed_amount + loan_details.disbursed_amount
- total_payment = loan_details.total_payment
-
- if loan_details.status in ("Disbursed", "Partially Disbursed") and not loan_details.is_term_loan:
- process_loan_interest_accrual_for_demand_loans(
- posting_date=add_days(self.disbursement_date, -1),
- loan=self.against_loan,
- accrual_type="Disbursement",
- )
-
- if disbursed_amount > loan_details.loan_amount:
- topup_amount = disbursed_amount - loan_details.loan_amount
-
- if topup_amount < 0:
- topup_amount = 0
-
- if topup_amount > self.disbursed_amount:
- topup_amount = self.disbursed_amount
-
- total_payment = total_payment + topup_amount
-
- if flt(disbursed_amount) >= loan_details.loan_amount:
- status = "Disbursed"
- else:
- status = "Partially Disbursed"
-
- return disbursed_amount, status, total_payment
-
- def make_gl_entries(self, cancel=0, adv_adj=0):
- gle_map = []
-
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.loan_account,
- "against": self.disbursement_account,
- "debit": self.disbursed_amount,
- "debit_in_account_currency": self.disbursed_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.against_loan,
- "remarks": _("Disbursement against loan:") + self.against_loan,
- "cost_center": self.cost_center,
- "party_type": self.applicant_type,
- "party": self.applicant,
- "posting_date": self.disbursement_date,
- }
- )
- )
-
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.disbursement_account,
- "against": self.loan_account,
- "credit": self.disbursed_amount,
- "credit_in_account_currency": self.disbursed_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.against_loan,
- "remarks": _("Disbursement against loan:") + self.against_loan,
- "cost_center": self.cost_center,
- "posting_date": self.disbursement_date,
- }
- )
- )
-
- if gle_map:
- make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj)
-
-
-def get_total_pledged_security_value(loan):
- update_time = get_datetime()
-
- loan_security_price_map = frappe._dict(
- frappe.get_all(
- "Loan Security Price",
- fields=["loan_security", "loan_security_price"],
- filters={"valid_from": ("<=", update_time), "valid_upto": (">=", update_time)},
- as_list=1,
- )
- )
-
- hair_cut_map = frappe._dict(
- frappe.get_all("Loan Security", fields=["name", "haircut"], as_list=1)
- )
-
- security_value = 0.0
- pledged_securities = get_pledged_security_qty(loan)
-
- for security, qty in pledged_securities.items():
- after_haircut_percentage = 100 - hair_cut_map.get(security)
- security_value += (
- loan_security_price_map.get(security, 0) * qty * after_haircut_percentage
- ) / 100
-
- return security_value
-
-
-@frappe.whitelist()
-def get_disbursal_amount(loan, on_current_security_price=0):
- from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
- get_pending_principal_amount,
- )
-
- loan_details = frappe.get_value(
- "Loan",
- loan,
- [
- "loan_amount",
- "disbursed_amount",
- "total_payment",
- "debit_adjustment_amount",
- "credit_adjustment_amount",
- "refund_amount",
- "total_principal_paid",
- "total_interest_payable",
- "status",
- "is_term_loan",
- "is_secured_loan",
- "maximum_loan_amount",
- "written_off_amount",
- ],
- as_dict=1,
- )
-
- if loan_details.is_secured_loan and frappe.get_all(
- "Loan Security Shortfall", filters={"loan": loan, "status": "Pending"}
- ):
- return 0
-
- pending_principal_amount = get_pending_principal_amount(loan_details)
-
- security_value = 0.0
- if loan_details.is_secured_loan and on_current_security_price:
- security_value = get_total_pledged_security_value(loan)
-
- if loan_details.is_secured_loan and not on_current_security_price:
- security_value = get_maximum_amount_as_per_pledged_security(loan)
-
- if not security_value and not loan_details.is_secured_loan:
- security_value = flt(loan_details.loan_amount)
-
- disbursal_amount = flt(security_value) - flt(pending_principal_amount)
-
- if (
- loan_details.is_term_loan
- and (disbursal_amount + loan_details.loan_amount) > loan_details.loan_amount
- ):
- disbursal_amount = loan_details.loan_amount - loan_details.disbursed_amount
-
- return disbursal_amount
-
-
-def get_maximum_amount_as_per_pledged_security(loan):
- return flt(frappe.db.get_value("Loan Security Pledge", {"loan": loan}, "sum(maximum_loan_value)"))
diff --git a/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py b/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py
deleted file mode 100644
index 4daa2ed..0000000
--- a/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-import frappe
-from frappe.utils import (
- add_days,
- add_to_date,
- date_diff,
- flt,
- get_datetime,
- get_first_day,
- get_last_day,
- nowdate,
-)
-
-from erpnext.loan_management.doctype.loan.test_loan import (
- create_demand_loan,
- create_loan_accounts,
- create_loan_application,
- create_loan_security,
- create_loan_security_pledge,
- create_loan_security_price,
- create_loan_security_type,
- create_loan_type,
- create_repayment_entry,
- make_loan_disbursement_entry,
-)
-from erpnext.loan_management.doctype.loan_application.loan_application import create_pledge
-from erpnext.loan_management.doctype.loan_interest_accrual.loan_interest_accrual import (
- days_in_year,
- get_per_day_interest,
-)
-from erpnext.loan_management.doctype.loan_repayment.loan_repayment import calculate_amounts
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_demand_loans,
-)
-from erpnext.selling.doctype.customer.test_customer import get_customer_dict
-
-
-class TestLoanDisbursement(unittest.TestCase):
- def setUp(self):
- create_loan_accounts()
-
- create_loan_type(
- "Demand Loan",
- 2000000,
- 13.5,
- 25,
- 0,
- 5,
- "Cash",
- "Disbursement Account - _TC",
- "Payment Account - _TC",
- "Loan Account - _TC",
- "Interest Income Account - _TC",
- "Penalty Income Account - _TC",
- )
-
- create_loan_security_type()
- create_loan_security()
-
- create_loan_security_price(
- "Test Security 1", 500, "Nos", get_datetime(), get_datetime(add_to_date(nowdate(), hours=24))
- )
- create_loan_security_price(
- "Test Security 2", 250, "Nos", get_datetime(), get_datetime(add_to_date(nowdate(), hours=24))
- )
-
- if not frappe.db.exists("Customer", "_Test Loan Customer"):
- frappe.get_doc(get_customer_dict("_Test Loan Customer")).insert(ignore_permissions=True)
-
- self.applicant = frappe.db.get_value("Customer", {"name": "_Test Loan Customer"}, "name")
-
- def test_loan_topup(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant, "Demand Loan", loan_application, posting_date=get_first_day(nowdate())
- )
-
- loan.submit()
-
- first_date = get_first_day(nowdate())
- last_date = get_last_day(nowdate())
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime().year) * 100
- )
-
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
-
- process_loan_interest_accrual_for_demand_loans(posting_date=add_days(last_date, 1))
-
- # Should not be able to create loan disbursement entry before repayment
- self.assertRaises(
- frappe.ValidationError, make_loan_disbursement_entry, loan.name, 500000, first_date
- )
-
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant, add_days(get_last_day(nowdate()), 5), 611095.89
- )
-
- repayment_entry.submit()
- loan.reload()
-
- # After repayment loan disbursement entry should go through
- make_loan_disbursement_entry(loan.name, 500000, disbursement_date=add_days(last_date, 16))
-
- # check for disbursement accrual
- loan_interest_accrual = frappe.db.get_value(
- "Loan Interest Accrual", {"loan": loan.name, "accrual_type": "Disbursement"}
- )
-
- self.assertTrue(loan_interest_accrual)
-
- def test_loan_topup_with_additional_pledge(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
- create_pledge(loan_application)
-
- loan = create_demand_loan(
- self.applicant, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
- loan.submit()
-
- self.assertEqual(loan.loan_amount, 1000000)
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- # Disbursed 10,00,000 amount
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
- amounts = calculate_amounts(loan.name, add_days(last_date, 1))
-
- previous_interest = amounts["interest_amount"]
-
- pledge1 = [{"loan_security": "Test Security 1", "qty": 2000.00}]
-
- create_loan_security_pledge(self.applicant, pledge1, loan=loan.name)
-
- # Topup 500000
- make_loan_disbursement_entry(loan.name, 500000, disbursement_date=add_days(last_date, 1))
- process_loan_interest_accrual_for_demand_loans(posting_date=add_days(last_date, 15))
- amounts = calculate_amounts(loan.name, add_days(last_date, 15))
-
- per_day_interest = get_per_day_interest(1500000, 13.5, "2019-10-30")
- interest = per_day_interest * 15
-
- self.assertEqual(amounts["pending_principal_amount"], 1500000)
- self.assertEqual(amounts["interest_amount"], flt(interest + previous_interest, 2))
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/__init__.py b/erpnext/loan_management/doctype/loan_interest_accrual/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_interest_accrual/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.js b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.js
deleted file mode 100644
index 177b235..0000000
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-{% include 'erpnext/loan_management/loan_common.js' %};
-
-frappe.ui.form.on('Loan Interest Accrual', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json
deleted file mode 100644
index 08dc98c..0000000
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-LIA-.#####",
- "creation": "2019-09-09 22:34:36.346812",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan",
- "applicant_type",
- "applicant",
- "interest_income_account",
- "loan_account",
- "column_break_4",
- "company",
- "posting_date",
- "accrual_type",
- "is_term_loan",
- "section_break_7",
- "pending_principal_amount",
- "payable_principal_amount",
- "paid_principal_amount",
- "column_break_14",
- "interest_amount",
- "total_pending_interest_amount",
- "paid_interest_amount",
- "penalty_amount",
- "section_break_15",
- "process_loan_interest_accrual",
- "repayment_schedule_name",
- "last_accrual_date",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Loan",
- "options": "Loan"
- },
- {
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date"
- },
- {
- "fieldname": "pending_principal_amount",
- "fieldtype": "Currency",
- "label": "Pending Principal Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "interest_amount",
- "fieldtype": "Currency",
- "label": "Interest Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Interest Accrual",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer"
- },
- {
- "fetch_from": "loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Applicant",
- "options": "applicant_type"
- },
- {
- "fieldname": "column_break_4",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "loan.interest_income_account",
- "fieldname": "interest_income_account",
- "fieldtype": "Data",
- "label": "Interest Income Account"
- },
- {
- "fetch_from": "loan.loan_account",
- "fieldname": "loan_account",
- "fieldtype": "Data",
- "label": "Loan Account"
- },
- {
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
- "label": "Amounts"
- },
- {
- "fetch_from": "loan.company",
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company"
- },
- {
- "default": "0",
- "fetch_from": "loan.is_term_loan",
- "fieldname": "is_term_loan",
- "fieldtype": "Check",
- "label": "Is Term Loan",
- "read_only": 1
- },
- {
- "depends_on": "is_term_loan",
- "fieldname": "payable_principal_amount",
- "fieldtype": "Currency",
- "label": "Payable Principal Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "section_break_15",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "process_loan_interest_accrual",
- "fieldtype": "Link",
- "label": "Process Loan Interest Accrual",
- "options": "Process Loan Interest Accrual"
- },
- {
- "fieldname": "column_break_14",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "repayment_schedule_name",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Repayment Schedule Name",
- "read_only": 1
- },
- {
- "depends_on": "eval:doc.is_term_loan",
- "fieldname": "paid_principal_amount",
- "fieldtype": "Currency",
- "label": "Paid Principal Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "paid_interest_amount",
- "fieldtype": "Currency",
- "label": "Paid Interest Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "accrual_type",
- "fieldtype": "Select",
- "in_filter": 1,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Accrual Type",
- "options": "Regular\nRepayment\nDisbursement\nCredit Adjustment\nDebit Adjustment\nRefund"
- },
- {
- "fieldname": "penalty_amount",
- "fieldtype": "Currency",
- "label": "Penalty Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "last_accrual_date",
- "fieldtype": "Date",
- "hidden": 1,
- "label": "Last Accrual Date",
- "read_only": 1
- },
- {
- "fieldname": "total_pending_interest_amount",
- "fieldtype": "Currency",
- "label": "Total Pending Interest Amount",
- "options": "Company:company:default_currency"
- }
- ],
- "in_create": 1,
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-06-30 11:51:31.911794",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Interest Accrual",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
deleted file mode 100644
index cac3f1f..0000000
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.utils import add_days, cint, date_diff, flt, get_datetime, getdate, nowdate
-
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.controllers.accounts_controller import AccountsController
-
-
-class LoanInterestAccrual(AccountsController):
- def validate(self):
- if not self.loan:
- frappe.throw(_("Loan is mandatory"))
-
- if not self.posting_date:
- self.posting_date = nowdate()
-
- if not self.interest_amount and not self.payable_principal_amount:
- frappe.throw(_("Interest Amount or Principal Amount is mandatory"))
-
- if not self.last_accrual_date:
- self.last_accrual_date = get_last_accrual_date(self.loan)
-
- def on_submit(self):
- self.make_gl_entries()
-
- def on_cancel(self):
- if self.repayment_schedule_name:
- self.update_is_accrued()
-
- self.make_gl_entries(cancel=1)
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
-
- def update_is_accrued(self):
- frappe.db.set_value("Repayment Schedule", self.repayment_schedule_name, "is_accrued", 0)
-
- def make_gl_entries(self, cancel=0, adv_adj=0):
- gle_map = []
-
- cost_center = frappe.db.get_value("Loan", self.loan, "cost_center")
-
- if self.interest_amount:
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.loan_account,
- "party_type": self.applicant_type,
- "party": self.applicant,
- "against": self.interest_income_account,
- "debit": self.interest_amount,
- "debit_in_account_currency": self.interest_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _("Interest accrued from {0} to {1} against loan: {2}").format(
- self.last_accrual_date, self.posting_date, self.loan
- ),
- "cost_center": cost_center,
- "posting_date": self.posting_date,
- }
- )
- )
-
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.interest_income_account,
- "against": self.loan_account,
- "credit": self.interest_amount,
- "credit_in_account_currency": self.interest_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": ("Interest accrued from {0} to {1} against loan: {2}").format(
- self.last_accrual_date, self.posting_date, self.loan
- ),
- "cost_center": cost_center,
- "posting_date": self.posting_date,
- }
- )
- )
-
- if gle_map:
- make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj)
-
-
-# For Eg: If Loan disbursement date is '01-09-2019' and disbursed amount is 1000000 and
-# rate of interest is 13.5 then first loan interest accural will be on '01-10-2019'
-# which means interest will be accrued for 30 days which should be equal to 11095.89
-def calculate_accrual_amount_for_demand_loans(
- loan, posting_date, process_loan_interest, accrual_type
-):
- from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
- calculate_amounts,
- get_pending_principal_amount,
- )
-
- no_of_days = get_no_of_days_for_interest_accural(loan, posting_date)
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- if no_of_days <= 0:
- return
-
- pending_principal_amount = get_pending_principal_amount(loan)
-
- interest_per_day = get_per_day_interest(
- pending_principal_amount, loan.rate_of_interest, posting_date
- )
- payable_interest = interest_per_day * no_of_days
-
- pending_amounts = calculate_amounts(loan.name, posting_date, payment_type="Loan Closure")
-
- args = frappe._dict(
- {
- "loan": loan.name,
- "applicant_type": loan.applicant_type,
- "applicant": loan.applicant,
- "interest_income_account": loan.interest_income_account,
- "loan_account": loan.loan_account,
- "pending_principal_amount": pending_principal_amount,
- "interest_amount": payable_interest,
- "total_pending_interest_amount": pending_amounts["interest_amount"],
- "penalty_amount": pending_amounts["penalty_amount"],
- "process_loan_interest": process_loan_interest,
- "posting_date": posting_date,
- "accrual_type": accrual_type,
- }
- )
-
- if flt(payable_interest, precision) > 0.0:
- make_loan_interest_accrual_entry(args)
-
-
-def make_accrual_interest_entry_for_demand_loans(
- posting_date, process_loan_interest, open_loans=None, loan_type=None, accrual_type="Regular"
-):
- query_filters = {
- "status": ("in", ["Disbursed", "Partially Disbursed"]),
- "docstatus": 1,
- "is_term_loan": 0,
- }
-
- if loan_type:
- query_filters.update({"loan_type": loan_type})
-
- if not open_loans:
- open_loans = frappe.get_all(
- "Loan",
- fields=[
- "name",
- "total_payment",
- "total_amount_paid",
- "debit_adjustment_amount",
- "credit_adjustment_amount",
- "refund_amount",
- "loan_account",
- "interest_income_account",
- "loan_amount",
- "is_term_loan",
- "status",
- "disbursement_date",
- "disbursed_amount",
- "applicant_type",
- "applicant",
- "rate_of_interest",
- "total_interest_payable",
- "written_off_amount",
- "total_principal_paid",
- "repayment_start_date",
- ],
- filters=query_filters,
- )
-
- for loan in open_loans:
- calculate_accrual_amount_for_demand_loans(
- loan, posting_date, process_loan_interest, accrual_type
- )
-
-
-def make_accrual_interest_entry_for_term_loans(
- posting_date, process_loan_interest, term_loan=None, loan_type=None, accrual_type="Regular"
-):
- curr_date = posting_date or add_days(nowdate(), 1)
-
- term_loans = get_term_loans(curr_date, term_loan, loan_type)
-
- accrued_entries = []
-
- for loan in term_loans:
- accrued_entries.append(loan.payment_entry)
- args = frappe._dict(
- {
- "loan": loan.name,
- "applicant_type": loan.applicant_type,
- "applicant": loan.applicant,
- "interest_income_account": loan.interest_income_account,
- "loan_account": loan.loan_account,
- "interest_amount": loan.interest_amount,
- "payable_principal": loan.principal_amount,
- "process_loan_interest": process_loan_interest,
- "repayment_schedule_name": loan.payment_entry,
- "posting_date": posting_date,
- "accrual_type": accrual_type,
- }
- )
-
- make_loan_interest_accrual_entry(args)
-
- if accrued_entries:
- frappe.db.sql(
- """UPDATE `tabRepayment Schedule`
- SET is_accrued = 1 where name in (%s)""" # nosec
- % ", ".join(["%s"] * len(accrued_entries)),
- tuple(accrued_entries),
- )
-
-
-def get_term_loans(date, term_loan=None, loan_type=None):
- condition = ""
-
- if term_loan:
- condition += " AND l.name = %s" % frappe.db.escape(term_loan)
-
- if loan_type:
- condition += " AND l.loan_type = %s" % frappe.db.escape(loan_type)
-
- term_loans = frappe.db.sql(
- """SELECT l.name, l.total_payment, l.total_amount_paid, l.loan_account,
- l.interest_income_account, l.is_term_loan, l.disbursement_date, l.applicant_type, l.applicant,
- l.rate_of_interest, l.total_interest_payable, l.repayment_start_date, rs.name as payment_entry,
- rs.payment_date, rs.principal_amount, rs.interest_amount, rs.is_accrued , rs.balance_loan_amount
- FROM `tabLoan` l, `tabRepayment Schedule` rs
- WHERE rs.parent = l.name
- AND l.docstatus=1
- AND l.is_term_loan =1
- AND rs.payment_date <= %s
- AND rs.is_accrued=0 {0}
- AND rs.principal_amount > 0
- AND l.status = 'Disbursed'
- ORDER BY rs.payment_date""".format(
- condition
- ),
- (getdate(date)),
- as_dict=1,
- )
-
- return term_loans
-
-
-def make_loan_interest_accrual_entry(args):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- loan_interest_accrual = frappe.new_doc("Loan Interest Accrual")
- loan_interest_accrual.loan = args.loan
- loan_interest_accrual.applicant_type = args.applicant_type
- loan_interest_accrual.applicant = args.applicant
- loan_interest_accrual.interest_income_account = args.interest_income_account
- loan_interest_accrual.loan_account = args.loan_account
- loan_interest_accrual.pending_principal_amount = flt(args.pending_principal_amount, precision)
- loan_interest_accrual.interest_amount = flt(args.interest_amount, precision)
- loan_interest_accrual.total_pending_interest_amount = flt(
- args.total_pending_interest_amount, precision
- )
- loan_interest_accrual.penalty_amount = flt(args.penalty_amount, precision)
- loan_interest_accrual.posting_date = args.posting_date or nowdate()
- loan_interest_accrual.process_loan_interest_accrual = args.process_loan_interest
- loan_interest_accrual.repayment_schedule_name = args.repayment_schedule_name
- loan_interest_accrual.payable_principal_amount = args.payable_principal
- loan_interest_accrual.accrual_type = args.accrual_type
-
- loan_interest_accrual.save()
- loan_interest_accrual.submit()
-
-
-def get_no_of_days_for_interest_accural(loan, posting_date):
- last_interest_accrual_date = get_last_accrual_date(loan.name)
-
- no_of_days = date_diff(posting_date or nowdate(), last_interest_accrual_date) + 1
-
- return no_of_days
-
-
-def get_last_accrual_date(loan):
- last_posting_date = frappe.db.sql(
- """ SELECT MAX(posting_date) from `tabLoan Interest Accrual`
- WHERE loan = %s and docstatus = 1""",
- (loan),
- )
-
- if last_posting_date[0][0]:
- # interest for last interest accrual date is already booked, so add 1 day
- return add_days(last_posting_date[0][0], 1)
- else:
- return frappe.db.get_value("Loan", loan, "disbursement_date")
-
-
-def days_in_year(year):
- days = 365
-
- if (year % 4 == 0) and (year % 100 != 0) or (year % 400 == 0):
- days = 366
-
- return days
-
-
-def get_per_day_interest(principal_amount, rate_of_interest, posting_date=None):
- if not posting_date:
- posting_date = getdate()
-
- return flt(
- (principal_amount * rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100)
- )
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py
deleted file mode 100644
index fd59393..0000000
--- a/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-import unittest
-
-import frappe
-from frappe.utils import add_to_date, date_diff, flt, get_datetime, get_first_day, nowdate
-
-from erpnext.loan_management.doctype.loan.test_loan import (
- create_demand_loan,
- create_loan_accounts,
- create_loan_application,
- create_loan_security,
- create_loan_security_price,
- create_loan_security_type,
- create_loan_type,
- make_loan_disbursement_entry,
-)
-from erpnext.loan_management.doctype.loan_application.loan_application import create_pledge
-from erpnext.loan_management.doctype.loan_interest_accrual.loan_interest_accrual import (
- days_in_year,
-)
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_demand_loans,
-)
-from erpnext.selling.doctype.customer.test_customer import get_customer_dict
-
-
-class TestLoanInterestAccrual(unittest.TestCase):
- def setUp(self):
- create_loan_accounts()
-
- create_loan_type(
- "Demand Loan",
- 2000000,
- 13.5,
- 25,
- 0,
- 5,
- "Cash",
- "Disbursement Account - _TC",
- "Payment Account - _TC",
- "Loan Account - _TC",
- "Interest Income Account - _TC",
- "Penalty Income Account - _TC",
- )
-
- create_loan_security_type()
- create_loan_security()
-
- create_loan_security_price(
- "Test Security 1", 500, "Nos", get_datetime(), get_datetime(add_to_date(nowdate(), hours=24))
- )
-
- if not frappe.db.exists("Customer", "_Test Loan Customer"):
- frappe.get_doc(get_customer_dict("_Test Loan Customer")).insert(ignore_permissions=True)
-
- self.applicant = frappe.db.get_value("Customer", {"name": "_Test Loan Customer"}, "name")
-
- def test_loan_interest_accural(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
- create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant, "Demand Loan", loan_application, posting_date=get_first_day(nowdate())
- )
- loan.submit()
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
-
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
- loan_interest_accural = frappe.get_doc("Loan Interest Accrual", {"loan": loan.name})
-
- self.assertEqual(flt(loan_interest_accural.interest_amount, 0), flt(accrued_interest_amount, 0))
-
- def test_accumulated_amounts(self):
- pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
-
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
- create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant, "Demand Loan", loan_application, posting_date=get_first_day(nowdate())
- )
- loan.submit()
-
- first_date = "2019-10-01"
- last_date = "2019-10-30"
-
- no_of_days = date_diff(last_date, first_date) + 1
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
- make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
- process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
- loan_interest_accrual = frappe.get_doc("Loan Interest Accrual", {"loan": loan.name})
-
- self.assertEqual(flt(loan_interest_accrual.interest_amount, 0), flt(accrued_interest_amount, 0))
-
- next_start_date = "2019-10-31"
- next_end_date = "2019-11-29"
-
- no_of_days = date_diff(next_end_date, next_start_date) + 1
- process = process_loan_interest_accrual_for_demand_loans(posting_date=next_end_date)
- new_accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime(first_date).year) * 100
- )
-
- total_pending_interest_amount = flt(accrued_interest_amount + new_accrued_interest_amount, 0)
-
- loan_interest_accrual = frappe.get_doc(
- "Loan Interest Accrual", {"loan": loan.name, "process_loan_interest_accrual": process}
- )
- self.assertEqual(
- flt(loan_interest_accrual.total_pending_interest_amount, 0), total_pending_interest_amount
- )
diff --git a/erpnext/loan_management/doctype/loan_refund/__init__.py b/erpnext/loan_management/doctype/loan_refund/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_refund/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_refund/loan_refund.js b/erpnext/loan_management/doctype/loan_refund/loan_refund.js
deleted file mode 100644
index f108bf7..0000000
--- a/erpnext/loan_management/doctype/loan_refund/loan_refund.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Refund', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/loan_refund/loan_refund.json b/erpnext/loan_management/doctype/loan_refund/loan_refund.json
deleted file mode 100644
index f78e55e..0000000
--- a/erpnext/loan_management/doctype/loan_refund/loan_refund.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-RF-.#####",
- "creation": "2022-06-24 15:51:03.165498",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan",
- "applicant_type",
- "applicant",
- "column_break_3",
- "company",
- "posting_date",
- "accounting_dimensions_section",
- "cost_center",
- "section_break_9",
- "refund_account",
- "column_break_11",
- "refund_amount",
- "reference_number",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan",
- "options": "Loan",
- "reqd": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "read_only": 1
- },
- {
- "fetch_from": "loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "label": "Applicant ",
- "options": "applicant_type",
- "read_only": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "loan.company",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "read_only": 1,
- "reqd": 1
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date",
- "reqd": 1
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "section_break_9",
- "fieldtype": "Section Break",
- "label": "Refund Details"
- },
- {
- "fieldname": "refund_account",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Refund Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "refund_amount",
- "fieldtype": "Currency",
- "label": "Refund Amount",
- "options": "Company:company:default_currency",
- "reqd": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Refund",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Refund",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "reference_number",
- "fieldtype": "Data",
- "label": "Reference Number"
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-06-24 16:13:48.793486",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Refund",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_refund/loan_refund.py b/erpnext/loan_management/doctype/loan_refund/loan_refund.py
deleted file mode 100644
index d7ab54c..0000000
--- a/erpnext/loan_management/doctype/loan_refund/loan_refund.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe import _
-from frappe.utils import getdate
-
-import erpnext
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
- get_pending_principal_amount,
-)
-
-
-class LoanRefund(AccountsController):
- """
- Add refund if total repayment is more than that is owed.
- """
-
- def validate(self):
- self.set_missing_values()
- self.validate_refund_amount()
-
- def set_missing_values(self):
- if not self.cost_center:
- self.cost_center = erpnext.get_default_cost_center(self.company)
-
- def validate_refund_amount(self):
- loan = frappe.get_doc("Loan", self.loan)
- pending_amount = get_pending_principal_amount(loan)
- if pending_amount >= 0:
- frappe.throw(_("No excess amount to refund."))
- else:
- excess_amount = pending_amount * -1
-
- if self.refund_amount > excess_amount:
- frappe.throw(_("Refund amount cannot be greater than excess amount {0}").format(excess_amount))
-
- def on_submit(self):
- self.update_outstanding_amount()
- self.make_gl_entries()
-
- def on_cancel(self):
- self.update_outstanding_amount(cancel=1)
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
- self.make_gl_entries(cancel=1)
-
- def update_outstanding_amount(self, cancel=0):
- refund_amount = frappe.db.get_value("Loan", self.loan, "refund_amount")
-
- if cancel:
- refund_amount -= self.refund_amount
- else:
- refund_amount += self.refund_amount
-
- frappe.db.set_value("Loan", self.loan, "refund_amount", refund_amount)
-
- def make_gl_entries(self, cancel=0):
- gl_entries = []
- loan_details = frappe.get_doc("Loan", self.loan)
-
- gl_entries.append(
- self.get_gl_dict(
- {
- "account": self.refund_account,
- "against": loan_details.loan_account,
- "credit": self.refund_amount,
- "credit_in_account_currency": self.refund_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _("Against Loan:") + self.loan,
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- gl_entries.append(
- self.get_gl_dict(
- {
- "account": loan_details.loan_account,
- "party_type": loan_details.applicant_type,
- "party": loan_details.applicant,
- "against": self.refund_account,
- "debit": self.refund_amount,
- "debit_in_account_currency": self.refund_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _("Against Loan:") + self.loan,
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- make_gl_entries(gl_entries, cancel=cancel, merge_entries=False)
diff --git a/erpnext/loan_management/doctype/loan_refund/test_loan_refund.py b/erpnext/loan_management/doctype/loan_refund/test_loan_refund.py
deleted file mode 100644
index de2f9e1..0000000
--- a/erpnext/loan_management/doctype/loan_refund/test_loan_refund.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests.utils import FrappeTestCase
-
-
-class TestLoanRefund(FrappeTestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_repayment/__init__.py b/erpnext/loan_management/doctype/loan_repayment/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_repayment/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js
deleted file mode 100644
index 82a2d80..0000000
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-{% include 'erpnext/loan_management/loan_common.js' %};
-
-frappe.ui.form.on('Loan Repayment', {
- // refresh: function(frm) {
-
- // }
- onload: function(frm) {
- frm.set_query('against_loan', function() {
- return {
- 'filters': {
- 'docstatus': 1
- }
- };
- });
-
- if (frm.doc.against_loan && frm.doc.posting_date && frm.doc.docstatus == 0) {
- frm.trigger('calculate_repayment_amounts');
- }
- },
-
- posting_date : function(frm) {
- frm.trigger('calculate_repayment_amounts');
- },
-
- against_loan: function(frm) {
- if (frm.doc.posting_date) {
- frm.trigger('calculate_repayment_amounts');
- }
- },
-
- payment_type: function(frm) {
- if (frm.doc.posting_date) {
- frm.trigger('calculate_repayment_amounts');
- }
- },
-
- calculate_repayment_amounts: function(frm) {
- frappe.call({
- method: 'erpnext.loan_management.doctype.loan_repayment.loan_repayment.calculate_amounts',
- args: {
- 'against_loan': frm.doc.against_loan,
- 'posting_date': frm.doc.posting_date,
- 'payment_type': frm.doc.payment_type
- },
- callback: function(r) {
- let amounts = r.message;
- frm.set_value('amount_paid', 0.0);
- frm.set_df_property('amount_paid', 'read_only', frm.doc.payment_type == "Loan Closure" ? 1:0);
-
- frm.set_value('pending_principal_amount', amounts['pending_principal_amount']);
- if (frm.doc.is_term_loan || frm.doc.payment_type == "Loan Closure") {
- frm.set_value('payable_principal_amount', amounts['payable_principal_amount']);
- frm.set_value('amount_paid', amounts['payable_amount']);
- }
- frm.set_value('interest_payable', amounts['interest_amount']);
- frm.set_value('penalty_amount', amounts['penalty_amount']);
- frm.set_value('payable_amount', amounts['payable_amount']);
- }
- });
- }
-});
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
deleted file mode 100644
index 3e7dc28..0000000
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
+++ /dev/null
@@ -1,339 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-REP-.####",
- "creation": "2022-01-25 10:30:02.767941",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "against_loan",
- "applicant_type",
- "applicant",
- "loan_type",
- "column_break_3",
- "company",
- "posting_date",
- "clearance_date",
- "rate_of_interest",
- "is_term_loan",
- "payment_details_section",
- "due_date",
- "pending_principal_amount",
- "interest_payable",
- "payable_amount",
- "column_break_9",
- "shortfall_amount",
- "payable_principal_amount",
- "penalty_amount",
- "amount_paid",
- "accounting_dimensions_section",
- "cost_center",
- "references_section",
- "reference_number",
- "column_break_21",
- "reference_date",
- "principal_amount_paid",
- "total_penalty_paid",
- "total_interest_paid",
- "repayment_details",
- "amended_from",
- "accounting_details_section",
- "payment_account",
- "penalty_income_account",
- "column_break_36",
- "loan_account"
- ],
- "fields": [
- {
- "fieldname": "against_loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Against Loan",
- "options": "Loan",
- "reqd": 1
- },
- {
- "fieldname": "posting_date",
- "fieldtype": "Datetime",
- "in_list_view": 1,
- "label": "Posting Date",
- "reqd": 1
- },
- {
- "fieldname": "payment_details_section",
- "fieldtype": "Section Break",
- "label": "Payment Details"
- },
- {
- "fieldname": "penalty_amount",
- "fieldtype": "Currency",
- "label": "Penalty Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "interest_payable",
- "fieldtype": "Currency",
- "label": "Interest Payable",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "against_loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fetch_from": "against_loan.loan_type",
- "fieldname": "loan_type",
- "fieldtype": "Link",
- "label": "Loan Type",
- "options": "Loan Type",
- "read_only": 1
- },
- {
- "fieldname": "column_break_9",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "payable_amount",
- "fieldtype": "Currency",
- "label": "Payable Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "bold": 1,
- "fieldname": "amount_paid",
- "fieldtype": "Currency",
- "label": "Amount Paid",
- "non_negative": 1,
- "options": "Company:company:default_currency",
- "reqd": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Repayment",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fetch_from": "against_loan.company",
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company",
- "read_only": 1
- },
- {
- "fieldname": "pending_principal_amount",
- "fieldtype": "Currency",
- "label": "Pending Principal Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "default": "0",
- "fetch_from": "against_loan.is_term_loan",
- "fieldname": "is_term_loan",
- "fieldtype": "Check",
- "label": "Is Term Loan",
- "read_only": 1
- },
- {
- "depends_on": "eval:doc.payment_type==\"Loan Closure\" || doc.is_term_loan",
- "fieldname": "payable_principal_amount",
- "fieldtype": "Currency",
- "label": "Payable Principal Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "references_section",
- "fieldtype": "Section Break",
- "label": "Payment References"
- },
- {
- "fieldname": "reference_number",
- "fieldtype": "Data",
- "label": "Reference Number"
- },
- {
- "fieldname": "reference_date",
- "fieldtype": "Date",
- "label": "Reference Date"
- },
- {
- "fieldname": "column_break_21",
- "fieldtype": "Column Break"
- },
- {
- "default": "0.0",
- "fieldname": "principal_amount_paid",
- "fieldtype": "Currency",
- "hidden": 1,
- "label": "Principal Amount Paid",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fetch_from": "against_loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "read_only": 1
- },
- {
- "fieldname": "due_date",
- "fieldtype": "Date",
- "label": "Due Date",
- "read_only": 1
- },
- {
- "fieldname": "repayment_details",
- "fieldtype": "Table",
- "hidden": 1,
- "label": "Repayment Details",
- "options": "Loan Repayment Detail"
- },
- {
- "fieldname": "total_interest_paid",
- "fieldtype": "Currency",
- "hidden": 1,
- "label": "Total Interest Paid",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fetch_from": "loan_type.rate_of_interest",
- "fieldname": "rate_of_interest",
- "fieldtype": "Percent",
- "label": "Rate Of Interest",
- "read_only": 1
- },
- {
- "fieldname": "shortfall_amount",
- "fieldtype": "Currency",
- "label": "Shortfall Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "total_penalty_paid",
- "fieldtype": "Currency",
- "hidden": 1,
- "label": "Total Penalty Paid",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "clearance_date",
- "fieldtype": "Date",
- "label": "Clearance Date",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "accounting_details_section",
- "fieldtype": "Section Break",
- "label": "Accounting Details"
- },
- {
- "fetch_from": "against_loan.payment_account",
- "fetch_if_empty": 1,
- "fieldname": "payment_account",
- "fieldtype": "Link",
- "label": "Repayment Account",
- "options": "Account"
- },
- {
- "fieldname": "column_break_36",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "against_loan.loan_account",
- "fieldname": "loan_account",
- "fieldtype": "Link",
- "label": "Loan Account",
- "options": "Account",
- "read_only": 1
- },
- {
- "fetch_from": "against_loan.penalty_income_account",
- "fieldname": "penalty_income_account",
- "fieldtype": "Link",
- "hidden": 1,
- "label": "Penalty Income Account",
- "options": "Account"
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-08-04 17:13:51.964203",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Repayment",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
deleted file mode 100644
index 8a185f8..0000000
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ /dev/null
@@ -1,777 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.utils import add_days, cint, date_diff, flt, get_datetime, getdate
-
-import erpnext
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.loan_management.doctype.loan_interest_accrual.loan_interest_accrual import (
- get_last_accrual_date,
- get_per_day_interest,
-)
-from erpnext.loan_management.doctype.loan_security_shortfall.loan_security_shortfall import (
- update_shortfall_status,
-)
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_demand_loans,
-)
-
-
-class LoanRepayment(AccountsController):
- def validate(self):
- amounts = calculate_amounts(self.against_loan, self.posting_date)
- self.set_missing_values(amounts)
- self.check_future_entries()
- self.validate_amount()
- self.allocate_amounts(amounts)
-
- def before_submit(self):
- self.book_unaccrued_interest()
-
- def on_submit(self):
- self.update_paid_amount()
- self.update_repayment_schedule()
- self.make_gl_entries()
-
- def on_cancel(self):
- self.check_future_accruals()
- self.update_repayment_schedule(cancel=1)
- self.mark_as_unpaid()
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
- self.make_gl_entries(cancel=1)
-
- def set_missing_values(self, amounts):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- if not self.posting_date:
- self.posting_date = get_datetime()
-
- if not self.cost_center:
- self.cost_center = erpnext.get_default_cost_center(self.company)
-
- if not self.interest_payable:
- self.interest_payable = flt(amounts["interest_amount"], precision)
-
- if not self.penalty_amount:
- self.penalty_amount = flt(amounts["penalty_amount"], precision)
-
- if not self.pending_principal_amount:
- self.pending_principal_amount = flt(amounts["pending_principal_amount"], precision)
-
- if not self.payable_principal_amount and self.is_term_loan:
- self.payable_principal_amount = flt(amounts["payable_principal_amount"], precision)
-
- if not self.payable_amount:
- self.payable_amount = flt(amounts["payable_amount"], precision)
-
- shortfall_amount = flt(
- frappe.db.get_value(
- "Loan Security Shortfall", {"loan": self.against_loan, "status": "Pending"}, "shortfall_amount"
- )
- )
-
- if shortfall_amount:
- self.shortfall_amount = shortfall_amount
-
- if amounts.get("due_date"):
- self.due_date = amounts.get("due_date")
-
- def check_future_entries(self):
- future_repayment_date = frappe.db.get_value(
- "Loan Repayment",
- {"posting_date": (">", self.posting_date), "docstatus": 1, "against_loan": self.against_loan},
- "posting_date",
- )
-
- if future_repayment_date:
- frappe.throw("Repayment already made till date {0}".format(get_datetime(future_repayment_date)))
-
- def validate_amount(self):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- if not self.amount_paid:
- frappe.throw(_("Amount paid cannot be zero"))
-
- def book_unaccrued_interest(self):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
- if flt(self.total_interest_paid, precision) > flt(self.interest_payable, precision):
- if not self.is_term_loan:
- # get last loan interest accrual date
- last_accrual_date = get_last_accrual_date(self.against_loan)
-
- # get posting date upto which interest has to be accrued
- per_day_interest = get_per_day_interest(
- self.pending_principal_amount, self.rate_of_interest, self.posting_date
- )
-
- no_of_days = (
- flt(flt(self.total_interest_paid - self.interest_payable, precision) / per_day_interest, 0)
- - 1
- )
-
- posting_date = add_days(last_accrual_date, no_of_days)
-
- # book excess interest paid
- process = process_loan_interest_accrual_for_demand_loans(
- posting_date=posting_date, loan=self.against_loan, accrual_type="Repayment"
- )
-
- # get loan interest accrual to update paid amount
- lia = frappe.db.get_value(
- "Loan Interest Accrual",
- {"process_loan_interest_accrual": process},
- ["name", "interest_amount", "payable_principal_amount"],
- as_dict=1,
- )
-
- if lia:
- self.append(
- "repayment_details",
- {
- "loan_interest_accrual": lia.name,
- "paid_interest_amount": flt(self.total_interest_paid - self.interest_payable, precision),
- "paid_principal_amount": 0.0,
- "accrual_type": "Repayment",
- },
- )
-
- def update_paid_amount(self):
- loan = frappe.get_value(
- "Loan",
- self.against_loan,
- [
- "total_amount_paid",
- "total_principal_paid",
- "status",
- "is_secured_loan",
- "total_payment",
- "debit_adjustment_amount",
- "credit_adjustment_amount",
- "refund_amount",
- "loan_amount",
- "disbursed_amount",
- "total_interest_payable",
- "written_off_amount",
- ],
- as_dict=1,
- )
-
- loan.update(
- {
- "total_amount_paid": loan.total_amount_paid + self.amount_paid,
- "total_principal_paid": loan.total_principal_paid + self.principal_amount_paid,
- }
- )
-
- pending_principal_amount = get_pending_principal_amount(loan)
- if not loan.is_secured_loan and pending_principal_amount <= 0:
- loan.update({"status": "Loan Closure Requested"})
-
- for payment in self.repayment_details:
- frappe.db.sql(
- """ UPDATE `tabLoan Interest Accrual`
- SET paid_principal_amount = `paid_principal_amount` + %s,
- paid_interest_amount = `paid_interest_amount` + %s
- WHERE name = %s""",
- (
- flt(payment.paid_principal_amount),
- flt(payment.paid_interest_amount),
- payment.loan_interest_accrual,
- ),
- )
-
- frappe.db.sql(
- """ UPDATE `tabLoan`
- SET total_amount_paid = %s, total_principal_paid = %s, status = %s
- WHERE name = %s """,
- (loan.total_amount_paid, loan.total_principal_paid, loan.status, self.against_loan),
- )
-
- update_shortfall_status(self.against_loan, self.principal_amount_paid)
-
- def mark_as_unpaid(self):
- loan = frappe.get_value(
- "Loan",
- self.against_loan,
- [
- "total_amount_paid",
- "total_principal_paid",
- "status",
- "is_secured_loan",
- "total_payment",
- "loan_amount",
- "disbursed_amount",
- "total_interest_payable",
- "written_off_amount",
- ],
- as_dict=1,
- )
-
- no_of_repayments = len(self.repayment_details)
-
- loan.update(
- {
- "total_amount_paid": loan.total_amount_paid - self.amount_paid,
- "total_principal_paid": loan.total_principal_paid - self.principal_amount_paid,
- }
- )
-
- if loan.status == "Loan Closure Requested":
- if loan.disbursed_amount >= loan.loan_amount:
- loan["status"] = "Disbursed"
- else:
- loan["status"] = "Partially Disbursed"
-
- for payment in self.repayment_details:
- frappe.db.sql(
- """ UPDATE `tabLoan Interest Accrual`
- SET paid_principal_amount = `paid_principal_amount` - %s,
- paid_interest_amount = `paid_interest_amount` - %s
- WHERE name = %s""",
- (payment.paid_principal_amount, payment.paid_interest_amount, payment.loan_interest_accrual),
- )
-
- # Cancel repayment interest accrual
- # checking idx as a preventive measure, repayment accrual will always be the last entry
- if payment.accrual_type == "Repayment" and payment.idx == no_of_repayments:
- lia_doc = frappe.get_doc("Loan Interest Accrual", payment.loan_interest_accrual)
- lia_doc.cancel()
-
- frappe.db.sql(
- """ UPDATE `tabLoan`
- SET total_amount_paid = %s, total_principal_paid = %s, status = %s
- WHERE name = %s """,
- (loan.total_amount_paid, loan.total_principal_paid, loan.status, self.against_loan),
- )
-
- def check_future_accruals(self):
- future_accrual_date = frappe.db.get_value(
- "Loan Interest Accrual",
- {"posting_date": (">", self.posting_date), "docstatus": 1, "loan": self.against_loan},
- "posting_date",
- )
-
- if future_accrual_date:
- frappe.throw(
- "Cannot cancel. Interest accruals already processed till {0}".format(
- get_datetime(future_accrual_date)
- )
- )
-
- def update_repayment_schedule(self, cancel=0):
- if self.is_term_loan and self.principal_amount_paid > self.payable_principal_amount:
- regenerate_repayment_schedule(self.against_loan, cancel)
-
- def allocate_amounts(self, repayment_details):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
- self.set("repayment_details", [])
- self.principal_amount_paid = 0
- self.total_penalty_paid = 0
- interest_paid = self.amount_paid
-
- if self.shortfall_amount and self.amount_paid > self.shortfall_amount:
- self.principal_amount_paid = self.shortfall_amount
- elif self.shortfall_amount:
- self.principal_amount_paid = self.amount_paid
-
- interest_paid -= self.principal_amount_paid
-
- if interest_paid > 0:
- if self.penalty_amount and interest_paid > self.penalty_amount:
- self.total_penalty_paid = flt(self.penalty_amount, precision)
- elif self.penalty_amount:
- self.total_penalty_paid = flt(interest_paid, precision)
-
- interest_paid -= self.total_penalty_paid
-
- if self.is_term_loan:
- interest_paid, updated_entries = self.allocate_interest_amount(interest_paid, repayment_details)
- self.allocate_principal_amount_for_term_loans(interest_paid, repayment_details, updated_entries)
- else:
- interest_paid, updated_entries = self.allocate_interest_amount(interest_paid, repayment_details)
- self.allocate_excess_payment_for_demand_loans(interest_paid, repayment_details)
-
- def allocate_interest_amount(self, interest_paid, repayment_details):
- updated_entries = {}
- self.total_interest_paid = 0
- idx = 1
-
- if interest_paid > 0:
- for lia, amounts in repayment_details.get("pending_accrual_entries", []).items():
- interest_amount = 0
- if amounts["interest_amount"] <= interest_paid:
- interest_amount = amounts["interest_amount"]
- self.total_interest_paid += interest_amount
- interest_paid -= interest_amount
- elif interest_paid:
- if interest_paid >= amounts["interest_amount"]:
- interest_amount = amounts["interest_amount"]
- self.total_interest_paid += interest_amount
- interest_paid = 0
- else:
- interest_amount = interest_paid
- self.total_interest_paid += interest_amount
- interest_paid = 0
-
- if interest_amount:
- self.append(
- "repayment_details",
- {
- "loan_interest_accrual": lia,
- "paid_interest_amount": interest_amount,
- "paid_principal_amount": 0,
- },
- )
- updated_entries[lia] = idx
- idx += 1
-
- return interest_paid, updated_entries
-
- def allocate_principal_amount_for_term_loans(
- self, interest_paid, repayment_details, updated_entries
- ):
- if interest_paid > 0:
- for lia, amounts in repayment_details.get("pending_accrual_entries", []).items():
- paid_principal = 0
- if amounts["payable_principal_amount"] <= interest_paid:
- paid_principal = amounts["payable_principal_amount"]
- self.principal_amount_paid += paid_principal
- interest_paid -= paid_principal
- elif interest_paid:
- if interest_paid >= amounts["payable_principal_amount"]:
- paid_principal = amounts["payable_principal_amount"]
- self.principal_amount_paid += paid_principal
- interest_paid = 0
- else:
- paid_principal = interest_paid
- self.principal_amount_paid += paid_principal
- interest_paid = 0
-
- if updated_entries.get(lia):
- idx = updated_entries.get(lia)
- self.get("repayment_details")[idx - 1].paid_principal_amount += paid_principal
- else:
- self.append(
- "repayment_details",
- {
- "loan_interest_accrual": lia,
- "paid_interest_amount": 0,
- "paid_principal_amount": paid_principal,
- },
- )
-
- if interest_paid > 0:
- self.principal_amount_paid += interest_paid
-
- def allocate_excess_payment_for_demand_loans(self, interest_paid, repayment_details):
- if repayment_details["unaccrued_interest"] and interest_paid > 0:
- # no of days for which to accrue interest
- # Interest can only be accrued for an entire day and not partial
- if interest_paid > repayment_details["unaccrued_interest"]:
- interest_paid -= repayment_details["unaccrued_interest"]
- self.total_interest_paid += repayment_details["unaccrued_interest"]
- else:
- # get no of days for which interest can be paid
- per_day_interest = get_per_day_interest(
- self.pending_principal_amount, self.rate_of_interest, self.posting_date
- )
-
- no_of_days = cint(interest_paid / per_day_interest)
- self.total_interest_paid += no_of_days * per_day_interest
- interest_paid -= no_of_days * per_day_interest
-
- if interest_paid > 0:
- self.principal_amount_paid += interest_paid
-
- def make_gl_entries(self, cancel=0, adv_adj=0):
- gle_map = []
- if self.shortfall_amount and self.amount_paid > self.shortfall_amount:
- remarks = "Shortfall repayment of {0}.<br>Repayment against loan {1}".format(
- self.shortfall_amount, self.against_loan
- )
- elif self.shortfall_amount:
- remarks = "Shortfall repayment of {0} against loan {1}".format(
- self.shortfall_amount, self.against_loan
- )
- else:
- remarks = "Repayment against loan " + self.against_loan
-
- if self.reference_number:
- remarks += " with reference no. {}".format(self.reference_number)
-
- if hasattr(self, "repay_from_salary") and self.repay_from_salary:
- payment_account = self.payroll_payable_account
- else:
- payment_account = self.payment_account
-
- if self.total_penalty_paid:
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.loan_account,
- "against": payment_account,
- "debit": self.total_penalty_paid,
- "debit_in_account_currency": self.total_penalty_paid,
- "against_voucher_type": "Loan",
- "against_voucher": self.against_loan,
- "remarks": _("Penalty against loan:") + self.against_loan,
- "cost_center": self.cost_center,
- "party_type": self.applicant_type,
- "party": self.applicant,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.penalty_income_account,
- "against": self.loan_account,
- "credit": self.total_penalty_paid,
- "credit_in_account_currency": self.total_penalty_paid,
- "against_voucher_type": "Loan",
- "against_voucher": self.against_loan,
- "remarks": _("Penalty against loan:") + self.against_loan,
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- gle_map.append(
- self.get_gl_dict(
- {
- "account": payment_account,
- "against": self.loan_account + ", " + self.penalty_income_account,
- "debit": self.amount_paid,
- "debit_in_account_currency": self.amount_paid,
- "against_voucher_type": "Loan",
- "against_voucher": self.against_loan,
- "remarks": _(remarks),
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- gle_map.append(
- self.get_gl_dict(
- {
- "account": self.loan_account,
- "party_type": self.applicant_type,
- "party": self.applicant,
- "against": payment_account,
- "credit": self.amount_paid,
- "credit_in_account_currency": self.amount_paid,
- "against_voucher_type": "Loan",
- "against_voucher": self.against_loan,
- "remarks": _(remarks),
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- if gle_map:
- make_gl_entries(gle_map, cancel=cancel, adv_adj=adv_adj, merge_entries=False)
-
-
-def create_repayment_entry(
- loan,
- applicant,
- company,
- posting_date,
- loan_type,
- payment_type,
- interest_payable,
- payable_principal_amount,
- amount_paid,
- penalty_amount=None,
- payroll_payable_account=None,
-):
-
- lr = frappe.get_doc(
- {
- "doctype": "Loan Repayment",
- "against_loan": loan,
- "payment_type": payment_type,
- "company": company,
- "posting_date": posting_date,
- "applicant": applicant,
- "penalty_amount": penalty_amount,
- "interest_payable": interest_payable,
- "payable_principal_amount": payable_principal_amount,
- "amount_paid": amount_paid,
- "loan_type": loan_type,
- "payroll_payable_account": payroll_payable_account,
- }
- ).insert()
-
- return lr
-
-
-def get_accrued_interest_entries(against_loan, posting_date=None):
- if not posting_date:
- posting_date = getdate()
-
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- unpaid_accrued_entries = frappe.db.sql(
- """
- SELECT name, posting_date, interest_amount - paid_interest_amount as interest_amount,
- payable_principal_amount - paid_principal_amount as payable_principal_amount,
- accrual_type
- FROM
- `tabLoan Interest Accrual`
- WHERE
- loan = %s
- AND posting_date <= %s
- AND (interest_amount - paid_interest_amount > 0 OR
- payable_principal_amount - paid_principal_amount > 0)
- AND
- docstatus = 1
- ORDER BY posting_date
- """,
- (against_loan, posting_date),
- as_dict=1,
- )
-
- # Skip entries with zero interest amount & payable principal amount
- unpaid_accrued_entries = [
- d
- for d in unpaid_accrued_entries
- if flt(d.interest_amount, precision) > 0 or flt(d.payable_principal_amount, precision) > 0
- ]
-
- return unpaid_accrued_entries
-
-
-def get_penalty_details(against_loan):
- penalty_details = frappe.db.sql(
- """
- SELECT posting_date, (penalty_amount - total_penalty_paid) as pending_penalty_amount
- FROM `tabLoan Repayment` where posting_date >= (SELECT MAX(posting_date) from `tabLoan Repayment`
- where against_loan = %s) and docstatus = 1 and against_loan = %s
- """,
- (against_loan, against_loan),
- )
-
- if penalty_details:
- return penalty_details[0][0], flt(penalty_details[0][1])
- else:
- return None, 0
-
-
-def regenerate_repayment_schedule(loan, cancel=0):
- from erpnext.loan_management.doctype.loan.loan import (
- add_single_month,
- get_monthly_repayment_amount,
- )
-
- loan_doc = frappe.get_doc("Loan", loan)
- next_accrual_date = None
- accrued_entries = 0
- last_repayment_amount = None
- last_balance_amount = None
-
- for term in reversed(loan_doc.get("repayment_schedule")):
- if not term.is_accrued:
- next_accrual_date = term.payment_date
- loan_doc.remove(term)
- else:
- accrued_entries += 1
- if last_repayment_amount is None:
- last_repayment_amount = term.total_payment
- if last_balance_amount is None:
- last_balance_amount = term.balance_loan_amount
-
- loan_doc.save()
-
- balance_amount = get_pending_principal_amount(loan_doc)
-
- if loan_doc.repayment_method == "Repay Fixed Amount per Period":
- monthly_repayment_amount = flt(
- balance_amount / len(loan_doc.get("repayment_schedule")) - accrued_entries
- )
- else:
- repayment_period = loan_doc.repayment_periods - accrued_entries
- if not cancel and repayment_period > 0:
- monthly_repayment_amount = get_monthly_repayment_amount(
- balance_amount, loan_doc.rate_of_interest, repayment_period
- )
- else:
- monthly_repayment_amount = last_repayment_amount
- balance_amount = last_balance_amount
-
- payment_date = next_accrual_date
-
- while balance_amount > 0:
- interest_amount = flt(balance_amount * flt(loan_doc.rate_of_interest) / (12 * 100))
- principal_amount = monthly_repayment_amount - interest_amount
- balance_amount = flt(balance_amount + interest_amount - monthly_repayment_amount)
- if balance_amount < 0:
- principal_amount += balance_amount
- balance_amount = 0.0
-
- total_payment = principal_amount + interest_amount
- loan_doc.append(
- "repayment_schedule",
- {
- "payment_date": payment_date,
- "principal_amount": principal_amount,
- "interest_amount": interest_amount,
- "total_payment": total_payment,
- "balance_loan_amount": balance_amount,
- },
- )
- next_payment_date = add_single_month(payment_date)
- payment_date = next_payment_date
-
- loan_doc.save()
-
-
-def get_pending_principal_amount(loan):
- if loan.status in ("Disbursed", "Closed") or loan.disbursed_amount >= loan.loan_amount:
- pending_principal_amount = (
- flt(loan.total_payment)
- + flt(loan.debit_adjustment_amount)
- - flt(loan.credit_adjustment_amount)
- - flt(loan.total_principal_paid)
- - flt(loan.total_interest_payable)
- - flt(loan.written_off_amount)
- + flt(loan.refund_amount)
- )
- else:
- pending_principal_amount = (
- flt(loan.disbursed_amount)
- + flt(loan.debit_adjustment_amount)
- - flt(loan.credit_adjustment_amount)
- - flt(loan.total_principal_paid)
- - flt(loan.total_interest_payable)
- - flt(loan.written_off_amount)
- + flt(loan.refund_amount)
- )
-
- return pending_principal_amount
-
-
-# This function returns the amounts that are payable at the time of loan repayment based on posting date
-# So it pulls all the unpaid Loan Interest Accrual Entries and calculates the penalty if applicable
-
-
-def get_amounts(amounts, against_loan, posting_date):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- against_loan_doc = frappe.get_doc("Loan", against_loan)
- loan_type_details = frappe.get_doc("Loan Type", against_loan_doc.loan_type)
- accrued_interest_entries = get_accrued_interest_entries(against_loan_doc.name, posting_date)
-
- computed_penalty_date, pending_penalty_amount = get_penalty_details(against_loan)
- pending_accrual_entries = {}
-
- total_pending_interest = 0
- penalty_amount = 0
- payable_principal_amount = 0
- final_due_date = ""
- due_date = ""
-
- for entry in accrued_interest_entries:
- # Loan repayment due date is one day after the loan interest is accrued
- # no of late days are calculated based on loan repayment posting date
- # and if no_of_late days are positive then penalty is levied
-
- due_date = add_days(entry.posting_date, 1)
- due_date_after_grace_period = add_days(due_date, loan_type_details.grace_period_in_days)
-
- # Consider one day after already calculated penalty
- if computed_penalty_date and getdate(computed_penalty_date) >= due_date_after_grace_period:
- due_date_after_grace_period = add_days(computed_penalty_date, 1)
-
- no_of_late_days = date_diff(posting_date, due_date_after_grace_period) + 1
-
- if (
- no_of_late_days > 0
- and (
- not (hasattr(against_loan_doc, "repay_from_salary") and against_loan_doc.repay_from_salary)
- )
- and entry.accrual_type == "Regular"
- ):
- penalty_amount += (
- entry.interest_amount * (loan_type_details.penalty_interest_rate / 100) * no_of_late_days
- )
-
- total_pending_interest += entry.interest_amount
- payable_principal_amount += entry.payable_principal_amount
-
- pending_accrual_entries.setdefault(
- entry.name,
- {
- "interest_amount": flt(entry.interest_amount, precision),
- "payable_principal_amount": flt(entry.payable_principal_amount, precision),
- },
- )
-
- if due_date and not final_due_date:
- final_due_date = add_days(due_date, loan_type_details.grace_period_in_days)
-
- pending_principal_amount = get_pending_principal_amount(against_loan_doc)
-
- unaccrued_interest = 0
- if due_date:
- pending_days = date_diff(posting_date, due_date) + 1
- else:
- last_accrual_date = get_last_accrual_date(against_loan_doc.name)
- pending_days = date_diff(posting_date, last_accrual_date) + 1
-
- if pending_days > 0:
- principal_amount = flt(pending_principal_amount, precision)
- per_day_interest = get_per_day_interest(
- principal_amount, loan_type_details.rate_of_interest, posting_date
- )
- unaccrued_interest += pending_days * per_day_interest
-
- amounts["pending_principal_amount"] = flt(pending_principal_amount, precision)
- amounts["payable_principal_amount"] = flt(payable_principal_amount, precision)
- amounts["interest_amount"] = flt(total_pending_interest, precision)
- amounts["penalty_amount"] = flt(penalty_amount + pending_penalty_amount, precision)
- amounts["payable_amount"] = flt(
- payable_principal_amount + total_pending_interest + penalty_amount, precision
- )
- amounts["pending_accrual_entries"] = pending_accrual_entries
- amounts["unaccrued_interest"] = flt(unaccrued_interest, precision)
- amounts["written_off_amount"] = flt(against_loan_doc.written_off_amount, precision)
-
- if final_due_date:
- amounts["due_date"] = final_due_date
-
- return amounts
-
-
-@frappe.whitelist()
-def calculate_amounts(against_loan, posting_date, payment_type=""):
- amounts = {
- "penalty_amount": 0.0,
- "interest_amount": 0.0,
- "pending_principal_amount": 0.0,
- "payable_principal_amount": 0.0,
- "payable_amount": 0.0,
- "unaccrued_interest": 0.0,
- "due_date": "",
- }
-
- amounts = get_amounts(amounts, against_loan, posting_date)
-
- # update values for closure
- if payment_type == "Loan Closure":
- amounts["payable_principal_amount"] = amounts["pending_principal_amount"]
- amounts["interest_amount"] += amounts["unaccrued_interest"]
- amounts["payable_amount"] = (
- amounts["payable_principal_amount"] + amounts["interest_amount"] + amounts["penalty_amount"]
- )
-
- return amounts
diff --git a/erpnext/loan_management/doctype/loan_repayment/test_loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/test_loan_repayment.py
deleted file mode 100644
index 98e5a0a..0000000
--- a/erpnext/loan_management/doctype/loan_repayment/test_loan_repayment.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanRepayment(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_repayment_detail/__init__.py b/erpnext/loan_management/doctype/loan_repayment_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_repayment_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_repayment_detail/loan_repayment_detail.json b/erpnext/loan_management/doctype/loan_repayment_detail/loan_repayment_detail.json
deleted file mode 100644
index 4b9b191..0000000
--- a/erpnext/loan_management/doctype/loan_repayment_detail/loan_repayment_detail.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "actions": [],
- "creation": "2020-04-15 18:31:54.026923",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_interest_accrual",
- "paid_principal_amount",
- "paid_interest_amount",
- "accrual_type"
- ],
- "fields": [
- {
- "fieldname": "loan_interest_accrual",
- "fieldtype": "Link",
- "label": "Loan Interest Accrual",
- "options": "Loan Interest Accrual"
- },
- {
- "fieldname": "paid_principal_amount",
- "fieldtype": "Currency",
- "label": "Paid Principal Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "paid_interest_amount",
- "fieldtype": "Currency",
- "label": "Paid Interest Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fetch_from": "loan_interest_accrual.accrual_type",
- "fetch_if_empty": 1,
- "fieldname": "accrual_type",
- "fieldtype": "Select",
- "label": "Accrual Type",
- "options": "Regular\nRepayment\nDisbursement"
- }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2020-10-23 08:09:18.267030",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Repayment Detail",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_repayment_detail/loan_repayment_detail.py b/erpnext/loan_management/doctype/loan_repayment_detail/loan_repayment_detail.py
deleted file mode 100644
index 495b686..0000000
--- a/erpnext/loan_management/doctype/loan_repayment_detail/loan_repayment_detail.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class LoanRepaymentDetail(Document):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security/loan_security.js b/erpnext/loan_management/doctype/loan_security/loan_security.js
deleted file mode 100644
index 0e815af..0000000
--- a/erpnext/loan_management/doctype/loan_security/loan_security.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Security', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/loan_security/loan_security.json b/erpnext/loan_management/doctype/loan_security/loan_security.json
deleted file mode 100644
index c698601..0000000
--- a/erpnext/loan_management/doctype/loan_security/loan_security.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2019-09-02 15:07:08.885593",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_security_name",
- "haircut",
- "loan_security_code",
- "column_break_3",
- "loan_security_type",
- "unit_of_measure",
- "disabled"
- ],
- "fields": [
- {
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Loan Security Name",
- "reqd": 1,
- "unique": 1
- },
- {
- "fetch_from": "loan_security_type.haircut",
- "fetch_if_empty": 1,
- "fieldname": "haircut",
- "fieldtype": "Percent",
- "label": "Haircut %"
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "loan_security_type",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan Security Type",
- "options": "Loan Security Type",
- "reqd": 1
- },
- {
- "fieldname": "loan_security_code",
- "fieldtype": "Data",
- "label": "Loan Security Code",
- "unique": 1
- },
- {
- "default": "0",
- "fieldname": "disabled",
- "fieldtype": "Check",
- "label": "Disabled"
- },
- {
- "fetch_from": "loan_security_type.unit_of_measure",
- "fieldname": "unit_of_measure",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Unit Of Measure",
- "options": "UOM",
- "read_only": 1,
- "reqd": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2020-10-26 07:34:48.601766",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- },
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- }
- ],
- "search_fields": "loan_security_code",
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_security/loan_security.py b/erpnext/loan_management/doctype/loan_security/loan_security.py
deleted file mode 100644
index 8087fc5..0000000
--- a/erpnext/loan_management/doctype/loan_security/loan_security.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class LoanSecurity(Document):
- def autoname(self):
- self.name = self.loan_security_name
diff --git a/erpnext/loan_management/doctype/loan_security/loan_security_dashboard.py b/erpnext/loan_management/doctype/loan_security/loan_security_dashboard.py
deleted file mode 100644
index 1d96885..0000000
--- a/erpnext/loan_management/doctype/loan_security/loan_security_dashboard.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def get_data():
- return {
- "fieldname": "loan_security",
- "transactions": [
- {"items": ["Loan Application", "Loan Security Price"]},
- {"items": ["Loan Security Pledge", "Loan Security Unpledge"]},
- ],
- }
diff --git a/erpnext/loan_management/doctype/loan_security/test_loan_security.py b/erpnext/loan_management/doctype/loan_security/test_loan_security.py
deleted file mode 100644
index 7e702ed..0000000
--- a/erpnext/loan_management/doctype/loan_security/test_loan_security.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanSecurity(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/__init__.py b/erpnext/loan_management/doctype/loan_security_pledge/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_security_pledge/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.js b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.js
deleted file mode 100644
index 48ca392..0000000
--- a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Security Pledge', {
- calculate_amounts: function(frm, cdt, cdn) {
- let row = locals[cdt][cdn];
- frappe.model.set_value(cdt, cdn, 'amount', row.qty * row.loan_security_price);
- frappe.model.set_value(cdt, cdn, 'post_haircut_amount', cint(row.amount - (row.amount * row.haircut/100)));
-
- let amount = 0;
- let maximum_amount = 0;
- $.each(frm.doc.securities || [], function(i, item){
- amount += item.amount;
- maximum_amount += item.post_haircut_amount;
- });
-
- frm.set_value('total_security_value', amount);
- frm.set_value('maximum_loan_value', maximum_amount);
- }
-});
-
-frappe.ui.form.on("Pledge", {
- loan_security: function(frm, cdt, cdn) {
- let row = locals[cdt][cdn];
-
- if (row.loan_security) {
- frappe.call({
- method: "erpnext.loan_management.doctype.loan_security_price.loan_security_price.get_loan_security_price",
- args: {
- loan_security: row.loan_security
- },
- callback: function(r) {
- frappe.model.set_value(cdt, cdn, 'loan_security_price', r.message);
- frm.events.calculate_amounts(frm, cdt, cdn);
- }
- });
- }
- },
-
- qty: function(frm, cdt, cdn) {
- frm.events.calculate_amounts(frm, cdt, cdn);
- },
-});
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.json b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.json
deleted file mode 100644
index 68bac8e..0000000
--- a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.json
+++ /dev/null
@@ -1,245 +0,0 @@
-{
- "actions": [],
- "autoname": "LS-.{applicant}.-.#####",
- "creation": "2019-08-29 18:48:51.371674",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_details_section",
- "applicant_type",
- "applicant",
- "loan",
- "loan_application",
- "column_break_3",
- "company",
- "pledge_time",
- "status",
- "loan_security_details_section",
- "securities",
- "section_break_10",
- "total_security_value",
- "column_break_11",
- "maximum_loan_value",
- "more_information_section",
- "reference_no",
- "column_break_18",
- "description",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Security Pledge",
- "print_hide": 1,
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fetch_from": "loan_application.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "loan_security_details_section",
- "fieldtype": "Section Break",
- "label": "Loan Security Details",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "label": "Loan",
- "options": "Loan",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "loan_application",
- "fieldtype": "Link",
- "label": "Loan Application",
- "options": "Loan Application",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "total_security_value",
- "fieldtype": "Currency",
- "label": "Total Security Value",
- "options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "maximum_loan_value",
- "fieldtype": "Currency",
- "label": "Maximum Loan Value",
- "options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "loan_details_section",
- "fieldtype": "Section Break",
- "label": "Loan Details",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "default": "Requested",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Status",
- "options": "Requested\nUnpledged\nPledged\nPartially Pledged\nCancelled",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "pledge_time",
- "fieldtype": "Datetime",
- "label": "Pledge Time",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "securities",
- "fieldtype": "Table",
- "label": "Securities",
- "options": "Pledge",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "section_break_10",
- "fieldtype": "Section Break",
- "label": "Totals",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "collapsible": 1,
- "fieldname": "more_information_section",
- "fieldtype": "Section Break",
- "label": "More Information",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "allow_on_submit": 1,
- "fieldname": "reference_no",
- "fieldtype": "Data",
- "label": "Reference No",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "fieldname": "column_break_18",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
- },
- {
- "allow_on_submit": 1,
- "fieldname": "description",
- "fieldtype": "Text",
- "label": "Description",
- "show_days": 1,
- "show_seconds": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2021-06-29 17:15:16.082256",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Pledge",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "search_fields": "applicant",
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
deleted file mode 100644
index f0d5954..0000000
--- a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import cint, now_datetime
-
-from erpnext.loan_management.doctype.loan_security_price.loan_security_price import (
- get_loan_security_price,
-)
-from erpnext.loan_management.doctype.loan_security_shortfall.loan_security_shortfall import (
- update_shortfall_status,
-)
-
-
-class LoanSecurityPledge(Document):
- def validate(self):
- self.set_pledge_amount()
- self.validate_duplicate_securities()
- self.validate_loan_security_type()
-
- def on_submit(self):
- if self.loan:
- self.db_set("status", "Pledged")
- self.db_set("pledge_time", now_datetime())
- update_shortfall_status(self.loan, self.total_security_value)
- update_loan(self.loan, self.maximum_loan_value)
-
- def on_cancel(self):
- if self.loan:
- self.db_set("status", "Cancelled")
- self.db_set("pledge_time", None)
- update_loan(self.loan, self.maximum_loan_value, cancel=1)
-
- def validate_duplicate_securities(self):
- security_list = []
- for security in self.securities:
- if security.loan_security not in security_list:
- security_list.append(security.loan_security)
- else:
- frappe.throw(
- _("Loan Security {0} added multiple times").format(frappe.bold(security.loan_security))
- )
-
- def validate_loan_security_type(self):
- existing_pledge = ""
-
- if self.loan:
- existing_pledge = frappe.db.get_value(
- "Loan Security Pledge", {"loan": self.loan, "docstatus": 1}, ["name"]
- )
-
- if existing_pledge:
- loan_security_type = frappe.db.get_value(
- "Pledge", {"parent": existing_pledge}, ["loan_security_type"]
- )
- else:
- loan_security_type = self.securities[0].loan_security_type
-
- ltv_ratio_map = frappe._dict(
- frappe.get_all("Loan Security Type", fields=["name", "loan_to_value_ratio"], as_list=1)
- )
-
- ltv_ratio = ltv_ratio_map.get(loan_security_type)
-
- for security in self.securities:
- if ltv_ratio_map.get(security.loan_security_type) != ltv_ratio:
- frappe.throw(_("Loan Securities with different LTV ratio cannot be pledged against one loan"))
-
- def set_pledge_amount(self):
- total_security_value = 0
- maximum_loan_value = 0
-
- for pledge in self.securities:
-
- if not pledge.qty and not pledge.amount:
- frappe.throw(_("Qty or Amount is mandatory for loan security!"))
-
- if not (self.loan_application and pledge.loan_security_price):
- pledge.loan_security_price = get_loan_security_price(pledge.loan_security)
-
- if not pledge.qty:
- pledge.qty = cint(pledge.amount / pledge.loan_security_price)
-
- pledge.amount = pledge.qty * pledge.loan_security_price
- pledge.post_haircut_amount = cint(pledge.amount - (pledge.amount * pledge.haircut / 100))
-
- total_security_value += pledge.amount
- maximum_loan_value += pledge.post_haircut_amount
-
- self.total_security_value = total_security_value
- self.maximum_loan_value = maximum_loan_value
-
-
-def update_loan(loan, maximum_value_against_pledge, cancel=0):
- maximum_loan_value = frappe.db.get_value("Loan", {"name": loan}, ["maximum_loan_amount"])
-
- if cancel:
- frappe.db.sql(
- """ UPDATE `tabLoan` SET maximum_loan_amount=%s
- WHERE name=%s""",
- (maximum_loan_value - maximum_value_against_pledge, loan),
- )
- else:
- frappe.db.sql(
- """ UPDATE `tabLoan` SET maximum_loan_amount=%s, is_secured_loan=1
- WHERE name=%s""",
- (maximum_loan_value + maximum_value_against_pledge, loan),
- )
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge_list.js b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge_list.js
deleted file mode 100644
index 174d1b0..0000000
--- a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge_list.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-// render
-frappe.listview_settings['Loan Security Pledge'] = {
- add_fields: ["status"],
- get_indicator: function(doc) {
- var status_color = {
- "Unpledged": "orange",
- "Pledged": "green",
- "Partially Pledged": "green"
- };
- return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
- }
-};
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/test_loan_security_pledge.py b/erpnext/loan_management/doctype/loan_security_pledge/test_loan_security_pledge.py
deleted file mode 100644
index b9d05c2..0000000
--- a/erpnext/loan_management/doctype/loan_security_pledge/test_loan_security_pledge.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanSecurityPledge(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security_price/__init__.py b/erpnext/loan_management/doctype/loan_security_price/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_security_price/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.js b/erpnext/loan_management/doctype/loan_security_price/loan_security_price.js
deleted file mode 100644
index 31b4ec7..0000000
--- a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Security Price', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.json b/erpnext/loan_management/doctype/loan_security_price/loan_security_price.json
deleted file mode 100644
index b6e8763..0000000
--- a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-LSP-.####",
- "creation": "2019-09-03 18:20:31.382887",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_security",
- "loan_security_name",
- "loan_security_type",
- "column_break_2",
- "uom",
- "section_break_4",
- "loan_security_price",
- "section_break_6",
- "valid_from",
- "column_break_8",
- "valid_upto"
- ],
- "fields": [
- {
- "fieldname": "loan_security",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan Security",
- "options": "Loan Security",
- "reqd": 1
- },
- {
- "fieldname": "column_break_2",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "loan_security.unit_of_measure",
- "fieldname": "uom",
- "fieldtype": "Link",
- "label": "UOM",
- "options": "UOM",
- "read_only": 1
- },
- {
- "fieldname": "section_break_4",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "loan_security_price",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Loan Security Price",
- "options": "Company:company:default_currency",
- "reqd": 1
- },
- {
- "fieldname": "section_break_6",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "valid_from",
- "fieldtype": "Datetime",
- "in_list_view": 1,
- "label": "Valid From",
- "reqd": 1
- },
- {
- "fieldname": "column_break_8",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "valid_upto",
- "fieldtype": "Datetime",
- "in_list_view": 1,
- "label": "Valid Upto",
- "reqd": 1
- },
- {
- "fetch_from": "loan_security.loan_security_type",
- "fieldname": "loan_security_type",
- "fieldtype": "Link",
- "label": "Loan Security Type",
- "options": "Loan Security Type",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.loan_security_name",
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "label": "Loan Security Name",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-01-17 07:41:49.598086",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Price",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- },
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py b/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py
deleted file mode 100644
index 45c4459..0000000
--- a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import get_datetime
-
-
-class LoanSecurityPrice(Document):
- def validate(self):
- self.validate_dates()
-
- def validate_dates(self):
-
- if self.valid_from > self.valid_upto:
- frappe.throw(_("Valid From Time must be lesser than Valid Upto Time."))
-
- existing_loan_security = frappe.db.sql(
- """ SELECT name from `tabLoan Security Price`
- WHERE loan_security = %s AND name != %s AND (valid_from BETWEEN %s and %s OR valid_upto BETWEEN %s and %s) """,
- (
- self.loan_security,
- self.name,
- self.valid_from,
- self.valid_upto,
- self.valid_from,
- self.valid_upto,
- ),
- )
-
- if existing_loan_security:
- frappe.throw(_("Loan Security Price overlapping with {0}").format(existing_loan_security[0][0]))
-
-
-@frappe.whitelist()
-def get_loan_security_price(loan_security, valid_time=None):
- if not valid_time:
- valid_time = get_datetime()
-
- loan_security_price = frappe.db.get_value(
- "Loan Security Price",
- {
- "loan_security": loan_security,
- "valid_from": ("<=", valid_time),
- "valid_upto": (">=", valid_time),
- },
- "loan_security_price",
- )
-
- if not loan_security_price:
- frappe.throw(_("No valid Loan Security Price found for {0}").format(frappe.bold(loan_security)))
- else:
- return loan_security_price
diff --git a/erpnext/loan_management/doctype/loan_security_price/test_loan_security_price.py b/erpnext/loan_management/doctype/loan_security_price/test_loan_security_price.py
deleted file mode 100644
index aa533d9..0000000
--- a/erpnext/loan_management/doctype/loan_security_price/test_loan_security_price.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanSecurityPrice(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/__init__.py b/erpnext/loan_management/doctype/loan_security_shortfall/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_security_shortfall/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.js b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.js
deleted file mode 100644
index f26c138..0000000
--- a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Security Shortfall', {
- refresh: function(frm) {
- frm.add_custom_button(__("Add Loan Security"), function() {
- frm.trigger('shortfall_action');
- });
- },
-
- shortfall_action: function(frm) {
- frappe.call({
- method: "erpnext.loan_management.doctype.loan_security_shortfall.loan_security_shortfall.add_security",
- args: {
- 'loan': frm.doc.loan
- },
- callback: function(r) {
- if (r.message) {
- let doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- }
- });
- }
-});
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.json b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.json
deleted file mode 100644
index d4007cb..0000000
--- a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-LSS-.#####",
- "creation": "2019-09-06 11:33:34.709540",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan",
- "applicant_type",
- "applicant",
- "status",
- "column_break_3",
- "shortfall_time",
- "section_break_3",
- "loan_amount",
- "shortfall_amount",
- "column_break_8",
- "security_value",
- "shortfall_percentage",
- "section_break_8",
- "process_loan_security_shortfall"
- ],
- "fields": [
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Loan ",
- "options": "Loan",
- "read_only": 1
- },
- {
- "fieldname": "loan_amount",
- "fieldtype": "Currency",
- "label": "Loan Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "security_value",
- "fieldtype": "Currency",
- "label": "Security Value ",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "shortfall_amount",
- "fieldtype": "Currency",
- "label": "Shortfall Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "section_break_3",
- "fieldtype": "Section Break"
- },
- {
- "description": "America/New_York",
- "fieldname": "shortfall_time",
- "fieldtype": "Datetime",
- "label": "Shortfall Time",
- "read_only": 1
- },
- {
- "default": "Pending",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Status",
- "options": "\nPending\nCompleted",
- "read_only": 1
- },
- {
- "fieldname": "section_break_8",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "process_loan_security_shortfall",
- "fieldtype": "Link",
- "label": "Process Loan Security Shortfall",
- "options": "Process Loan Security Shortfall",
- "read_only": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "column_break_8",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "shortfall_percentage",
- "fieldtype": "Percent",
- "in_list_view": 1,
- "label": "Shortfall Percentage",
- "read_only": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer"
- },
- {
- "fetch_from": "loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Applicant",
- "options": "applicant_type"
- }
- ],
- "in_create": 1,
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2022-06-30 11:57:09.378089",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Shortfall",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- },
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
deleted file mode 100644
index b901e62..0000000
--- a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe.model.document import Document
-from frappe.utils import flt, get_datetime
-
-from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import (
- get_pledged_security_qty,
-)
-
-
-class LoanSecurityShortfall(Document):
- pass
-
-
-def update_shortfall_status(loan, security_value, on_cancel=0):
- loan_security_shortfall = frappe.db.get_value(
- "Loan Security Shortfall",
- {"loan": loan, "status": "Pending"},
- ["name", "shortfall_amount"],
- as_dict=1,
- )
-
- if not loan_security_shortfall:
- return
-
- if security_value >= loan_security_shortfall.shortfall_amount:
- frappe.db.set_value(
- "Loan Security Shortfall",
- loan_security_shortfall.name,
- {
- "status": "Completed",
- "shortfall_amount": loan_security_shortfall.shortfall_amount,
- "shortfall_percentage": 0,
- },
- )
- else:
- frappe.db.set_value(
- "Loan Security Shortfall",
- loan_security_shortfall.name,
- "shortfall_amount",
- loan_security_shortfall.shortfall_amount - security_value,
- )
-
-
-@frappe.whitelist()
-def add_security(loan):
- loan_details = frappe.db.get_value(
- "Loan", loan, ["applicant", "company", "applicant_type"], as_dict=1
- )
-
- loan_security_pledge = frappe.new_doc("Loan Security Pledge")
- loan_security_pledge.loan = loan
- loan_security_pledge.company = loan_details.company
- loan_security_pledge.applicant_type = loan_details.applicant_type
- loan_security_pledge.applicant = loan_details.applicant
-
- return loan_security_pledge.as_dict()
-
-
-def check_for_ltv_shortfall(process_loan_security_shortfall):
-
- update_time = get_datetime()
-
- loan_security_price_map = frappe._dict(
- frappe.get_all(
- "Loan Security Price",
- fields=["loan_security", "loan_security_price"],
- filters={"valid_from": ("<=", update_time), "valid_upto": (">=", update_time)},
- as_list=1,
- )
- )
-
- loans = frappe.get_all(
- "Loan",
- fields=[
- "name",
- "loan_amount",
- "total_principal_paid",
- "total_payment",
- "total_interest_payable",
- "disbursed_amount",
- "status",
- ],
- filters={"status": ("in", ["Disbursed", "Partially Disbursed"]), "is_secured_loan": 1},
- )
-
- loan_shortfall_map = frappe._dict(
- frappe.get_all(
- "Loan Security Shortfall", fields=["loan", "name"], filters={"status": "Pending"}, as_list=1
- )
- )
-
- loan_security_map = {}
-
- for loan in loans:
- if loan.status == "Disbursed":
- outstanding_amount = (
- flt(loan.total_payment) - flt(loan.total_interest_payable) - flt(loan.total_principal_paid)
- )
- else:
- outstanding_amount = (
- flt(loan.disbursed_amount) - flt(loan.total_interest_payable) - flt(loan.total_principal_paid)
- )
-
- pledged_securities = get_pledged_security_qty(loan.name)
- ltv_ratio = 0.0
- security_value = 0.0
-
- for security, qty in pledged_securities.items():
- if not ltv_ratio:
- ltv_ratio = get_ltv_ratio(security)
- security_value += flt(loan_security_price_map.get(security)) * flt(qty)
-
- current_ratio = (outstanding_amount / security_value) * 100 if security_value else 0
-
- if current_ratio > ltv_ratio:
- shortfall_amount = outstanding_amount - ((security_value * ltv_ratio) / 100)
- create_loan_security_shortfall(
- loan.name,
- outstanding_amount,
- security_value,
- shortfall_amount,
- current_ratio,
- process_loan_security_shortfall,
- )
- elif loan_shortfall_map.get(loan.name):
- shortfall_amount = outstanding_amount - ((security_value * ltv_ratio) / 100)
- if shortfall_amount <= 0:
- shortfall = loan_shortfall_map.get(loan.name)
- update_pending_shortfall(shortfall)
-
-
-def create_loan_security_shortfall(
- loan,
- loan_amount,
- security_value,
- shortfall_amount,
- shortfall_ratio,
- process_loan_security_shortfall,
-):
- existing_shortfall = frappe.db.get_value(
- "Loan Security Shortfall", {"loan": loan, "status": "Pending"}, "name"
- )
-
- if existing_shortfall:
- ltv_shortfall = frappe.get_doc("Loan Security Shortfall", existing_shortfall)
- else:
- ltv_shortfall = frappe.new_doc("Loan Security Shortfall")
- ltv_shortfall.loan = loan
-
- ltv_shortfall.shortfall_time = get_datetime()
- ltv_shortfall.loan_amount = loan_amount
- ltv_shortfall.security_value = security_value
- ltv_shortfall.shortfall_amount = shortfall_amount
- ltv_shortfall.shortfall_percentage = shortfall_ratio
- ltv_shortfall.process_loan_security_shortfall = process_loan_security_shortfall
- ltv_shortfall.save()
-
-
-def get_ltv_ratio(loan_security):
- loan_security_type = frappe.db.get_value("Loan Security", loan_security, "loan_security_type")
- ltv_ratio = frappe.db.get_value("Loan Security Type", loan_security_type, "loan_to_value_ratio")
- return ltv_ratio
-
-
-def update_pending_shortfall(shortfall):
- # Get all pending loan security shortfall
- frappe.db.set_value(
- "Loan Security Shortfall",
- shortfall,
- {"status": "Completed", "shortfall_amount": 0, "shortfall_percentage": 0},
- )
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/test_loan_security_shortfall.py b/erpnext/loan_management/doctype/loan_security_shortfall/test_loan_security_shortfall.py
deleted file mode 100644
index 58bf974..0000000
--- a/erpnext/loan_management/doctype/loan_security_shortfall/test_loan_security_shortfall.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanSecurityShortfall(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security_type/__init__.py b/erpnext/loan_management/doctype/loan_security_type/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_security_type/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_security_type/loan_security_type.js b/erpnext/loan_management/doctype/loan_security_type/loan_security_type.js
deleted file mode 100644
index 3a1e068..0000000
--- a/erpnext/loan_management/doctype/loan_security_type/loan_security_type.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Security Type', {
- // refresh: function(frm) {
-
- // },
-});
diff --git a/erpnext/loan_management/doctype/loan_security_type/loan_security_type.json b/erpnext/loan_management/doctype/loan_security_type/loan_security_type.json
deleted file mode 100644
index 871e825..0000000
--- a/erpnext/loan_management/doctype/loan_security_type/loan_security_type.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "actions": [],
- "autoname": "field:loan_security_type",
- "creation": "2019-08-29 18:46:07.322056",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_security_type",
- "unit_of_measure",
- "haircut",
- "column_break_5",
- "loan_to_value_ratio",
- "disabled"
- ],
- "fields": [
- {
- "default": "0",
- "fieldname": "disabled",
- "fieldtype": "Check",
- "label": "Disabled"
- },
- {
- "fieldname": "loan_security_type",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Loan Security Type",
- "reqd": 1,
- "unique": 1
- },
- {
- "description": "Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.",
- "fieldname": "haircut",
- "fieldtype": "Percent",
- "label": "Haircut %"
- },
- {
- "fieldname": "unit_of_measure",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Unit Of Measure",
- "options": "UOM",
- "reqd": 1
- },
- {
- "fieldname": "column_break_5",
- "fieldtype": "Column Break"
- },
- {
- "description": "Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ",
- "fieldname": "loan_to_value_ratio",
- "fieldtype": "Percent",
- "label": "Loan To Value Ratio"
- }
- ],
- "links": [],
- "modified": "2020-05-16 09:38:45.988080",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Type",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- },
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_security_type/loan_security_type.py b/erpnext/loan_management/doctype/loan_security_type/loan_security_type.py
deleted file mode 100644
index af87259..0000000
--- a/erpnext/loan_management/doctype/loan_security_type/loan_security_type.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class LoanSecurityType(Document):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security_type/loan_security_type_dashboard.py b/erpnext/loan_management/doctype/loan_security_type/loan_security_type_dashboard.py
deleted file mode 100644
index 8fc4520..0000000
--- a/erpnext/loan_management/doctype/loan_security_type/loan_security_type_dashboard.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def get_data():
- return {
- "fieldname": "loan_security_type",
- "transactions": [
- {"items": ["Loan Security", "Loan Security Price"]},
- {"items": ["Loan Security Pledge", "Loan Security Unpledge"]},
- ],
- }
diff --git a/erpnext/loan_management/doctype/loan_security_type/test_loan_security_type.py b/erpnext/loan_management/doctype/loan_security_type/test_loan_security_type.py
deleted file mode 100644
index cf7a335..0000000
--- a/erpnext/loan_management/doctype/loan_security_type/test_loan_security_type.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanSecurityType(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/__init__.py b/erpnext/loan_management/doctype/loan_security_unpledge/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_security_unpledge/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.js b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.js
deleted file mode 100644
index 8223206..0000000
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Security Unpledge', {
- refresh: function(frm) {
-
- if (frm.doc.docstatus == 1 && frm.doc.status == 'Approved') {
- frm.set_df_property('status', 'read_only', 1);
- }
- }
-});
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.json b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.json
deleted file mode 100644
index 92923bb..0000000
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
- "actions": [],
- "autoname": "LSU-.{applicant}.-.#####",
- "creation": "2019-09-21 13:23:16.117028",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_details_section",
- "loan",
- "applicant_type",
- "applicant",
- "column_break_3",
- "company",
- "unpledge_time",
- "status",
- "loan_security_details_section",
- "securities",
- "more_information_section",
- "reference_no",
- "column_break_13",
- "description",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "loan_details_section",
- "fieldtype": "Section Break",
- "label": "Loan Details"
- },
- {
- "fetch_from": "loan_application.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "reqd": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "label": "Loan",
- "options": "Loan",
- "reqd": 1
- },
- {
- "allow_on_submit": 1,
- "default": "Requested",
- "depends_on": "eval:doc.docstatus == 1",
- "fieldname": "status",
- "fieldtype": "Select",
- "label": "Status",
- "options": "Requested\nApproved",
- "permlevel": 1
- },
- {
- "fieldname": "unpledge_time",
- "fieldtype": "Datetime",
- "label": "Unpledge Time",
- "read_only": 1
- },
- {
- "fieldname": "loan_security_details_section",
- "fieldtype": "Section Break",
- "label": "Loan Security Details"
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Security Unpledge",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "securities",
- "fieldtype": "Table",
- "label": "Securities",
- "options": "Unpledge",
- "reqd": 1
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company",
- "reqd": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "reqd": 1
- },
- {
- "collapsible": 1,
- "fieldname": "more_information_section",
- "fieldtype": "Section Break",
- "label": "More Information"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "reference_no",
- "fieldtype": "Data",
- "label": "Reference No"
- },
- {
- "fieldname": "column_break_13",
- "fieldtype": "Column Break"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "description",
- "fieldtype": "Text",
- "label": "Description"
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2021-04-19 18:12:01.401744",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Unpledge",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "delete": 1,
- "email": 1,
- "export": 1,
- "permlevel": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "search_fields": "applicant",
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
deleted file mode 100644
index 15a9c4a..0000000
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import flt, get_datetime, getdate
-
-
-class LoanSecurityUnpledge(Document):
- def validate(self):
- self.validate_duplicate_securities()
- self.validate_unpledge_qty()
-
- def on_cancel(self):
- self.update_loan_status(cancel=1)
- self.db_set("status", "Requested")
-
- def validate_duplicate_securities(self):
- security_list = []
- for d in self.securities:
- if d.loan_security not in security_list:
- security_list.append(d.loan_security)
- else:
- frappe.throw(
- _("Row {0}: Loan Security {1} added multiple times").format(
- d.idx, frappe.bold(d.loan_security)
- )
- )
-
- def validate_unpledge_qty(self):
- from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
- get_pending_principal_amount,
- )
- from erpnext.loan_management.doctype.loan_security_shortfall.loan_security_shortfall import (
- get_ltv_ratio,
- )
-
- pledge_qty_map = get_pledged_security_qty(self.loan)
-
- ltv_ratio_map = frappe._dict(
- frappe.get_all("Loan Security Type", fields=["name", "loan_to_value_ratio"], as_list=1)
- )
-
- loan_security_price_map = frappe._dict(
- frappe.get_all(
- "Loan Security Price",
- fields=["loan_security", "loan_security_price"],
- filters={"valid_from": ("<=", get_datetime()), "valid_upto": (">=", get_datetime())},
- as_list=1,
- )
- )
-
- loan_details = frappe.get_value(
- "Loan",
- self.loan,
- [
- "total_payment",
- "debit_adjustment_amount",
- "credit_adjustment_amount",
- "refund_amount",
- "total_principal_paid",
- "loan_amount",
- "total_interest_payable",
- "written_off_amount",
- "disbursed_amount",
- "status",
- ],
- as_dict=1,
- )
-
- pending_principal_amount = get_pending_principal_amount(loan_details)
-
- security_value = 0
- unpledge_qty_map = {}
- ltv_ratio = 0
-
- for security in self.securities:
- pledged_qty = pledge_qty_map.get(security.loan_security, 0)
- if security.qty > pledged_qty:
- msg = _("Row {0}: {1} {2} of {3} is pledged against Loan {4}.").format(
- security.idx,
- pledged_qty,
- security.uom,
- frappe.bold(security.loan_security),
- frappe.bold(self.loan),
- )
- msg += "<br>"
- msg += _("You are trying to unpledge more.")
- frappe.throw(msg, title=_("Loan Security Unpledge Error"))
-
- unpledge_qty_map.setdefault(security.loan_security, 0)
- unpledge_qty_map[security.loan_security] += security.qty
-
- for security in pledge_qty_map:
- if not ltv_ratio:
- ltv_ratio = get_ltv_ratio(security)
-
- qty_after_unpledge = pledge_qty_map.get(security, 0) - unpledge_qty_map.get(security, 0)
- current_price = loan_security_price_map.get(security)
- security_value += qty_after_unpledge * current_price
-
- if not security_value and flt(pending_principal_amount, 2) > 0:
- self._throw(security_value, pending_principal_amount, ltv_ratio)
-
- if security_value and flt(pending_principal_amount / security_value) * 100 > ltv_ratio:
- self._throw(security_value, pending_principal_amount, ltv_ratio)
-
- def _throw(self, security_value, pending_principal_amount, ltv_ratio):
- msg = _("Loan Security Value after unpledge is {0}").format(frappe.bold(security_value))
- msg += "<br>"
- msg += _("Pending principal amount is {0}").format(frappe.bold(flt(pending_principal_amount, 2)))
- msg += "<br>"
- msg += _("Loan To Security Value ratio must always be {0}").format(frappe.bold(ltv_ratio))
- frappe.throw(msg, title=_("Loan To Value ratio breach"))
-
- def on_update_after_submit(self):
- self.approve()
-
- def approve(self):
- if self.status == "Approved" and not self.unpledge_time:
- self.update_loan_status()
- self.db_set("unpledge_time", get_datetime())
-
- def update_loan_status(self, cancel=0):
- if cancel:
- loan_status = frappe.get_value("Loan", self.loan, "status")
- if loan_status == "Closed":
- frappe.db.set_value("Loan", self.loan, "status", "Loan Closure Requested")
- else:
- pledged_qty = 0
- current_pledges = get_pledged_security_qty(self.loan)
-
- for security, qty in current_pledges.items():
- pledged_qty += qty
-
- if not pledged_qty:
- frappe.db.set_value("Loan", self.loan, {"status": "Closed", "closure_date": getdate()})
-
-
-@frappe.whitelist()
-def get_pledged_security_qty(loan):
-
- current_pledges = {}
-
- unpledges = frappe._dict(
- frappe.db.sql(
- """
- SELECT u.loan_security, sum(u.qty) as qty
- FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
- WHERE up.loan = %s
- AND u.parent = up.name
- AND up.status = 'Approved'
- GROUP BY u.loan_security
- """,
- (loan),
- )
- )
-
- pledges = frappe._dict(
- frappe.db.sql(
- """
- SELECT p.loan_security, sum(p.qty) as qty
- FROM `tabLoan Security Pledge` lp, `tabPledge`p
- WHERE lp.loan = %s
- AND p.parent = lp.name
- AND lp.status = 'Pledged'
- GROUP BY p.loan_security
- """,
- (loan),
- )
- )
-
- for security, qty in pledges.items():
- current_pledges.setdefault(security, qty)
- current_pledges[security] -= unpledges.get(security, 0.0)
-
- return current_pledges
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge_list.js b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge_list.js
deleted file mode 100644
index 196ebbb..0000000
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge_list.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-// render
-frappe.listview_settings['Loan Security Unpledge'] = {
- add_fields: ["status"],
- get_indicator: function(doc) {
- var status_color = {
- "Requested": "orange",
- "Approved": "green",
- };
- return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
- }
-};
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/test_loan_security_unpledge.py b/erpnext/loan_management/doctype/loan_security_unpledge/test_loan_security_unpledge.py
deleted file mode 100644
index 2f124e4..0000000
--- a/erpnext/loan_management/doctype/loan_security_unpledge/test_loan_security_unpledge.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanSecurityUnpledge(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_type/__init__.py b/erpnext/loan_management/doctype/loan_type/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_type/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_type/loan_type.js b/erpnext/loan_management/doctype/loan_type/loan_type.js
deleted file mode 100644
index 9f9137c..0000000
--- a/erpnext/loan_management/doctype/loan_type/loan_type.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Loan Type', {
- onload: function(frm) {
- $.each(["penalty_income_account", "interest_income_account"], function (i, field) {
- frm.set_query(field, function () {
- return {
- "filters": {
- "company": frm.doc.company,
- "root_type": "Income",
- "is_group": 0
- }
- };
- });
- });
-
- $.each(["payment_account", "loan_account", "disbursement_account"], function (i, field) {
- frm.set_query(field, function () {
- return {
- "filters": {
- "company": frm.doc.company,
- "root_type": "Asset",
- "is_group": 0
- }
- };
- });
- });
- }
-});
diff --git a/erpnext/loan_management/doctype/loan_type/loan_type.json b/erpnext/loan_management/doctype/loan_type/loan_type.json
deleted file mode 100644
index 5cc9464..0000000
--- a/erpnext/loan_management/doctype/loan_type/loan_type.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
- "actions": [],
- "autoname": "field:loan_name",
- "creation": "2019-08-29 18:08:38.159726",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_name",
- "maximum_loan_amount",
- "rate_of_interest",
- "penalty_interest_rate",
- "grace_period_in_days",
- "write_off_amount",
- "column_break_2",
- "company",
- "is_term_loan",
- "disabled",
- "repayment_schedule_type",
- "repayment_date_on",
- "description",
- "account_details_section",
- "mode_of_payment",
- "disbursement_account",
- "payment_account",
- "column_break_12",
- "loan_account",
- "interest_income_account",
- "penalty_income_account",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "loan_name",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Loan Name",
- "reqd": 1,
- "unique": 1
- },
- {
- "fieldname": "maximum_loan_amount",
- "fieldtype": "Currency",
- "label": "Maximum Loan Amount",
- "options": "Company:company:default_currency"
- },
- {
- "default": "0",
- "fieldname": "rate_of_interest",
- "fieldtype": "Percent",
- "label": "Rate of Interest (%) Yearly",
- "reqd": 1
- },
- {
- "fieldname": "column_break_2",
- "fieldtype": "Column Break"
- },
- {
- "allow_on_submit": 1,
- "default": "0",
- "fieldname": "disabled",
- "fieldtype": "Check",
- "label": "Disabled"
- },
- {
- "fieldname": "description",
- "fieldtype": "Text",
- "label": "Description"
- },
- {
- "fieldname": "account_details_section",
- "fieldtype": "Section Break",
- "label": "Account Details"
- },
- {
- "fieldname": "mode_of_payment",
- "fieldtype": "Link",
- "label": "Mode of Payment",
- "options": "Mode of Payment",
- "reqd": 1
- },
- {
- "fieldname": "payment_account",
- "fieldtype": "Link",
- "label": "Repayment Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "fieldname": "loan_account",
- "fieldtype": "Link",
- "label": "Loan Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "fieldname": "column_break_12",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "interest_income_account",
- "fieldtype": "Link",
- "label": "Interest Income Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "fieldname": "penalty_income_account",
- "fieldtype": "Link",
- "label": "Penalty Income Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "default": "0",
- "fieldname": "is_term_loan",
- "fieldtype": "Check",
- "label": "Is Term Loan"
- },
- {
- "description": "Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ",
- "fieldname": "penalty_interest_rate",
- "fieldtype": "Percent",
- "label": "Penalty Interest Rate (%) Per Day"
- },
- {
- "description": "No. of days from due date until which penalty won't be charged in case of delay in loan repayment",
- "fieldname": "grace_period_in_days",
- "fieldtype": "Int",
- "label": "Grace Period in Days"
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Type",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company",
- "reqd": 1
- },
- {
- "allow_on_submit": 1,
- "description": "Loan Write Off will be automatically created on loan closure request if pending amount is below this limit",
- "fieldname": "write_off_amount",
- "fieldtype": "Currency",
- "label": "Auto Write Off Amount ",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "disbursement_account",
- "fieldtype": "Link",
- "label": "Disbursement Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "depends_on": "is_term_loan",
- "description": "The schedule type that will be used for generating the term loan schedules (will affect the payment date and monthly repayment amount)",
- "fieldname": "repayment_schedule_type",
- "fieldtype": "Select",
- "label": "Repayment Schedule Type",
- "mandatory_depends_on": "is_term_loan",
- "options": "\nMonthly as per repayment start date\nPro-rated calendar months"
- },
- {
- "depends_on": "eval:doc.repayment_schedule_type == \"Pro-rated calendar months\"",
- "description": "Select whether the repayment date should be the end of the current month or start of the upcoming month",
- "fieldname": "repayment_date_on",
- "fieldtype": "Select",
- "label": "Repayment Date On",
- "mandatory_depends_on": "eval:doc.repayment_schedule_type == \"Pro-rated calendar months\"",
- "options": "\nStart of the next month\nEnd of the current month"
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-10-22 17:43:03.954201",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Type",
- "naming_rule": "By fieldname",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "read": 1,
- "role": "Employee"
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_type/loan_type.py b/erpnext/loan_management/doctype/loan_type/loan_type.py
deleted file mode 100644
index 51ee05b..0000000
--- a/erpnext/loan_management/doctype/loan_type/loan_type.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-
-class LoanType(Document):
- def validate(self):
- self.validate_accounts()
-
- def validate_accounts(self):
- for fieldname in [
- "payment_account",
- "loan_account",
- "interest_income_account",
- "penalty_income_account",
- ]:
- company = frappe.get_value("Account", self.get(fieldname), "company")
-
- if company and company != self.company:
- frappe.throw(
- _("Account {0} does not belong to company {1}").format(
- frappe.bold(self.get(fieldname)), frappe.bold(self.company)
- )
- )
-
- if self.get("loan_account") == self.get("payment_account"):
- frappe.throw(_("Loan Account and Payment Account cannot be same"))
diff --git a/erpnext/loan_management/doctype/loan_type/loan_type_dashboard.py b/erpnext/loan_management/doctype/loan_type/loan_type_dashboard.py
deleted file mode 100644
index e2467c6..0000000
--- a/erpnext/loan_management/doctype/loan_type/loan_type_dashboard.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def get_data():
- return {
- "fieldname": "loan_type",
- "transactions": [{"items": ["Loan Repayment", "Loan"]}, {"items": ["Loan Application"]}],
- }
diff --git a/erpnext/loan_management/doctype/loan_type/test_loan_type.py b/erpnext/loan_management/doctype/loan_type/test_loan_type.py
deleted file mode 100644
index e3b51e8..0000000
--- a/erpnext/loan_management/doctype/loan_type/test_loan_type.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanType(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/loan_write_off/__init__.py b/erpnext/loan_management/doctype/loan_write_off/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/loan_write_off/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.js b/erpnext/loan_management/doctype/loan_write_off/loan_write_off.js
deleted file mode 100644
index 4e3319c..0000000
--- a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-{% include 'erpnext/loan_management/loan_common.js' %};
-
-frappe.ui.form.on('Loan Write Off', {
- loan: function(frm) {
- frm.trigger('show_pending_principal_amount');
- },
- onload: function(frm) {
- frm.trigger('show_pending_principal_amount');
- },
- refresh: function(frm) {
- frm.set_query('write_off_account', function(){
- return {
- filters: {
- 'company': frm.doc.company,
- 'root_type': 'Expense',
- 'is_group': 0
- }
- }
- });
- },
- show_pending_principal_amount: function(frm) {
- if (frm.doc.loan && frm.doc.docstatus === 0) {
- frappe.db.get_value('Loan', frm.doc.loan, ['total_payment', 'total_interest_payable',
- 'total_principal_paid', 'written_off_amount'], function(values) {
- frm.set_df_property('write_off_amount', 'description',
- "Pending principal amount is " + cstr(flt(values.total_payment - values.total_interest_payable
- - values.total_principal_paid - values.written_off_amount, 2)));
- frm.refresh_field('write_off_amount');
- });
-
- }
- }
-});
diff --git a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.json b/erpnext/loan_management/doctype/loan_write_off/loan_write_off.json
deleted file mode 100644
index 4ca9ef1..0000000
--- a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-WO-.#####",
- "creation": "2020-10-16 11:09:14.495066",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan",
- "applicant_type",
- "applicant",
- "column_break_3",
- "company",
- "posting_date",
- "accounting_dimensions_section",
- "cost_center",
- "section_break_9",
- "write_off_account",
- "column_break_11",
- "write_off_amount",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan",
- "options": "Loan",
- "reqd": 1
- },
- {
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date",
- "reqd": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fetch_from": "loan.company",
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "read_only": 1,
- "reqd": 1
- },
- {
- "fetch_from": "loan.applicant_type",
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "read_only": 1
- },
- {
- "fetch_from": "loan.applicant",
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "label": "Applicant ",
- "options": "applicant_type",
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "section_break_9",
- "fieldtype": "Section Break",
- "label": "Write Off Details"
- },
- {
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Write Off Account",
- "options": "Account",
- "reqd": 1
- },
- {
- "fieldname": "write_off_amount",
- "fieldtype": "Currency",
- "label": "Write Off Amount",
- "options": "Company:company:default_currency",
- "reqd": 1
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Loan Write Off",
- "print_hide": 1,
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2021-04-19 18:11:27.759862",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Write Off",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py b/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py
deleted file mode 100644
index ae483f9..0000000
--- a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.utils import cint, flt, getdate
-
-import erpnext
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
- get_pending_principal_amount,
-)
-
-
-class LoanWriteOff(AccountsController):
- def validate(self):
- self.set_missing_values()
- self.validate_write_off_amount()
-
- def set_missing_values(self):
- if not self.cost_center:
- self.cost_center = erpnext.get_default_cost_center(self.company)
-
- def validate_write_off_amount(self):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
-
- loan_details = frappe.get_value(
- "Loan",
- self.loan,
- [
- "total_payment",
- "debit_adjustment_amount",
- "credit_adjustment_amount",
- "refund_amount",
- "total_principal_paid",
- "loan_amount",
- "total_interest_payable",
- "written_off_amount",
- "disbursed_amount",
- "status",
- ],
- as_dict=1,
- )
-
- pending_principal_amount = flt(get_pending_principal_amount(loan_details), precision)
-
- if self.write_off_amount > pending_principal_amount:
- frappe.throw(_("Write off amount cannot be greater than pending principal amount"))
-
- def on_submit(self):
- self.update_outstanding_amount()
- self.make_gl_entries()
-
- def on_cancel(self):
- self.update_outstanding_amount(cancel=1)
- self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
- self.make_gl_entries(cancel=1)
-
- def update_outstanding_amount(self, cancel=0):
- written_off_amount = frappe.db.get_value("Loan", self.loan, "written_off_amount")
-
- if cancel:
- written_off_amount -= self.write_off_amount
- else:
- written_off_amount += self.write_off_amount
-
- frappe.db.set_value("Loan", self.loan, "written_off_amount", written_off_amount)
-
- def make_gl_entries(self, cancel=0):
- gl_entries = []
- loan_details = frappe.get_doc("Loan", self.loan)
-
- gl_entries.append(
- self.get_gl_dict(
- {
- "account": self.write_off_account,
- "against": loan_details.loan_account,
- "debit": self.write_off_amount,
- "debit_in_account_currency": self.write_off_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _("Against Loan:") + self.loan,
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- gl_entries.append(
- self.get_gl_dict(
- {
- "account": loan_details.loan_account,
- "party_type": loan_details.applicant_type,
- "party": loan_details.applicant,
- "against": self.write_off_account,
- "credit": self.write_off_amount,
- "credit_in_account_currency": self.write_off_amount,
- "against_voucher_type": "Loan",
- "against_voucher": self.loan,
- "remarks": _("Against Loan:") + self.loan,
- "cost_center": self.cost_center,
- "posting_date": getdate(self.posting_date),
- }
- )
- )
-
- make_gl_entries(gl_entries, cancel=cancel, merge_entries=False)
diff --git a/erpnext/loan_management/doctype/loan_write_off/test_loan_write_off.py b/erpnext/loan_management/doctype/loan_write_off/test_loan_write_off.py
deleted file mode 100644
index 1494114..0000000
--- a/erpnext/loan_management/doctype/loan_write_off/test_loan_write_off.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestLoanWriteOff(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/pledge/__init__.py b/erpnext/loan_management/doctype/pledge/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/pledge/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/pledge/pledge.js b/erpnext/loan_management/doctype/pledge/pledge.js
deleted file mode 100644
index fb6ab10..0000000
--- a/erpnext/loan_management/doctype/pledge/pledge.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Pledge', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/pledge/pledge.json b/erpnext/loan_management/doctype/pledge/pledge.json
deleted file mode 100644
index c23479c..0000000
--- a/erpnext/loan_management/doctype/pledge/pledge.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "actions": [],
- "creation": "2019-09-09 17:06:16.756573",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_security",
- "loan_security_name",
- "loan_security_type",
- "loan_security_code",
- "uom",
- "column_break_5",
- "qty",
- "haircut",
- "loan_security_price",
- "amount",
- "post_haircut_amount"
- ],
- "fields": [
- {
- "fieldname": "loan_security",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan Security",
- "options": "Loan Security",
- "reqd": 1
- },
- {
- "fetch_from": "loan_security.loan_security_type",
- "fieldname": "loan_security_type",
- "fieldtype": "Link",
- "label": "Loan Security Type",
- "options": "Loan Security Type",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.loan_security_code",
- "fieldname": "loan_security_code",
- "fieldtype": "Data",
- "label": "Loan Security Code"
- },
- {
- "fetch_from": "loan_security.unit_of_measure",
- "fieldname": "uom",
- "fieldtype": "Link",
- "label": "UOM",
- "options": "UOM"
- },
- {
- "fieldname": "qty",
- "fieldtype": "Float",
- "in_list_view": 1,
- "label": "Quantity",
- "non_negative": 1
- },
- {
- "fieldname": "loan_security_price",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Loan Security Price",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.haircut",
- "fieldname": "haircut",
- "fieldtype": "Percent",
- "label": "Haircut %",
- "read_only": 1
- },
- {
- "fieldname": "amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fieldname": "column_break_5",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "post_haircut_amount",
- "fieldtype": "Currency",
- "label": "Post Haircut Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.loan_security_name",
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "label": "Loan Security Name",
- "read_only": 1
- }
- ],
- "istable": 1,
- "links": [],
- "modified": "2021-01-17 07:41:12.452514",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Pledge",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/pledge/pledge.py b/erpnext/loan_management/doctype/pledge/pledge.py
deleted file mode 100644
index f02ed95..0000000
--- a/erpnext/loan_management/doctype/pledge/pledge.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class Pledge(Document):
- pass
diff --git a/erpnext/loan_management/doctype/pledge/test_pledge.py b/erpnext/loan_management/doctype/pledge/test_pledge.py
deleted file mode 100644
index 2d3fd32..0000000
--- a/erpnext/loan_management/doctype/pledge/test_pledge.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestPledge(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/__init__.py b/erpnext/loan_management/doctype/process_loan_interest_accrual/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.js b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.js
deleted file mode 100644
index c596be2..0000000
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Process Loan Interest Accrual', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.json b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.json
deleted file mode 100644
index 7fc4736..0000000
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-PLA-.#####",
- "creation": "2019-09-19 06:08:12.363640",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "posting_date",
- "loan_type",
- "loan",
- "process_type",
- "accrual_type",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Posting Date",
- "reqd": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Process Loan Interest Accrual",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "loan_type",
- "fieldtype": "Link",
- "label": "Loan Type",
- "options": "Loan Type"
- },
- {
- "fieldname": "loan",
- "fieldtype": "Link",
- "label": "Loan ",
- "options": "Loan"
- },
- {
- "fieldname": "process_type",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Process Type",
- "read_only": 1
- },
- {
- "fieldname": "accrual_type",
- "fieldtype": "Select",
- "hidden": 1,
- "label": "Accrual Type",
- "options": "Regular\nRepayment\nDisbursement\nCredit Adjustment\nDebit Adjustment\nRefund",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "is_submittable": 1,
- "links": [],
- "modified": "2022-06-29 11:19:33.203088",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Process Loan Interest Accrual",
- "naming_rule": "Expression (old style)",
- "owner": "Administrator",
- "permissions": [
- {
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py
deleted file mode 100644
index 25c72d9..0000000
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe.model.document import Document
-from frappe.utils import nowdate
-
-from erpnext.loan_management.doctype.loan_interest_accrual.loan_interest_accrual import (
- make_accrual_interest_entry_for_demand_loans,
- make_accrual_interest_entry_for_term_loans,
-)
-
-
-class ProcessLoanInterestAccrual(Document):
- def on_submit(self):
- open_loans = []
-
- if self.loan:
- loan_doc = frappe.get_doc("Loan", self.loan)
- if loan_doc:
- open_loans.append(loan_doc)
-
- if (not self.loan or not loan_doc.is_term_loan) and self.process_type != "Term Loans":
- make_accrual_interest_entry_for_demand_loans(
- self.posting_date,
- self.name,
- open_loans=open_loans,
- loan_type=self.loan_type,
- accrual_type=self.accrual_type,
- )
-
- if (not self.loan or loan_doc.is_term_loan) and self.process_type != "Demand Loans":
- make_accrual_interest_entry_for_term_loans(
- self.posting_date,
- self.name,
- term_loan=self.loan,
- loan_type=self.loan_type,
- accrual_type=self.accrual_type,
- )
-
-
-def process_loan_interest_accrual_for_demand_loans(
- posting_date=None, loan_type=None, loan=None, accrual_type="Regular"
-):
- loan_process = frappe.new_doc("Process Loan Interest Accrual")
- loan_process.posting_date = posting_date or nowdate()
- loan_process.loan_type = loan_type
- loan_process.process_type = "Demand Loans"
- loan_process.loan = loan
- loan_process.accrual_type = accrual_type
-
- loan_process.submit()
-
- return loan_process.name
-
-
-def process_loan_interest_accrual_for_term_loans(posting_date=None, loan_type=None, loan=None):
-
- if not term_loan_accrual_pending(posting_date or nowdate(), loan=loan):
- return
-
- loan_process = frappe.new_doc("Process Loan Interest Accrual")
- loan_process.posting_date = posting_date or nowdate()
- loan_process.loan_type = loan_type
- loan_process.process_type = "Term Loans"
- loan_process.loan = loan
-
- loan_process.submit()
-
- return loan_process.name
-
-
-def term_loan_accrual_pending(date, loan=None):
- filters = {"payment_date": ("<=", date), "is_accrued": 0}
-
- if loan:
- filters.update({"parent": loan})
-
- pending_accrual = frappe.db.get_value("Repayment Schedule", filters)
-
- return pending_accrual
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual_dashboard.py b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual_dashboard.py
deleted file mode 100644
index ac85df7..0000000
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual_dashboard.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def get_data():
- return {
- "fieldname": "process_loan_interest_accrual",
- "transactions": [{"items": ["Loan Interest Accrual"]}],
- }
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/test_process_loan_interest_accrual.py b/erpnext/loan_management/doctype/process_loan_interest_accrual/test_process_loan_interest_accrual.py
deleted file mode 100644
index 1fb8c2e..0000000
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/test_process_loan_interest_accrual.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestProcessLoanInterestAccrual(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/process_loan_security_shortfall/__init__.py b/erpnext/loan_management/doctype/process_loan_security_shortfall/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/process_loan_security_shortfall/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.js b/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.js
deleted file mode 100644
index 645e3ad..0000000
--- a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Process Loan Security Shortfall', {
- onload: function(frm) {
- frm.set_value('update_time', frappe.datetime.now_datetime());
- }
-});
diff --git a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.json b/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.json
deleted file mode 100644
index 3feb305..0000000
--- a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-PLS-.#####",
- "creation": "2019-09-19 06:43:26.742336",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "update_time",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Process Loan Security Shortfall",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "update_time",
- "fieldtype": "Datetime",
- "in_list_view": 1,
- "label": "Update Time",
- "read_only": 1,
- "reqd": 1
- }
- ],
- "is_submittable": 1,
- "links": [],
- "modified": "2021-01-17 03:59:14.494557",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Process Loan Security Shortfall",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "select": 1,
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "select": 1,
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.py b/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.py
deleted file mode 100644
index fffc5d4..0000000
--- a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe.model.document import Document
-from frappe.utils import get_datetime
-
-from erpnext.loan_management.doctype.loan_security_shortfall.loan_security_shortfall import (
- check_for_ltv_shortfall,
-)
-
-
-class ProcessLoanSecurityShortfall(Document):
- def onload(self):
- self.set_onload("update_time", get_datetime())
-
- def on_submit(self):
- check_for_ltv_shortfall(self.name)
-
-
-def create_process_loan_security_shortfall():
- if check_for_secured_loans():
- process = frappe.new_doc("Process Loan Security Shortfall")
- process.update_time = get_datetime()
- process.submit()
-
-
-def check_for_secured_loans():
- return frappe.db.count("Loan", {"docstatus": 1, "is_secured_loan": 1})
diff --git a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall_dashboard.py b/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall_dashboard.py
deleted file mode 100644
index 4d7b163..0000000
--- a/erpnext/loan_management/doctype/process_loan_security_shortfall/process_loan_security_shortfall_dashboard.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def get_data():
- return {
- "fieldname": "process_loan_security_shortfall",
- "transactions": [{"items": ["Loan Security Shortfall"]}],
- }
diff --git a/erpnext/loan_management/doctype/process_loan_security_shortfall/test_process_loan_security_shortfall.py b/erpnext/loan_management/doctype/process_loan_security_shortfall/test_process_loan_security_shortfall.py
deleted file mode 100644
index c743cf0..0000000
--- a/erpnext/loan_management/doctype/process_loan_security_shortfall/test_process_loan_security_shortfall.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestProcessLoanSecurityShortfall(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/proposed_pledge/__init__.py b/erpnext/loan_management/doctype/proposed_pledge/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/proposed_pledge/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/proposed_pledge/proposed_pledge.json b/erpnext/loan_management/doctype/proposed_pledge/proposed_pledge.json
deleted file mode 100644
index a0b3a79..0000000
--- a/erpnext/loan_management/doctype/proposed_pledge/proposed_pledge.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "actions": [],
- "creation": "2019-08-29 22:29:37.628178",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_security",
- "loan_security_name",
- "qty",
- "loan_security_price",
- "amount",
- "haircut",
- "post_haircut_amount"
- ],
- "fields": [
- {
- "fieldname": "loan_security_price",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Loan Security Price",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Amount",
- "options": "Company:company:default_currency"
- },
- {
- "fetch_from": "loan_security.haircut",
- "fieldname": "haircut",
- "fieldtype": "Percent",
- "label": "Haircut %",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security_pledge.qty",
- "fieldname": "qty",
- "fieldtype": "Float",
- "in_list_view": 1,
- "label": "Quantity",
- "non_negative": 1
- },
- {
- "fieldname": "loan_security",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan Security",
- "options": "Loan Security"
- },
- {
- "fieldname": "post_haircut_amount",
- "fieldtype": "Currency",
- "label": "Post Haircut Amount",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.loan_security_name",
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "label": "Loan Security Name",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-01-17 07:29:01.671722",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Proposed Pledge",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/proposed_pledge/proposed_pledge.py b/erpnext/loan_management/doctype/proposed_pledge/proposed_pledge.py
deleted file mode 100644
index ac2b7d2..0000000
--- a/erpnext/loan_management/doctype/proposed_pledge/proposed_pledge.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class ProposedPledge(Document):
- pass
diff --git a/erpnext/loan_management/doctype/repayment_schedule/__init__.py b/erpnext/loan_management/doctype/repayment_schedule/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/repayment_schedule/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/repayment_schedule/repayment_schedule.json b/erpnext/loan_management/doctype/repayment_schedule/repayment_schedule.json
deleted file mode 100644
index 7f71beb..0000000
--- a/erpnext/loan_management/doctype/repayment_schedule/repayment_schedule.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "creation": "2019-09-12 12:57:07.940159",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "payment_date",
- "principal_amount",
- "interest_amount",
- "total_payment",
- "balance_loan_amount",
- "is_accrued"
- ],
- "fields": [
- {
- "columns": 2,
- "fieldname": "payment_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Payment Date"
- },
- {
- "columns": 2,
- "fieldname": "principal_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Principal Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "columns": 2,
- "fieldname": "interest_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Interest Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "columns": 2,
- "fieldname": "total_payment",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Total Payment",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "columns": 2,
- "fieldname": "balance_loan_amount",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Balance Loan Amount",
- "no_copy": 1,
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "default": "0",
- "fieldname": "is_accrued",
- "fieldtype": "Check",
- "in_list_view": 1,
- "label": "Is Accrued",
- "read_only": 1
- }
- ],
- "istable": 1,
- "modified": "2019-09-12 12:57:07.940159",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Repayment Schedule",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/repayment_schedule/repayment_schedule.py b/erpnext/loan_management/doctype/repayment_schedule/repayment_schedule.py
deleted file mode 100644
index dc407e7..0000000
--- a/erpnext/loan_management/doctype/repayment_schedule/repayment_schedule.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class RepaymentSchedule(Document):
- pass
diff --git a/erpnext/loan_management/doctype/sanctioned_loan_amount/__init__.py b/erpnext/loan_management/doctype/sanctioned_loan_amount/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/sanctioned_loan_amount/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.js b/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.js
deleted file mode 100644
index 5361e7c..0000000
--- a/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Sanctioned Loan Amount', {
- // refresh: function(frm) {
-
- // }
-});
diff --git a/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.json b/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.json
deleted file mode 100644
index 0447cd9..0000000
--- a/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "actions": [],
- "autoname": "LM-SLA-.####",
- "creation": "2019-11-23 10:19:06.179736",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "applicant_type",
- "applicant",
- "column_break_3",
- "company",
- "sanctioned_amount_limit"
- ],
- "fields": [
- {
- "fieldname": "applicant_type",
- "fieldtype": "Select",
- "in_list_view": 1,
- "label": "Applicant Type",
- "options": "Employee\nMember\nCustomer",
- "reqd": 1
- },
- {
- "fieldname": "applicant",
- "fieldtype": "Dynamic Link",
- "in_list_view": 1,
- "label": "Applicant",
- "options": "applicant_type",
- "reqd": 1
- },
- {
- "fieldname": "column_break_3",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Company",
- "options": "Company",
- "reqd": 1
- },
- {
- "fieldname": "sanctioned_amount_limit",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Sanctioned Amount Limit",
- "options": "Company:company:default_currency",
- "reqd": 1
- }
- ],
- "links": [],
- "modified": "2020-02-25 05:10:52.421193",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Sanctioned Loan Amount",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- },
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Loan Manager",
- "share": 1,
- "write": 1
- }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.py b/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.py
deleted file mode 100644
index e7487cb..0000000
--- a/erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-
-class SanctionedLoanAmount(Document):
- def validate(self):
- sanctioned_doc = frappe.db.exists(
- "Sanctioned Loan Amount", {"applicant": self.applicant, "company": self.company}
- )
-
- if sanctioned_doc and sanctioned_doc != self.name:
- frappe.throw(
- _("Sanctioned Loan Amount already exists for {0} against company {1}").format(
- frappe.bold(self.applicant), frappe.bold(self.company)
- )
- )
diff --git a/erpnext/loan_management/doctype/sanctioned_loan_amount/test_sanctioned_loan_amount.py b/erpnext/loan_management/doctype/sanctioned_loan_amount/test_sanctioned_loan_amount.py
deleted file mode 100644
index 4d99086..0000000
--- a/erpnext/loan_management/doctype/sanctioned_loan_amount/test_sanctioned_loan_amount.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-import unittest
-
-
-class TestSanctionedLoanAmount(unittest.TestCase):
- pass
diff --git a/erpnext/loan_management/doctype/unpledge/__init__.py b/erpnext/loan_management/doctype/unpledge/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/doctype/unpledge/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/doctype/unpledge/unpledge.json b/erpnext/loan_management/doctype/unpledge/unpledge.json
deleted file mode 100644
index 0091e6c..0000000
--- a/erpnext/loan_management/doctype/unpledge/unpledge.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "actions": [],
- "creation": "2019-09-21 13:22:19.793797",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
- "loan_security",
- "loan_security_name",
- "loan_security_type",
- "loan_security_code",
- "haircut",
- "uom",
- "column_break_5",
- "qty"
- ],
- "fields": [
- {
- "fieldname": "loan_security",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Loan Security",
- "options": "Loan Security",
- "reqd": 1
- },
- {
- "fetch_from": "loan_security.loan_security_type",
- "fieldname": "loan_security_type",
- "fieldtype": "Link",
- "label": "Loan Security Type",
- "options": "Loan Security Type",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.loan_security_code",
- "fieldname": "loan_security_code",
- "fieldtype": "Data",
- "label": "Loan Security Code"
- },
- {
- "fetch_from": "loan_security.unit_of_measure",
- "fieldname": "uom",
- "fieldtype": "Link",
- "label": "UOM",
- "options": "UOM"
- },
- {
- "fieldname": "column_break_5",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "qty",
- "fieldtype": "Float",
- "in_list_view": 1,
- "label": "Quantity",
- "non_negative": 1,
- "reqd": 1
- },
- {
- "fetch_from": "loan_security.haircut",
- "fieldname": "haircut",
- "fieldtype": "Percent",
- "label": "Haircut",
- "read_only": 1
- },
- {
- "fetch_from": "loan_security.loan_security_name",
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "label": "Loan Security Name",
- "read_only": 1
- }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-01-17 07:36:20.212342",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Unpledge",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/unpledge/unpledge.py b/erpnext/loan_management/doctype/unpledge/unpledge.py
deleted file mode 100644
index 403749b..0000000
--- a/erpnext/loan_management/doctype/unpledge/unpledge.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class Unpledge(Document):
- pass
diff --git a/erpnext/loan_management/loan_common.js b/erpnext/loan_management/loan_common.js
deleted file mode 100644
index 247e30b..0000000
--- a/erpnext/loan_management/loan_common.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on(cur_frm.doctype, {
- refresh: function(frm) {
- if (['Loan Disbursement', 'Loan Repayment', 'Loan Interest Accrual', 'Loan Write Off'].includes(frm.doc.doctype)
- && frm.doc.docstatus > 0) {
-
- frm.add_custom_button(__("Accounting Ledger"), function() {
- frappe.route_options = {
- voucher_no: frm.doc.name,
- company: frm.doc.company,
- from_date: moment(frm.doc.posting_date).format('YYYY-MM-DD'),
- to_date: moment(frm.doc.modified).format('YYYY-MM-DD'),
- show_cancelled_entries: frm.doc.docstatus === 2
- };
-
- frappe.set_route("query-report", "General Ledger");
- },__("View"));
- }
- },
- applicant: function(frm) {
- if (!["Loan Application", "Loan"].includes(frm.doc.doctype)) {
- return;
- }
-
- if (frm.doc.applicant) {
- frappe.model.with_doc(frm.doc.applicant_type, frm.doc.applicant, function() {
- var applicant = frappe.model.get_doc(frm.doc.applicant_type, frm.doc.applicant);
- frm.set_value("applicant_name",
- applicant.employee_name || applicant.member_name);
- });
- }
- else {
- frm.set_value("applicant_name", null);
- }
- }
-});
diff --git a/erpnext/loan_management/loan_management_dashboard/loan_dashboard/loan_dashboard.json b/erpnext/loan_management/loan_management_dashboard/loan_dashboard/loan_dashboard.json
deleted file mode 100644
index e060253..0000000
--- a/erpnext/loan_management/loan_management_dashboard/loan_dashboard/loan_dashboard.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "cards": [
- {
- "card": "New Loans"
- },
- {
- "card": "Active Loans"
- },
- {
- "card": "Closed Loans"
- },
- {
- "card": "Total Disbursed"
- },
- {
- "card": "Open Loan Applications"
- },
- {
- "card": "New Loan Applications"
- },
- {
- "card": "Total Sanctioned Amount"
- },
- {
- "card": "Active Securities"
- },
- {
- "card": "Applicants With Unpaid Shortfall"
- },
- {
- "card": "Total Shortfall Amount"
- },
- {
- "card": "Total Repayment"
- },
- {
- "card": "Total Write Off"
- }
- ],
- "charts": [
- {
- "chart": "New Loans",
- "width": "Half"
- },
- {
- "chart": "Loan Disbursements",
- "width": "Half"
- },
- {
- "chart": "Top 10 Pledged Loan Securities",
- "width": "Half"
- },
- {
- "chart": "Loan Interest Accrual",
- "width": "Half"
- }
- ],
- "creation": "2021-02-06 16:52:43.484752",
- "dashboard_name": "Loan Dashboard",
- "docstatus": 0,
- "doctype": "Dashboard",
- "idx": 0,
- "is_default": 0,
- "is_standard": 1,
- "modified": "2021-02-21 20:53:47.531699",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Dashboard",
- "owner": "Administrator"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/active_loans/active_loans.json b/erpnext/loan_management/number_card/active_loans/active_loans.json
deleted file mode 100644
index 7e0db47..0000000
--- a/erpnext/loan_management/number_card/active_loans/active_loans.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "",
- "creation": "2021-02-06 17:10:26.132493",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan\",\"docstatus\",\"=\",\"1\",false],[\"Loan\",\"status\",\"in\",[\"Disbursed\",\"Partially Disbursed\",null],false]]",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Active Loans",
- "modified": "2021-02-06 17:29:20.304087",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Active Loans",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Monthly",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/active_securities/active_securities.json b/erpnext/loan_management/number_card/active_securities/active_securities.json
deleted file mode 100644
index 298e410..0000000
--- a/erpnext/loan_management/number_card/active_securities/active_securities.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "",
- "creation": "2021-02-06 19:07:21.344199",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Security",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Security\",\"disabled\",\"=\",0,false]]",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Active Securities",
- "modified": "2021-02-06 19:07:26.671516",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Active Securities",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/applicants_with_unpaid_shortfall/applicants_with_unpaid_shortfall.json b/erpnext/loan_management/number_card/applicants_with_unpaid_shortfall/applicants_with_unpaid_shortfall.json
deleted file mode 100644
index 3b9eba1..0000000
--- a/erpnext/loan_management/number_card/applicants_with_unpaid_shortfall/applicants_with_unpaid_shortfall.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "creation": "2021-02-07 18:55:12.632616",
- "docstatus": 0,
- "doctype": "Number Card",
- "filters_json": "null",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Applicants With Unpaid Shortfall",
- "method": "erpnext.loan_management.doctype.loan.loan.get_shortfall_applicants",
- "modified": "2021-02-07 21:46:27.369795",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Applicants With Unpaid Shortfall",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Custom"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/closed_loans/closed_loans.json b/erpnext/loan_management/number_card/closed_loans/closed_loans.json
deleted file mode 100644
index c2f2244..0000000
--- a/erpnext/loan_management/number_card/closed_loans/closed_loans.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "",
- "creation": "2021-02-21 19:51:49.261813",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan\",\"docstatus\",\"=\",\"1\",false],[\"Loan\",\"status\",\"=\",\"Closed\",false]]",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Closed Loans",
- "modified": "2021-02-21 19:51:54.087903",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Closed Loans",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/last_interest_accrual/last_interest_accrual.json b/erpnext/loan_management/number_card/last_interest_accrual/last_interest_accrual.json
deleted file mode 100644
index 65c8ce6..0000000
--- a/erpnext/loan_management/number_card/last_interest_accrual/last_interest_accrual.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "creation": "2021-02-07 21:57:14.758007",
- "docstatus": 0,
- "doctype": "Number Card",
- "filters_json": "null",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Last Interest Accrual",
- "method": "erpnext.loan_management.doctype.loan.loan.get_last_accrual_date",
- "modified": "2021-02-07 21:59:47.525197",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Last Interest Accrual",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Custom"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/new_loan_applications/new_loan_applications.json b/erpnext/loan_management/number_card/new_loan_applications/new_loan_applications.json
deleted file mode 100644
index 7e655ff..0000000
--- a/erpnext/loan_management/number_card/new_loan_applications/new_loan_applications.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "",
- "creation": "2021-02-06 17:59:10.051269",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Application",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Application\",\"docstatus\",\"=\",\"1\",false],[\"Loan Application\",\"creation\",\"Timespan\",\"today\",false]]",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "New Loan Applications",
- "modified": "2021-02-06 17:59:21.880979",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "New Loan Applications",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/new_loans/new_loans.json b/erpnext/loan_management/number_card/new_loans/new_loans.json
deleted file mode 100644
index 424f0f1..0000000
--- a/erpnext/loan_management/number_card/new_loans/new_loans.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "",
- "creation": "2021-02-06 17:56:34.624031",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan\",\"docstatus\",\"=\",\"1\",false],[\"Loan\",\"creation\",\"Timespan\",\"today\",false]]",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "New Loans",
- "modified": "2021-02-06 17:58:20.209166",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "New Loans",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/open_loan_applications/open_loan_applications.json b/erpnext/loan_management/number_card/open_loan_applications/open_loan_applications.json
deleted file mode 100644
index 1d5e84e..0000000
--- a/erpnext/loan_management/number_card/open_loan_applications/open_loan_applications.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "",
- "creation": "2021-02-06 17:23:32.509899",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Application",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Application\",\"docstatus\",\"=\",\"1\",false],[\"Loan Application\",\"status\",\"=\",\"Open\",false]]",
- "function": "Count",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Open Loan Applications",
- "modified": "2021-02-06 17:29:09.761011",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Open Loan Applications",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Monthly",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/total_disbursed/total_disbursed.json b/erpnext/loan_management/number_card/total_disbursed/total_disbursed.json
deleted file mode 100644
index 4a3f869..0000000
--- a/erpnext/loan_management/number_card/total_disbursed/total_disbursed.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "disbursed_amount",
- "creation": "2021-02-06 16:52:19.505462",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Disbursement",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Disbursement\",\"docstatus\",\"=\",\"1\",false]]",
- "function": "Sum",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Total Disbursed Amount",
- "modified": "2021-02-06 17:29:38.453870",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Total Disbursed",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Monthly",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/total_repayment/total_repayment.json b/erpnext/loan_management/number_card/total_repayment/total_repayment.json
deleted file mode 100644
index 38de42b..0000000
--- a/erpnext/loan_management/number_card/total_repayment/total_repayment.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "aggregate_function_based_on": "amount_paid",
- "color": "#29CD42",
- "creation": "2021-02-21 19:27:45.989222",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Repayment",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Repayment\",\"docstatus\",\"=\",\"1\",false]]",
- "function": "Sum",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Total Repayment",
- "modified": "2021-02-21 19:34:59.656546",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Total Repayment",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/total_sanctioned_amount/total_sanctioned_amount.json b/erpnext/loan_management/number_card/total_sanctioned_amount/total_sanctioned_amount.json
deleted file mode 100644
index dfb9d24..0000000
--- a/erpnext/loan_management/number_card/total_sanctioned_amount/total_sanctioned_amount.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "loan_amount",
- "creation": "2021-02-06 17:05:04.704162",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan\",\"docstatus\",\"=\",\"1\",false],[\"Loan\",\"status\",\"=\",\"Sanctioned\",false]]",
- "function": "Sum",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Total Sanctioned Amount",
- "modified": "2021-02-06 17:29:29.930557",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Total Sanctioned Amount",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Monthly",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/total_shortfall_amount/total_shortfall_amount.json b/erpnext/loan_management/number_card/total_shortfall_amount/total_shortfall_amount.json
deleted file mode 100644
index aa6b093..0000000
--- a/erpnext/loan_management/number_card/total_shortfall_amount/total_shortfall_amount.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "aggregate_function_based_on": "shortfall_amount",
- "creation": "2021-02-09 08:07:20.096995",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Security Shortfall",
- "dynamic_filters_json": "[]",
- "filters_json": "[]",
- "function": "Sum",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Total Unpaid Shortfall Amount",
- "modified": "2021-02-09 08:09:00.355547",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Total Shortfall Amount",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/number_card/total_write_off/total_write_off.json b/erpnext/loan_management/number_card/total_write_off/total_write_off.json
deleted file mode 100644
index c85169a..0000000
--- a/erpnext/loan_management/number_card/total_write_off/total_write_off.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "aggregate_function_based_on": "write_off_amount",
- "color": "#CB2929",
- "creation": "2021-02-21 19:48:29.004429",
- "docstatus": 0,
- "doctype": "Number Card",
- "document_type": "Loan Write Off",
- "dynamic_filters_json": "[]",
- "filters_json": "[[\"Loan Write Off\",\"docstatus\",\"=\",\"1\",false]]",
- "function": "Sum",
- "idx": 0,
- "is_public": 0,
- "is_standard": 1,
- "label": "Total Write Off",
- "modified": "2021-02-21 19:48:58.604159",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Total Write Off",
- "owner": "Administrator",
- "report_function": "Sum",
- "show_percentage_stats": 1,
- "stats_time_interval": "Daily",
- "type": "Document Type"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/report/__init__.py b/erpnext/loan_management/report/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/report/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/__init__.py b/erpnext/loan_management/report/applicant_wise_loan_security_exposure/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.js b/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.js
deleted file mode 100644
index 73d60c4..0000000
--- a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-/* eslint-disable */
-
-frappe.query_reports["Applicant-Wise Loan Security Exposure"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
- }
- ]
-};
diff --git a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.json b/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.json
deleted file mode 100644
index a778cd7..0000000
--- a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "add_total_row": 0,
- "columns": [],
- "creation": "2021-01-15 23:48:38.913514",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "filters": [],
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2021-01-15 23:48:38.913514",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Applicant-Wise Loan Security Exposure",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Loan Security",
- "report_name": "Applicant-Wise Loan Security Exposure",
- "report_type": "Script Report",
- "roles": [
- {
- "role": "System Manager"
- },
- {
- "role": "Loan Manager"
- }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py b/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py
deleted file mode 100644
index 02da810..0000000
--- a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.utils import flt
-
-import erpnext
-
-
-def execute(filters=None):
- columns = get_columns(filters)
- data = get_data(filters)
- return columns, data
-
-
-def get_columns(filters):
- columns = [
- {
- "label": _("Applicant Type"),
- "fieldname": "applicant_type",
- "options": "DocType",
- "width": 100,
- },
- {
- "label": _("Applicant Name"),
- "fieldname": "applicant_name",
- "fieldtype": "Dynamic Link",
- "options": "applicant_type",
- "width": 150,
- },
- {
- "label": _("Loan Security"),
- "fieldname": "loan_security",
- "fieldtype": "Link",
- "options": "Loan Security",
- "width": 160,
- },
- {
- "label": _("Loan Security Code"),
- "fieldname": "loan_security_code",
- "fieldtype": "Data",
- "width": 100,
- },
- {
- "label": _("Loan Security Name"),
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "width": 150,
- },
- {"label": _("Haircut"), "fieldname": "haircut", "fieldtype": "Percent", "width": 100},
- {
- "label": _("Loan Security Type"),
- "fieldname": "loan_security_type",
- "fieldtype": "Link",
- "options": "Loan Security Type",
- "width": 120,
- },
- {"label": _("Disabled"), "fieldname": "disabled", "fieldtype": "Check", "width": 80},
- {"label": _("Total Qty"), "fieldname": "total_qty", "fieldtype": "Float", "width": 100},
- {
- "label": _("Latest Price"),
- "fieldname": "latest_price",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Price Valid Upto"),
- "fieldname": "price_valid_upto",
- "fieldtype": "Datetime",
- "width": 100,
- },
- {
- "label": _("Current Value"),
- "fieldname": "current_value",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("% Of Applicant Portfolio"),
- "fieldname": "portfolio_percent",
- "fieldtype": "Percentage",
- "width": 100,
- },
- {
- "label": _("Currency"),
- "fieldname": "currency",
- "fieldtype": "Currency",
- "options": "Currency",
- "hidden": 1,
- "width": 100,
- },
- ]
-
- return columns
-
-
-def get_data(filters):
- data = []
- loan_security_details = get_loan_security_details()
- pledge_values, total_value_map, applicant_type_map = get_applicant_wise_total_loan_security_qty(
- filters, loan_security_details
- )
-
- currency = erpnext.get_company_currency(filters.get("company"))
-
- for key, qty in pledge_values.items():
- if qty:
- row = {}
- current_value = flt(qty * loan_security_details.get(key[1], {}).get("latest_price", 0))
- valid_upto = loan_security_details.get(key[1], {}).get("valid_upto")
-
- row.update(loan_security_details.get(key[1]))
- row.update(
- {
- "applicant_type": applicant_type_map.get(key[0]),
- "applicant_name": key[0],
- "total_qty": qty,
- "current_value": current_value,
- "price_valid_upto": valid_upto,
- "portfolio_percent": flt(current_value * 100 / total_value_map.get(key[0]), 2)
- if total_value_map.get(key[0])
- else 0.0,
- "currency": currency,
- }
- )
-
- data.append(row)
-
- return data
-
-
-def get_loan_security_details():
- security_detail_map = {}
- loan_security_price_map = {}
- lsp_validity_map = {}
-
- loan_security_prices = frappe.db.sql(
- """
- SELECT loan_security, loan_security_price, valid_upto
- FROM `tabLoan Security Price` t1
- WHERE valid_from >= (SELECT MAX(valid_from) FROM `tabLoan Security Price` t2
- WHERE t1.loan_security = t2.loan_security)
- """,
- as_dict=1,
- )
-
- for security in loan_security_prices:
- loan_security_price_map.setdefault(security.loan_security, security.loan_security_price)
- lsp_validity_map.setdefault(security.loan_security, security.valid_upto)
-
- loan_security_details = frappe.get_all(
- "Loan Security",
- fields=[
- "name as loan_security",
- "loan_security_code",
- "loan_security_name",
- "haircut",
- "loan_security_type",
- "disabled",
- ],
- )
-
- for security in loan_security_details:
- security.update(
- {
- "latest_price": flt(loan_security_price_map.get(security.loan_security)),
- "valid_upto": lsp_validity_map.get(security.loan_security),
- }
- )
-
- security_detail_map.setdefault(security.loan_security, security)
-
- return security_detail_map
-
-
-def get_applicant_wise_total_loan_security_qty(filters, loan_security_details):
- current_pledges = {}
- total_value_map = {}
- applicant_type_map = {}
- applicant_wise_unpledges = {}
- conditions = ""
-
- if filters.get("company"):
- conditions = "AND company = %(company)s"
-
- unpledges = frappe.db.sql(
- """
- SELECT up.applicant, u.loan_security, sum(u.qty) as qty
- FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
- WHERE u.parent = up.name
- AND up.status = 'Approved'
- {conditions}
- GROUP BY up.applicant, u.loan_security
- """.format(
- conditions=conditions
- ),
- filters,
- as_dict=1,
- )
-
- for unpledge in unpledges:
- applicant_wise_unpledges.setdefault((unpledge.applicant, unpledge.loan_security), unpledge.qty)
-
- pledges = frappe.db.sql(
- """
- SELECT lp.applicant_type, lp.applicant, p.loan_security, sum(p.qty) as qty
- FROM `tabLoan Security Pledge` lp, `tabPledge`p
- WHERE p.parent = lp.name
- AND lp.status = 'Pledged'
- {conditions}
- GROUP BY lp.applicant, p.loan_security
- """.format(
- conditions=conditions
- ),
- filters,
- as_dict=1,
- )
-
- for security in pledges:
- current_pledges.setdefault((security.applicant, security.loan_security), security.qty)
- total_value_map.setdefault(security.applicant, 0.0)
- applicant_type_map.setdefault(security.applicant, security.applicant_type)
-
- current_pledges[(security.applicant, security.loan_security)] -= applicant_wise_unpledges.get(
- (security.applicant, security.loan_security), 0.0
- )
-
- total_value_map[security.applicant] += current_pledges.get(
- (security.applicant, security.loan_security)
- ) * loan_security_details.get(security.loan_security, {}).get("latest_price", 0)
-
- return current_pledges, total_value_map, applicant_type_map
diff --git a/erpnext/loan_management/report/loan_interest_report/__init__.py b/erpnext/loan_management/report/loan_interest_report/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/report/loan_interest_report/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.js b/erpnext/loan_management/report/loan_interest_report/loan_interest_report.js
deleted file mode 100644
index 458c79a..0000000
--- a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-/* eslint-disable */
-
-frappe.query_reports["Loan Interest Report"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
- },
- {
- "fieldname":"applicant_type",
- "label": __("Applicant Type"),
- "fieldtype": "Select",
- "options": ["Customer", "Employee"],
- "reqd": 1,
- "default": "Customer",
- on_change: function() {
- frappe.query_report.set_filter_value('applicant', "");
- }
- },
- {
- "fieldname": "applicant",
- "label": __("Applicant"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var applicant_type = frappe.query_report.get_filter_value('applicant_type');
- var applicant = frappe.query_report.get_filter_value('applicant');
- if(applicant && !applicant_type) {
- frappe.throw(__("Please select Applicant Type first"));
- }
- return applicant_type;
- }
- },
- {
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- },
- {
- "fieldname":"to_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- },
- ]
-};
diff --git a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.json b/erpnext/loan_management/report/loan_interest_report/loan_interest_report.json
deleted file mode 100644
index 321d606..0000000
--- a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "add_total_row": 1,
- "columns": [],
- "creation": "2021-01-10 02:03:26.742693",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "filters": [],
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2021-01-10 02:03:26.742693",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Interest Report",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Loan Interest Accrual",
- "report_name": "Loan Interest Report",
- "report_type": "Script Report",
- "roles": [
- {
- "role": "System Manager"
- },
- {
- "role": "Loan Manager"
- }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py b/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py
deleted file mode 100644
index 58a7880..0000000
--- a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-from frappe.utils import add_days, flt, getdate
-
-import erpnext
-from erpnext.loan_management.report.applicant_wise_loan_security_exposure.applicant_wise_loan_security_exposure import (
- get_loan_security_details,
-)
-
-
-def execute(filters=None):
- columns = get_columns()
- data = get_active_loan_details(filters)
- return columns, data
-
-
-def get_columns():
- columns = [
- {"label": _("Loan"), "fieldname": "loan", "fieldtype": "Link", "options": "Loan", "width": 160},
- {"label": _("Status"), "fieldname": "status", "fieldtype": "Data", "width": 160},
- {
- "label": _("Applicant Type"),
- "fieldname": "applicant_type",
- "options": "DocType",
- "width": 100,
- },
- {
- "label": _("Applicant Name"),
- "fieldname": "applicant_name",
- "fieldtype": "Dynamic Link",
- "options": "applicant_type",
- "width": 150,
- },
- {
- "label": _("Loan Type"),
- "fieldname": "loan_type",
- "fieldtype": "Link",
- "options": "Loan Type",
- "width": 100,
- },
- {
- "label": _("Sanctioned Amount"),
- "fieldname": "sanctioned_amount",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Disbursed Amount"),
- "fieldname": "disbursed_amount",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Penalty Amount"),
- "fieldname": "penalty",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Accrued Interest"),
- "fieldname": "accrued_interest",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Accrued Principal"),
- "fieldname": "accrued_principal",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Total Repayment"),
- "fieldname": "total_repayment",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Principal Outstanding"),
- "fieldname": "principal_outstanding",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Interest Outstanding"),
- "fieldname": "interest_outstanding",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Total Outstanding"),
- "fieldname": "total_outstanding",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Undue Booked Interest"),
- "fieldname": "undue_interest",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 120,
- },
- {
- "label": _("Interest %"),
- "fieldname": "rate_of_interest",
- "fieldtype": "Percent",
- "width": 100,
- },
- {
- "label": _("Penalty Interest %"),
- "fieldname": "penalty_interest",
- "fieldtype": "Percent",
- "width": 100,
- },
- {
- "label": _("Loan To Value Ratio"),
- "fieldname": "loan_to_value",
- "fieldtype": "Percent",
- "width": 100,
- },
- {
- "label": _("Currency"),
- "fieldname": "currency",
- "fieldtype": "Currency",
- "options": "Currency",
- "hidden": 1,
- "width": 100,
- },
- ]
-
- return columns
-
-
-def get_active_loan_details(filters):
- filter_obj = {
- "status": ("!=", "Closed"),
- "docstatus": 1,
- }
- if filters.get("company"):
- filter_obj.update({"company": filters.get("company")})
-
- if filters.get("applicant"):
- filter_obj.update({"applicant": filters.get("applicant")})
-
- loan_details = frappe.get_all(
- "Loan",
- fields=[
- "name as loan",
- "applicant_type",
- "applicant as applicant_name",
- "loan_type",
- "disbursed_amount",
- "rate_of_interest",
- "total_payment",
- "total_principal_paid",
- "total_interest_payable",
- "written_off_amount",
- "status",
- ],
- filters=filter_obj,
- )
-
- loan_list = [d.loan for d in loan_details]
-
- current_pledges = get_loan_wise_pledges(filters)
- loan_wise_security_value = get_loan_wise_security_value(filters, current_pledges)
-
- sanctioned_amount_map = get_sanctioned_amount_map()
- penal_interest_rate_map = get_penal_interest_rate_map()
- payments = get_payments(loan_list, filters)
- accrual_map = get_interest_accruals(loan_list, filters)
- currency = erpnext.get_company_currency(filters.get("company"))
-
- for loan in loan_details:
- total_payment = loan.total_payment if loan.status == "Disbursed" else loan.disbursed_amount
-
- loan.update(
- {
- "sanctioned_amount": flt(sanctioned_amount_map.get(loan.applicant_name)),
- "principal_outstanding": flt(total_payment)
- - flt(loan.total_principal_paid)
- - flt(loan.total_interest_payable)
- - flt(loan.written_off_amount),
- "total_repayment": flt(payments.get(loan.loan)),
- "accrued_interest": flt(accrual_map.get(loan.loan, {}).get("accrued_interest")),
- "accrued_principal": flt(accrual_map.get(loan.loan, {}).get("accrued_principal")),
- "interest_outstanding": flt(accrual_map.get(loan.loan, {}).get("interest_outstanding")),
- "penalty": flt(accrual_map.get(loan.loan, {}).get("penalty")),
- "penalty_interest": penal_interest_rate_map.get(loan.loan_type),
- "undue_interest": flt(accrual_map.get(loan.loan, {}).get("undue_interest")),
- "loan_to_value": 0.0,
- "currency": currency,
- }
- )
-
- loan["total_outstanding"] = (
- loan["principal_outstanding"] + loan["interest_outstanding"] + loan["penalty"]
- )
-
- if loan_wise_security_value.get(loan.loan):
- loan["loan_to_value"] = flt(
- (loan["principal_outstanding"] * 100) / loan_wise_security_value.get(loan.loan)
- )
-
- return loan_details
-
-
-def get_sanctioned_amount_map():
- return frappe._dict(
- frappe.get_all(
- "Sanctioned Loan Amount", fields=["applicant", "sanctioned_amount_limit"], as_list=1
- )
- )
-
-
-def get_payments(loans, filters):
- query_filters = {"against_loan": ("in", loans)}
-
- if filters.get("from_date"):
- query_filters.update({"posting_date": (">=", filters.get("from_date"))})
-
- if filters.get("to_date"):
- query_filters.update({"posting_date": ("<=", filters.get("to_date"))})
-
- return frappe._dict(
- frappe.get_all(
- "Loan Repayment",
- fields=["against_loan", "sum(amount_paid)"],
- filters=query_filters,
- group_by="against_loan",
- as_list=1,
- )
- )
-
-
-def get_interest_accruals(loans, filters):
- accrual_map = {}
- query_filters = {"loan": ("in", loans)}
-
- if filters.get("from_date"):
- query_filters.update({"posting_date": (">=", filters.get("from_date"))})
-
- if filters.get("to_date"):
- query_filters.update({"posting_date": ("<=", filters.get("to_date"))})
-
- interest_accruals = frappe.get_all(
- "Loan Interest Accrual",
- fields=[
- "loan",
- "interest_amount",
- "posting_date",
- "penalty_amount",
- "paid_interest_amount",
- "accrual_type",
- "payable_principal_amount",
- ],
- filters=query_filters,
- order_by="posting_date desc",
- )
-
- for entry in interest_accruals:
- accrual_map.setdefault(
- entry.loan,
- {
- "accrued_interest": 0.0,
- "accrued_principal": 0.0,
- "undue_interest": 0.0,
- "interest_outstanding": 0.0,
- "last_accrual_date": "",
- "due_date": "",
- },
- )
-
- if entry.accrual_type == "Regular":
- if not accrual_map[entry.loan]["due_date"]:
- accrual_map[entry.loan]["due_date"] = add_days(entry.posting_date, 1)
- if not accrual_map[entry.loan]["last_accrual_date"]:
- accrual_map[entry.loan]["last_accrual_date"] = entry.posting_date
-
- due_date = accrual_map[entry.loan]["due_date"]
- last_accrual_date = accrual_map[entry.loan]["last_accrual_date"]
-
- if due_date and getdate(entry.posting_date) < getdate(due_date):
- accrual_map[entry.loan]["interest_outstanding"] += (
- entry.interest_amount - entry.paid_interest_amount
- )
- else:
- accrual_map[entry.loan]["undue_interest"] += entry.interest_amount - entry.paid_interest_amount
-
- accrual_map[entry.loan]["accrued_interest"] += entry.interest_amount
- accrual_map[entry.loan]["accrued_principal"] += entry.payable_principal_amount
-
- if last_accrual_date and getdate(entry.posting_date) == last_accrual_date:
- accrual_map[entry.loan]["penalty"] = entry.penalty_amount
-
- return accrual_map
-
-
-def get_penal_interest_rate_map():
- return frappe._dict(
- frappe.get_all("Loan Type", fields=["name", "penalty_interest_rate"], as_list=1)
- )
-
-
-def get_loan_wise_pledges(filters):
- loan_wise_unpledges = {}
- current_pledges = {}
-
- conditions = ""
-
- if filters.get("company"):
- conditions = "AND company = %(company)s"
-
- unpledges = frappe.db.sql(
- """
- SELECT up.loan, u.loan_security, sum(u.qty) as qty
- FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
- WHERE u.parent = up.name
- AND up.status = 'Approved'
- {conditions}
- GROUP BY up.loan, u.loan_security
- """.format(
- conditions=conditions
- ),
- filters,
- as_dict=1,
- )
-
- for unpledge in unpledges:
- loan_wise_unpledges.setdefault((unpledge.loan, unpledge.loan_security), unpledge.qty)
-
- pledges = frappe.db.sql(
- """
- SELECT lp.loan, p.loan_security, sum(p.qty) as qty
- FROM `tabLoan Security Pledge` lp, `tabPledge`p
- WHERE p.parent = lp.name
- AND lp.status = 'Pledged'
- {conditions}
- GROUP BY lp.loan, p.loan_security
- """.format(
- conditions=conditions
- ),
- filters,
- as_dict=1,
- )
-
- for security in pledges:
- current_pledges.setdefault((security.loan, security.loan_security), security.qty)
- current_pledges[(security.loan, security.loan_security)] -= loan_wise_unpledges.get(
- (security.loan, security.loan_security), 0.0
- )
-
- return current_pledges
-
-
-def get_loan_wise_security_value(filters, current_pledges):
- loan_security_details = get_loan_security_details()
- loan_wise_security_value = {}
-
- for key in current_pledges:
- qty = current_pledges.get(key)
- loan_wise_security_value.setdefault(key[0], 0.0)
- loan_wise_security_value[key[0]] += flt(
- qty * loan_security_details.get(key[1], {}).get("latest_price", 0)
- )
-
- return loan_wise_security_value
diff --git a/erpnext/loan_management/report/loan_repayment_and_closure/__init__.py b/erpnext/loan_management/report/loan_repayment_and_closure/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/report/loan_repayment_and_closure/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.js b/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.js
deleted file mode 100644
index ed5e937..0000000
--- a/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-/* eslint-disable */
-
-frappe.query_reports["Loan Repayment and Closure"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
- },
- {
- "fieldname":"applicant_type",
- "label": __("Applicant Type"),
- "fieldtype": "Select",
- "options": ["Customer", "Employee"],
- "reqd": 1,
- "default": "Customer",
- on_change: function() {
- frappe.query_report.set_filter_value('applicant', "");
- }
- },
- {
- "fieldname": "applicant",
- "label": __("Applicant"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var applicant_type = frappe.query_report.get_filter_value('applicant_type');
- var applicant = frappe.query_report.get_filter_value('applicant');
- if(applicant && !applicant_type) {
- frappe.throw(__("Please select Applicant Type first"));
- }
- return applicant_type;
- }
-
- },
- ]
-};
diff --git a/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.json b/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.json
deleted file mode 100644
index 52d5b2c..0000000
--- a/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "add_total_row": 0,
- "creation": "2019-09-03 16:54:55.616593",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2020-02-25 07:16:47.696994",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Repayment and Closure",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Loan Repayment",
- "report_name": "Loan Repayment and Closure",
- "report_type": "Script Report",
- "roles": [
- {
- "role": "System Manager"
- },
- {
- "role": "Loan Manager"
- }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.py b/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.py
deleted file mode 100644
index 253b994..0000000
--- a/erpnext/loan_management/report/loan_repayment_and_closure/loan_repayment_and_closure.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-
-
-def execute(filters=None):
- columns = get_columns()
- data = get_data(filters)
- return columns, data
-
-
-def get_columns():
- return [
- {"label": _("Posting Date"), "fieldtype": "Date", "fieldname": "posting_date", "width": 100},
- {
- "label": _("Loan Repayment"),
- "fieldtype": "Link",
- "fieldname": "loan_repayment",
- "options": "Loan Repayment",
- "width": 100,
- },
- {
- "label": _("Against Loan"),
- "fieldtype": "Link",
- "fieldname": "against_loan",
- "options": "Loan",
- "width": 200,
- },
- {"label": _("Applicant"), "fieldtype": "Data", "fieldname": "applicant", "width": 150},
- {"label": _("Payment Type"), "fieldtype": "Data", "fieldname": "payment_type", "width": 150},
- {
- "label": _("Principal Amount"),
- "fieldtype": "Currency",
- "fieldname": "principal_amount",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Interest Amount"),
- "fieldtype": "Currency",
- "fieldname": "interest",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Penalty Amount"),
- "fieldtype": "Currency",
- "fieldname": "penalty",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Payable Amount"),
- "fieldtype": "Currency",
- "fieldname": "payable_amount",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Paid Amount"),
- "fieldtype": "Currency",
- "fieldname": "paid_amount",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Currency"),
- "fieldtype": "Link",
- "fieldname": "currency",
- "options": "Currency",
- "width": 100,
- },
- ]
-
-
-def get_data(filters):
- data = []
-
- query_filters = {
- "docstatus": 1,
- "company": filters.get("company"),
- }
-
- if filters.get("applicant"):
- query_filters.update({"applicant": filters.get("applicant")})
-
- loan_repayments = frappe.get_all(
- "Loan Repayment",
- filters=query_filters,
- fields=[
- "posting_date",
- "applicant",
- "name",
- "against_loan",
- "payable_amount",
- "pending_principal_amount",
- "interest_payable",
- "penalty_amount",
- "amount_paid",
- ],
- )
-
- default_currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency")
-
- for repayment in loan_repayments:
- row = {
- "posting_date": repayment.posting_date,
- "loan_repayment": repayment.name,
- "applicant": repayment.applicant,
- "payment_type": repayment.payment_type,
- "against_loan": repayment.against_loan,
- "principal_amount": repayment.pending_principal_amount,
- "interest": repayment.interest_payable,
- "penalty": repayment.penalty_amount,
- "payable_amount": repayment.payable_amount,
- "paid_amount": repayment.amount_paid,
- "currency": default_currency,
- }
-
- data.append(row)
-
- return data
diff --git a/erpnext/loan_management/report/loan_security_exposure/__init__.py b/erpnext/loan_management/report/loan_security_exposure/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/report/loan_security_exposure/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.js b/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.js
deleted file mode 100644
index 777f296..0000000
--- a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-/* eslint-disable */
-
-frappe.query_reports["Loan Security Exposure"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
- }
- ]
-};
diff --git a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.json b/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.json
deleted file mode 100644
index d4dca08..0000000
--- a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "add_total_row": 0,
- "columns": [],
- "creation": "2021-01-16 08:08:01.694583",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "filters": [],
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2021-01-16 08:08:01.694583",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Exposure",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Loan Security",
- "report_name": "Loan Security Exposure",
- "report_type": "Script Report",
- "roles": [
- {
- "role": "System Manager"
- },
- {
- "role": "Loan Manager"
- }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py b/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py
deleted file mode 100644
index a92f960..0000000
--- a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-from frappe import _
-from frappe.utils import flt
-
-import erpnext
-from erpnext.loan_management.report.applicant_wise_loan_security_exposure.applicant_wise_loan_security_exposure import (
- get_applicant_wise_total_loan_security_qty,
- get_loan_security_details,
-)
-
-
-def execute(filters=None):
- columns = get_columns(filters)
- data = get_data(filters)
- return columns, data
-
-
-def get_columns(filters):
- columns = [
- {
- "label": _("Loan Security"),
- "fieldname": "loan_security",
- "fieldtype": "Link",
- "options": "Loan Security",
- "width": 160,
- },
- {
- "label": _("Loan Security Code"),
- "fieldname": "loan_security_code",
- "fieldtype": "Data",
- "width": 100,
- },
- {
- "label": _("Loan Security Name"),
- "fieldname": "loan_security_name",
- "fieldtype": "Data",
- "width": 150,
- },
- {"label": _("Haircut"), "fieldname": "haircut", "fieldtype": "Percent", "width": 100},
- {
- "label": _("Loan Security Type"),
- "fieldname": "loan_security_type",
- "fieldtype": "Link",
- "options": "Loan Security Type",
- "width": 120,
- },
- {"label": _("Disabled"), "fieldname": "disabled", "fieldtype": "Check", "width": 80},
- {"label": _("Total Qty"), "fieldname": "total_qty", "fieldtype": "Float", "width": 100},
- {
- "label": _("Latest Price"),
- "fieldname": "latest_price",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("Price Valid Upto"),
- "fieldname": "price_valid_upto",
- "fieldtype": "Datetime",
- "width": 100,
- },
- {
- "label": _("Current Value"),
- "fieldname": "current_value",
- "fieldtype": "Currency",
- "options": "currency",
- "width": 100,
- },
- {
- "label": _("% Of Total Portfolio"),
- "fieldname": "portfolio_percent",
- "fieldtype": "Percentage",
- "width": 100,
- },
- {
- "label": _("Pledged Applicant Count"),
- "fieldname": "pledged_applicant_count",
- "fieldtype": "Percentage",
- "width": 100,
- },
- {
- "label": _("Currency"),
- "fieldname": "currency",
- "fieldtype": "Currency",
- "options": "Currency",
- "hidden": 1,
- "width": 100,
- },
- ]
-
- return columns
-
-
-def get_data(filters):
- data = []
- loan_security_details = get_loan_security_details()
- current_pledges, total_portfolio_value = get_company_wise_loan_security_details(
- filters, loan_security_details
- )
- currency = erpnext.get_company_currency(filters.get("company"))
-
- for security, value in current_pledges.items():
- if value.get("qty"):
- row = {}
- current_value = flt(
- value.get("qty", 0) * loan_security_details.get(security, {}).get("latest_price", 0)
- )
- valid_upto = loan_security_details.get(security, {}).get("valid_upto")
-
- row.update(loan_security_details.get(security))
- row.update(
- {
- "total_qty": value.get("qty"),
- "current_value": current_value,
- "price_valid_upto": valid_upto,
- "portfolio_percent": flt(current_value * 100 / total_portfolio_value, 2),
- "pledged_applicant_count": value.get("applicant_count"),
- "currency": currency,
- }
- )
-
- data.append(row)
-
- return data
-
-
-def get_company_wise_loan_security_details(filters, loan_security_details):
- pledge_values, total_value_map, applicant_type_map = get_applicant_wise_total_loan_security_qty(
- filters, loan_security_details
- )
-
- total_portfolio_value = 0
- security_wise_map = {}
- for key, qty in pledge_values.items():
- security_wise_map.setdefault(key[1], {"qty": 0.0, "applicant_count": 0.0})
-
- security_wise_map[key[1]]["qty"] += qty
- if qty:
- security_wise_map[key[1]]["applicant_count"] += 1
-
- total_portfolio_value += flt(qty * loan_security_details.get(key[1], {}).get("latest_price", 0))
-
- return security_wise_map, total_portfolio_value
diff --git a/erpnext/loan_management/report/loan_security_status/__init__.py b/erpnext/loan_management/report/loan_security_status/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/loan_management/report/loan_security_status/__init__.py
+++ /dev/null
diff --git a/erpnext/loan_management/report/loan_security_status/loan_security_status.js b/erpnext/loan_management/report/loan_security_status/loan_security_status.js
deleted file mode 100644
index 6e6191c..0000000
--- a/erpnext/loan_management/report/loan_security_status/loan_security_status.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-/* eslint-disable */
-
-frappe.query_reports["Loan Security Status"] = {
- "filters": [
- {
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
- },
- {
- "fieldname":"applicant_type",
- "label": __("Applicant Type"),
- "fieldtype": "Select",
- "options": ["Customer", "Employee"],
- "reqd": 1,
- "default": "Customer",
- on_change: function() {
- frappe.query_report.set_filter_value('applicant', "");
- }
- },
- {
- "fieldname": "applicant",
- "label": __("Applicant"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var applicant_type = frappe.query_report.get_filter_value('applicant_type');
- var applicant = frappe.query_report.get_filter_value('applicant');
- if(applicant && !applicant_type) {
- frappe.throw(__("Please select Applicant Type first"));
- }
- return applicant_type;
- }
- },
- {
- "fieldname":"pledge_status",
- "label": __("Pledge Status"),
- "fieldtype": "Select",
- "options": ["", "Requested", "Pledged", "Partially Pledged", "Unpledged"],
- },
- ]
-};
diff --git a/erpnext/loan_management/report/loan_security_status/loan_security_status.json b/erpnext/loan_management/report/loan_security_status/loan_security_status.json
deleted file mode 100644
index 9eb948d..0000000
--- a/erpnext/loan_management/report/loan_security_status/loan_security_status.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "add_total_row": 1,
- "creation": "2019-10-07 05:57:33.435705",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2019-10-07 13:45:46.793949",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loan Security Status",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Loan Security",
- "report_name": "Loan Security Status",
- "report_type": "Script Report",
- "roles": [
- {
- "role": "System Manager"
- },
- {
- "role": "Loan Manager"
- }
- ]
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/report/loan_security_status/loan_security_status.py b/erpnext/loan_management/report/loan_security_status/loan_security_status.py
deleted file mode 100644
index 9a5a180..0000000
--- a/erpnext/loan_management/report/loan_security_status/loan_security_status.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-import frappe
-from frappe import _
-
-
-def execute(filters=None):
- columns = get_columns(filters)
- data = get_data(filters)
- return columns, data
-
-
-def get_columns(filters):
- columns = [
- {
- "label": _("Loan Security Pledge"),
- "fieldtype": "Link",
- "fieldname": "loan_security_pledge",
- "options": "Loan Security Pledge",
- "width": 200,
- },
- {"label": _("Loan"), "fieldtype": "Link", "fieldname": "loan", "options": "Loan", "width": 200},
- {"label": _("Applicant"), "fieldtype": "Data", "fieldname": "applicant", "width": 200},
- {"label": _("Status"), "fieldtype": "Data", "fieldname": "status", "width": 100},
- {"label": _("Pledge Time"), "fieldtype": "Data", "fieldname": "pledge_time", "width": 150},
- {
- "label": _("Loan Security"),
- "fieldtype": "Link",
- "fieldname": "loan_security",
- "options": "Loan Security",
- "width": 150,
- },
- {"label": _("Quantity"), "fieldtype": "Float", "fieldname": "qty", "width": 100},
- {
- "label": _("Loan Security Price"),
- "fieldtype": "Currency",
- "fieldname": "loan_security_price",
- "options": "currency",
- "width": 200,
- },
- {
- "label": _("Loan Security Value"),
- "fieldtype": "Currency",
- "fieldname": "loan_security_value",
- "options": "currency",
- "width": 200,
- },
- {
- "label": _("Currency"),
- "fieldtype": "Link",
- "fieldname": "currency",
- "options": "Currency",
- "width": 50,
- "hidden": 1,
- },
- ]
-
- return columns
-
-
-def get_data(filters):
-
- data = []
- conditions = get_conditions(filters)
-
- loan_security_pledges = frappe.db.sql(
- """
- SELECT
- p.name, p.applicant, p.loan, p.status, p.pledge_time,
- c.loan_security, c.qty, c.loan_security_price, c.amount
- FROM
- `tabLoan Security Pledge` p, `tabPledge` c
- WHERE
- p.docstatus = 1
- AND c.parent = p.name
- AND p.company = %(company)s
- {conditions}
- """.format(
- conditions=conditions
- ),
- (filters),
- as_dict=1,
- ) # nosec
-
- default_currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency")
-
- for pledge in loan_security_pledges:
- row = {}
- row["loan_security_pledge"] = pledge.name
- row["loan"] = pledge.loan
- row["applicant"] = pledge.applicant
- row["status"] = pledge.status
- row["pledge_time"] = pledge.pledge_time
- row["loan_security"] = pledge.loan_security
- row["qty"] = pledge.qty
- row["loan_security_price"] = pledge.loan_security_price
- row["loan_security_value"] = pledge.amount
- row["currency"] = default_currency
-
- data.append(row)
-
- return data
-
-
-def get_conditions(filters):
- conditions = []
-
- if filters.get("applicant"):
- conditions.append("p.applicant = %(applicant)s")
-
- if filters.get("pledge_status"):
- conditions.append(" p.status = %(pledge_status)s")
-
- return "AND {}".format(" AND ".join(conditions)) if conditions else ""
diff --git a/erpnext/loan_management/workspace/loan_management/loan_management.json b/erpnext/loan_management/workspace/loan_management/loan_management.json
deleted file mode 100644
index b08a85e..0000000
--- a/erpnext/loan_management/workspace/loan_management/loan_management.json
+++ /dev/null
@@ -1,273 +0,0 @@
-{
- "charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Loan Application\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Loan\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Loan\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Loan Processes\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Disbursement and Repayment\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Loan Security\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
- "creation": "2020-03-12 16:35:55.299820",
- "docstatus": 0,
- "doctype": "Workspace",
- "for_user": "",
- "hide_custom": 0,
- "icon": "loan",
- "idx": 0,
- "label": "Loans",
- "links": [
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Type",
- "link_count": 0,
- "link_to": "Loan Type",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Application",
- "link_count": 0,
- "link_to": "Loan Application",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan",
- "link_count": 0,
- "link_to": "Loan",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Processes",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Process Loan Security Shortfall",
- "link_count": 0,
- "link_to": "Process Loan Security Shortfall",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Process Loan Interest Accrual",
- "link_count": 0,
- "link_to": "Process Loan Interest Accrual",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Disbursement and Repayment",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Disbursement",
- "link_count": 0,
- "link_to": "Loan Disbursement",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Repayment",
- "link_count": 0,
- "link_to": "Loan Repayment",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Write Off",
- "link_count": 0,
- "link_to": "Loan Write Off",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Interest Accrual",
- "link_count": 0,
- "link_to": "Loan Interest Accrual",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Type",
- "link_count": 0,
- "link_to": "Loan Security Type",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Price",
- "link_count": 0,
- "link_to": "Loan Security Price",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security",
- "link_count": 0,
- "link_to": "Loan Security",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Pledge",
- "link_count": 0,
- "link_to": "Loan Security Pledge",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Unpledge",
- "link_count": 0,
- "link_to": "Loan Security Unpledge",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Shortfall",
- "link_count": 0,
- "link_to": "Loan Security Shortfall",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Reports",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Repayment and Closure",
- "link_count": 0,
- "link_to": "Loan Repayment and Closure",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Security Status",
- "link_count": 0,
- "link_to": "Loan Security Status",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- }
- ],
- "modified": "2022-01-13 17:39:16.790152",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loans",
- "owner": "Administrator",
- "parent_page": "",
- "public": 1,
- "restrict_to_domain": "",
- "roles": [],
- "sequence_id": 16.0,
- "shortcuts": [
- {
- "color": "Green",
- "format": "{} Open",
- "label": "Loan Application",
- "link_to": "Loan Application",
- "stats_filter": "{ \"status\": \"Open\" }",
- "type": "DocType"
- },
- {
- "label": "Loan",
- "link_to": "Loan",
- "type": "DocType"
- },
- {
- "doc_view": "",
- "label": "Dashboard",
- "link_to": "Loan Dashboard",
- "type": "Dashboard"
- }
- ],
- "title": "Loans"
-}
\ No newline at end of file
diff --git a/erpnext/loan_management/workspace/loans/loans.json b/erpnext/loan_management/workspace/loans/loans.json
deleted file mode 100644
index c65be4e..0000000
--- a/erpnext/loan_management/workspace/loans/loans.json
+++ /dev/null
@@ -1,315 +0,0 @@
-{
- "charts": [],
- "content": "[{\"id\":\"_38WStznya\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"t7o_K__1jB\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Loan Application\",\"col\":3}},{\"id\":\"IRiNDC6w1p\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Loan\",\"col\":3}},{\"id\":\"xbbo0FYbq0\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"7ZL4Bro-Vi\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"yhyioTViZ3\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"oYFn4b1kSw\",\"type\":\"card\",\"data\":{\"card_name\":\"Loan\",\"col\":4}},{\"id\":\"vZepJF5tl9\",\"type\":\"card\",\"data\":{\"card_name\":\"Loan Processes\",\"col\":4}},{\"id\":\"k-393Mjhqe\",\"type\":\"card\",\"data\":{\"card_name\":\"Disbursement and Repayment\",\"col\":4}},{\"id\":\"6crJ0DBiBJ\",\"type\":\"card\",\"data\":{\"card_name\":\"Loan Security\",\"col\":4}},{\"id\":\"Um5YwxVLRJ\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
- "creation": "2020-03-12 16:35:55.299820",
- "docstatus": 0,
- "doctype": "Workspace",
- "for_user": "",
- "hide_custom": 0,
- "icon": "loan",
- "idx": 0,
- "is_hidden": 0,
- "label": "Loans",
- "links": [
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Type",
- "link_count": 0,
- "link_to": "Loan Type",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Application",
- "link_count": 0,
- "link_to": "Loan Application",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan",
- "link_count": 0,
- "link_to": "Loan",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Processes",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Process Loan Security Shortfall",
- "link_count": 0,
- "link_to": "Process Loan Security Shortfall",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Process Loan Interest Accrual",
- "link_count": 0,
- "link_to": "Process Loan Interest Accrual",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Disbursement and Repayment",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Disbursement",
- "link_count": 0,
- "link_to": "Loan Disbursement",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Repayment",
- "link_count": 0,
- "link_to": "Loan Repayment",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Write Off",
- "link_count": 0,
- "link_to": "Loan Write Off",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Interest Accrual",
- "link_count": 0,
- "link_to": "Loan Interest Accrual",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Type",
- "link_count": 0,
- "link_to": "Loan Security Type",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Price",
- "link_count": 0,
- "link_to": "Loan Security Price",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security",
- "link_count": 0,
- "link_to": "Loan Security",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Pledge",
- "link_count": 0,
- "link_to": "Loan Security Pledge",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Unpledge",
- "link_count": 0,
- "link_to": "Loan Security Unpledge",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loan Security Shortfall",
- "link_count": 0,
- "link_to": "Loan Security Shortfall",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Reports",
- "link_count": 6,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Repayment and Closure",
- "link_count": 0,
- "link_to": "Loan Repayment and Closure",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Security Status",
- "link_count": 0,
- "link_to": "Loan Security Status",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Interest Report",
- "link_count": 0,
- "link_to": "Loan Interest Report",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Security Exposure",
- "link_count": 0,
- "link_to": "Loan Security Exposure",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 1,
- "label": "Applicant-Wise Loan Security Exposure",
- "link_count": 0,
- "link_to": "Applicant-Wise Loan Security Exposure",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 1,
- "label": "Loan Security Status",
- "link_count": 0,
- "link_to": "Loan Security Status",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- }
- ],
- "modified": "2023-01-31 19:47:13.114415",
- "modified_by": "Administrator",
- "module": "Loan Management",
- "name": "Loans",
- "owner": "Administrator",
- "parent_page": "",
- "public": 1,
- "quick_lists": [],
- "restrict_to_domain": "",
- "roles": [],
- "sequence_id": 16.0,
- "shortcuts": [
- {
- "color": "Green",
- "format": "{} Open",
- "label": "Loan Application",
- "link_to": "Loan Application",
- "stats_filter": "{ \"status\": \"Open\" }",
- "type": "DocType"
- },
- {
- "label": "Loan",
- "link_to": "Loan",
- "type": "DocType"
- },
- {
- "doc_view": "",
- "label": "Dashboard",
- "link_to": "Loan Dashboard",
- "type": "Dashboard"
- }
- ],
- "title": "Loans"
-}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
index 5252798..4480ae5 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
@@ -7,6 +7,19 @@
frm.set_query('contact_person', erpnext.queries.contact_query);
frm.set_query('customer_address', erpnext.queries.address_query);
frm.set_query('customer', erpnext.queries.customer);
+
+ frm.set_query('serial_and_batch_bundle', 'items', (doc, cdt, cdn) => {
+ let item = locals[cdt][cdn];
+
+ return {
+ filters: {
+ 'item_code': item.item_code,
+ 'voucher_type': 'Maintenance Schedule',
+ 'type_of_transaction': 'Maintenance',
+ 'company': doc.company,
+ }
+ }
+ });
},
onload: function (frm) {
if (!frm.doc.status) {
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index 4f89a67..08026d0 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -152,6 +152,7 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -160,6 +161,7 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Contact Email",
+ "options": "Email",
"print_hide": 1,
"read_only": 1
},
@@ -236,10 +238,11 @@
"link_fieldname": "maintenance_schedule"
}
],
- "modified": "2021-05-27 16:05:10.746465",
+ "modified": "2023-06-03 16:15:43.958072",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Schedule",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -260,5 +263,6 @@
"search_fields": "status,customer,customer_name",
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"timeline_field": "customer"
}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 95e2d69..e5bb9e8 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -7,7 +7,6 @@
from erpnext.setup.doctype.employee.employee import get_holiday_list_for_employee
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-from erpnext.stock.utils import get_valid_serial_nos
from erpnext.utilities.transaction_base import TransactionBase, delete_events
@@ -74,10 +73,14 @@
email_map = {}
for d in self.get("items"):
- if d.serial_no:
- serial_nos = get_valid_serial_nos(d.serial_no)
- self.validate_serial_no(d.item_code, serial_nos, d.start_date)
- self.update_amc_date(serial_nos, d.end_date)
+ if d.serial_and_batch_bundle:
+ serial_nos = frappe.get_doc(
+ "Serial and Batch Bundle", d.serial_and_batch_bundle
+ ).get_serial_nos()
+
+ if serial_nos:
+ self.validate_serial_no(d.item_code, serial_nos, d.start_date)
+ self.update_amc_date(serial_nos, d.end_date)
no_email_sp = []
if d.sales_person not in email_map:
@@ -241,9 +244,27 @@
self.validate_maintenance_detail()
self.validate_dates_with_periodicity()
self.validate_sales_order()
+ self.validate_serial_no_bundle()
if not self.schedules or self.validate_items_table_change() or self.validate_no_of_visits():
self.generate_schedule()
+ def validate_serial_no_bundle(self):
+ ids = [d.serial_and_batch_bundle for d in self.items if d.serial_and_batch_bundle]
+
+ if not ids:
+ return
+
+ voucher_nos = frappe.get_all(
+ "Serial and Batch Bundle", fields=["name", "voucher_type"], filters={"name": ("in", ids)}
+ )
+
+ for row in voucher_nos:
+ if row.voucher_type != "Maintenance Schedule":
+ msg = f"""Serial and Batch Bundle {row.name}
+ should have voucher type as 'Maintenance Schedule'"""
+
+ frappe.throw(_(msg))
+
def on_update(self):
self.db_set("status", "Draft")
@@ -341,9 +362,14 @@
def on_cancel(self):
for d in self.get("items"):
- if d.serial_no:
- serial_nos = get_valid_serial_nos(d.serial_no)
- self.update_amc_date(serial_nos)
+ if d.serial_and_batch_bundle:
+ serial_nos = frappe.get_doc(
+ "Serial and Batch Bundle", d.serial_and_batch_bundle
+ ).get_serial_nos()
+
+ if serial_nos:
+ self.update_amc_date(serial_nos)
+
self.db_set("status", "Cancelled")
delete_events(self.doctype, self.name)
@@ -397,11 +423,15 @@
target.maintenance_schedule_detail = s_id
def update_serial(source, target, parent):
- serial_nos = get_serial_nos(target.serial_no)
- if len(serial_nos) == 1:
- target.serial_no = serial_nos[0]
- else:
- target.serial_no = ""
+ if source.serial_and_batch_bundle:
+ serial_nos = frappe.get_doc(
+ "Serial and Batch Bundle", source.serial_and_batch_bundle
+ ).get_serial_nos()
+
+ if len(serial_nos) == 1:
+ target.serial_no = serial_nos[0]
+ else:
+ target.serial_no = ""
doclist = get_mapped_doc(
"Maintenance Schedule",
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
index 3dacdea..d8e02cf 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -20,7 +20,9 @@
"sales_person",
"reference",
"serial_no",
- "sales_order"
+ "sales_order",
+ "column_break_ugqr",
+ "serial_and_batch_bundle"
],
"fields": [
{
@@ -121,7 +123,8 @@
"fieldtype": "Small Text",
"label": "Serial No",
"oldfieldname": "serial_no",
- "oldfieldtype": "Small Text"
+ "oldfieldtype": "Small Text",
+ "read_only": 1
},
{
"fieldname": "sales_order",
@@ -144,17 +147,31 @@
{
"fieldname": "column_break_10",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_ugqr",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2021-04-15 16:09:47.311994",
+ "modified": "2023-03-22 18:44:36.816037",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Schedule Item",
+ "naming_rule": "Random",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index 4a6aa0a..b0d5cb8 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -101,6 +101,7 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -108,6 +109,7 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Contact Email",
+ "options": "Email",
"read_only": 1
},
{
@@ -293,7 +295,7 @@
"idx": 1,
"is_submittable": 1,
"links": [],
- "modified": "2021-12-17 03:10:27.608112",
+ "modified": "2023-06-03 16:19:07.902723",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Visit",
@@ -319,6 +321,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"timeline_field": "customer",
"title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 4304193..8c671e2 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -48,7 +48,8 @@
return {
query: "erpnext.manufacturing.doctype.bom.bom.item_query",
filters: {
- "item_code": doc.item
+ "include_item_in_manufacturing": 1,
+ "is_fixed_asset": 0
}
};
});
@@ -411,7 +412,6 @@
}
frm.set_value("process_loss_qty", qty);
- frm.set_value("add_process_loss_cost_in_fg", qty ? 1: 0);
}
});
@@ -653,7 +653,7 @@
frappe.ui.form.on("BOM Operation", "workstation", function(frm, cdt, cdn) {
var d = locals[cdt][cdn];
-
+ if(!d.workstation) return;
frappe.call({
"method": "frappe.client.get",
args: {
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index a085af8..8058a5f 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -1317,7 +1317,7 @@
if not field in searchfields
]
- query_filters = {"disabled": 0, "end_of_life": (">", today())}
+ query_filters = {"disabled": 0, "ifnull(end_of_life, '3099-12-31')": (">", today())}
or_cond_filters = {}
if txt:
@@ -1339,8 +1339,9 @@
if not has_variants:
query_filters["has_variants"] = 0
- if filters and filters.get("is_stock_item"):
- query_filters["is_stock_item"] = 1
+ if filters:
+ for fieldname, value in filters.items():
+ query_filters[fieldname] = value
return frappe.get_list(
"Item",
diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
index 01bf2e4..051b475 100644
--- a/erpnext/manufacturing/doctype/bom/test_bom.py
+++ b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -698,6 +698,45 @@
bom.update_cost()
self.assertFalse(bom.flags.cost_updated)
+ def test_do_not_include_manufacturing_and_fixed_items(self):
+ from erpnext.manufacturing.doctype.bom.bom import item_query
+
+ if not frappe.db.exists("Asset Category", "Computers-Test"):
+ doc = frappe.get_doc({"doctype": "Asset Category", "asset_category_name": "Computers-Test"})
+ doc.flags.ignore_mandatory = True
+ doc.insert()
+
+ for item_code, properties in {
+ "_Test RM Item 1 Do Not Include In Manufacture": {
+ "is_stock_item": 1,
+ "include_item_in_manufacturing": 0,
+ },
+ "_Test RM Item 2 Fixed Asset Item": {
+ "is_fixed_asset": 1,
+ "is_stock_item": 0,
+ "asset_category": "Computers-Test",
+ },
+ "_Test RM Item 3 Manufacture Item": {"is_stock_item": 1, "include_item_in_manufacturing": 1},
+ }.items():
+ make_item(item_code, properties)
+
+ data = item_query(
+ "Item",
+ txt="_Test RM Item",
+ searchfield="name",
+ start=0,
+ page_len=20000,
+ filters={"include_item_in_manufacturing": 1, "is_fixed_asset": 0},
+ )
+
+ items = []
+ for row in data:
+ items.append(row[0])
+
+ self.assertTrue("_Test RM Item 1 Do Not Include In Manufacture" not in items)
+ self.assertTrue("_Test RM Item 2 Fixed Asset Item" not in items)
+ self.assertTrue("_Test RM Item 3 Manufacture Item" in items)
+
def get_default_bom(item_code="_Test FG Item 2"):
return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1})
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
index 7477f95..17b5aae 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
@@ -88,12 +88,14 @@
boms=boms,
timeout=40000,
now=frappe.flags.in_test,
+ enqueue_after_commit=True,
)
else:
frappe.enqueue(
method="erpnext.manufacturing.doctype.bom_update_log.bom_update_log.process_boms_cost_level_wise",
update_doc=self,
now=frappe.flags.in_test,
+ enqueue_after_commit=True,
)
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index 5305db3..8e9f542 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -12,6 +12,28 @@
};
});
+ frm.set_query("serial_and_batch_bundle", () => {
+ return {
+ filters: {
+ 'item_code': frm.doc.production_item,
+ 'voucher_type': frm.doc.doctype,
+ 'voucher_no': ["in", [frm.doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = () => {
+ return {
+ 'item_code': frm.doc.production_item,
+ 'warehouse': frm.doc.wip_warehouse,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
+
frm.set_indicator_formatter('sub_operation',
function(doc) {
if (doc.status == "Pending") {
@@ -83,7 +105,7 @@
// and if stock mvt for WIP is required
if (frm.doc.work_order) {
frappe.db.get_value('Work Order', frm.doc.work_order, ['skip_transfer', 'status'], (result) => {
- if (result.skip_transfer === 1 || result.status == 'In Process' || frm.doc.transferred_qty > 0) {
+ if (result.skip_transfer === 1 || result.status == 'In Process' || frm.doc.transferred_qty > 0 || !frm.doc.items.length) {
frm.trigger("prepare_timer_buttons");
}
});
@@ -411,6 +433,16 @@
}
});
+ if (frm.doc.total_completed_qty && frm.doc.for_quantity > frm.doc.total_completed_qty) {
+ let flt_precision = precision('for_quantity', frm.doc);
+ let process_loss_qty = (
+ flt(frm.doc.for_quantity, flt_precision)
+ - flt(frm.doc.total_completed_qty, flt_precision)
+ );
+
+ frm.set_value('process_loss_qty', process_loss_qty);
+ }
+
refresh_field("total_completed_qty");
}
});
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index 8506111..0f01704 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -9,37 +9,40 @@
"naming_series",
"work_order",
"bom_no",
+ "production_item",
+ "employee",
"column_break_4",
"posting_date",
"company",
- "production_section",
- "production_item",
- "item_name",
"for_quantity",
- "serial_no",
- "column_break_12",
- "wip_warehouse",
- "quality_inspection_template",
- "quality_inspection",
- "project",
- "batch_no",
- "operation_section_section",
- "operation",
- "operation_row_number",
- "column_break_18",
- "workstation_type",
- "workstation",
- "employee",
- "section_break_21",
- "sub_operations",
- "timing_detail",
+ "total_completed_qty",
+ "process_loss_qty",
+ "scheduled_time_section",
"expected_start_date",
+ "time_required",
+ "column_break_jkir",
"expected_end_date",
+ "section_break_05am",
+ "scheduled_time_logs",
+ "timing_detail",
"time_logs",
"section_break_13",
- "total_completed_qty",
- "column_break_15",
+ "actual_start_date",
"total_time_in_mins",
+ "column_break_15",
+ "actual_end_date",
+ "production_section",
+ "operation",
+ "wip_warehouse",
+ "column_break_12",
+ "workstation_type",
+ "workstation",
+ "quality_inspection_section",
+ "quality_inspection_template",
+ "column_break_fcmp",
+ "quality_inspection",
+ "section_break_21",
+ "sub_operations",
"section_break_8",
"items",
"scrap_items_section",
@@ -51,18 +54,25 @@
"hour_rate",
"for_operation",
"more_information",
- "operation_id",
- "sequence_id",
+ "project",
+ "item_name",
"transferred_qty",
"requested_qty",
"status",
"column_break_20",
+ "operation_row_number",
+ "operation_id",
+ "sequence_id",
"remarks",
+ "serial_and_batch_bundle",
+ "batch_no",
+ "serial_no",
"barcode",
"job_started",
"started_time",
"current_time",
- "amended_from"
+ "amended_from",
+ "connections_tab"
],
"fields": [
{
@@ -132,7 +142,7 @@
{
"fieldname": "timing_detail",
"fieldtype": "Section Break",
- "label": "Timing Detail"
+ "label": "Actual Time"
},
{
"allow_bulk_edit": 1,
@@ -165,7 +175,7 @@
},
{
"fieldname": "section_break_8",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"label": "Raw Materials"
},
{
@@ -177,7 +187,7 @@
{
"collapsible": 1,
"fieldname": "more_information",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"label": "More Information"
},
{
@@ -262,10 +272,9 @@
"reqd": 1
},
{
- "collapsible": 1,
"fieldname": "production_section",
- "fieldtype": "Section Break",
- "label": "Production"
+ "fieldtype": "Tab Break",
+ "label": "Operation & Workstation"
},
{
"fieldname": "column_break_12",
@@ -330,18 +339,10 @@
"read_only": 1
},
{
- "fieldname": "operation_section_section",
- "fieldtype": "Section Break",
- "label": "Operation Section"
- },
- {
- "fieldname": "column_break_18",
- "fieldtype": "Column Break"
- },
- {
"fieldname": "section_break_21",
- "fieldtype": "Section Break",
- "hide_border": 1
+ "fieldtype": "Tab Break",
+ "hide_border": 1,
+ "label": "Sub Operations"
},
{
"depends_on": "is_corrective_job_card",
@@ -353,7 +354,7 @@
"collapsible": 1,
"depends_on": "is_corrective_job_card",
"fieldname": "corrective_operation_section",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"label": "Corrective Operation"
},
{
@@ -391,18 +392,22 @@
{
"fieldname": "serial_no",
"fieldtype": "Small Text",
- "label": "Serial No"
+ "hidden": 1,
+ "label": "Serial No",
+ "read_only": 1
},
{
"fieldname": "batch_no",
"fieldtype": "Link",
+ "hidden": 1,
"label": "Batch No",
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"collapsible": 1,
"fieldname": "scrap_items_section",
- "fieldtype": "Section Break",
+ "fieldtype": "Tab Break",
"label": "Scrap Items"
},
{
@@ -435,11 +440,78 @@
"fieldname": "expected_end_date",
"fieldtype": "Datetime",
"label": "Expected End Date"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "process_loss_qty",
+ "fieldname": "process_loss_qty",
+ "fieldtype": "Float",
+ "label": "Process Loss Qty",
+ "read_only": 1
+ },
+ {
+ "fieldname": "connections_tab",
+ "fieldtype": "Tab Break",
+ "label": "Connections",
+ "show_dashboard": 1
+ },
+ {
+ "fieldname": "scheduled_time_section",
+ "fieldtype": "Section Break",
+ "label": "Scheduled Time"
+ },
+ {
+ "fieldname": "column_break_jkir",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "time_required",
+ "fieldtype": "Float",
+ "label": "Expected Time Required (In Mins)"
+ },
+ {
+ "fieldname": "section_break_05am",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "scheduled_time_logs",
+ "fieldtype": "Table",
+ "label": "Scheduled Time Logs",
+ "options": "Job Card Scheduled Time",
+ "read_only": 1
+ },
+ {
+ "fieldname": "actual_start_date",
+ "fieldtype": "Datetime",
+ "label": "Actual Start Date",
+ "read_only": 1
+ },
+ {
+ "fieldname": "actual_end_date",
+ "fieldtype": "Datetime",
+ "label": "Actual End Date",
+ "read_only": 1
+ },
+ {
+ "fieldname": "quality_inspection_section",
+ "fieldtype": "Section Break",
+ "label": "Quality Inspection"
+ },
+ {
+ "fieldname": "column_break_fcmp",
+ "fieldtype": "Column Break"
}
],
"is_submittable": 1,
"links": [],
- "modified": "2022-11-09 15:02:44.490731",
+ "modified": "2023-06-28 19:23:14.345214",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index e82f379..80bdfd5 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -2,7 +2,7 @@
# For license information, please see license.txt
import datetime
import json
-from typing import Optional
+from collections import OrderedDict
import frappe
from frappe import _, bold
@@ -74,6 +74,52 @@
self.update_sub_operation_status()
self.validate_work_order()
+ def on_update(self):
+ self.validate_job_card_qty()
+
+ def validate_job_card_qty(self):
+ if not (self.operation_id and self.work_order):
+ return
+
+ wo_qty = flt(frappe.get_cached_value("Work Order", self.work_order, "qty"))
+
+ completed_qty = flt(
+ frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty")
+ )
+
+ over_production_percentage = flt(
+ frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
+ )
+
+ wo_qty = wo_qty + (wo_qty * over_production_percentage / 100)
+
+ job_card_qty = frappe.get_all(
+ "Job Card",
+ fields=["sum(for_quantity)"],
+ filters={
+ "work_order": self.work_order,
+ "operation_id": self.operation_id,
+ "docstatus": ["!=", 2],
+ },
+ as_list=1,
+ )
+
+ job_card_qty = flt(job_card_qty[0][0]) if job_card_qty else 0
+
+ if job_card_qty and ((job_card_qty - completed_qty) > wo_qty):
+ form_link = get_link_to_form("Manufacturing Settings", "Manufacturing Settings")
+
+ msg = f"""
+ Qty To Manufacture in the job card
+ cannot be greater than Qty To Manufacture in the
+ work order for the operation {bold(self.operation)}.
+ <br><br><b>Solution: </b> Either you can reduce the
+ Qty To Manufacture in the job card or set the
+ 'Overproduction Percentage For Work Order'
+ in the {form_link}."""
+
+ frappe.throw(_(msg), title=_("Extra Job Card Quantity"))
+
def set_sub_operations(self):
if not self.sub_operations and self.operation:
self.sub_operations = []
@@ -118,10 +164,40 @@
self.total_completed_qty += row.completed_qty
def get_overlap_for(self, args, check_next_available_slot=False):
- production_capacity = 1
+ time_logs = []
+ time_logs.extend(self.get_time_logs(args, "Job Card Time Log", check_next_available_slot))
+
+ time_logs.extend(self.get_time_logs(args, "Job Card Scheduled Time", check_next_available_slot))
+
+ if not time_logs:
+ return {}
+
+ time_logs = sorted(time_logs, key=lambda x: x.get("to_time"))
+
+ production_capacity = 1
+ if self.workstation:
+ production_capacity = (
+ frappe.get_cached_value("Workstation", self.workstation, "production_capacity") or 1
+ )
+
+ if args.get("employee"):
+ # override capacity for employee
+ production_capacity = 1
+
+ if time_logs and production_capacity > len(time_logs):
+ return {}
+
+ if self.workstation_type and time_logs:
+ if workstation_time := self.get_workstation_based_on_available_slot(time_logs):
+ self.workstation = workstation_time.get("workstation")
+ return workstation_time
+
+ return time_logs[-1]
+
+ def get_time_logs(self, args, doctype, check_next_available_slot=False):
jc = frappe.qb.DocType("Job Card")
- jctl = frappe.qb.DocType("Job Card Time Log")
+ jctl = frappe.qb.DocType(doctype)
time_conditions = [
((jctl.from_time < args.from_time) & (jctl.to_time > args.from_time)),
@@ -135,7 +211,7 @@
query = (
frappe.qb.from_(jctl)
.from_(jc)
- .select(jc.name.as_("name"), jctl.to_time, jc.workstation, jc.workstation_type)
+ .select(jc.name.as_("name"), jctl.from_time, jctl.to_time, jc.workstation, jc.workstation_type)
.where(
(jctl.parent == jc.name)
& (Criterion.any(time_conditions))
@@ -143,42 +219,51 @@
& (jc.name != f"{args.parent or 'No Name'}")
& (jc.docstatus < 2)
)
- .orderby(jctl.to_time, order=frappe.qb.desc)
+ .orderby(jctl.to_time)
)
if self.workstation_type:
query = query.where(jc.workstation_type == self.workstation_type)
if self.workstation:
- production_capacity = (
- frappe.get_cached_value("Workstation", self.workstation, "production_capacity") or 1
- )
query = query.where(jc.workstation == self.workstation)
- if args.get("employee"):
- # override capacity for employee
- production_capacity = 1
+ if args.get("employee") and doctype == "Job Card Time Log":
query = query.where(jctl.employee == args.get("employee"))
- existing = query.run(as_dict=True)
+ if doctype != "Job Card Time Log":
+ query = query.where(jc.total_time_in_mins == 0)
- if existing and production_capacity > len(existing):
- return
+ time_logs = query.run(as_dict=True)
- if self.workstation_type:
- if workstation := self.get_workstation_based_on_available_slot(existing):
- self.workstation = workstation
- return None
+ return time_logs
- return existing[0] if existing else None
-
- def get_workstation_based_on_available_slot(self, existing) -> Optional[str]:
+ def get_workstation_based_on_available_slot(self, existing_time_logs) -> dict:
workstations = get_workstations(self.workstation_type)
if workstations:
- busy_workstations = [row.workstation for row in existing]
- for workstation in workstations:
- if workstation not in busy_workstations:
- return workstation
+ busy_workstations = self.time_slot_wise_busy_workstations(existing_time_logs)
+ for time_slot in busy_workstations:
+ available_workstations = sorted(list(set(workstations) - set(busy_workstations[time_slot])))
+ if available_workstations:
+ return frappe._dict(
+ {
+ "workstation": available_workstations[0],
+ "planned_start_time": get_datetime(time_slot[0]),
+ "to_time": get_datetime(time_slot[1]),
+ }
+ )
+
+ return frappe._dict({})
+
+ @staticmethod
+ def time_slot_wise_busy_workstations(existing_time_logs) -> dict:
+ time_slot = OrderedDict()
+ for row in existing_time_logs:
+ from_time = get_datetime(row.from_time).strftime("%Y-%m-%d %H:%M")
+ to_time = get_datetime(row.to_time).strftime("%Y-%m-%d %H:%M")
+ time_slot.setdefault((from_time, to_time), []).append(row.workstation)
+
+ return time_slot
def schedule_time_logs(self, row):
row.remaining_time_in_mins = row.time_in_mins
@@ -191,11 +276,17 @@
def validate_overlap_for_workstation(self, args, row):
# get the last record based on the to time from the job card
data = self.get_overlap_for(args, check_next_available_slot=True)
- if data:
- if not self.workstation:
- self.workstation = data.workstation
+ if not self.workstation:
+ workstations = get_workstations(self.workstation_type)
+ if workstations:
+ # Get the first workstation
+ self.workstation = workstations[0]
- row.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
+ if data:
+ if data.get("planned_start_time"):
+ row.planned_start_time = get_datetime(data.planned_start_time)
+ else:
+ row.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
def check_workstation_time(self, row):
workstation_doc = frappe.get_cached_doc("Workstation", self.workstation)
@@ -364,7 +455,7 @@
def update_time_logs(self, row):
self.append(
- "time_logs",
+ "scheduled_time_logs",
{
"from_time": row.planned_start_time,
"to_time": row.planned_end_time,
@@ -405,6 +496,10 @@
},
)
+ def before_save(self):
+ self.set_expected_and_actual_time()
+ self.set_process_loss()
+
def on_submit(self):
self.validate_transfer_qty()
self.validate_job_card()
@@ -441,19 +536,61 @@
)
)
- if self.for_quantity and self.total_completed_qty != self.for_quantity:
+ precision = self.precision("total_completed_qty")
+ total_completed_qty = flt(
+ flt(self.total_completed_qty, precision) + flt(self.process_loss_qty, precision)
+ )
+
+ if self.for_quantity and flt(total_completed_qty, precision) != flt(
+ self.for_quantity, precision
+ ):
total_completed_qty = bold(_("Total Completed Qty"))
qty_to_manufacture = bold(_("Qty to Manufacture"))
frappe.throw(
_("The {0} ({1}) must be equal to {2} ({3})").format(
total_completed_qty,
- bold(self.total_completed_qty),
+ bold(flt(total_completed_qty, precision)),
qty_to_manufacture,
bold(self.for_quantity),
)
)
+ def set_expected_and_actual_time(self):
+ for child_table, start_field, end_field, time_required in [
+ ("scheduled_time_logs", "expected_start_date", "expected_end_date", "time_required"),
+ ("time_logs", "actual_start_date", "actual_end_date", "total_time_in_mins"),
+ ]:
+ if not self.get(child_table):
+ continue
+
+ time_list = []
+ time_in_mins = 0.0
+ for row in self.get(child_table):
+ time_in_mins += flt(row.get("time_in_mins"))
+ for field in ["from_time", "to_time"]:
+ if row.get(field):
+ time_list.append(get_datetime(row.get(field)))
+
+ if time_list:
+ self.set(start_field, min(time_list))
+ if end_field == "actual_end_date" and not self.time_logs[-1].to_time:
+ self.set(end_field, "")
+ return
+
+ self.set(end_field, max(time_list))
+
+ self.set(time_required, time_in_mins)
+
+ def set_process_loss(self):
+ precision = self.precision("total_completed_qty")
+
+ self.process_loss_qty = 0.0
+ if self.total_completed_qty and self.for_quantity > self.total_completed_qty:
+ self.process_loss_qty = flt(self.for_quantity, precision) - flt(
+ self.total_completed_qty, precision
+ )
+
def update_work_order(self):
if not self.work_order:
return
@@ -465,7 +602,7 @@
):
return
- for_quantity, time_in_mins = 0, 0
+ for_quantity, time_in_mins, process_loss_qty = 0, 0, 0
from_time_list, to_time_list = [], []
field = "operation_id"
@@ -473,6 +610,7 @@
if data and len(data) > 0:
for_quantity = flt(data[0].completed_qty)
time_in_mins = flt(data[0].time_in_mins)
+ process_loss_qty = flt(data[0].process_loss_qty)
wo = frappe.get_doc("Work Order", self.work_order)
@@ -480,8 +618,8 @@
self.update_corrective_in_work_order(wo)
elif self.operation_id:
- self.validate_produced_quantity(for_quantity, wo)
- self.update_work_order_data(for_quantity, time_in_mins, wo)
+ self.validate_produced_quantity(for_quantity, process_loss_qty, wo)
+ self.update_work_order_data(for_quantity, process_loss_qty, time_in_mins, wo)
def update_corrective_in_work_order(self, wo):
wo.corrective_operation_cost = 0.0
@@ -496,11 +634,11 @@
wo.flags.ignore_validate_update_after_submit = True
wo.save()
- def validate_produced_quantity(self, for_quantity, wo):
+ def validate_produced_quantity(self, for_quantity, process_loss_qty, wo):
if self.docstatus < 2:
return
- if wo.produced_qty > for_quantity:
+ if wo.produced_qty > for_quantity + process_loss_qty:
first_part_msg = _(
"The {0} {1} is used to calculate the valuation cost for the finished good {2}."
).format(
@@ -515,7 +653,8 @@
_("{0} {1}").format(first_part_msg, second_part_msg), JobCardCancelError, title=_("Error")
)
- def update_work_order_data(self, for_quantity, time_in_mins, wo):
+ def update_work_order_data(self, for_quantity, process_loss_qty, time_in_mins, wo):
+ workstation_hour_rate = frappe.get_value("Workstation", self.workstation, "hour_rate")
jc = frappe.qb.DocType("Job Card")
jctl = frappe.qb.DocType("Job Card Time Log")
@@ -535,12 +674,14 @@
for data in wo.operations:
if data.get("name") == self.operation_id:
data.completed_qty = for_quantity
+ data.process_loss_qty = process_loss_qty
data.actual_operation_time = time_in_mins
data.actual_start_time = time_data[0].start_time if time_data else None
data.actual_end_time = time_data[0].end_time if time_data else None
if data.get("workstation") != self.workstation:
# workstations can change in a job card
data.workstation = self.workstation
+ data.hour_rate = flt(workstation_hour_rate)
wo.flags.ignore_validate_update_after_submit = True
wo.update_operation_status()
@@ -551,7 +692,11 @@
def get_current_operation_data(self):
return frappe.get_all(
"Job Card",
- fields=["sum(total_time_in_mins) as time_in_mins", "sum(total_completed_qty) as completed_qty"],
+ fields=[
+ "sum(total_time_in_mins) as time_in_mins",
+ "sum(total_completed_qty) as completed_qty",
+ "sum(process_loss_qty) as process_loss_qty",
+ ],
filters={
"docstatus": 1,
"work_order": self.work_order,
@@ -605,23 +750,19 @@
exc=JobCardOverTransferError,
)
- job_card_items_transferred_qty = _get_job_card_items_transferred_qty(ste_doc)
+ job_card_items_transferred_qty = _get_job_card_items_transferred_qty(ste_doc) or {}
+ allow_excess = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
- if job_card_items_transferred_qty:
- allow_excess = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
+ for row in ste_doc.items:
+ if not row.job_card_item:
+ continue
- for row in ste_doc.items:
- if not row.job_card_item:
- continue
+ transferred_qty = flt(job_card_items_transferred_qty.get(row.job_card_item, 0.0))
- transferred_qty = flt(job_card_items_transferred_qty.get(row.job_card_item))
+ if not allow_excess:
+ _validate_over_transfer(row, transferred_qty)
- if not allow_excess:
- _validate_over_transfer(row, transferred_qty)
-
- frappe.db.set_value(
- "Job Card Item", row.job_card_item, "transferred_qty", flt(transferred_qty)
- )
+ frappe.db.set_value("Job Card Item", row.job_card_item, "transferred_qty", flt(transferred_qty))
def set_transferred_qty(self, update_status=False):
"Set total FG Qty in Job Card for which RM was transferred."
@@ -682,7 +823,7 @@
self.status = {0: "Open", 1: "Submitted", 2: "Cancelled"}[self.docstatus or 0]
if self.docstatus < 2:
- if self.for_quantity <= self.transferred_qty:
+ if flt(self.for_quantity) <= flt(self.transferred_qty):
self.status = "Material Transferred"
if self.time_logs:
@@ -733,7 +874,7 @@
data = frappe.get_all(
"Work Order Operation",
- fields=["operation", "status", "completed_qty"],
+ fields=["operation", "status", "completed_qty", "sequence_id"],
filters={"docstatus": 1, "parent": self.work_order, "sequence_id": ("<", self.sequence_id)},
order_by="sequence_id, idx",
)
@@ -751,6 +892,16 @@
OperationSequenceError,
)
+ if row.completed_qty < current_operation_qty:
+ msg = f"""The completed quantity {bold(current_operation_qty)}
+ of an operation {bold(self.operation)} cannot be greater
+ than the completed quantity {bold(row.completed_qty)}
+ of a previous operation
+ {bold(row.operation)}.
+ """
+
+ frappe.throw(_(msg))
+
def validate_work_order(self):
if self.is_work_order_closed():
frappe.throw(_("You can't make any changes to Job Card since Work Order is closed."))
diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py
index 4d2dab7..bde0548 100644
--- a/erpnext/manufacturing/doctype/job_card/test_job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py
@@ -5,15 +5,17 @@
from typing import Literal
import frappe
+from frappe.test_runner import make_test_records
from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import random_string
-from frappe.utils.data import add_to_date, now
+from frappe.utils.data import add_to_date, now, today
from erpnext.manufacturing.doctype.job_card.job_card import (
JobCardOverTransferError,
OperationMismatchError,
OverlapError,
make_corrective_job_card,
+ make_material_request,
)
from erpnext.manufacturing.doctype.job_card.job_card import (
make_stock_entry as make_stock_entry_from_jc,
@@ -272,6 +274,42 @@
transfer_entry_2.insert()
self.assertRaises(JobCardOverTransferError, transfer_entry_2.submit)
+ @change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
+ def test_job_card_excess_material_transfer_with_no_reference(self):
+
+ self.transfer_material_against = "Job Card"
+ self.source_warehouse = "Stores - _TC"
+
+ self.generate_required_stock(self.work_order)
+
+ job_card_name = frappe.db.get_value("Job Card", {"work_order": self.work_order.name})
+
+ # fully transfer both RMs
+ transfer_entry_1 = make_stock_entry_from_jc(job_card_name)
+ row = transfer_entry_1.items[0]
+
+ # Add new row without reference of the job card item
+ transfer_entry_1.append(
+ "items",
+ {
+ "item_code": row.item_code,
+ "item_name": row.item_name,
+ "item_group": row.item_group,
+ "qty": row.qty,
+ "uom": row.uom,
+ "conversion_factor": row.conversion_factor,
+ "stock_uom": row.stock_uom,
+ "basic_rate": row.basic_rate,
+ "basic_amount": row.basic_amount,
+ "expense_account": row.expense_account,
+ "cost_center": row.cost_center,
+ "s_warehouse": row.s_warehouse,
+ "t_warehouse": row.t_warehouse,
+ },
+ )
+
+ self.assertRaises(frappe.ValidationError, transfer_entry_1.insert)
+
def test_job_card_partial_material_transfer(self):
"Test partial material transfer against Job Card"
self.transfer_material_against = "Job Card"
@@ -306,6 +344,12 @@
job_card.reload()
self.assertEqual(job_card.transferred_qty, 2)
+ transfer_entry_2.cancel()
+ transfer_entry.cancel()
+
+ job_card.reload()
+ self.assertEqual(job_card.transferred_qty, 0.0)
+
def test_job_card_material_transfer_correctness(self):
"""
1. Test if only current Job Card Items are pulled in a Stock Entry against a Job Card
@@ -407,6 +451,167 @@
jc.docstatus = 2
assertStatus("Cancelled")
+ def test_job_card_material_request_and_bom_details(self):
+ from erpnext.stock.doctype.material_request.material_request import make_stock_entry
+
+ create_bom_with_multiple_operations()
+ work_order = make_wo_with_transfer_against_jc()
+
+ job_card_name = frappe.db.get_value("Job Card", {"work_order": work_order.name}, "name")
+
+ mr = make_material_request(job_card_name)
+ mr.schedule_date = today()
+ mr.submit()
+
+ ste = make_stock_entry(mr.name)
+ self.assertEqual(ste.purpose, "Material Transfer for Manufacture")
+ self.assertEqual(ste.work_order, work_order.name)
+ self.assertEqual(ste.job_card, job_card_name)
+ self.assertEqual(ste.from_bom, 1.0)
+ self.assertEqual(ste.bom_no, work_order.bom_no)
+
+ def test_job_card_proccess_qty_and_completed_qty(self):
+ from erpnext.manufacturing.doctype.routing.test_routing import (
+ create_routing,
+ setup_bom,
+ setup_operations,
+ )
+ from erpnext.manufacturing.doctype.work_order.work_order import (
+ make_stock_entry as make_stock_entry_for_wo,
+ )
+ from erpnext.stock.doctype.item.test_item import make_item
+ from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+
+ operations = [
+ {"operation": "Test Operation A1", "workstation": "Test Workstation A", "time_in_mins": 30},
+ {"operation": "Test Operation B1", "workstation": "Test Workstation A", "time_in_mins": 20},
+ ]
+
+ make_test_records("UOM")
+
+ warehouse = create_warehouse("Test Warehouse 123 for Job Card")
+
+ setup_operations(operations)
+
+ item_code = "Test Job Card Process Qty Item"
+ for item in [item_code, item_code + "RM 1", item_code + "RM 2"]:
+ if not frappe.db.exists("Item", item):
+ make_item(
+ item,
+ {
+ "item_name": item,
+ "stock_uom": "Nos",
+ "is_stock_item": 1,
+ },
+ )
+
+ routing_doc = create_routing(routing_name="Testing Route", operations=operations)
+ bom_doc = setup_bom(
+ item_code=item_code,
+ routing=routing_doc.name,
+ raw_materials=[item_code + "RM 1", item_code + "RM 2"],
+ source_warehouse=warehouse,
+ )
+
+ for row in bom_doc.items:
+ make_stock_entry(
+ item_code=row.item_code,
+ target=row.source_warehouse,
+ qty=10,
+ basic_rate=100,
+ )
+
+ wo_doc = make_wo_order_test_record(
+ production_item=item_code,
+ bom_no=bom_doc.name,
+ skip_transfer=1,
+ wip_warehouse=warehouse,
+ source_warehouse=warehouse,
+ )
+
+ for row in routing_doc.operations:
+ self.assertEqual(row.sequence_id, row.idx)
+
+ first_job_card = frappe.get_all(
+ "Job Card",
+ filters={"work_order": wo_doc.name, "sequence_id": 1},
+ fields=["name"],
+ order_by="sequence_id",
+ limit=1,
+ )[0].name
+
+ jc = frappe.get_doc("Job Card", first_job_card)
+ for row in jc.scheduled_time_logs:
+ jc.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ },
+ )
+
+ jc.time_logs[0].completed_qty = 8
+ jc.save()
+ jc.submit()
+
+ self.assertEqual(jc.process_loss_qty, 2)
+ self.assertEqual(jc.for_quantity, 10)
+
+ second_job_card = frappe.get_all(
+ "Job Card",
+ filters={"work_order": wo_doc.name, "sequence_id": 2},
+ fields=["name"],
+ order_by="sequence_id",
+ limit=1,
+ )[0].name
+
+ jc2 = frappe.get_doc("Job Card", second_job_card)
+ for row in jc2.scheduled_time_logs:
+ jc2.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ },
+ )
+ jc2.time_logs[0].completed_qty = 10
+
+ self.assertRaises(frappe.ValidationError, jc2.save)
+
+ jc2.load_from_db()
+ for row in jc2.scheduled_time_logs:
+ jc2.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ },
+ )
+
+ jc2.time_logs[0].completed_qty = 8
+ jc2.save()
+ jc2.submit()
+
+ self.assertEqual(jc2.for_quantity, 10)
+ self.assertEqual(jc2.process_loss_qty, 2)
+
+ s = frappe.get_doc(make_stock_entry_for_wo(wo_doc.name, "Manufacture", 10))
+ s.submit()
+
+ self.assertEqual(s.process_loss_qty, 2)
+
+ wo_doc.reload()
+ for row in wo_doc.operations:
+ self.assertEqual(row.completed_qty, 8)
+ self.assertEqual(row.process_loss_qty, 2)
+
+ self.assertEqual(wo_doc.produced_qty, 8)
+ self.assertEqual(wo_doc.process_loss_qty, 2)
+ self.assertEqual(wo_doc.status, "Completed")
+
def create_bom_with_multiple_operations():
"Create a BOM with multiple operations and Material Transfer against Job Card"
diff --git a/erpnext/accounts/doctype/cash_flow_mapping_template/__init__.py b/erpnext/manufacturing/doctype/job_card_scheduled_time/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/cash_flow_mapping_template/__init__.py
rename to erpnext/manufacturing/doctype/job_card_scheduled_time/__init__.py
diff --git a/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json b/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json
new file mode 100644
index 0000000..522cfa3
--- /dev/null
+++ b/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json
@@ -0,0 +1,45 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2023-06-14 15:23:54.673262",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "from_time",
+ "to_time",
+ "time_in_mins"
+ ],
+ "fields": [
+ {
+ "fieldname": "from_time",
+ "fieldtype": "Datetime",
+ "in_list_view": 1,
+ "label": "From Time"
+ },
+ {
+ "fieldname": "to_time",
+ "fieldtype": "Datetime",
+ "in_list_view": 1,
+ "label": "To Time"
+ },
+ {
+ "fieldname": "time_in_mins",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Time (In Mins)"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2023-06-14 15:27:03.203045",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Job Card Scheduled Time",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.py b/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.py
new file mode 100644
index 0000000..e50b153
--- /dev/null
+++ b/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class JobCardScheduledTime(Document):
+ pass
diff --git a/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json b/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
index 8c61d54..09bf1d8 100644
--- a/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
+++ b/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
@@ -16,6 +16,7 @@
"column_break_4",
"quantity",
"uom",
+ "conversion_factor",
"projected_qty",
"reserved_qty_for_production",
"safety_stock",
@@ -169,11 +170,17 @@
"label": "Qty As Per BOM",
"no_copy": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "conversion_factor",
+ "fieldtype": "Float",
+ "label": "Conversion Factor",
+ "read_only": 1
}
],
"istable": 1,
"links": [],
- "modified": "2022-11-26 14:59:25.879631",
+ "modified": "2023-05-03 12:43:29.895754",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Material Request Plan Item",
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 62715e6..4898691 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -99,7 +99,7 @@
}, __('Create'));
}
- if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
+ if (frm.doc.mr_items && frm.doc.mr_items.length && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
frm.add_custom_button(__("Material Request"), ()=> {
frm.trigger("make_material_request");
}, __('Create'));
@@ -336,10 +336,6 @@
},
get_items_for_material_requests(frm, warehouses) {
- let set_fields = ['actual_qty', 'item_code','item_name', 'description', 'uom', 'from_warehouse',
- 'min_order_qty', 'required_bom_qty', 'quantity', 'sales_order', 'warehouse', 'projected_qty', 'ordered_qty',
- 'reserved_qty_for_production', 'material_request_type'];
-
frappe.call({
method: "erpnext.manufacturing.doctype.production_plan.production_plan.get_items_for_material_requests",
freeze: true,
@@ -352,11 +348,11 @@
frm.set_value('mr_items', []);
r.message.forEach(row => {
let d = frm.add_child('mr_items');
- set_fields.forEach(field => {
- if (row[field]) {
+ for (let field in row) {
+ if (field !== 'name') {
d[field] = row[field];
}
- });
+ }
});
}
refresh_field('mr_items');
@@ -455,10 +451,14 @@
for_warehouse: row.warehouse
},
callback: function(r) {
- let {projected_qty, actual_qty} = r.message;
+ if (r.message) {
+ let {projected_qty, actual_qty} = r.message[0];
- frappe.model.set_value(cdt, cdn, 'projected_qty', projected_qty);
- frappe.model.set_value(cdt, cdn, 'actual_qty', actual_qty);
+ frappe.model.set_value(cdt, cdn, {
+ 'projected_qty': projected_qty,
+ 'actual_qty': actual_qty
+ });
+ }
}
})
}
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.json b/erpnext/manufacturing/doctype/production_plan/production_plan.json
index fdaa4a2..232f1cb 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.json
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -35,8 +35,12 @@
"section_break_25",
"prod_plan_references",
"section_break_24",
- "get_sub_assembly_items",
"combine_sub_items",
+ "section_break_ucc4",
+ "skip_available_sub_assembly_item",
+ "column_break_igxl",
+ "get_sub_assembly_items",
+ "section_break_g4ip",
"sub_assembly_items",
"download_materials_request_plan_section_section",
"download_materials_required",
@@ -351,12 +355,12 @@
{
"fieldname": "section_break_24",
"fieldtype": "Section Break",
- "hide_border": 1
+ "hide_border": 1,
+ "label": "Sub Assembly Items"
},
{
"fieldname": "sub_assembly_items",
"fieldtype": "Table",
- "label": "Sub Assembly Items",
"no_copy": 1,
"options": "Production Plan Sub Assembly Item"
},
@@ -392,13 +396,33 @@
"fieldname": "download_materials_request_plan_section_section",
"fieldtype": "Section Break",
"label": "Download Materials Request Plan Section"
+ },
+ {
+ "default": "0",
+ "description": "System consider the projected quantity to check available or will be available sub-assembly items ",
+ "fieldname": "skip_available_sub_assembly_item",
+ "fieldtype": "Check",
+ "label": "Skip Available Sub Assembly Items"
+ },
+ {
+ "fieldname": "section_break_ucc4",
+ "fieldtype": "Column Break",
+ "hide_border": 1
+ },
+ {
+ "fieldname": "section_break_g4ip",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_igxl",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-calendar",
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-03-31 10:30:48.118932",
+ "modified": "2023-05-22 23:36:31.770517",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan",
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 0cc0f80..5f957a5 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -28,6 +28,7 @@
from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
from erpnext.stock.get_item_details import get_conversion_factor
+from erpnext.stock.utils import get_or_make_bin
from erpnext.utilities.transaction_base import validate_uom_is_integer
@@ -398,9 +399,20 @@
self.set_status()
self.db_set("status", self.status)
+ def on_submit(self):
+ self.update_bin_qty()
+
def on_cancel(self):
self.db_set("status", "Cancelled")
self.delete_draft_work_order()
+ self.update_bin_qty()
+
+ def update_bin_qty(self):
+ for d in self.mr_items:
+ if d.warehouse:
+ bin_name = get_or_make_bin(d.item_code, d.warehouse)
+ bin = frappe.get_doc("Bin", bin_name, for_update=True)
+ bin.update_reserved_qty_for_production_plan()
def delete_draft_work_order(self):
for d in frappe.get_all(
@@ -503,6 +515,9 @@
self.show_list_created_message("Work Order", wo_list)
self.show_list_created_message("Purchase Order", po_list)
+ if not wo_list:
+ frappe.msgprint(_("No Work Orders were created"))
+
def make_work_order_for_finished_goods(self, wo_list, default_warehouses):
items_data = self.get_production_items()
@@ -575,6 +590,7 @@
"production_plan_sub_assembly_item": row.name,
"bom": row.bom_no,
"production_plan": self.name,
+ "fg_item_qty": row.qty,
}
for field in [
@@ -605,6 +621,9 @@
def create_work_order(self, item):
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError
+ if item.get("qty") <= 0:
+ return
+
wo = frappe.new_doc("Work Order")
wo.update(item)
wo.planned_start_date = item.get("planned_start_date") or item.get("schedule_date")
@@ -678,10 +697,9 @@
material_request.flags.ignore_permissions = 1
material_request.run_method("set_missing_values")
+ material_request.save()
if self.get("submit_material_request"):
material_request.submit()
- else:
- material_request.save()
frappe.flags.mute_messages = False
@@ -705,7 +723,9 @@
frappe.throw(_("Row #{0}: Please select Item Code in Assembly Items").format(row.idx))
bom_data = []
- get_sub_assembly_items(row.bom_no, bom_data, row.planned_qty)
+
+ warehouse = row.warehouse if self.skip_available_sub_assembly_item else None
+ get_sub_assembly_items(row.bom_no, bom_data, row.planned_qty, self.company, warehouse=warehouse)
self.set_sub_assembly_items_based_on_level(row, bom_data, manufacturing_type)
sub_assembly_items_store.extend(bom_data)
@@ -881,7 +901,9 @@
build_csv_response(item_list, doc.name)
-def get_exploded_items(item_details, company, bom_no, include_non_stock_items, planned_qty=1):
+def get_exploded_items(
+ item_details, company, bom_no, include_non_stock_items, planned_qty=1, doc=None
+):
bei = frappe.qb.DocType("BOM Explosion Item")
bom = frappe.qb.DocType("BOM")
item = frappe.qb.DocType("Item")
@@ -1068,6 +1090,7 @@
"item_code": row.item_code,
"item_name": row.item_name,
"quantity": required_qty / conversion_factor,
+ "conversion_factor": conversion_factor,
"required_bom_qty": total_qty,
"stock_uom": row.get("stock_uom"),
"warehouse": warehouse
@@ -1257,6 +1280,12 @@
include_safety_stock = doc.get("include_safety_stock")
so_item_details = frappe._dict()
+
+ sub_assembly_items = {}
+ if doc.get("skip_available_sub_assembly_item"):
+ for d in doc.get("sub_assembly_items"):
+ sub_assembly_items.setdefault((d.get("production_item"), d.get("bom_no")), d.get("qty"))
+
for data in po_items:
if not data.get("include_exploded_items") and doc.get("sub_assembly_items"):
data["include_exploded_items"] = 1
@@ -1282,10 +1311,24 @@
frappe.throw(_("For row {0}: Enter Planned Qty").format(data.get("idx")))
if bom_no:
- if data.get("include_exploded_items") and include_subcontracted_items:
+ if (
+ data.get("include_exploded_items")
+ and doc.get("sub_assembly_items")
+ and doc.get("skip_available_sub_assembly_item")
+ ):
+ item_details = get_raw_materials_of_sub_assembly_items(
+ item_details,
+ company,
+ bom_no,
+ include_non_stock_items,
+ sub_assembly_items,
+ planned_qty=planned_qty,
+ )
+
+ elif data.get("include_exploded_items") and include_subcontracted_items:
# fetch exploded items from BOM
item_details = get_exploded_items(
- item_details, company, bom_no, include_non_stock_items, planned_qty=planned_qty
+ item_details, company, bom_no, include_non_stock_items, planned_qty=planned_qty, doc=doc
)
else:
item_details = get_subitems(
@@ -1442,12 +1485,22 @@
}
-def get_sub_assembly_items(bom_no, bom_data, to_produce_qty, indent=0):
+def get_sub_assembly_items(bom_no, bom_data, to_produce_qty, company, warehouse=None, indent=0):
data = get_bom_children(parent=bom_no)
for d in data:
if d.expandable:
parent_item_code = frappe.get_cached_value("BOM", bom_no, "item")
stock_qty = (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
+
+ if warehouse:
+ bin_dict = get_bin_details(d, company, for_warehouse=warehouse)
+
+ if bin_dict and bin_dict[0].projected_qty > 0:
+ if bin_dict[0].projected_qty > stock_qty:
+ continue
+ else:
+ stock_qty = stock_qty - bin_dict[0].projected_qty
+
bom_data.append(
frappe._dict(
{
@@ -1467,10 +1520,109 @@
)
if d.value:
- get_sub_assembly_items(d.value, bom_data, stock_qty, indent=indent + 1)
+ get_sub_assembly_items(d.value, bom_data, stock_qty, company, warehouse, indent=indent + 1)
def set_default_warehouses(row, default_warehouses):
for field in ["wip_warehouse", "fg_warehouse"]:
if not row.get(field):
row[field] = default_warehouses.get(field)
+
+
+def get_reserved_qty_for_production_plan(item_code, warehouse):
+ from erpnext.manufacturing.doctype.work_order.work_order import get_reserved_qty_for_production
+
+ table = frappe.qb.DocType("Production Plan")
+ child = frappe.qb.DocType("Material Request Plan Item")
+
+ query = (
+ frappe.qb.from_(table)
+ .inner_join(child)
+ .on(table.name == child.parent)
+ .select(Sum(child.required_bom_qty * IfNull(child.conversion_factor, 1.0)))
+ .where(
+ (table.docstatus == 1)
+ & (child.item_code == item_code)
+ & (child.warehouse == warehouse)
+ & (table.status.notin(["Completed", "Closed"]))
+ )
+ ).run()
+
+ if not query:
+ return 0.0
+
+ reserved_qty_for_production_plan = flt(query[0][0])
+
+ reserved_qty_for_production = flt(
+ get_reserved_qty_for_production(item_code, warehouse, check_production_plan=True)
+ )
+
+ if reserved_qty_for_production > reserved_qty_for_production_plan:
+ return 0.0
+
+ return reserved_qty_for_production_plan - reserved_qty_for_production
+
+
+def get_raw_materials_of_sub_assembly_items(
+ item_details, company, bom_no, include_non_stock_items, sub_assembly_items, planned_qty=1
+):
+
+ bei = frappe.qb.DocType("BOM Item")
+ bom = frappe.qb.DocType("BOM")
+ item = frappe.qb.DocType("Item")
+ item_default = frappe.qb.DocType("Item Default")
+ item_uom = frappe.qb.DocType("UOM Conversion Detail")
+
+ items = (
+ frappe.qb.from_(bei)
+ .join(bom)
+ .on(bom.name == bei.parent)
+ .join(item)
+ .on(item.name == bei.item_code)
+ .left_join(item_default)
+ .on((item_default.parent == item.name) & (item_default.company == company))
+ .left_join(item_uom)
+ .on((item.name == item_uom.parent) & (item_uom.uom == item.purchase_uom))
+ .select(
+ (IfNull(Sum(bei.stock_qty / IfNull(bom.quantity, 1)), 0) * planned_qty).as_("qty"),
+ item.item_name,
+ item.name.as_("item_code"),
+ bei.description,
+ bei.stock_uom,
+ bei.bom_no,
+ item.min_order_qty,
+ bei.source_warehouse,
+ item.default_material_request_type,
+ item.min_order_qty,
+ item_default.default_warehouse,
+ item.purchase_uom,
+ item_uom.conversion_factor,
+ item.safety_stock,
+ )
+ .where(
+ (bei.docstatus == 1)
+ & (bom.name == bom_no)
+ & (item.is_stock_item.isin([0, 1]) if include_non_stock_items else item.is_stock_item == 1)
+ )
+ .groupby(bei.item_code, bei.stock_uom)
+ ).run(as_dict=True)
+
+ for item in items:
+ key = (item.item_code, item.bom_no)
+ if item.bom_no and key in sub_assembly_items:
+ planned_qty = flt(sub_assembly_items[key])
+ get_raw_materials_of_sub_assembly_items(
+ item_details,
+ company,
+ item.bom_no,
+ include_non_stock_items,
+ sub_assembly_items,
+ planned_qty=planned_qty,
+ )
+ else:
+ if not item.conversion_factor and item.purchase_uom:
+ item.conversion_factor = get_uom_conversion_factor(item.item_code, item.purchase_uom)
+
+ item_details.setdefault(item.get("item_code"), item)
+
+ return item_details
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 2bf14c2..fcfba7f 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -76,6 +76,13 @@
"Work Order", fields=["name"], filters={"production_plan": pln.name}, as_list=1
)
+ pln.make_work_order()
+ nwork_orders = frappe.get_all(
+ "Work Order", fields=["name"], filters={"production_plan": pln.name}, as_list=1
+ )
+
+ self.assertTrue(len(work_orders), len(nwork_orders))
+
self.assertTrue(len(work_orders), len(pln.po_items))
for name in material_requests:
@@ -307,6 +314,43 @@
self.assertEqual(plan.sub_assembly_items[0].supplier, "_Test Supplier")
+ def test_production_plan_for_subcontracting_po(self):
+ from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
+
+ bom_tree_1 = {"Test Laptop 1": {"Test Motherboard 1": {"Test Motherboard Wires 1": {}}}}
+ create_nested_bom(bom_tree_1, prefix="")
+
+ item_doc = frappe.get_doc("Item", "Test Motherboard 1")
+ company = "_Test Company"
+
+ item_doc.is_sub_contracted_item = 1
+ for row in item_doc.item_defaults:
+ if row.company == company and not row.default_supplier:
+ row.default_supplier = "_Test Supplier"
+
+ if not item_doc.item_defaults:
+ item_doc.append("item_defaults", {"company": company, "default_supplier": "_Test Supplier"})
+
+ item_doc.save()
+
+ plan = create_production_plan(
+ item_code="Test Laptop 1", planned_qty=10, use_multi_level_bom=1, do_not_submit=True
+ )
+ plan.get_sub_assembly_items()
+ plan.set_default_supplier_for_subcontracting_order()
+ plan.submit()
+
+ self.assertEqual(plan.sub_assembly_items[0].supplier, "_Test Supplier")
+ plan.make_work_order()
+
+ po = frappe.db.get_value("Purchase Order Item", {"production_plan": plan.name}, "parent")
+ po_doc = frappe.get_doc("Purchase Order", po)
+ self.assertEqual(po_doc.supplier, "_Test Supplier")
+ self.assertEqual(po_doc.items[0].qty, 10.0)
+ self.assertEqual(po_doc.items[0].fg_item_qty, 10.0)
+ self.assertEqual(po_doc.items[0].fg_item_qty, 10.0)
+ self.assertEqual(po_doc.items[0].fg_item, "Test Motherboard 1")
+
def test_production_plan_combine_subassembly(self):
"""
Test combining Sub assembly items belonging to the same BOM in Prod Plan.
@@ -868,6 +912,71 @@
for item_code in mr_items:
self.assertTrue(item_code in validate_mr_items)
+ def test_resered_qty_for_production_plan_for_material_requests(self):
+ from erpnext.stock.utils import get_or_make_bin
+
+ bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC")
+ before_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+ pln = create_production_plan(item_code="Test Production Item 1")
+
+ bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC")
+ after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+ self.assertEqual(after_qty - before_qty, 1)
+
+ pln = frappe.get_doc("Production Plan", pln.name)
+ pln.cancel()
+
+ bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC")
+ after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
+
+ self.assertEqual(after_qty, before_qty)
+
+ def test_skip_available_qty_for_sub_assembly_items(self):
+ from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
+
+ bom_tree = {
+ "Fininshed Goods1 For SUB Test": {
+ "SubAssembly1 For SUB Test": {"ChildPart1 For SUB Test": {}},
+ "SubAssembly2 For SUB Test": {},
+ }
+ }
+
+ parent_bom = create_nested_bom(bom_tree, prefix="")
+ plan = create_production_plan(
+ item_code=parent_bom.item,
+ planned_qty=10,
+ ignore_existing_ordered_qty=1,
+ do_not_submit=1,
+ skip_available_sub_assembly_item=1,
+ warehouse="_Test Warehouse - _TC",
+ )
+
+ make_stock_entry(
+ item_code="SubAssembly1 For SUB Test",
+ qty=5,
+ rate=100,
+ target="_Test Warehouse - _TC",
+ )
+
+ self.assertTrue(plan.skip_available_sub_assembly_item)
+
+ plan.get_sub_assembly_items()
+
+ for row in plan.sub_assembly_items:
+ if row.production_item == "SubAssembly1 For SUB Test":
+ self.assertEqual(row.qty, 5)
+
+ mr_items = get_items_for_material_requests(plan.as_dict())
+ for row in mr_items:
+ row = frappe._dict(row)
+ if row.item_code == "ChildPart1 For SUB Test":
+ self.assertEqual(row.quantity, 5)
+
+ if row.item_code == "SubAssembly2 For SUB Test":
+ self.assertEqual(row.quantity, 10)
+
def create_production_plan(**args):
"""
@@ -887,6 +996,7 @@
"include_subcontracted_items": args.include_subcontracted_items or 0,
"ignore_existing_ordered_qty": args.ignore_existing_ordered_qty or 0,
"get_items_from": "Sales Order",
+ "skip_available_sub_assembly_item": args.skip_available_sub_assembly_item or 0,
}
)
@@ -900,6 +1010,7 @@
"planned_qty": args.planned_qty or 1,
"planned_start_date": args.planned_start_date or now_datetime(),
"stock_uom": args.stock_uom or "Nos",
+ "warehouse": args.warehouse,
},
)
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
index 4eb6bf6..fde0404 100644
--- a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -28,7 +28,11 @@
"uom",
"stock_uom",
"column_break_22",
- "description"
+ "description",
+ "section_break_4rxf",
+ "actual_qty",
+ "column_break_xfhm",
+ "projected_qty"
],
"fields": [
{
@@ -183,12 +187,34 @@
"fieldtype": "Datetime",
"in_list_view": 1,
"label": "Schedule Date"
+ },
+ {
+ "fieldname": "section_break_4rxf",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "actual_qty",
+ "fieldtype": "Float",
+ "label": "Actual Qty",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_xfhm",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "projected_qty",
+ "fieldtype": "Float",
+ "label": "Projected Qty",
+ "no_copy": 1,
+ "read_only": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-11-28 13:50:15.116082",
+ "modified": "2023-05-22 17:52:34.708879",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan Sub Assembly Item",
diff --git a/erpnext/manufacturing/doctype/routing/routing.js b/erpnext/manufacturing/doctype/routing/routing.js
index b480c70..784e83a 100644
--- a/erpnext/manufacturing/doctype/routing/routing.js
+++ b/erpnext/manufacturing/doctype/routing/routing.js
@@ -50,7 +50,7 @@
workstation: function(frm, cdt, cdn) {
const d = locals[cdt][cdn];
-
+ if(!d.workstation) return;
frappe.call({
"method": "frappe.client.get",
args: {
diff --git a/erpnext/manufacturing/doctype/routing/test_routing.py b/erpnext/manufacturing/doctype/routing/test_routing.py
index 48f1851..e069aea 100644
--- a/erpnext/manufacturing/doctype/routing/test_routing.py
+++ b/erpnext/manufacturing/doctype/routing/test_routing.py
@@ -38,6 +38,16 @@
"Job Card", filters={"work_order": wo_doc.name}, order_by="sequence_id desc"
):
job_card_doc = frappe.get_doc("Job Card", data.name)
+ for row in job_card_doc.scheduled_time_logs:
+ job_card_doc.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ },
+ )
+
job_card_doc.time_logs[0].completed_qty = 10
if job_card_doc.sequence_id != 1:
self.assertRaises(OperationSequenceError, job_card_doc.save)
@@ -141,6 +151,7 @@
routing=args.routing,
with_operations=1,
currency=args.currency,
+ source_warehouse=args.source_warehouse,
)
else:
bom_doc = frappe.get_doc("BOM", name)
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index 729ed42..c828c87 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -22,6 +22,11 @@
)
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
from erpnext.stock.doctype.item.test_item import create_item, make_item
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_entry import test_stock_entry
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
@@ -482,6 +487,16 @@
for i, job_card in enumerate(job_cards):
doc = frappe.get_doc("Job Card", job_card)
+ for row in doc.scheduled_time_logs:
+ doc.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ },
+ )
+
doc.time_logs[0].completed_qty = 1
doc.submit()
@@ -498,10 +513,8 @@
stock_entry.cancel()
def test_capcity_planning(self):
- frappe.db.set_value(
- "Manufacturing Settings",
- None,
- {"disable_capacity_planning": 0, "capacity_planning_for_days": 1},
+ frappe.db.set_single_value(
+ "Manufacturing Settings", {"disable_capacity_planning": 0, "capacity_planning_for_days": 1}
)
data = frappe.get_cached_value(
@@ -524,7 +537,7 @@
self.assertRaises(CapacityError, work_order1.submit)
- frappe.db.set_value("Manufacturing Settings", None, {"capacity_planning_for_days": 30})
+ frappe.db.set_single_value("Manufacturing Settings", {"capacity_planning_for_days": 30})
work_order1.reload()
work_order1.submit()
@@ -534,7 +547,7 @@
work_order.cancel()
def test_work_order_with_non_transfer_item(self):
- frappe.db.set_value("Manufacturing Settings", None, "backflush_raw_materials_based_on", "BOM")
+ frappe.db.set_single_value("Manufacturing Settings", "backflush_raw_materials_based_on", "BOM")
items = {"Finished Good Transfer Item": 1, "_Test FG Item": 1, "_Test FG Item 1": 0}
for item, allow_transfer in items.items():
@@ -614,7 +627,7 @@
fg_item = "Test Batch Size Item For BOM 3"
rm1 = "Test Batch Size Item RM 1 For BOM 3"
- frappe.db.set_value("Manufacturing Settings", None, "make_serial_no_batch_from_work_order", 0)
+ frappe.db.set_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order", 0)
for item in ["Test Batch Size Item For BOM 3", "Test Batch Size Item RM 1 For BOM 3"]:
item_args = {"include_item_in_manufacturing": 1, "is_stock_item": 1}
@@ -650,7 +663,7 @@
work_order = make_wo_order_test_record(
item=fg_item, skip_transfer=True, planned_start_date=now(), qty=1
)
- frappe.db.set_value("Manufacturing Settings", None, "make_serial_no_batch_from_work_order", 1)
+ frappe.db.set_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order", 1)
ste1 = frappe.get_doc(make_stock_entry(work_order.name, "Manufacture", 1))
for row in ste1.get("items"):
if row.is_finished_item:
@@ -672,8 +685,11 @@
if row.is_finished_item:
self.assertEqual(row.item_code, fg_item)
self.assertEqual(row.qty, 10)
- self.assertTrue(row.batch_no in batches)
- batches.remove(row.batch_no)
+
+ bundle_id = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+ for bundle_row in bundle_id.get("entries"):
+ self.assertTrue(bundle_row.batch_no in batches)
+ batches.remove(bundle_row.batch_no)
ste1.submit()
@@ -682,15 +698,19 @@
for row in ste1.get("items"):
if row.is_finished_item:
self.assertEqual(row.item_code, fg_item)
- self.assertEqual(row.qty, 10)
- remaining_batches.append(row.batch_no)
+ self.assertEqual(row.qty, 20)
+
+ bundle_id = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+ for bundle_row in bundle_id.get("entries"):
+ self.assertTrue(bundle_row.batch_no in batches)
+ remaining_batches.append(bundle_row.batch_no)
self.assertEqual(sorted(remaining_batches), sorted(batches))
- frappe.db.set_value("Manufacturing Settings", None, "make_serial_no_batch_from_work_order", 0)
+ frappe.db.set_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order", 0)
def test_partial_material_consumption(self):
- frappe.db.set_value("Manufacturing Settings", None, "material_consumption", 1)
+ frappe.db.set_single_value("Manufacturing Settings", "material_consumption", 1)
wo_order = make_wo_order_test_record(planned_start_date=now(), qty=4)
ste_cancel_list = []
@@ -724,13 +744,12 @@
for ste_doc in ste_cancel_list:
ste_doc.cancel()
- frappe.db.set_value("Manufacturing Settings", None, "material_consumption", 0)
+ frappe.db.set_single_value("Manufacturing Settings", "material_consumption", 0)
def test_extra_material_transfer(self):
- frappe.db.set_value("Manufacturing Settings", None, "material_consumption", 0)
- frappe.db.set_value(
+ frappe.db.set_single_value("Manufacturing Settings", "material_consumption", 0)
+ frappe.db.set_single_value(
"Manufacturing Settings",
- None,
"backflush_raw_materials_based_on",
"Material Transferred for Manufacture",
)
@@ -775,7 +794,7 @@
for ste_doc in ste_cancel_list:
ste_doc.cancel()
- frappe.db.set_value("Manufacturing Settings", None, "backflush_raw_materials_based_on", "BOM")
+ frappe.db.set_single_value("Manufacturing Settings", "backflush_raw_materials_based_on", "BOM")
def test_make_stock_entry_for_customer_provided_item(self):
finished_item = "Test Item for Make Stock Entry 1"
@@ -891,7 +910,7 @@
self.assertEqual(se.process_loss_qty, 1)
wo.load_from_db()
- self.assertEqual(wo.status, "In Process")
+ self.assertEqual(wo.status, "Completed")
@timeout(seconds=60)
def test_job_card_scrap_item(self):
@@ -948,7 +967,7 @@
item=item, company=company, planned_start_date=add_days(now(), 60), qty=20, skip_transfer=1
)
job_card = frappe.db.get_value("Job Card", {"work_order": wo_order.name}, "name")
- update_job_card(job_card, 10)
+ update_job_card(job_card, 10, 1)
stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10))
for row in stock_entry.items:
@@ -966,7 +985,7 @@
make_job_card(wo_order.name, operations)
job_card = frappe.db.get_value("Job Card", {"work_order": wo_order.name, "docstatus": 0}, "name")
- update_job_card(job_card, 10)
+ update_job_card(job_card, 10, 2)
stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10))
for row in stock_entry.items:
@@ -1075,9 +1094,8 @@
def test_partial_manufacture_entries(self):
cancel_stock_entry = []
- frappe.db.set_value(
+ frappe.db.set_single_value(
"Manufacturing Settings",
- None,
"backflush_raw_materials_based_on",
"Material Transferred for Manufacture",
)
@@ -1127,7 +1145,7 @@
doc = frappe.get_doc("Stock Entry", ste)
doc.cancel()
- frappe.db.set_value("Manufacturing Settings", None, "backflush_raw_materials_based_on", "BOM")
+ frappe.db.set_single_value("Manufacturing Settings", "backflush_raw_materials_based_on", "BOM")
@change_settings("Manufacturing Settings", {"make_serial_no_batch_from_work_order": 1})
def test_auto_batch_creation(self):
@@ -1168,18 +1186,28 @@
try:
wo_order = make_wo_order_test_record(item=fg_item, qty=2, skip_transfer=True)
- serial_nos = wo_order.serial_no
+ serial_nos = self.get_serial_nos_for_fg(wo_order.name)
+
stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10))
stock_entry.set_work_order_details()
stock_entry.set_serial_no_batch_for_finished_good()
for row in stock_entry.items:
if row.item_code == fg_item:
- self.assertTrue(row.serial_no)
- self.assertEqual(sorted(get_serial_nos(row.serial_no)), sorted(get_serial_nos(serial_nos)))
+ self.assertTrue(row.serial_and_batch_bundle)
+ self.assertEqual(
+ sorted(get_serial_nos_from_bundle(row.serial_and_batch_bundle)), sorted(serial_nos)
+ )
except frappe.MandatoryError:
self.fail("Batch generation causing failing in Work Order")
+ def get_serial_nos_for_fg(self, work_order):
+ serial_nos = []
+ for row in frappe.get_all("Serial No", filters={"work_order": work_order}):
+ serial_nos.append(row.name)
+
+ return serial_nos
+
@change_settings(
"Manufacturing Settings",
{"backflush_raw_materials_based_on": "Material Transferred for Manufacture"},
@@ -1261,9 +1289,8 @@
self.assertEqual(work_order.required_items[1].transferred_qty, 2)
def test_backflushed_batch_raw_materials_based_on_transferred(self):
- frappe.db.set_value(
+ frappe.db.set_single_value(
"Manufacturing Settings",
- None,
"backflush_raw_materials_based_on",
"Material Transferred for Manufacture",
)
@@ -1272,68 +1299,70 @@
fg_item = "Test FG Item with Batch Raw Materials"
ste_doc = test_stock_entry.make_stock_entry(
- item_code=batch_item, target="Stores - _TC", qty=2, basic_rate=100, do_not_save=True
- )
-
- ste_doc.append(
- "items",
- {
- "item_code": batch_item,
- "item_name": batch_item,
- "description": batch_item,
- "basic_rate": 100,
- "t_warehouse": "Stores - _TC",
- "qty": 2,
- "uom": "Nos",
- "stock_uom": "Nos",
- "conversion_factor": 1,
- },
+ item_code=batch_item, target="Stores - _TC", qty=4, basic_rate=100, do_not_save=True
)
# Inward raw materials in Stores warehouse
ste_doc.insert()
ste_doc.submit()
+ ste_doc.load_from_db()
- batch_list = sorted([row.batch_no for row in ste_doc.items])
+ batch_no = get_batch_from_bundle(ste_doc.items[0].serial_and_batch_bundle)
wo_doc = make_wo_order_test_record(production_item=fg_item, qty=4)
transferred_ste_doc = frappe.get_doc(
make_stock_entry(wo_doc.name, "Material Transfer for Manufacture", 4)
)
- transferred_ste_doc.items[0].qty = 2
- transferred_ste_doc.items[0].batch_no = batch_list[0]
+ transferred_ste_doc.items[0].qty = 4
+ transferred_ste_doc.items[0].serial_and_batch_bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": batch_item,
+ "warehouse": "Stores - _TC",
+ "company": transferred_ste_doc.company,
+ "qty": 4,
+ "voucher_type": "Stock Entry",
+ "batches": frappe._dict({batch_no: 4}),
+ "posting_date": transferred_ste_doc.posting_date,
+ "posting_time": transferred_ste_doc.posting_time,
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+ ).name
- new_row = copy.deepcopy(transferred_ste_doc.items[0])
- new_row.name = ""
- new_row.batch_no = batch_list[1]
-
- # Transferred two batches from Stores to WIP Warehouse
- transferred_ste_doc.append("items", new_row)
transferred_ste_doc.submit()
+ transferred_ste_doc.load_from_db()
# First Manufacture stock entry
manufacture_ste_doc1 = frappe.get_doc(make_stock_entry(wo_doc.name, "Manufacture", 1))
+ manufacture_ste_doc1.submit()
+ manufacture_ste_doc1.load_from_db()
# Batch no should be same as transferred Batch no
- self.assertEqual(manufacture_ste_doc1.items[0].batch_no, batch_list[0])
+ self.assertEqual(
+ get_batch_from_bundle(manufacture_ste_doc1.items[0].serial_and_batch_bundle), batch_no
+ )
self.assertEqual(manufacture_ste_doc1.items[0].qty, 1)
- manufacture_ste_doc1.submit()
-
# Second Manufacture stock entry
manufacture_ste_doc2 = frappe.get_doc(make_stock_entry(wo_doc.name, "Manufacture", 2))
+ manufacture_ste_doc2.submit()
+ manufacture_ste_doc2.load_from_db()
- # Batch no should be same as transferred Batch no
- self.assertEqual(manufacture_ste_doc2.items[0].batch_no, batch_list[0])
- self.assertEqual(manufacture_ste_doc2.items[0].qty, 1)
- self.assertEqual(manufacture_ste_doc2.items[1].batch_no, batch_list[1])
- self.assertEqual(manufacture_ste_doc2.items[1].qty, 1)
+ self.assertTrue(manufacture_ste_doc2.items[0].serial_and_batch_bundle)
+ bundle_doc = frappe.get_doc(
+ "Serial and Batch Bundle", manufacture_ste_doc2.items[0].serial_and_batch_bundle
+ )
+
+ for d in bundle_doc.entries:
+ self.assertEqual(d.batch_no, batch_no)
+ self.assertEqual(abs(d.qty), 2)
def test_backflushed_serial_no_raw_materials_based_on_transferred(self):
- frappe.db.set_value(
+ frappe.db.set_single_value(
"Manufacturing Settings",
- None,
"backflush_raw_materials_based_on",
"Material Transferred for Manufacture",
)
@@ -1375,9 +1404,8 @@
self.assertEqual(manufacture_ste_doc2.items[0].qty, 2)
def test_backflushed_serial_no_batch_raw_materials_based_on_transferred(self):
- frappe.db.set_value(
+ frappe.db.set_single_value(
"Manufacturing Settings",
- None,
"backflush_raw_materials_based_on",
"Material Transferred for Manufacture",
)
@@ -1386,81 +1414,83 @@
fg_item = "Test FG Item with Serial & Batch No Raw Materials"
ste_doc = test_stock_entry.make_stock_entry(
- item_code=sn_batch_item, target="Stores - _TC", qty=2, basic_rate=100, do_not_save=True
- )
-
- ste_doc.append(
- "items",
- {
- "item_code": sn_batch_item,
- "item_name": sn_batch_item,
- "description": sn_batch_item,
- "basic_rate": 100,
- "t_warehouse": "Stores - _TC",
- "qty": 2,
- "uom": "Nos",
- "stock_uom": "Nos",
- "conversion_factor": 1,
- },
+ item_code=sn_batch_item, target="Stores - _TC", qty=4, basic_rate=100, do_not_save=True
)
# Inward raw materials in Stores warehouse
ste_doc.insert()
ste_doc.submit()
+ ste_doc.load_from_db()
- batch_dict = {row.batch_no: get_serial_nos(row.serial_no) for row in ste_doc.items}
- batches = list(batch_dict.keys())
+ serial_nos = []
+ for row in ste_doc.items:
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+
+ for d in bundle_doc.entries:
+ serial_nos.append(d.serial_no)
wo_doc = make_wo_order_test_record(production_item=fg_item, qty=4)
transferred_ste_doc = frappe.get_doc(
make_stock_entry(wo_doc.name, "Material Transfer for Manufacture", 4)
)
- transferred_ste_doc.items[0].qty = 2
- transferred_ste_doc.items[0].batch_no = batches[0]
- transferred_ste_doc.items[0].serial_no = "\n".join(batch_dict.get(batches[0]))
+ transferred_ste_doc.items[0].qty = 4
+ transferred_ste_doc.items[0].serial_and_batch_bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": transferred_ste_doc.get("items")[0].item_code,
+ "warehouse": transferred_ste_doc.get("items")[0].s_warehouse,
+ "company": transferred_ste_doc.company,
+ "qty": 4,
+ "type_of_transaction": "Outward",
+ "voucher_type": "Stock Entry",
+ "serial_nos": serial_nos,
+ "posting_date": transferred_ste_doc.posting_date,
+ "posting_time": transferred_ste_doc.posting_time,
+ "do_not_submit": True,
+ }
+ )
+ ).name
- new_row = copy.deepcopy(transferred_ste_doc.items[0])
- new_row.name = ""
- new_row.batch_no = batches[1]
- new_row.serial_no = "\n".join(batch_dict.get(batches[1]))
-
- # Transferred two batches from Stores to WIP Warehouse
- transferred_ste_doc.append("items", new_row)
transferred_ste_doc.submit()
+ transferred_ste_doc.load_from_db()
# First Manufacture stock entry
manufacture_ste_doc1 = frappe.get_doc(make_stock_entry(wo_doc.name, "Manufacture", 1))
+ manufacture_ste_doc1.submit()
+ manufacture_ste_doc1.load_from_db()
# Batch no & Serial Nos should be same as transferred Batch no & Serial Nos
- batch_no = manufacture_ste_doc1.items[0].batch_no
- self.assertEqual(
- get_serial_nos(manufacture_ste_doc1.items[0].serial_no)[0], batch_dict.get(batch_no)[0]
- )
- self.assertEqual(manufacture_ste_doc1.items[0].qty, 1)
+ bundle = manufacture_ste_doc1.items[0].serial_and_batch_bundle
+ self.assertTrue(bundle)
- manufacture_ste_doc1.submit()
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", bundle)
+ for d in bundle_doc.entries:
+ self.assertTrue(d.serial_no)
+ self.assertTrue(d.batch_no)
+ batch_no = frappe.get_cached_value("Serial No", d.serial_no, "batch_no")
+ self.assertEqual(d.batch_no, batch_no)
+ serial_nos.remove(d.serial_no)
# Second Manufacture stock entry
- manufacture_ste_doc2 = frappe.get_doc(make_stock_entry(wo_doc.name, "Manufacture", 2))
+ manufacture_ste_doc2 = frappe.get_doc(make_stock_entry(wo_doc.name, "Manufacture", 3))
+ manufacture_ste_doc2.submit()
+ manufacture_ste_doc2.load_from_db()
- # Batch no & Serial Nos should be same as transferred Batch no & Serial Nos
- batch_no = manufacture_ste_doc2.items[0].batch_no
- self.assertEqual(
- get_serial_nos(manufacture_ste_doc2.items[0].serial_no)[0], batch_dict.get(batch_no)[1]
- )
- self.assertEqual(manufacture_ste_doc2.items[0].qty, 1)
+ bundle = manufacture_ste_doc2.items[0].serial_and_batch_bundle
+ self.assertTrue(bundle)
- batch_no = manufacture_ste_doc2.items[1].batch_no
- self.assertEqual(
- get_serial_nos(manufacture_ste_doc2.items[1].serial_no)[0], batch_dict.get(batch_no)[0]
- )
- self.assertEqual(manufacture_ste_doc2.items[1].qty, 1)
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", bundle)
+ for d in bundle_doc.entries:
+ self.assertTrue(d.serial_no)
+ self.assertTrue(d.batch_no)
+ serial_nos.remove(d.serial_no)
+
+ self.assertFalse(serial_nos)
def test_non_consumed_material_return_against_work_order(self):
- frappe.db.set_value(
+ frappe.db.set_single_value(
"Manufacturing Settings",
- None,
"backflush_raw_materials_based_on",
"Material Transferred for Manufacture",
)
@@ -1490,13 +1520,10 @@
for row in ste_doc.items:
row.qty += 2
row.transfer_qty += 2
- nste_doc = test_stock_entry.make_stock_entry(
+ test_stock_entry.make_stock_entry(
item_code=row.item_code, target="Stores - _TC", qty=row.qty, basic_rate=100
)
- row.batch_no = nste_doc.items[0].batch_no
- row.serial_no = nste_doc.items[0].serial_no
-
ste_doc.save()
ste_doc.submit()
ste_doc.load_from_db()
@@ -1508,9 +1535,19 @@
row.qty -= 2
row.transfer_qty -= 2
- if row.serial_no:
- serial_nos = get_serial_nos(row.serial_no)
- row.serial_no = "\n".join(serial_nos[0:5])
+ if not row.serial_and_batch_bundle:
+ continue
+
+ bundle_id = row.serial_and_batch_bundle
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", bundle_id)
+ if bundle_doc.has_serial_no:
+ bundle_doc.set("entries", bundle_doc.entries[0:5])
+ else:
+ for bundle_row in bundle_doc.entries:
+ bundle_row.qty += 2
+
+ bundle_doc.save()
+ bundle_doc.load_from_db()
ste_doc.save()
ste_doc.submit()
@@ -1598,6 +1635,88 @@
self.assertEqual(row.to_time, add_to_date(planned_start_date, minutes=30))
self.assertEqual(row.workstation, workstations_to_check[index])
+ def test_job_card_extra_qty(self):
+ items = [
+ "Test FG Item for Scrap Item Test 1",
+ "Test RM Item 1 for Scrap Item Test 1",
+ "Test RM Item 2 for Scrap Item Test 1",
+ ]
+
+ company = "_Test Company with perpetual inventory"
+ for item_code in items:
+ create_item(
+ item_code=item_code,
+ is_stock_item=1,
+ is_purchase_item=1,
+ opening_stock=100,
+ valuation_rate=10,
+ company=company,
+ warehouse="Stores - TCP1",
+ )
+
+ item = "Test FG Item for Scrap Item Test 1"
+ raw_materials = ["Test RM Item 1 for Scrap Item Test 1", "Test RM Item 2 for Scrap Item Test 1"]
+ if not frappe.db.get_value("BOM", {"item": item}):
+ bom = make_bom(
+ item=item, source_warehouse="Stores - TCP1", raw_materials=raw_materials, do_not_save=True
+ )
+ bom.with_operations = 1
+ bom.append(
+ "operations",
+ {
+ "operation": "_Test Operation 1",
+ "workstation": "_Test Workstation 1",
+ "hour_rate": 20,
+ "time_in_mins": 60,
+ },
+ )
+
+ bom.submit()
+
+ wo_order = make_wo_order_test_record(
+ item=item,
+ company=company,
+ planned_start_date=now(),
+ qty=20,
+ )
+ job_card = frappe.db.get_value("Job Card", {"work_order": wo_order.name}, "name")
+ job_card_doc = frappe.get_doc("Job Card", job_card)
+ for row in job_card_doc.scheduled_time_logs:
+ job_card_doc.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ "completed_qty": 20,
+ },
+ )
+
+ job_card_doc.save()
+
+ # Make another Job Card for the same Work Order
+ job_card2 = frappe.copy_doc(job_card_doc)
+ job_card2.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "time_in_mins": row.time_in_mins,
+ },
+ )
+
+ job_card2.time_logs[0].completed_qty = 20
+
+ self.assertRaises(frappe.ValidationError, job_card2.save)
+
+ frappe.db.set_single_value(
+ "Manufacturing Settings", "overproduction_percentage_for_work_order", 100
+ )
+
+ job_card2 = frappe.copy_doc(job_card_doc)
+ job_card2.time_logs = []
+ job_card2.save()
+
def prepare_data_for_workstation_type_check():
from erpnext.manufacturing.doctype.operation.test_operation import make_operation
@@ -1755,7 +1874,7 @@
make_bom(item=item.name, source_warehouse="Stores - _TC", raw_materials=[sn_batch_item_doc.name])
-def update_job_card(job_card, jc_qty=None):
+def update_job_card(job_card, jc_qty=None, days=None):
employee = frappe.db.get_value("Employee", {"status": "Active"}, "name")
job_card_doc = frappe.get_doc("Job Card", job_card)
job_card_doc.set(
@@ -1769,15 +1888,32 @@
if jc_qty:
job_card_doc.for_quantity = jc_qty
- job_card_doc.append(
- "time_logs",
- {
- "from_time": now(),
- "employee": employee,
- "time_in_mins": 60,
- "completed_qty": job_card_doc.for_quantity,
- },
- )
+ for row in job_card_doc.scheduled_time_logs:
+ job_card_doc.append(
+ "time_logs",
+ {
+ "from_time": row.from_time,
+ "to_time": row.to_time,
+ "employee": employee,
+ "time_in_mins": 60,
+ "completed_qty": 0.0,
+ },
+ )
+
+ if not job_card_doc.time_logs and days:
+ planned_start_time = add_days(now(), days=days)
+ job_card_doc.append(
+ "time_logs",
+ {
+ "from_time": planned_start_time,
+ "to_time": add_to_date(planned_start_time, minutes=60),
+ "employee": employee,
+ "time_in_mins": 60,
+ "completed_qty": 0.0,
+ },
+ )
+
+ job_card_doc.time_logs[0].completed_qty = job_card_doc.for_quantity
job_card_doc.submit()
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index 97480b2..c1a078d 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -139,7 +139,7 @@
}
if (frm.doc.status != "Closed") {
- if (frm.doc.docstatus === 1
+ if (frm.doc.docstatus === 1 && frm.doc.status !== "Completed"
&& frm.doc.operations && frm.doc.operations.length) {
const not_completed = frm.doc.operations.filter(d => {
@@ -256,6 +256,12 @@
label: __('Batch Size'),
read_only: 1
},
+ {
+ fieldtype: 'Int',
+ fieldname: 'sequence_id',
+ label: __('Sequence Id'),
+ read_only: 1
+ },
],
data: operations_data,
in_place_edit: true,
@@ -280,8 +286,8 @@
var pending_qty = 0;
frm.doc.operations.forEach(data => {
- if(data.completed_qty != frm.doc.qty) {
- pending_qty = frm.doc.qty - flt(data.completed_qty);
+ if(data.completed_qty + data.process_loss_qty != frm.doc.qty) {
+ pending_qty = frm.doc.qty - flt(data.completed_qty) - flt(data.process_loss_qty);
if (pending_qty) {
dialog.fields_dict.operations.df.data.push({
@@ -290,7 +296,8 @@
'workstation': data.workstation,
'batch_size': data.batch_size,
'qty': pending_qty,
- 'pending_qty': pending_qty
+ 'pending_qty': pending_qty,
+ 'sequence_id': data.sequence_id
});
}
}
@@ -625,20 +632,18 @@
// all materials transferred for manufacturing, make this primary
finish_btn.addClass('btn-primary');
}
- } else {
- frappe.db.get_doc("Manufacturing Settings").then((doc) => {
- let allowance_percentage = doc.overproduction_percentage_for_work_order;
+ } else if (frm.doc.__onload && frm.doc.__onload.overproduction_percentage) {
+ let allowance_percentage = frm.doc.__onload.overproduction_percentage;
- if (allowance_percentage > 0) {
- let allowed_qty = frm.doc.qty + ((allowance_percentage / 100) * frm.doc.qty);
+ if (allowance_percentage > 0) {
+ let allowed_qty = frm.doc.qty + ((allowance_percentage / 100) * frm.doc.qty);
- if ((flt(doc.produced_qty) < allowed_qty)) {
- frm.add_custom_button(__('Finish'), function() {
- erpnext.work_order.make_se(frm, 'Manufacture');
- });
- }
+ if ((flt(doc.produced_qty) < allowed_qty)) {
+ frm.add_custom_button(__('Finish'), function() {
+ erpnext.work_order.make_se(frm, 'Manufacture');
+ });
}
- });
+ }
}
}
} else {
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index aa90498..a236f2a 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -42,13 +42,12 @@
"has_serial_no",
"has_batch_no",
"column_break_18",
- "serial_no",
"batch_size",
"required_items_section",
"materials_and_operations_tab",
"operations_section",
- "operations",
"transfer_material_against",
+ "operations",
"time",
"planned_start_date",
"planned_end_date",
@@ -331,7 +330,6 @@
"label": "Expected Delivery Date"
},
{
- "collapsible": 1,
"fieldname": "operations_section",
"fieldtype": "Section Break",
"label": "Operations",
@@ -533,13 +531,6 @@
"read_only": 1
},
{
- "depends_on": "has_serial_no",
- "fieldname": "serial_no",
- "fieldtype": "Small Text",
- "label": "Serial Nos",
- "no_copy": 1
- },
- {
"default": "0",
"depends_on": "has_batch_no",
"fieldname": "batch_size",
@@ -599,7 +590,7 @@
"image_field": "image",
"is_submittable": 1,
"links": [],
- "modified": "2023-04-06 12:35:12.149827",
+ "modified": "2023-06-09 13:20:09.154362",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order",
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 66b871c..7c15bf9 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -17,6 +17,7 @@
get_datetime,
get_link_to_form,
getdate,
+ now,
nowdate,
time_diff_in_hours,
)
@@ -32,12 +33,7 @@
)
from erpnext.stock.doctype.batch.batch import make_batch
from erpnext.stock.doctype.item.item import get_item_defaults, validate_end_of_life
-from erpnext.stock.doctype.serial_no.serial_no import (
- auto_make_serial_nos,
- clean_serial_no_string,
- get_auto_serial_nos,
- get_serial_nos,
-)
+from erpnext.stock.doctype.serial_no.serial_no import get_available_serial_nos, get_serial_nos
from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
from erpnext.stock.utils import get_bin, get_latest_stock_qty, validate_warehouse_company
from erpnext.utilities.transaction_base import validate_uom_is_integer
@@ -249,7 +245,9 @@
status = "Not Started"
if flt(self.material_transferred_for_manufacturing) > 0:
status = "In Process"
- if flt(self.produced_qty) >= flt(self.qty):
+
+ total_qty = flt(self.produced_qty) + flt(self.process_loss_qty)
+ if flt(total_qty) >= flt(self.qty):
status = "Completed"
else:
status = "Cancelled"
@@ -448,24 +446,53 @@
frappe.delete_doc("Batch", row.name)
def make_serial_nos(self, args):
- self.serial_no = clean_serial_no_string(self.serial_no)
- serial_no_series = frappe.get_cached_value("Item", self.production_item, "serial_no_series")
- if serial_no_series:
- self.serial_no = get_auto_serial_nos(serial_no_series, self.qty)
+ item_details = frappe.get_cached_value(
+ "Item", self.production_item, ["serial_no_series", "item_name", "description"], as_dict=1
+ )
- if self.serial_no:
- args.update({"serial_no": self.serial_no, "actual_qty": self.qty})
- auto_make_serial_nos(args)
+ serial_nos = []
+ if item_details.serial_no_series:
+ serial_nos = get_available_serial_nos(item_details.serial_no_series, self.qty)
- serial_nos_length = len(get_serial_nos(self.serial_no))
- if serial_nos_length != self.qty:
- frappe.throw(
- _("{0} Serial Numbers required for Item {1}. You have provided {2}.").format(
- self.qty, self.production_item, serial_nos_length
- ),
- SerialNoQtyError,
+ if not serial_nos:
+ return
+
+ fields = [
+ "name",
+ "serial_no",
+ "creation",
+ "modified",
+ "owner",
+ "modified_by",
+ "company",
+ "item_code",
+ "item_name",
+ "description",
+ "status",
+ "work_order",
+ ]
+
+ serial_nos_details = []
+ for serial_no in serial_nos:
+ serial_nos_details.append(
+ (
+ serial_no,
+ serial_no,
+ now(),
+ now(),
+ frappe.session.user,
+ frappe.session.user,
+ self.company,
+ self.production_item,
+ item_details.item_name,
+ item_details.description,
+ "Inactive",
+ self.name,
+ )
)
+ frappe.db.bulk_insert("Serial No", fields=fields, values=set(serial_nos_details))
+
def create_job_card(self):
manufacturing_settings_doc = frappe.get_doc("Manufacturing Settings")
@@ -492,8 +519,8 @@
)
if enable_capacity_planning and job_card_doc:
- row.planned_start_time = job_card_doc.time_logs[-1].from_time
- row.planned_end_time = job_card_doc.time_logs[-1].to_time
+ row.planned_start_time = job_card_doc.scheduled_time_logs[-1].from_time
+ row.planned_end_time = job_card_doc.scheduled_time_logs[-1].to_time
if date_diff(row.planned_start_time, original_start_time) > plan_days:
frappe.message_log.pop()
@@ -558,12 +585,19 @@
and self.production_plan_item
and not self.production_plan_sub_assembly_item
):
- qty = frappe.get_value("Production Plan Item", self.production_plan_item, "ordered_qty") or 0.0
+ table = frappe.qb.DocType("Work Order")
- if self.docstatus == 1:
- qty += self.qty
- elif self.docstatus == 2:
- qty -= self.qty
+ query = (
+ frappe.qb.from_(table)
+ .select(Sum(table.qty))
+ .where(
+ (table.production_plan == self.production_plan)
+ & (table.production_plan_item == self.production_plan_item)
+ & (table.docstatus == 1)
+ )
+ ).run()
+
+ qty = flt(query[0][0]) if query else 0
frappe.db.set_value("Production Plan Item", self.production_plan_item, "ordered_qty", qty)
@@ -729,13 +763,15 @@
max_allowed_qty_for_wo = flt(self.qty) + (allowance_percentage / 100 * flt(self.qty))
for d in self.get("operations"):
- if not d.completed_qty:
+ precision = d.precision("completed_qty")
+ qty = flt(d.completed_qty, precision) + flt(d.process_loss_qty, precision)
+ if not qty:
d.status = "Pending"
- elif flt(d.completed_qty) < flt(self.qty):
+ elif flt(qty) < flt(self.qty):
d.status = "Work in Progress"
- elif flt(d.completed_qty) == flt(self.qty):
+ elif flt(qty) == flt(self.qty):
d.status = "Completed"
- elif flt(d.completed_qty) <= max_allowed_qty_for_wo:
+ elif flt(qty) <= max_allowed_qty_for_wo:
d.status = "Completed"
else:
frappe.throw(_("Completed Qty cannot be greater than 'Qty to Manufacture'"))
@@ -990,7 +1026,7 @@
consumed_qty = frappe.db.sql(
"""
SELECT
- SUM(qty)
+ SUM(detail.qty)
FROM
`tabStock Entry` entry,
`tabStock Entry Detail` detail
@@ -1035,24 +1071,6 @@
bom.set_bom_material_details()
return bom
- def update_batch_produced_qty(self, stock_entry_doc):
- if not cint(
- frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")
- ):
- return
-
- for row in stock_entry_doc.items:
- if row.batch_no and (row.is_finished_item or row.is_scrap_item):
- qty = frappe.get_all(
- "Stock Entry Detail",
- filters={"batch_no": row.batch_no, "docstatus": 1},
- or_filters={"is_finished_item": 1, "is_scrap_item": 1},
- fields=["sum(qty)"],
- as_list=1,
- )[0][0]
-
- frappe.db.set_value("Batch", row.batch_no, "produced_qty", flt(qty))
-
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
@@ -1350,10 +1368,10 @@
def get_serial_nos_for_job_card(row, wo_doc):
- if not wo_doc.serial_no:
+ if not wo_doc.has_serial_no:
return
- serial_nos = get_serial_nos(wo_doc.serial_no)
+ serial_nos = get_serial_nos_for_work_order(wo_doc.name, wo_doc.production_item)
used_serial_nos = []
for d in frappe.get_all(
"Job Card",
@@ -1366,6 +1384,21 @@
row.serial_no = "\n".join(serial_nos[0 : cint(row.job_card_qty)])
+def get_serial_nos_for_work_order(work_order, production_item):
+ serial_nos = []
+ for d in frappe.get_all(
+ "Serial No",
+ fields=["name"],
+ filters={
+ "work_order": work_order,
+ "item_code": production_item,
+ },
+ ):
+ serial_nos.append(d.name)
+
+ return serial_nos
+
+
def validate_operation_data(row):
if row.get("qty") <= 0:
frappe.throw(
@@ -1476,12 +1509,14 @@
return doc
-def get_reserved_qty_for_production(item_code: str, warehouse: str) -> float:
+def get_reserved_qty_for_production(
+ item_code: str, warehouse: str, check_production_plan: bool = False
+) -> float:
"""Get total reserved quantity for any item in specified warehouse"""
wo = frappe.qb.DocType("Work Order")
wo_item = frappe.qb.DocType("Work Order Item")
- return (
+ query = (
frappe.qb.from_(wo)
.from_(wo_item)
.select(
@@ -1502,7 +1537,12 @@
| (wo_item.required_qty > wo_item.consumed_qty)
)
)
- ).run()[0][0] or 0.0
+ )
+
+ if check_production_plan:
+ query = query.where(wo.production_plan.isnotnull())
+
+ return query.run()[0][0] or 0.0
@frappe.whitelist()
diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
index 31b9201..de1f67f 100644
--- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
+++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
@@ -2,12 +2,14 @@
"actions": [],
"creation": "2014-10-16 14:35:41.950175",
"doctype": "DocType",
+ "editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"details",
"operation",
"status",
"completed_qty",
+ "process_loss_qty",
"column_break_4",
"bom",
"workstation_type",
@@ -36,6 +38,7 @@
"fieldtype": "Section Break"
},
{
+ "columns": 2,
"fieldname": "operation",
"fieldtype": "Link",
"in_list_view": 1,
@@ -46,6 +49,7 @@
"reqd": 1
},
{
+ "columns": 2,
"fieldname": "bom",
"fieldtype": "Link",
"in_list_view": 1,
@@ -62,7 +66,7 @@
"oldfieldtype": "Text"
},
{
- "columns": 1,
+ "columns": 2,
"description": "Operation completed for how many finished goods?",
"fieldname": "completed_qty",
"fieldtype": "Float",
@@ -80,6 +84,7 @@
"options": "Pending\nWork in Progress\nCompleted"
},
{
+ "columns": 1,
"fieldname": "workstation",
"fieldtype": "Link",
"in_list_view": 1,
@@ -115,7 +120,7 @@
"fieldname": "time_in_mins",
"fieldtype": "Float",
"in_list_view": 1,
- "label": "Operation Time",
+ "label": "Time",
"oldfieldname": "time_in_mins",
"oldfieldtype": "Currency",
"reqd": 1
@@ -203,12 +208,21 @@
"fieldtype": "Link",
"label": "Workstation Type",
"options": "Workstation Type"
+ },
+ {
+ "columns": 2,
+ "fieldname": "process_loss_qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Process Loss Qty",
+ "no_copy": 1,
+ "read_only": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-11-09 01:37:56.563068",
+ "modified": "2023-06-09 14:03:01.612909",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order Operation",
diff --git a/erpnext/manufacturing/doctype/workstation_type/workstation_type.py b/erpnext/manufacturing/doctype/workstation_type/workstation_type.py
index 348f4f8..8c1e230 100644
--- a/erpnext/manufacturing/doctype/workstation_type/workstation_type.py
+++ b/erpnext/manufacturing/doctype/workstation_type/workstation_type.py
@@ -20,6 +20,8 @@
def get_workstations(workstation_type):
- workstations = frappe.get_all("Workstation", filters={"workstation_type": workstation_type})
+ workstations = frappe.get_all(
+ "Workstation", filters={"workstation_type": workstation_type}, order_by="creation"
+ )
return [workstation.name for workstation in workstations]
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
index 123a82a..a3f0d00 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
@@ -30,7 +30,7 @@
"fieldname":"based_on_document",
"label": __("Based On Document"),
"fieldtype": "Select",
- "options": ["Sales Order", "Delivery Note", "Quotation"],
+ "options": ["Sales Order", "Sales Invoice", "Delivery Note", "Quotation"],
"default": "Sales Order",
"reqd": 1
},
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
index d3bce83..daef7f6 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
@@ -99,7 +99,9 @@
parent = frappe.qb.DocType(self.doctype)
child = frappe.qb.DocType(self.child_doctype)
- date_field = "posting_date" if self.doctype == "Delivery Note" else "transaction_date"
+ date_field = (
+ "posting_date" if self.doctype in ("Delivery Note", "Sales Invoice") else "transaction_date"
+ )
query = (
frappe.qb.from_(parent)
diff --git a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
index ce8f4f3..c3dd9cf 100644
--- a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
+++ b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
@@ -33,10 +33,9 @@
wo.name,
wo.status,
wo.production_item,
- wo.qty,
wo.produced_qty,
wo.process_loss_qty,
- (wo.produced_qty - wo.process_loss_qty).as_("actual_produced_qty"),
+ wo.qty.as_("qty_to_manufacture"),
Sum(se.total_incoming_value).as_("total_fg_value"),
Sum(se.total_outgoing_value).as_("total_rm_value"),
)
@@ -44,6 +43,7 @@
(wo.process_loss_qty > 0)
& (wo.company == filters.company)
& (se.docstatus == 1)
+ & (se.purpose == "Manufacture")
& (se.posting_date.between(filters.from_date, filters.to_date))
)
.groupby(se.work_order)
@@ -80,19 +80,29 @@
},
{"label": _("Status"), "fieldname": "status", "fieldtype": "Data", "width": "100"},
{
+ "label": _("Qty To Manufacture"),
+ "fieldname": "qty_to_manufacture",
+ "fieldtype": "Float",
+ "width": "150",
+ },
+ {
"label": _("Manufactured Qty"),
"fieldname": "produced_qty",
"fieldtype": "Float",
"width": "150",
},
- {"label": _("Loss Qty"), "fieldname": "process_loss_qty", "fieldtype": "Float", "width": "150"},
{
- "label": _("Actual Manufactured Qty"),
- "fieldname": "actual_produced_qty",
+ "label": _("Process Loss Qty"),
+ "fieldname": "process_loss_qty",
"fieldtype": "Float",
"width": "150",
},
- {"label": _("Loss Value"), "fieldname": "total_pl_value", "fieldtype": "Float", "width": "150"},
+ {
+ "label": _("Process Loss Value"),
+ "fieldname": "total_pl_value",
+ "fieldtype": "Float",
+ "width": "150",
+ },
{"label": _("FG Value"), "fieldname": "total_fg_value", "fieldtype": "Float", "width": "150"},
{
"label": _("Raw Material Value"),
@@ -105,5 +115,5 @@
def update_data_with_total_pl_value(data: Data) -> None:
for row in data:
- value_per_unit_fg = row["total_fg_value"] / row["actual_produced_qty"]
+ value_per_unit_fg = row["total_fg_value"] / row["qty_to_manufacture"]
row["total_pl_value"] = row["process_loss_qty"] * value_per_unit_fg
diff --git a/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py b/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py
index de96a6c..38e0585 100644
--- a/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py
+++ b/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py
@@ -69,7 +69,7 @@
"label": _("Id"),
"fieldname": "name",
"fieldtype": "Link",
- "options": "Work Order",
+ "options": "Quality Inspection",
"width": 100,
},
{"label": _("Report Date"), "fieldname": "report_date", "fieldtype": "Date", "width": 150},
diff --git a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json
index c25f606..518ae14 100644
--- a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json
@@ -1,13 +1,15 @@
{
"charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"BOM\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Production Plan\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Work Order\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Job Card\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Forecasting\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"BOM Stock Report\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Production Planning Report\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Production\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Bill of Materials\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Tools\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
+ "content": "[{\"id\":\"csBCiDglCE\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"xit0dg7KvY\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"BOM\",\"col\":3}},{\"id\":\"LRhGV9GAov\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Production Plan\",\"col\":3}},{\"id\":\"69KKosI6Hg\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Work Order\",\"col\":3}},{\"id\":\"PwndxuIpB3\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Job Card\",\"col\":3}},{\"id\":\"OaiDqTT03Y\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Forecasting\",\"col\":3}},{\"id\":\"OtMcArFRa5\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"BOM Stock Report\",\"col\":3}},{\"id\":\"76yYsI5imF\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Production Planning Report\",\"col\":3}},{\"id\":\"PIQJYZOMnD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Manufacturing\",\"col\":3}},{\"id\":\"bN_6tHS-Ct\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"yVEFZMqVwd\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"rwrmsTI58-\",\"type\":\"card\",\"data\":{\"card_name\":\"Production\",\"col\":4}},{\"id\":\"6dnsyX-siZ\",\"type\":\"card\",\"data\":{\"card_name\":\"Bill of Materials\",\"col\":4}},{\"id\":\"CIq-v5f5KC\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"id\":\"8RRiQeYr0G\",\"type\":\"card\",\"data\":{\"card_name\":\"Tools\",\"col\":4}},{\"id\":\"Pu8z7-82rT\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
"creation": "2020-03-02 17:11:37.032604",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "organization",
"idx": 0,
+ "is_hidden": 0,
"label": "Manufacturing",
"links": [
{
@@ -243,7 +245,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Bill of Materials",
- "link_count": 15,
+ "link_count": 6,
"onboard": 0,
"type": "Card Break"
},
@@ -312,121 +314,31 @@
"link_type": "DocType",
"onboard": 0,
"type": "Link"
- },
- {
- "dependencies": "Work Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Production Planning Report",
- "link_count": 0,
- "link_to": "Production Planning Report",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Quality Inspection",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Work Order Summary",
- "link_count": 0,
- "link_to": "Work Order Summary",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Downtime Entry",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Quality Inspection Summary",
- "link_count": 0,
- "link_to": "Quality Inspection Summary",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Job Card",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Downtime Analysis",
- "link_count": 0,
- "link_to": "Downtime Analysis",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "BOM",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Job Card Summary",
- "link_count": 0,
- "link_to": "Job Card Summary",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "BOM",
- "hidden": 0,
- "is_query_report": 1,
- "label": "BOM Search",
- "link_count": 0,
- "link_to": "BOM Search",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Work Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "BOM Stock Report",
- "link_count": 0,
- "link_to": "BOM Stock Report",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "BOM",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Production Analytics",
- "link_count": 0,
- "link_to": "Production Analytics",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "BOM Operations Time",
- "link_count": 0,
- "link_to": "BOM Operations Time",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
}
],
- "modified": "2022-11-14 14:53:34.616862",
+ "modified": "2023-07-04 14:40:47.281125",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
"quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 17.0,
+ "sequence_id": 8.0,
"shortcuts": [
{
"color": "Grey",
"doc_view": "List",
+ "label": "Learn Manufacturing",
+ "type": "URL",
+ "url": "https://frappe.school/courses/manufacturing?utm_source=in_app"
+ },
+ {
+ "color": "Grey",
+ "doc_view": "List",
"label": "BOM",
"link_to": "BOM",
"stats_filter": "{\"is_active\":[\"=\",1]}",
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index af96297..dcb4212 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -15,7 +15,6 @@
ERPNext Integrations
Quality Management
Communication
-Loan Management
Telephony
Bulk Transaction
E-commerce
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3357b06..f9d9ebb 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -15,7 +15,6 @@
erpnext.patches.v10_0.set_currency_in_pricing_rule
erpnext.patches.v10_0.update_translatable_fields
execute:frappe.delete_doc('DocType', 'Production Planning Tool', ignore_missing=True)
-erpnext.patches.v10_0.add_default_cash_flow_mappers
erpnext.patches.v11_0.rename_duplicate_item_code_values
erpnext.patches.v11_0.make_quality_inspection_template
erpnext.patches.v11_0.merge_land_unit_with_location
@@ -106,7 +105,6 @@
execute:frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
execute:frappe.reload_doc('desk', 'doctype', 'dashboard_chart_field')
erpnext.patches.v12_0.remove_bank_remittance_custom_fields
-execute:frappe.delete_doc_if_exists("Report", "Loan Repayment")
erpnext.patches.v12_0.move_credit_limit_to_customer_credit_limit
erpnext.patches.v12_0.add_variant_of_in_item_attribute_table
erpnext.patches.v12_0.rename_bank_account_field_in_journal_entry_account
@@ -146,7 +144,6 @@
execute:frappe.rename_doc("Desk Page", "Getting Started", "Home", force=True)
erpnext.patches.v12_0.unset_customer_supplier_based_on_type_of_item_price
erpnext.patches.v12_0.set_valid_till_date_in_supplier_quotation
-erpnext.patches.v13_0.update_old_loans
erpnext.patches.v12_0.set_serial_no_status #2020-05-21
erpnext.patches.v12_0.update_price_list_currency_in_bom
execute:frappe.reload_doctype('Dashboard')
@@ -155,7 +152,6 @@
erpnext.patches.v13_0.update_actual_start_and_end_date_in_wo
erpnext.patches.v12_0.update_bom_in_so_mr
execute:frappe.delete_doc("Report", "Department Analytics")
-execute:frappe.rename_doc("Desk Page", "Loan Management", "Loan", force=True)
erpnext.patches.v12_0.update_uom_conversion_factor
erpnext.patches.v13_0.replace_pos_page_with_point_of_sale_page
erpnext.patches.v13_0.delete_old_purchase_reports
@@ -188,7 +184,6 @@
erpnext.patches.v13_0.update_pos_closing_entry_in_merge_log
erpnext.patches.v13_0.add_po_to_global_search
erpnext.patches.v13_0.update_returned_qty_in_pr_dn
-execute:frappe.rename_doc("Workspace", "Loan", "Loan Management", ignore_if_exists=True, force=True)
erpnext.patches.v13_0.create_uae_pos_invoice_fields
erpnext.patches.v13_0.update_project_template_tasks
erpnext.patches.v13_0.convert_qi_parameter_to_link_field
@@ -205,7 +200,6 @@
erpnext.patches.v13_0.update_shipment_status
erpnext.patches.v13_0.remove_attribute_field_from_item_variant_setting
erpnext.patches.v13_0.set_pos_closing_as_failed
-execute:frappe.rename_doc("Workspace", "Loan Management", "Loans", force=True)
erpnext.patches.v13_0.update_timesheet_changes
erpnext.patches.v13_0.add_doctype_to_sla #14-06-2021
erpnext.patches.v13_0.bill_for_rejected_quantity_in_purchase_invoice
@@ -267,6 +261,7 @@
erpnext.patches.v14_0.update_reference_due_date_in_journal_entry
erpnext.patches.v15_0.saudi_depreciation_warning
erpnext.patches.v15_0.delete_saudi_doctypes
+erpnext.patches.v14_0.show_loan_management_deprecation_warning
[post_model_sync]
execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
@@ -283,16 +278,13 @@
erpnext.patches.v14_0.migrate_cost_center_allocations
erpnext.patches.v13_0.convert_to_website_item_in_item_card_group_template
erpnext.patches.v13_0.shopping_cart_to_ecommerce
-erpnext.patches.v13_0.update_disbursement_account
erpnext.patches.v13_0.update_reserved_qty_closed_wo
erpnext.patches.v13_0.update_exchange_rate_settings
erpnext.patches.v14_0.delete_amazon_mws_doctype
erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
-erpnext.patches.v13_0.update_accounts_in_loan_docs
erpnext.patches.v13_0.item_reposting_for_incorrect_sl_and_gl
erpnext.patches.v14_0.update_batch_valuation_flag
erpnext.patches.v14_0.delete_non_profit_doctypes
-erpnext.patches.v13_0.add_cost_center_in_loans
erpnext.patches.v13_0.set_return_against_in_pos_invoice_references
erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items # 24-03-2022
erpnext.patches.v13_0.copy_custom_field_filters_to_website_item
@@ -312,7 +304,6 @@
erpnext.patches.v14_0.fix_crm_no_of_employees
erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
-erpnext.patches.v13_0.update_schedule_type_in_loans
erpnext.patches.v13_0.drop_unused_sle_index_parts
erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
erpnext.patches.v14_0.update_partial_tds_fields
@@ -326,8 +317,20 @@
erpnext.patches.v15_0.update_asset_value_for_manual_depr_entries
erpnext.patches.v15_0.update_gpa_and_ndb_for_assdeprsch
erpnext.patches.v14_0.create_accounting_dimensions_for_closing_balance
-erpnext.patches.v14_0.update_closing_balances
+erpnext.patches.v14_0.update_closing_balances #14-07-2023
+execute:frappe.db.set_single_value("Accounts Settings", "merge_similar_account_heads", 0)
# below migration patches should always run last
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
execute:frappe.delete_doc_if_exists("Report", "Tax Detail")
erpnext.patches.v15_0.enable_all_leads
+erpnext.patches.v14_0.update_company_in_ldc
+erpnext.patches.v14_0.set_packed_qty_in_draft_delivery_notes
+execute:frappe.delete_doc('DocType', 'Cash Flow Mapping Template Details', ignore_missing=True)
+execute:frappe.delete_doc('DocType', 'Cash Flow Mapping', ignore_missing=True)
+execute:frappe.delete_doc('DocType', 'Cash Flow Mapper', ignore_missing=True)
+execute:frappe.delete_doc('DocType', 'Cash Flow Mapping Template', ignore_missing=True)
+execute:frappe.delete_doc('DocType', 'Cash Flow Mapping Accounts', ignore_missing=True)
+erpnext.patches.v14_0.cleanup_workspaces
+erpnext.patches.v15_0.remove_loan_management_module #2023-07-03
+erpnext.patches.v14_0.set_report_in_process_SOA
+erpnext.buying.doctype.supplier.patches.migrate_supplier_portal_users
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/add_default_cash_flow_mappers.py b/erpnext/patches/v10_0/add_default_cash_flow_mappers.py
deleted file mode 100644
index 5493258..0000000
--- a/erpnext/patches/v10_0/add_default_cash_flow_mappers.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-
-import frappe
-
-from erpnext.setup.install import create_default_cash_flow_mapper_templates
-
-
-def execute():
- frappe.reload_doc("accounts", "doctype", frappe.scrub("Cash Flow Mapping"))
- frappe.reload_doc("accounts", "doctype", frappe.scrub("Cash Flow Mapper"))
- frappe.reload_doc("accounts", "doctype", frappe.scrub("Cash Flow Mapping Template Details"))
-
- create_default_cash_flow_mapper_templates()
diff --git a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
index 51ba706..037dda5 100644
--- a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
+++ b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
@@ -7,8 +7,8 @@
def execute():
frappe.reload_doc("buying", "doctype", "buying_settings")
- frappe.db.set_value(
- "Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", "BOM"
+ frappe.db.set_single_value(
+ "Buying Settings", "backflush_raw_materials_of_subcontract_based_on", "BOM"
)
frappe.reload_doc("stock", "doctype", "stock_entry_detail")
diff --git a/erpnext/patches/v12_0/rename_tolerance_fields.py b/erpnext/patches/v12_0/rename_tolerance_fields.py
index ef1ba65..c53604c 100644
--- a/erpnext/patches/v12_0/rename_tolerance_fields.py
+++ b/erpnext/patches/v12_0/rename_tolerance_fields.py
@@ -11,6 +11,6 @@
rename_field("Item", "tolerance", "over_delivery_receipt_allowance")
qty_allowance = frappe.db.get_single_value("Stock Settings", "over_delivery_receipt_allowance")
- frappe.db.set_value("Accounts Settings", None, "over_delivery_receipt_allowance", qty_allowance)
+ frappe.db.set_single_value("Accounts Settings", "over_delivery_receipt_allowance", qty_allowance)
frappe.db.sql("update tabItem set over_billing_allowance=over_delivery_receipt_allowance")
diff --git a/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py b/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
index 37af989..84dd1c7 100644
--- a/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
+++ b/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
@@ -4,6 +4,6 @@
def execute():
frappe.reload_doc("accounts", "doctype", "accounts_settings")
- frappe.db.set_value(
- "Accounts Settings", None, "automatically_process_deferred_accounting_entry", 1
+ frappe.db.set_single_value(
+ "Accounts Settings", "automatically_process_deferred_accounting_entry", 1
)
diff --git a/erpnext/patches/v12_0/set_default_homepage_type.py b/erpnext/patches/v12_0/set_default_homepage_type.py
index d70b28e..d91fe33 100644
--- a/erpnext/patches/v12_0/set_default_homepage_type.py
+++ b/erpnext/patches/v12_0/set_default_homepage_type.py
@@ -2,4 +2,4 @@
def execute():
- frappe.db.set_value("Homepage", "Homepage", "hero_section_based_on", "Default")
+ frappe.db.set_single_value("Homepage", "hero_section_based_on", "Default")
diff --git a/erpnext/patches/v12_0/set_priority_for_support.py b/erpnext/patches/v12_0/set_priority_for_support.py
index a8a07e7..a16eb8a 100644
--- a/erpnext/patches/v12_0/set_priority_for_support.py
+++ b/erpnext/patches/v12_0/set_priority_for_support.py
@@ -46,7 +46,7 @@
frappe.reload_doc("support", "doctype", "service_level")
frappe.reload_doc("support", "doctype", "support_settings")
- frappe.db.set_value("Support Settings", None, "track_service_level_agreement", 1)
+ frappe.db.set_single_value("Support Settings", "track_service_level_agreement", 1)
for service_level in service_level_priorities:
if service_level:
diff --git a/erpnext/patches/v13_0/add_cost_center_in_loans.py b/erpnext/patches/v13_0/add_cost_center_in_loans.py
deleted file mode 100644
index e293cf2..0000000
--- a/erpnext/patches/v13_0/add_cost_center_in_loans.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import frappe
-
-
-def execute():
- frappe.reload_doc("loan_management", "doctype", "loan")
- loan = frappe.qb.DocType("Loan")
-
- for company in frappe.get_all("Company", pluck="name"):
- default_cost_center = frappe.db.get_value("Company", company, "cost_center")
- frappe.qb.update(loan).set(loan.cost_center, default_cost_center).where(
- loan.company == company
- ).run()
diff --git a/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py b/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
index ddbb7fd..ed764f4 100644
--- a/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
+++ b/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
@@ -61,7 +61,6 @@
doc.load_items_from_bom()
doc.calculate_rate_and_amount()
set_expense_account(doc)
- doc.make_batches("t_warehouse")
if doc.docstatus == 0:
doc.save()
diff --git a/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py b/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
index e8d0b59..4ad572f 100644
--- a/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
+++ b/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
@@ -15,7 +15,7 @@
web_item = frappe.db.get_value("Website Item", {"item_code": row.parent})
web_item_doc = frappe.get_doc("Website Item", web_item)
- child_doc = frappe.new_doc(docfield.options, web_item_doc, field)
+ child_doc = frappe.new_doc(docfield.options, parent_doc=web_item_doc, parentfield=field)
for field in ["name", "creation", "modified", "idx"]:
row[field] = None
diff --git a/erpnext/patches/v13_0/modify_invalid_gain_loss_gl_entries.py b/erpnext/patches/v13_0/modify_invalid_gain_loss_gl_entries.py
index 6c64ef6..0f77afd 100644
--- a/erpnext/patches/v13_0/modify_invalid_gain_loss_gl_entries.py
+++ b/erpnext/patches/v13_0/modify_invalid_gain_loss_gl_entries.py
@@ -47,7 +47,7 @@
acc_frozen_upto = frappe.db.get_value("Accounts Settings", None, "acc_frozen_upto")
if acc_frozen_upto:
- frappe.db.set_value("Accounts Settings", None, "acc_frozen_upto", None)
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
for invoice in purchase_invoices + sales_invoices:
try:
@@ -65,4 +65,4 @@
print(f"Failed to correct gl entries of {invoice.name}")
if acc_frozen_upto:
- frappe.db.set_value("Accounts Settings", None, "acc_frozen_upto", acc_frozen_upto)
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", acc_frozen_upto)
diff --git a/erpnext/patches/v13_0/update_accounts_in_loan_docs.py b/erpnext/patches/v13_0/update_accounts_in_loan_docs.py
deleted file mode 100644
index bf98e9e..0000000
--- a/erpnext/patches/v13_0/update_accounts_in_loan_docs.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import frappe
-
-
-def execute():
- ld = frappe.qb.DocType("Loan Disbursement").as_("ld")
- lr = frappe.qb.DocType("Loan Repayment").as_("lr")
- loan = frappe.qb.DocType("Loan")
-
- frappe.qb.update(ld).inner_join(loan).on(loan.name == ld.against_loan).set(
- ld.disbursement_account, loan.disbursement_account
- ).set(ld.loan_account, loan.loan_account).where(ld.docstatus < 2).run()
-
- frappe.qb.update(lr).inner_join(loan).on(loan.name == lr.against_loan).set(
- lr.payment_account, loan.payment_account
- ).set(lr.loan_account, loan.loan_account).set(
- lr.penalty_income_account, loan.penalty_income_account
- ).where(
- lr.docstatus < 2
- ).run()
diff --git a/erpnext/patches/v13_0/update_amt_in_work_order_required_items.py b/erpnext/patches/v13_0/update_amt_in_work_order_required_items.py
index e37f291..64170ed 100644
--- a/erpnext/patches/v13_0/update_amt_in_work_order_required_items.py
+++ b/erpnext/patches/v13_0/update_amt_in_work_order_required_items.py
@@ -7,4 +7,6 @@
frappe.reload_doc("manufacturing", "doctype", "work_order")
frappe.reload_doc("manufacturing", "doctype", "work_order_item")
- frappe.db.sql("""UPDATE `tabWork Order Item` SET amount = rate * required_qty""")
+ frappe.db.sql(
+ """UPDATE `tabWork Order Item` SET amount = ifnull(rate, 0.0) * ifnull(required_qty, 0.0)"""
+ )
diff --git a/erpnext/patches/v13_0/update_disbursement_account.py b/erpnext/patches/v13_0/update_disbursement_account.py
deleted file mode 100644
index d6aba47..0000000
--- a/erpnext/patches/v13_0/update_disbursement_account.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import frappe
-
-
-def execute():
-
- frappe.reload_doc("loan_management", "doctype", "loan_type")
- frappe.reload_doc("loan_management", "doctype", "loan")
-
- loan_type = frappe.qb.DocType("Loan Type")
- loan = frappe.qb.DocType("Loan")
-
- frappe.qb.update(loan_type).set(loan_type.disbursement_account, loan_type.payment_account).run()
-
- frappe.qb.update(loan).set(loan.disbursement_account, loan.payment_account).run()
diff --git a/erpnext/patches/v13_0/update_old_loans.py b/erpnext/patches/v13_0/update_old_loans.py
deleted file mode 100644
index 0bd3fcd..0000000
--- a/erpnext/patches/v13_0/update_old_loans.py
+++ /dev/null
@@ -1,200 +0,0 @@
-import frappe
-from frappe import _
-from frappe.model.naming import make_autoname
-from frappe.utils import flt, nowdate
-
-from erpnext.accounts.doctype.account.test_account import create_account
-from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
- get_accrued_interest_entries,
-)
-from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
- process_loan_interest_accrual_for_term_loans,
-)
-
-
-def execute():
-
- # Create a penalty account for loan types
-
- frappe.reload_doc("loan_management", "doctype", "loan_type")
- frappe.reload_doc("loan_management", "doctype", "loan")
- frappe.reload_doc("loan_management", "doctype", "repayment_schedule")
- frappe.reload_doc("loan_management", "doctype", "process_loan_interest_accrual")
- frappe.reload_doc("loan_management", "doctype", "loan_repayment")
- frappe.reload_doc("loan_management", "doctype", "loan_repayment_detail")
- frappe.reload_doc("loan_management", "doctype", "loan_interest_accrual")
- frappe.reload_doc("accounts", "doctype", "gl_entry")
- frappe.reload_doc("accounts", "doctype", "journal_entry_account")
-
- updated_loan_types = []
- loans_to_close = []
-
- # Update old loan status as closed
- if frappe.db.has_column("Repayment Schedule", "paid"):
- loans_list = frappe.db.sql(
- """SELECT distinct parent from `tabRepayment Schedule`
- where paid = 0 and docstatus = 1""",
- as_dict=1,
- )
-
- loans_to_close = [d.parent for d in loans_list]
-
- if loans_to_close:
- frappe.db.sql(
- "UPDATE `tabLoan` set status = 'Closed' where name not in (%s)"
- % (", ".join(["%s"] * len(loans_to_close))),
- tuple(loans_to_close),
- )
-
- loans = frappe.get_all(
- "Loan",
- fields=[
- "name",
- "loan_type",
- "company",
- "status",
- "mode_of_payment",
- "applicant_type",
- "applicant",
- "loan_account",
- "payment_account",
- "interest_income_account",
- ],
- filters={"docstatus": 1, "status": ("!=", "Closed")},
- )
-
- for loan in loans:
- # Update details in Loan Types and Loan
- loan_type_company = frappe.db.get_value("Loan Type", loan.loan_type, "company")
- loan_type = loan.loan_type
-
- group_income_account = frappe.get_value(
- "Account",
- {
- "company": loan.company,
- "is_group": 1,
- "root_type": "Income",
- "account_name": _("Indirect Income"),
- },
- )
-
- if not group_income_account:
- group_income_account = frappe.get_value(
- "Account", {"company": loan.company, "is_group": 1, "root_type": "Income"}
- )
-
- penalty_account = create_account(
- company=loan.company,
- account_type="Income Account",
- account_name="Penalty Account",
- parent_account=group_income_account,
- )
-
- # Same loan type used for multiple companies
- if loan_type_company and loan_type_company != loan.company:
- # get loan type for appropriate company
- loan_type_name = frappe.get_value(
- "Loan Type",
- {
- "company": loan.company,
- "mode_of_payment": loan.mode_of_payment,
- "loan_account": loan.loan_account,
- "payment_account": loan.payment_account,
- "disbursement_account": loan.payment_account,
- "interest_income_account": loan.interest_income_account,
- "penalty_income_account": loan.penalty_income_account,
- },
- "name",
- )
-
- if not loan_type_name:
- loan_type_name = create_loan_type(loan, loan_type_name, penalty_account)
-
- # update loan type in loan
- frappe.db.sql(
- "UPDATE `tabLoan` set loan_type = %s where name = %s", (loan_type_name, loan.name)
- )
-
- loan_type = loan_type_name
- if loan_type_name not in updated_loan_types:
- updated_loan_types.append(loan_type_name)
-
- elif not loan_type_company:
- loan_type_doc = frappe.get_doc("Loan Type", loan.loan_type)
- loan_type_doc.is_term_loan = 1
- loan_type_doc.company = loan.company
- loan_type_doc.mode_of_payment = loan.mode_of_payment
- loan_type_doc.payment_account = loan.payment_account
- loan_type_doc.loan_account = loan.loan_account
- loan_type_doc.interest_income_account = loan.interest_income_account
- loan_type_doc.penalty_income_account = penalty_account
- loan_type_doc.submit()
- updated_loan_types.append(loan.loan_type)
- loan_type = loan.loan_type
-
- if loan_type in updated_loan_types:
- if loan.status == "Fully Disbursed":
- status = "Disbursed"
- elif loan.status == "Repaid/Closed":
- status = "Closed"
- else:
- status = loan.status
-
- frappe.db.set_value(
- "Loan",
- loan.name,
- {"is_term_loan": 1, "penalty_income_account": penalty_account, "status": status},
- )
-
- process_loan_interest_accrual_for_term_loans(
- posting_date=nowdate(), loan_type=loan_type, loan=loan.name
- )
-
- if frappe.db.has_column("Repayment Schedule", "paid"):
- total_principal, total_interest = frappe.db.get_value(
- "Repayment Schedule",
- {"paid": 1, "parent": loan.name},
- ["sum(principal_amount) as total_principal", "sum(interest_amount) as total_interest"],
- )
-
- accrued_entries = get_accrued_interest_entries(loan.name)
- for entry in accrued_entries:
- interest_paid = 0
- principal_paid = 0
-
- if flt(total_interest) > flt(entry.interest_amount):
- interest_paid = flt(entry.interest_amount)
- else:
- interest_paid = flt(total_interest)
-
- if flt(total_principal) > flt(entry.payable_principal_amount):
- principal_paid = flt(entry.payable_principal_amount)
- else:
- principal_paid = flt(total_principal)
-
- frappe.db.sql(
- """ UPDATE `tabLoan Interest Accrual`
- SET paid_principal_amount = `paid_principal_amount` + %s,
- paid_interest_amount = `paid_interest_amount` + %s
- WHERE name = %s""",
- (principal_paid, interest_paid, entry.name),
- )
-
- total_principal = flt(total_principal) - principal_paid
- total_interest = flt(total_interest) - interest_paid
-
-
-def create_loan_type(loan, loan_type_name, penalty_account):
- loan_type_doc = frappe.new_doc("Loan Type")
- loan_type_doc.loan_name = make_autoname("Loan Type-.####")
- loan_type_doc.is_term_loan = 1
- loan_type_doc.company = loan.company
- loan_type_doc.mode_of_payment = loan.mode_of_payment
- loan_type_doc.payment_account = loan.payment_account
- loan_type_doc.disbursement_account = loan.payment_account
- loan_type_doc.loan_account = loan.loan_account
- loan_type_doc.interest_income_account = loan.interest_income_account
- loan_type_doc.penalty_income_account = penalty_account
- loan_type_doc.submit()
-
- return loan_type_doc.name
diff --git a/erpnext/patches/v13_0/update_schedule_type_in_loans.py b/erpnext/patches/v13_0/update_schedule_type_in_loans.py
deleted file mode 100644
index e5b5f64..0000000
--- a/erpnext/patches/v13_0/update_schedule_type_in_loans.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import frappe
-
-
-def execute():
- loan = frappe.qb.DocType("Loan")
- loan_type = frappe.qb.DocType("Loan Type")
-
- frappe.qb.update(loan_type).set(
- loan_type.repayment_schedule_type, "Monthly as per repayment start date"
- ).where(loan_type.is_term_loan == 1).run()
-
- frappe.qb.update(loan).set(
- loan.repayment_schedule_type, "Monthly as per repayment start date"
- ).where(loan.is_term_loan == 1).run()
diff --git a/erpnext/patches/v14_0/cleanup_workspaces.py b/erpnext/patches/v14_0/cleanup_workspaces.py
new file mode 100644
index 0000000..2fc0a4f
--- /dev/null
+++ b/erpnext/patches/v14_0/cleanup_workspaces.py
@@ -0,0 +1,9 @@
+import frappe
+
+
+def execute():
+ for ws in ["Retail", "Utilities"]:
+ frappe.delete_doc_if_exists("Workspace", ws)
+
+ for ws in ["Integrations", "Settings"]:
+ frappe.db.set_value("Workspace", ws, "public", 0)
diff --git a/erpnext/patches/v14_0/discount_accounting_separation.py b/erpnext/patches/v14_0/discount_accounting_separation.py
index 0d1349a..4216ecc 100644
--- a/erpnext/patches/v14_0/discount_accounting_separation.py
+++ b/erpnext/patches/v14_0/discount_accounting_separation.py
@@ -8,4 +8,4 @@
discount_account = data and int(data[0][0]) or 0
if discount_account:
for doctype in ["Buying Settings", "Selling Settings"]:
- frappe.db.set_value(doctype, doctype, "enable_discount_accounting", 1, update_modified=False)
+ frappe.db.set_single_value(doctype, "enable_discount_accounting", 1, update_modified=False)
diff --git a/erpnext/patches/v14_0/migrate_crm_settings.py b/erpnext/patches/v14_0/migrate_crm_settings.py
index 696a100..2477255 100644
--- a/erpnext/patches/v14_0/migrate_crm_settings.py
+++ b/erpnext/patches/v14_0/migrate_crm_settings.py
@@ -11,8 +11,7 @@
frappe.reload_doc("crm", "doctype", "crm_settings")
if settings:
- frappe.db.set_value(
- "CRM Settings",
+ frappe.db.set_single_value(
"CRM Settings",
{
"campaign_naming_by": settings.campaign_naming_by,
diff --git a/erpnext/patches/v14_0/set_packed_qty_in_draft_delivery_notes.py b/erpnext/patches/v14_0/set_packed_qty_in_draft_delivery_notes.py
new file mode 100644
index 0000000..1aeb2e6
--- /dev/null
+++ b/erpnext/patches/v14_0/set_packed_qty_in_draft_delivery_notes.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.query_builder.functions import Sum
+
+
+def execute():
+ ps = frappe.qb.DocType("Packing Slip")
+ dn = frappe.qb.DocType("Delivery Note")
+ ps_item = frappe.qb.DocType("Packing Slip Item")
+
+ ps_details = (
+ frappe.qb.from_(ps)
+ .join(ps_item)
+ .on(ps.name == ps_item.parent)
+ .join(dn)
+ .on(ps.delivery_note == dn.name)
+ .select(
+ dn.name.as_("delivery_note"),
+ ps_item.item_code.as_("item_code"),
+ Sum(ps_item.qty).as_("packed_qty"),
+ )
+ .where((ps.docstatus == 1) & (dn.docstatus == 0))
+ .groupby(dn.name, ps_item.item_code)
+ ).run(as_dict=True)
+
+ if ps_details:
+ dn_list = set()
+ item_code_list = set()
+ for ps_detail in ps_details:
+ dn_list.add(ps_detail.delivery_note)
+ item_code_list.add(ps_detail.item_code)
+
+ dn_item = frappe.qb.DocType("Delivery Note Item")
+ dn_item_query = (
+ frappe.qb.from_(dn_item)
+ .select(
+ dn.parent.as_("delivery_note"),
+ dn_item.name,
+ dn_item.item_code,
+ dn_item.qty,
+ )
+ .where((dn_item.parent.isin(dn_list)) & (dn_item.item_code.isin(item_code_list)))
+ )
+
+ dn_details = frappe._dict()
+ for r in dn_item_query.run(as_dict=True):
+ dn_details.setdefault((r.delivery_note, r.item_code), frappe._dict()).setdefault(r.name, r.qty)
+
+ for ps_detail in ps_details:
+ dn_items = dn_details.get((ps_detail.delivery_note, ps_detail.item_code))
+
+ if dn_items:
+ remaining_qty = ps_detail.packed_qty
+ for name, qty in dn_items.items():
+ if remaining_qty > 0:
+ row_packed_qty = min(qty, remaining_qty)
+ frappe.db.set_value("Delivery Note Item", name, "packed_qty", row_packed_qty)
+ remaining_qty -= row_packed_qty
diff --git a/erpnext/patches/v14_0/set_report_in_process_SOA.py b/erpnext/patches/v14_0/set_report_in_process_SOA.py
new file mode 100644
index 0000000..9eb5e3a
--- /dev/null
+++ b/erpnext/patches/v14_0/set_report_in_process_SOA.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
+# License: MIT. See LICENSE
+
+import frappe
+
+
+def execute():
+ process_soa = frappe.qb.DocType("Process Statement Of Accounts")
+ q = frappe.qb.update(process_soa).set(process_soa.report, "General Ledger")
+ q.run()
diff --git a/erpnext/patches/v14_0/show_loan_management_deprecation_warning.py b/erpnext/patches/v14_0/show_loan_management_deprecation_warning.py
new file mode 100644
index 0000000..af87c0f
--- /dev/null
+++ b/erpnext/patches/v14_0/show_loan_management_deprecation_warning.py
@@ -0,0 +1,16 @@
+import click
+import frappe
+
+
+def execute():
+ if "lending" in frappe.get_installed_apps():
+ return
+
+ click.secho(
+ "Loan Management module has been moved to a separate app"
+ " and will be removed from ERPNext in Version 15."
+ " Please install the Lending app when upgrading to Version 15"
+ " to continue using the Loan Management module:\n"
+ "https://github.com/frappe/lending",
+ fg="yellow",
+ )
diff --git a/erpnext/patches/v14_0/update_closing_balances.py b/erpnext/patches/v14_0/update_closing_balances.py
index 40a1851..2947b98 100644
--- a/erpnext/patches/v14_0/update_closing_balances.py
+++ b/erpnext/patches/v14_0/update_closing_balances.py
@@ -11,23 +11,65 @@
def execute():
- company_wise_order = {}
- get_opening_entries = True
- for pcv in frappe.db.get_all(
- "Period Closing Voucher",
- fields=["company", "posting_date", "name"],
- filters={"docstatus": 1},
- order_by="posting_date",
- ):
+ frappe.db.truncate("Account Closing Balance")
- company_wise_order.setdefault(pcv.company, [])
- if pcv.posting_date not in company_wise_order[pcv.company]:
- pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name)
- pcv_doc.year_start_date = get_fiscal_year(
- pcv.posting_date, pcv.fiscal_year, company=pcv.company
- )[1]
- gl_entries = pcv_doc.get_gl_entries()
- closing_entries = pcv_doc.get_grouped_gl_entries(get_opening_entries=get_opening_entries)
- make_closing_entries(gl_entries + closing_entries, voucher_name=pcv.name)
- company_wise_order[pcv.company].append(pcv.posting_date)
- get_opening_entries = False
+ for company in frappe.get_all("Company", pluck="name"):
+ i = 0
+ company_wise_order = {}
+ for pcv in frappe.db.get_all(
+ "Period Closing Voucher",
+ fields=["company", "posting_date", "name"],
+ filters={"docstatus": 1, "company": company},
+ order_by="posting_date",
+ ):
+
+ company_wise_order.setdefault(pcv.company, [])
+ if pcv.posting_date not in company_wise_order[pcv.company]:
+ pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name)
+ pcv_doc.year_start_date = get_fiscal_year(
+ pcv.posting_date, pcv.fiscal_year, company=pcv.company
+ )[1]
+
+ # get gl entries against pcv
+ gl_entries = frappe.db.get_all(
+ "GL Entry", filters={"voucher_no": pcv.name, "is_cancelled": 0}, fields=["*"]
+ )
+ for entry in gl_entries:
+ entry["is_period_closing_voucher_entry"] = 1
+ entry["closing_date"] = pcv_doc.posting_date
+ entry["period_closing_voucher"] = pcv_doc.name
+
+ closing_entries = []
+
+ if pcv.posting_date not in company_wise_order[pcv.company]:
+ # get all gl entries for the year
+ closing_entries = frappe.db.get_all(
+ "GL Entry",
+ filters={
+ "is_cancelled": 0,
+ "voucher_no": ["!=", pcv.name],
+ "posting_date": ["between", [pcv_doc.year_start_date, pcv.posting_date]],
+ "is_opening": "No",
+ "company": company,
+ },
+ fields=["*"],
+ )
+
+ if i == 0:
+ # add opening entries only for the first pcv
+ closing_entries += frappe.db.get_all(
+ "GL Entry",
+ filters={"is_cancelled": 0, "is_opening": "Yes", "company": company},
+ fields=["*"],
+ )
+
+ for entry in closing_entries:
+ entry["closing_date"] = pcv_doc.posting_date
+ entry["period_closing_voucher"] = pcv_doc.name
+
+ entries = gl_entries + closing_entries
+
+ if entries:
+ make_closing_entries(entries, voucher_name=pcv.name)
+ i += 1
+ company_wise_order[pcv.company].append(pcv.posting_date)
diff --git a/erpnext/patches/v14_0/update_company_in_ldc.py b/erpnext/patches/v14_0/update_company_in_ldc.py
new file mode 100644
index 0000000..ca95cf2
--- /dev/null
+++ b/erpnext/patches/v14_0/update_company_in_ldc.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# License: MIT. See LICENSE
+
+
+import frappe
+
+from erpnext import get_default_company
+
+
+def execute():
+ company = get_default_company()
+ if company:
+ for d in frappe.get_all("Lower Deduction Certificate", pluck="name"):
+ frappe.db.set_value("Lower Deduction Certificate", d, "company", company, update_modified=False)
diff --git a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
index 5c46bf3..a53adf1 100644
--- a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
+++ b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
@@ -6,10 +6,14 @@
assets = get_details_of_draft_or_submitted_depreciable_assets()
- for asset in assets:
- finance_book_rows = get_details_of_asset_finance_books_rows(asset.name)
+ asset_finance_books_map = get_asset_finance_books_map()
- for fb_row in finance_book_rows:
+ asset_depreciation_schedules_map = get_asset_depreciation_schedules_map()
+
+ for asset in assets:
+ depreciation_schedules = asset_depreciation_schedules_map[asset.name]
+
+ for fb_row in asset_finance_books_map[asset.name]:
asset_depr_schedule_doc = frappe.new_doc("Asset Depreciation Schedule")
asset_depr_schedule_doc.set_draft_asset_depr_schedule_details(asset, fb_row)
@@ -19,7 +23,11 @@
if asset.docstatus == 1:
asset_depr_schedule_doc.submit()
- update_depreciation_schedules(asset.name, asset_depr_schedule_doc.name, fb_row.idx)
+ depreciation_schedules_of_fb_row = [
+ ds for ds in depreciation_schedules if ds["finance_book_id"] == str(fb_row.idx)
+ ]
+
+ update_depreciation_schedules(depreciation_schedules_of_fb_row, asset_depr_schedule_doc.name)
def get_details_of_draft_or_submitted_depreciable_assets():
@@ -41,12 +49,33 @@
return records
-def get_details_of_asset_finance_books_rows(asset_name):
+def group_records_by_asset_name(records):
+ grouped_dict = {}
+
+ for item in records:
+ key = list(item.keys())[0]
+ value = item[key]
+
+ if value not in grouped_dict:
+ grouped_dict[value] = []
+
+ del item["asset_name"]
+
+ grouped_dict[value].append(item)
+
+ return grouped_dict
+
+
+def get_asset_finance_books_map():
afb = frappe.qb.DocType("Asset Finance Book")
+ asset = frappe.qb.DocType("Asset")
records = (
frappe.qb.from_(afb)
+ .join(asset)
+ .on(afb.parent == asset.name)
.select(
+ asset.name.as_("asset_name"),
afb.finance_book,
afb.idx,
afb.depreciation_method,
@@ -55,23 +84,44 @@
afb.rate_of_depreciation,
afb.expected_value_after_useful_life,
)
- .where(afb.parent == asset_name)
+ .where(asset.docstatus < 2)
+ .orderby(afb.idx)
).run(as_dict=True)
- return records
+ asset_finance_books_map = group_records_by_asset_name(records)
+
+ return asset_finance_books_map
-def update_depreciation_schedules(asset_name, asset_depr_schedule_name, fb_row_idx):
+def get_asset_depreciation_schedules_map():
ds = frappe.qb.DocType("Depreciation Schedule")
+ asset = frappe.qb.DocType("Asset")
- depr_schedules = (
+ records = (
frappe.qb.from_(ds)
- .select(ds.name)
- .where((ds.parent == asset_name) & (ds.finance_book_id == str(fb_row_idx)))
+ .join(asset)
+ .on(ds.parent == asset.name)
+ .select(
+ asset.name.as_("asset_name"),
+ ds.name,
+ ds.finance_book_id,
+ )
+ .where(asset.docstatus < 2)
.orderby(ds.idx)
).run(as_dict=True)
- for idx, depr_schedule in enumerate(depr_schedules, start=1):
+ asset_depreciation_schedules_map = group_records_by_asset_name(records)
+
+ return asset_depreciation_schedules_map
+
+
+def update_depreciation_schedules(
+ depreciation_schedules,
+ asset_depr_schedule_name,
+):
+ ds = frappe.qb.DocType("Depreciation Schedule")
+
+ for idx, depr_schedule in enumerate(depreciation_schedules, start=1):
(
frappe.qb.update(ds)
.set(ds.idx, idx)
diff --git a/erpnext/patches/v15_0/remove_loan_management_module.py b/erpnext/patches/v15_0/remove_loan_management_module.py
new file mode 100644
index 0000000..8242f9c
--- /dev/null
+++ b/erpnext/patches/v15_0/remove_loan_management_module.py
@@ -0,0 +1,48 @@
+import frappe
+
+
+def execute():
+ if "lending" in frappe.get_installed_apps():
+ return
+
+ frappe.delete_doc("Module Def", "Loan Management", ignore_missing=True, force=True)
+
+ frappe.delete_doc("Workspace", "Loans", ignore_missing=True, force=True)
+
+ print_formats = frappe.get_all(
+ "Print Format", {"module": "Loan Management", "standard": "Yes"}, pluck="name"
+ )
+ for print_format in print_formats:
+ frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
+
+ reports = frappe.get_all(
+ "Report", {"module": "Loan Management", "is_standard": "Yes"}, pluck="name"
+ )
+ for report in reports:
+ frappe.delete_doc("Report", report, ignore_missing=True, force=True)
+
+ doctypes = frappe.get_all("DocType", {"module": "Loan Management", "custom": 0}, pluck="name")
+ for doctype in doctypes:
+ frappe.delete_doc("DocType", doctype, ignore_missing=True, force=True)
+
+ notifications = frappe.get_all(
+ "Notification", {"module": "Loan Management", "is_standard": 1}, pluck="name"
+ )
+ for notifcation in notifications:
+ frappe.delete_doc("Notification", notifcation, ignore_missing=True, force=True)
+
+ for dt in ["Web Form", "Dashboard", "Dashboard Chart", "Number Card"]:
+ records = frappe.get_all(dt, {"module": "Loan Management", "is_standard": 1}, pluck="name")
+ for record in records:
+ frappe.delete_doc(dt, record, ignore_missing=True, force=True)
+
+ custom_fields = {
+ "Loan": ["repay_from_salary"],
+ "Loan Repayment": ["repay_from_salary", "payroll_payable_account"],
+ }
+
+ for doc, fields in custom_fields.items():
+ filters = {"dt": doc, "fieldname": ["in", fields]}
+ records = frappe.get_all("Custom Field", filters=filters, pluck="name")
+ for record in records:
+ frappe.delete_doc("Custom Field", record, ignore_missing=True, force=True)
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index ba7aa85..502ee57 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -234,13 +234,13 @@
{
"fieldname": "actual_start_date",
"fieldtype": "Date",
- "label": "Actual Start Date (via Time Sheet)",
+ "label": "Actual Start Date (via Timesheet)",
"read_only": 1
},
{
"fieldname": "actual_time",
"fieldtype": "Float",
- "label": "Actual Time (in Hours via Time Sheet)",
+ "label": "Actual Time in Hours (via Timesheet)",
"read_only": 1
},
{
@@ -250,7 +250,7 @@
{
"fieldname": "actual_end_date",
"fieldtype": "Date",
- "label": "Actual End Date (via Time Sheet)",
+ "label": "Actual End Date (via Timesheet)",
"oldfieldname": "act_completion_date",
"oldfieldtype": "Date",
"read_only": 1
@@ -275,7 +275,7 @@
{
"fieldname": "total_costing_amount",
"fieldtype": "Currency",
- "label": "Total Costing Amount (via Timesheets)",
+ "label": "Total Costing Amount (via Timesheet)",
"read_only": 1
},
{
@@ -289,7 +289,8 @@
"fieldtype": "Link",
"label": "Company",
"options": "Company",
- "remember_last_selected_value": 1
+ "remember_last_selected_value": 1,
+ "reqd": 1
},
{
"fieldname": "column_break_28",
@@ -304,19 +305,19 @@
{
"fieldname": "total_billable_amount",
"fieldtype": "Currency",
- "label": "Total Billable Amount (via Timesheets)",
+ "label": "Total Billable Amount (via Timesheet)",
"read_only": 1
},
{
"fieldname": "total_billed_amount",
"fieldtype": "Currency",
- "label": "Total Billed Amount (via Sales Invoices)",
+ "label": "Total Billed Amount (via Sales Invoice)",
"read_only": 1
},
{
"fieldname": "total_consumed_material_cost",
"fieldtype": "Currency",
- "label": "Total Consumed Material Cost (via Stock Entry)",
+ "label": "Total Consumed Material Cost (via Stock Entry)",
"read_only": 1
},
{
@@ -364,7 +365,8 @@
"default": "0",
"fieldname": "collect_progress",
"fieldtype": "Check",
- "label": "Collect Progress"
+ "label": "Collect Progress",
+ "search_index": 1
},
{
"depends_on": "collect_progress",
@@ -451,7 +453,7 @@
"index_web_pages_for_search": 1,
"links": [],
"max_attachments": 4,
- "modified": "2023-02-14 04:54:25.819620",
+ "modified": "2023-06-28 18:57:11.603497",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project",
diff --git a/erpnext/projects/doctype/project_update/project_update.json b/erpnext/projects/doctype/project_update/project_update.json
index 497b2b7..c548111 100644
--- a/erpnext/projects/doctype/project_update/project_update.json
+++ b/erpnext/projects/doctype/project_update/project_update.json
@@ -1,355 +1,106 @@
{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "beta": 0,
- "creation": "2018-01-18 09:44:47.565494",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "autoname": "naming_series:",
+ "creation": "2018-01-18 09:44:47.565494",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "naming_series",
+ "project",
+ "sent",
+ "column_break_2",
+ "date",
+ "time",
+ "section_break_5",
+ "users",
+ "amended_from"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "naming_series",
- "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": "Series",
- "length": 0,
- "no_copy": 0,
- "options": "PROJ-UPD-.YYYY.-",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "naming_series",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Series",
+ "options": "PROJ-UPD-.YYYY.-"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Project",
- "length": 0,
- "no_copy": 0,
- "options": "Project",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Project",
+ "options": "Project",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fieldname": "sent",
- "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": "Sent",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "sent",
+ "fieldtype": "Check",
+ "label": "Sent",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "label": "Date",
+ "read_only": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "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": "Time",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "time",
+ "fieldtype": "Time",
+ "label": "Time",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_5",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "users",
- "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": "Users",
- "length": 0,
- "no_copy": 0,
- "options": "Project User",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "users",
+ "fieldtype": "Table",
+ "label": "Users",
+ "options": "Project User"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": "Project Update",
- "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,
- "translatable": 0,
- "unique": 0
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Project Update",
+ "print_hide": 1,
+ "read_only": 1
}
- ],
- "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": "2019-01-16 19:31:05.210656",
- "modified_by": "Administrator",
- "module": "Projects",
- "name": "Project Update",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-06-28 18:59:50.678917",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Project Update",
+ "naming_rule": "By \"Naming Series\" field",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 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": "Projects User",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Projects User",
+ "share": 1,
+ "submit": 1,
"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,
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 141a99e..62ec9e0 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -240,7 +240,7 @@
{
"fieldname": "act_start_date",
"fieldtype": "Date",
- "label": "Actual Start Date (via Time Sheet)",
+ "label": "Actual Start Date (via Timesheet)",
"oldfieldname": "act_start_date",
"oldfieldtype": "Date",
"read_only": 1
@@ -248,7 +248,7 @@
{
"fieldname": "actual_time",
"fieldtype": "Float",
- "label": "Actual Time (in Hours via Time Sheet)",
+ "label": "Actual Time in Hours (via Timesheet)",
"read_only": 1
},
{
@@ -258,7 +258,7 @@
{
"fieldname": "act_end_date",
"fieldtype": "Date",
- "label": "Actual End Date (via Time Sheet)",
+ "label": "Actual End Date (via Timesheet)",
"oldfieldname": "act_end_date",
"oldfieldtype": "Date",
"read_only": 1
@@ -272,7 +272,7 @@
{
"fieldname": "total_costing_amount",
"fieldtype": "Currency",
- "label": "Total Costing Amount (via Time Sheet)",
+ "label": "Total Costing Amount (via Timesheet)",
"oldfieldname": "actual_budget",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -285,7 +285,7 @@
{
"fieldname": "total_billing_amount",
"fieldtype": "Currency",
- "label": "Total Billing Amount (via Time Sheet)",
+ "label": "Total Billable Amount (via Timesheet)",
"read_only": 1
},
{
@@ -389,7 +389,7 @@
"is_tree": 1,
"links": [],
"max_attachments": 5,
- "modified": "2022-06-23 16:58:47.005241",
+ "modified": "2023-04-17 21:06:50.174418",
"modified_by": "Administrator",
"module": "Projects",
"name": "Task",
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index ce3ae4f..333d4d9 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -66,8 +66,10 @@
task_date = self.get(fieldname)
if task_date and date_diff(project_end_date, getdate(task_date)) < 0:
frappe.throw(
- _("Task's {0} cannot be after Project's Expected End Date.").format(
- _(self.meta.get_label(fieldname))
+ _("{0}'s {1} cannot be after {2}'s Expected End Date.").format(
+ frappe.bold(frappe.get_desk_link("Task", self.name)),
+ _(self.meta.get_label(fieldname)),
+ frappe.bold(frappe.get_desk_link("Project", self.project)),
),
frappe.exceptions.InvalidDates,
)
@@ -302,6 +304,7 @@
@frappe.whitelist()
def make_timesheet(source_name, target_doc=None, ignore_permissions=False):
def set_missing_values(source, target):
+ target.parent_project = source.project
target.append(
"time_logs",
{
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index 98d2bbc..5ab8bae 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -25,20 +25,38 @@
}
return [__(doc.status), colors[doc.status], "status,=," + doc.status];
},
- gantt_custom_popup_html: function(ganttobj, task) {
- var html = `<h5><a style="text-decoration:underline"\
- href="/app/task/${ganttobj.id}""> ${ganttobj.name} </a></h5>`;
+ gantt_custom_popup_html: function (ganttobj, task) {
+ let html = `
+ <a class="text-white mb-2 inline-block cursor-pointer"
+ href="/app/task/${ganttobj.id}"">
+ ${ganttobj.name}
+ </a>
+ `;
- if(task.project) html += `<p>Project: ${task.project}</p>`;
- html += `<p>Progress: ${ganttobj.progress}</p>`;
+ if (task.project) {
+ html += `<p class="mb-1">${__("Project")}:
+ <a class="text-white inline-block"
+ href="/app/project/${task.project}"">
+ ${task.project}
+ </a>
+ </p>`;
+ }
+ html += `<p class="mb-1">
+ ${__("Progress")}:
+ <span class="text-white">${ganttobj.progress}%</span>
+ </p>`;
- if(task._assign_list) {
- html += task._assign_list.reduce(
- (html, user) => html + frappe.avatar(user)
- , '');
+ if (task._assign) {
+ const assign_list = JSON.parse(task._assign);
+ const assignment_wrapper = `
+ <span>Assigned to:</span>
+ <span class="text-white">
+ ${assign_list.map((user) => frappe.user_info(user).fullname).join(", ")}
+ </span>
+ `;
+ html += assignment_wrapper;
}
- return html;
- }
-
+ return `<div class="p-3" style="min-width: 220px">${html}</div>`;
+ },
};
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 4683006..ba6262d 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -96,7 +96,6 @@
"read_only": 1
},
{
- "depends_on": "eval:!doc.work_order || doc.docstatus == 1",
"fieldname": "employee_detail",
"fieldtype": "Section Break",
"label": "Employee Detail"
@@ -311,7 +310,7 @@
"idx": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-02-14 04:55:41.735991",
+ "modified": "2023-04-20 15:59:11.107831",
"modified_by": "Administrator",
"module": "Projects",
"name": "Timesheet",
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index d482a46..11156f4 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -374,6 +374,7 @@
billing_rate = billing_amount / hours
target.company = timesheet.company
+ target.project = timesheet.parent_project
if customer:
target.customer = customer
diff --git a/erpnext/projects/workspace/projects/projects.json b/erpnext/projects/workspace/projects/projects.json
index 4bdb1db..94ae9c0 100644
--- a/erpnext/projects/workspace/projects/projects.json
+++ b/erpnext/projects/workspace/projects/projects.json
@@ -5,14 +5,16 @@
"label": "Open Projects"
}
],
- "content": "[{\"type\":\"chart\",\"data\":{\"chart_name\":\"Open Projects\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Task\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Project\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Timesheet\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Project Billing Summary\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Projects\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Time Tracking\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
+ "content": "[{\"id\":\"VDMms0hapk\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Open Projects\",\"col\":12}},{\"id\":\"7Mbx6I5JUf\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"nyuMo9byw7\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"dILbX_r0ve\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Task\",\"col\":3}},{\"id\":\"JT8ntrqRiJ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Project\",\"col\":3}},{\"id\":\"RsafDhm1MS\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Timesheet\",\"col\":3}},{\"id\":\"cVJH-gD0CR\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Project Billing Summary\",\"col\":3}},{\"id\":\"DbctrdmAy1\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"jx5aPK9aXN\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Project Management\",\"col\":3}},{\"id\":\"ncIHWGQQvX\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"oGhjvYjfv-\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"TdsgJyG3EI\",\"type\":\"card\",\"data\":{\"card_name\":\"Projects\",\"col\":4}},{\"id\":\"nIc0iyvf1T\",\"type\":\"card\",\"data\":{\"card_name\":\"Time Tracking\",\"col\":4}},{\"id\":\"8G1if4jsQ7\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}},{\"id\":\"o7qTNRXZI8\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]",
"creation": "2020-03-02 15:46:04.874669",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "project",
"idx": 0,
+ "is_hidden": 0,
"label": "Projects",
"links": [
{
@@ -190,19 +192,27 @@
"type": "Link"
}
],
- "modified": "2022-10-11 22:39:10.436311",
+ "modified": "2023-07-04 14:39:08.935853",
"modified_by": "Administrator",
"module": "Projects",
"name": "Projects",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
"quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 20.0,
+ "sequence_id": 11.0,
"shortcuts": [
{
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "Learn Project Management",
+ "type": "URL",
+ "url": "https://frappe.school/courses/project-management?utm_source=in_app"
+ },
+ {
"color": "Blue",
"format": "{} Assigned",
"label": "Task",
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 44abb33..1bed541 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -2,8 +2,7 @@
"css/erpnext.css": [
"public/less/erpnext.less",
"public/scss/call_popup.scss",
- "public/scss/point-of-sale.scss",
- "public/scss/hierarchy_chart.scss"
+ "public/scss/point-of-sale.scss"
],
"js/erpnext-web.min.js": [
"public/js/website_utils.js",
@@ -29,7 +28,6 @@
"public/js/help_links.js",
"public/js/agriculture/ternary_plot.js",
"public/js/templates/item_quick_entry.html",
- "public/js/utils/item_quick_entry.js",
"public/js/utils/customer_quick_entry.js",
"public/js/utils/supplier_quick_entry.js",
"public/js/education/student_button.html",
@@ -38,7 +36,6 @@
"public/js/utils/dimension_tree_filter.js",
"public/js/telephony.js",
"public/js/templates/call_link.html",
- "public/js/templates/node_card.html",
"public/js/bulk_transaction_processing.js"
],
"js/item-dashboard.min.js": [
@@ -63,10 +60,6 @@
"public/js/bank_reconciliation_tool/number_card.js",
"public/js/bank_reconciliation_tool/dialog_manager.js"
],
- "js/hierarchy-chart.min.js": [
- "public/js/hierarchy_chart/hierarchy_chart_desktop.js",
- "public/js/hierarchy_chart/hierarchy_chart_mobile.js"
- ],
"js/e-commerce.min.js": [
"e_commerce/product_ui/views.js",
"e_commerce/product_ui/grid.js",
diff --git a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
index 0cda938..5e5742a 100644
--- a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
@@ -40,8 +40,8 @@
name: __("Date"),
editable: false,
width: 100,
+ format: frappe.form.formatters.Date,
},
-
{
name: __("Party Type"),
editable: false,
@@ -117,17 +117,13 @@
return [
row["date"],
row["party_type"],
- row["party"],
+ frappe.form.formatters.Link(row["party"], {options: row["party_type"]}),
row["description"],
row["deposit"],
row["withdrawal"],
row["unallocated_amount"],
row["reference_number"],
- `
- <Button class="btn btn-primary btn-xs center" data-name = ${row["name"]} >
- ${__("Actions")}
- </a>
- `,
+ `<button class="btn btn-primary btn-xs center" data-name="${row["name"]}">${__("Actions")}</button>`
];
}
diff --git a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
index 1271e38..cbb64ca 100644
--- a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
@@ -76,30 +76,17 @@
callback: (result) => {
const data = result.message;
-
if (data && data.length > 0) {
const proposals_wrapper = this.dialog.fields_dict.payment_proposals.$wrapper;
proposals_wrapper.show();
this.dialog.fields_dict.no_matching_vouchers.$wrapper.hide();
- this.data = [];
- data.forEach((row) => {
- const reference_date = row[5] ? row[5] : row[8];
- this.data.push([
- row[1],
- row[2],
- reference_date,
- format_currency(row[3], row[9]),
- row[4],
- row[6],
- ]);
- });
+ this.data = data.map((row) => this.format_row(row));
this.get_dt_columns();
this.get_datatable(proposals_wrapper);
} else {
const proposals_wrapper = this.dialog.fields_dict.payment_proposals.$wrapper;
proposals_wrapper.hide();
this.dialog.fields_dict.no_matching_vouchers.$wrapper.show();
-
}
this.dialog.show();
},
@@ -122,6 +109,7 @@
name: __("Reference Date"),
editable: false,
width: 120,
+ format: frappe.form.formatters.Date,
},
{
name: __("Remaining"),
@@ -141,6 +129,17 @@
];
}
+ format_row(row) {
+ return [
+ row[1], // Document Type
+ frappe.form.formatters.Link(row[2], {options: row[1]}), // Document Name
+ row[5] || row[8], // Reference Date
+ format_currency(row[3], row[9]), // Remaining
+ row[4], // Reference Number
+ row[6], // Party
+ ];
+ }
+
get_datatable(proposals_wrapper) {
if (!this.datatable) {
const datatable_options = {
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index d943126..47b88a0 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -91,6 +91,12 @@
});
frappe.ui.form.on('Purchase Invoice', {
+ setup: (frm) => {
+ frm.make_methods = {
+ 'Landed Cost Voucher': function () { frm.trigger('create_landedcost_voucher') },
+ }
+ },
+
mode_of_payment: function(frm) {
get_payment_mode_account(frm, frm.doc.mode_of_payment, function(account){
frm.set_value('cash_bank_account', account);
@@ -99,6 +105,20 @@
payment_terms_template: function() {
cur_frm.trigger("disable_due_date");
+ },
+
+ create_landedcost_voucher: function (frm) {
+ let lcv = frappe.model.get_new_doc('Landed Cost Voucher');
+ lcv.company = frm.doc.company;
+
+ let lcv_receipt = frappe.model.get_new_doc('Landed Cost Purchase Invoice');
+ lcv_receipt.receipt_document_type = 'Purchase Invoice';
+ lcv_receipt.receipt_document = frm.doc.name;
+ lcv_receipt.supplier = frm.doc.supplier;
+ lcv_receipt.grand_total = frm.doc.grand_total;
+ lcv.purchase_receipts = [lcv_receipt];
+
+ frappe.set_route("Form", lcv.doctype, lcv.name);
}
});
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index b0e08cc..c001b4e 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -341,10 +341,80 @@
}
frappe.throw(msg);
}
- });
-
- }
+ }
+ );
}
+ }
+
+ add_serial_batch_bundle(doc, cdt, cdn) {
+ let item = locals[cdt][cdn];
+ let me = this;
+ let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
+
+ frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
+ .then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ item.has_serial_no = r.message.has_serial_no;
+ item.has_batch_no = r.message.has_batch_no;
+ item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
+ item.is_rejected = false;
+
+ frappe.require(path, function() {
+ new erpnext.SerialBatchPackageSelector(
+ me.frm, item, (r) => {
+ if (r) {
+ let update_values = {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ }
+
+ if (r.warehouse) {
+ update_values["warehouse"] = r.warehouse;
+ }
+
+ frappe.model.set_value(item.doctype, item.name, update_values);
+ }
+ }
+ );
+ });
+ }
+ });
+ }
+
+ add_serial_batch_for_rejected_qty(doc, cdt, cdn) {
+ let item = locals[cdt][cdn];
+ let me = this;
+ let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
+
+ frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
+ .then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ item.has_serial_no = r.message.has_serial_no;
+ item.has_batch_no = r.message.has_batch_no;
+ item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
+ item.is_rejected = true;
+
+ frappe.require(path, function() {
+ new erpnext.SerialBatchPackageSelector(
+ me.frm, item, (r) => {
+ if (r) {
+ let update_values = {
+ "serial_and_batch_bundle": r.name,
+ "rejected_qty": Math.abs(r.total_qty)
+ }
+
+ if (r.warehouse) {
+ update_values["rejected_warehouse"] = r.warehouse;
+ }
+
+ frappe.model.set_value(item.doctype, item.name, update_values);
+ }
+ }
+ );
+ });
+ }
+ });
+ }
};
cur_frm.add_fetch('project', 'cost_center', 'cost_center');
diff --git a/erpnext/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js
index d346357..720423b 100644
--- a/erpnext/public/js/controllers/stock_controller.js
+++ b/erpnext/public/js/controllers/stock_controller.js
@@ -66,7 +66,7 @@
}
show_general_ledger() {
- var me = this;
+ let me = this;
if(this.frm.doc.docstatus > 0) {
cur_frm.add_custom_button(__('Accounting Ledger'), function() {
frappe.route_options = {
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 8efc47d..6f4e602 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -92,7 +92,7 @@
_calculate_taxes_and_totals() {
const is_quotation = this.frm.doc.doctype == "Quotation";
- this.frm.doc._items = is_quotation ? this.filtered_items() : this.frm.doc.items;
+ this.frm._items = is_quotation ? this.filtered_items() : this.frm.doc.items;
this.validate_conversion_rate();
this.calculate_item_values();
@@ -125,7 +125,7 @@
calculate_item_values() {
var me = this;
if (!this.discount_amount_applied) {
- for (const item of this.frm.doc._items || []) {
+ for (const item of this.frm._items || []) {
frappe.model.round_floats_in(item);
item.net_rate = item.rate;
item.qty = item.qty === undefined ? (me.frm.doc.is_return ? -1 : 1) : item.qty;
@@ -209,7 +209,7 @@
});
if(has_inclusive_tax==false) return;
- $.each(me.frm.doc._items || [], function(n, item) {
+ $.each(me.frm._items || [], function(n, item) {
var item_tax_map = me._load_item_tax_rate(item.item_tax_rate);
var cumulated_tax_fraction = 0.0;
var total_inclusive_tax_amount_per_qty = 0;
@@ -280,13 +280,13 @@
var me = this;
this.frm.doc.total_qty = this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
- $.each(this.frm.doc._items || [], function(i, item) {
+ $.each(this.frm._items || [], function(i, item) {
me.frm.doc.total += item.amount;
me.frm.doc.total_qty += item.qty;
me.frm.doc.base_total += item.base_amount;
me.frm.doc.net_total += item.net_amount;
me.frm.doc.base_net_total += item.base_net_amount;
- });
+ });
}
calculate_shipping_charges() {
@@ -333,7 +333,7 @@
}
});
- $.each(this.frm.doc._items || [], function(n, item) {
+ $.each(this.frm._items || [], function(n, item) {
var item_tax_map = me._load_item_tax_rate(item.item_tax_rate);
$.each(me.frm.doc["taxes"] || [], function(i, tax) {
// tax_amount represents the amount of tax for the current step
@@ -342,7 +342,7 @@
// Adjust divisional loss to the last item
if (tax.charge_type == "Actual") {
actual_tax_dict[tax.idx] -= current_tax_amount;
- if (n == me.frm.doc._items.length - 1) {
+ if (n == me.frm._items.length - 1) {
current_tax_amount += actual_tax_dict[tax.idx];
}
}
@@ -379,7 +379,7 @@
}
// set precision in the last item iteration
- if (n == me.frm.doc._items.length - 1) {
+ if (n == me.frm._items.length - 1) {
me.round_off_totals(tax);
me.set_in_company_currency(tax,
["tax_amount", "tax_amount_after_discount_amount"]);
@@ -602,7 +602,7 @@
_cleanup() {
this.frm.doc.base_in_words = this.frm.doc.in_words = "";
- let items = this.frm.doc._items;
+ let items = this.frm._items;
if(items && items.length) {
if(!frappe.meta.get_docfield(items[0].doctype, "item_tax_amount", this.frm.doctype)) {
@@ -659,7 +659,7 @@
var net_total = 0;
// calculate item amount after Discount Amount
if (total_for_discount_amount) {
- $.each(this.frm.doc._items || [], function(i, item) {
+ $.each(this.frm._items || [], function(i, item) {
distributed_amount = flt(me.frm.doc.discount_amount) * item.net_amount / total_for_discount_amount;
item.net_amount = flt(item.net_amount - distributed_amount,
precision("base_amount", item));
@@ -667,7 +667,7 @@
// discount amount rounding loss adjustment if no taxes
if ((!(me.frm.doc.taxes || []).length || total_for_discount_amount==me.frm.doc.net_total || (me.frm.doc.apply_discount_on == "Net Total"))
- && i == (me.frm.doc._items || []).length - 1) {
+ && i == (me.frm._items || []).length - 1) {
var discount_amount_loss = flt(me.frm.doc.net_total - net_total
- me.frm.doc.discount_amount, precision("net_total"));
item.net_amount = flt(item.net_amount + discount_amount_loss,
@@ -805,11 +805,13 @@
);
}
- this.frm.doc.payments.find(pay => {
- if (pay.default) {
- pay.amount = total_amount_to_pay;
- }
- });
+ if(!this.frm.doc.is_return){
+ this.frm.doc.payments.find(payment => {
+ if (payment.default) {
+ payment.amount = total_amount_to_pay;
+ }
+ });
+ }
this.frm.refresh_fields();
}
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 0bd4d91..543d0e9 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -6,6 +6,9 @@
setup() {
super.setup();
let me = this;
+
+ this.frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle'];
+
frappe.flags.hide_serial_batch_dialog = true;
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
@@ -119,10 +122,27 @@
}
});
- if(this.frm.fields_dict["items"].grid.get_field('batch_no')) {
- this.frm.set_query("batch_no", "items", function(doc, cdt, cdn) {
- return me.set_query_for_batch(doc, cdt, cdn);
+ if(this.frm.fields_dict["items"].grid.get_field('serial_and_batch_bundle')) {
+ this.frm.set_query("serial_and_batch_bundle", "items", function(doc, cdt, cdn) {
+ let item_row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': item_row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
});
+
+ let sbb_field = this.frm.get_docfield('items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ }
+ };
+ }
}
if(
@@ -173,7 +193,9 @@
this.frm.set_query("expense_account", "items", function(doc) {
return {
filters: {
- "company": doc.company
+ "company": doc.company,
+ "report_type": "Profit and Loss",
+ "is_group": 0
}
};
});
@@ -422,7 +444,7 @@
update_stock = cint(me.frm.doc.update_stock);
show_batch_dialog = update_stock;
- } else if((this.frm.doc.doctype === 'Purchase Receipt' && me.frm.doc.is_return) ||
+ } else if((this.frm.doc.doctype === 'Purchase Receipt') ||
this.frm.doc.doctype === 'Delivery Note') {
show_batch_dialog = 1;
}
@@ -494,7 +516,7 @@
},
() => {
// for internal customer instead of pricing rule directly apply valuation rate on item
- if (me.frm.doc.is_internal_customer || me.frm.doc.is_internal_supplier) {
+ if ((me.frm.doc.is_internal_customer || me.frm.doc.is_internal_supplier) && me.frm.doc.represents_company === me.frm.doc.company) {
me.get_incoming_rate(item, me.frm.posting_date, me.frm.posting_time,
me.frm.doc.doctype, me.frm.doc.company);
} else {
@@ -514,6 +536,8 @@
if (r.message &&
(r.message.has_batch_no || r.message.has_serial_no)) {
frappe.flags.hide_serial_batch_dialog = false;
+ } else {
+ show_batch_dialog = false;
}
});
},
@@ -528,7 +552,7 @@
});
},
() => {
- if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) {
+ if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog && !frappe.flags.dialog_set) {
var d = locals[cdt][cdn];
$.each(r.message, function(k, v) {
if(!d[k]) d[k] = v;
@@ -538,12 +562,15 @@
d.batch_no = undefined;
}
+ frappe.flags.dialog_set = true;
erpnext.show_serial_batch_selector(me.frm, d, (item) => {
me.frm.script_manager.trigger('qty', item.doctype, item.name);
if (!me.frm.doc.set_warehouse)
me.frm.script_manager.trigger('warehouse', item.doctype, item.name);
me.apply_price_list(item, true);
}, undefined, !frappe.flags.hide_serial_batch_dialog);
+ } else {
+ frappe.flags.dialog_set = false;
}
},
() => me.conversion_factor(doc, cdt, cdn, true),
@@ -672,6 +699,10 @@
}
}
+ on_submit() {
+ refresh_field("items");
+ }
+
update_qty(cdt, cdn) {
var valid_serial_nos = [];
var serialnos = [];
@@ -1920,7 +1951,7 @@
}
prompt_user_for_reference_date(){
- var me = this;
+ let me = this;
frappe.prompt({
label: __("Cheque/Reference Date"),
fieldname: "reference_date",
@@ -1947,7 +1978,7 @@
let has_payment_schedule = this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length;
if(!is_eligible || !has_payment_schedule) return false;
- let has_discount = this.frm.doc.payment_schedule.some(row => row.discount_date);
+ let has_discount = this.frm.doc.payment_schedule.some(row => row.discount);
return has_discount;
}
@@ -2272,12 +2303,14 @@
}
};
-erpnext.show_serial_batch_selector = function (frm, d, callback, on_close, show_dialog) {
+erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close, show_dialog) {
let warehouse, receiving_stock, existing_stock;
+
+ let warehouse_field = "warehouse";
if (frm.doc.is_return) {
if (["Purchase Receipt", "Purchase Invoice"].includes(frm.doc.doctype)) {
existing_stock = true;
- warehouse = d.warehouse;
+ warehouse = item_row.warehouse;
} else if (["Delivery Note", "Sales Invoice"].includes(frm.doc.doctype)) {
receiving_stock = true;
}
@@ -2287,11 +2320,24 @@
receiving_stock = true;
} else {
existing_stock = true;
- warehouse = d.s_warehouse;
+ warehouse = item_row.s_warehouse;
+ }
+
+ if (in_list([
+ "Material Transfer",
+ "Send to Subcontractor",
+ "Material Issue",
+ "Material Consumption for Manufacture",
+ "Material Transfer for Manufacture"
+ ], frm.doc.purpose)
+ ) {
+ warehouse_field = "s_warehouse";
+ } else {
+ warehouse_field = "t_warehouse";
}
} else {
existing_stock = true;
- warehouse = d.warehouse;
+ warehouse = item_row.warehouse;
}
}
@@ -2304,16 +2350,26 @@
}
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
- new erpnext.SerialNoBatchSelector({
- frm: frm,
- item: d,
- warehouse_details: {
- type: "Warehouse",
- name: warehouse
- },
- callback: callback,
- on_close: on_close
- }, show_dialog);
+ if (in_list(["Sales Invoice", "Delivery Note"], frm.doc.doctype)) {
+ item_row.type_of_transaction = frm.doc.is_return ? "Inward" : "Outward";
+ } else {
+ item_row.type_of_transaction = frm.doc.is_return ? "Outward" : "Inward";
+ }
+
+ new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
+ if (r) {
+ let update_values = {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ }
+
+ if (r.warehouse) {
+ update_values[warehouse_field] = r.warehouse;
+ }
+
+ frappe.model.set_value(item_row.doctype, item_row.name, update_values);
+ }
+ });
});
}
diff --git a/erpnext/public/js/erpnext.bundle.js b/erpnext/public/js/erpnext.bundle.js
index 7b230af..4e028e4 100644
--- a/erpnext/public/js/erpnext.bundle.js
+++ b/erpnext/public/js/erpnext.bundle.js
@@ -12,12 +12,12 @@
import "./help_links";
import "./agriculture/ternary_plot";
import "./templates/item_quick_entry.html";
-import "./utils/item_quick_entry";
import "./utils/contact_address_quick_entry";
import "./utils/customer_quick_entry";
import "./utils/supplier_quick_entry";
import "./call_popup/call_popup";
import "./utils/dimension_tree_filter";
+import "./utils/ledger_preview.js"
import "./utils/barcode_scanner";
import "./telephony";
import "./templates/call_link.html";
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index b0082bd..2b50a75 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -182,6 +182,16 @@
company: frappe.query_report.get_filter_value("company")
});
}
+ },
+ {
+ "fieldname": "project",
+ "label": __("Project"),
+ "fieldtype": "MultiSelectList",
+ get_data: function(txt) {
+ return frappe.db.get_link_options('Project', txt, {
+ company: frappe.query_report.get_filter_value("company")
+ });
+ },
}
]
diff --git a/erpnext/public/js/hierarchy-chart.bundle.js b/erpnext/public/js/hierarchy-chart.bundle.js
deleted file mode 100644
index 0270313..0000000
--- a/erpnext/public/js/hierarchy-chart.bundle.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "./hierarchy_chart/hierarchy_chart_desktop.js";
-import "./hierarchy_chart/hierarchy_chart_mobile.js";
-import "./templates/node_card.html";
diff --git a/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js b/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
deleted file mode 100644
index a585aa6..0000000
--- a/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
+++ /dev/null
@@ -1,608 +0,0 @@
-import html2canvas from 'html2canvas';
-erpnext.HierarchyChart = class {
- /* Options:
- - doctype
- - wrapper: wrapper for the hierarchy view
- - method:
- - to get the data for each node
- - this method should return id, name, title, image, and connections for each node
- */
- constructor(doctype, wrapper, method) {
- this.page = wrapper.page;
- this.method = method;
- this.doctype = doctype;
-
- this.setup_page_style();
- this.page.main.addClass('frappe-card');
-
- this.nodes = {};
- this.setup_node_class();
- }
-
- setup_page_style() {
- this.page.main.css({
- 'min-height': '300px',
- 'max-height': '600px',
- 'overflow': 'auto',
- 'position': 'relative'
- });
- }
-
- setup_node_class() {
- let me = this;
- this.Node = class {
- constructor({
- id, parent, parent_id, image, name, title, expandable, connections, is_root // eslint-disable-line
- }) {
- // to setup values passed via constructor
- $.extend(this, arguments[0]);
-
- this.expanded = 0;
-
- me.nodes[this.id] = this;
- me.make_node_element(this);
-
- if (!me.all_nodes_expanded) {
- me.setup_node_click_action(this);
- }
-
- me.setup_edit_node_action(this);
- }
- };
- }
-
- make_node_element(node) {
- let node_card = frappe.render_template('node_card', {
- id: node.id,
- name: node.name,
- title: node.title,
- image: node.image,
- parent: node.parent_id,
- connections: node.connections,
- is_mobile: false
- });
-
- node.parent.append(node_card);
- node.$link = $(`[id="${node.id}"]`);
- }
-
- show() {
- this.setup_actions();
- if ($(`[data-fieldname="company"]`).length) return;
- let me = this;
-
- let company = this.page.add_field({
- fieldtype: 'Link',
- options: 'Company',
- fieldname: 'company',
- placeholder: __('Select Company'),
- default: frappe.defaults.get_default('company'),
- only_select: true,
- reqd: 1,
- change: () => {
- me.company = undefined;
- $('#hierarchy-chart-wrapper').remove();
-
- if (company.get_value()) {
- me.company = company.get_value();
-
- // svg for connectors
- me.make_svg_markers();
- me.setup_hierarchy();
- me.render_root_nodes();
- me.all_nodes_expanded = false;
- } else {
- frappe.throw(__('Please select a company first.'));
- }
- }
- });
-
- company.refresh();
- $(`[data-fieldname="company"]`).trigger('change');
- $(`[data-fieldname="company"] .link-field`).css('z-index', 2);
- }
-
- setup_actions() {
- let me = this;
- this.page.clear_inner_toolbar();
- this.page.add_inner_button(__('Export'), function() {
- me.export_chart();
- });
-
- this.page.add_inner_button(__('Expand All'), function() {
- me.load_children(me.root_node, true);
- me.all_nodes_expanded = true;
-
- me.page.remove_inner_button(__('Expand All'));
- me.page.add_inner_button(__('Collapse All'), function() {
- me.setup_hierarchy();
- me.render_root_nodes();
- me.all_nodes_expanded = false;
-
- me.page.remove_inner_button(__('Collapse All'));
- me.setup_actions();
- });
- });
- }
-
- export_chart() {
- frappe.dom.freeze(__('Exporting...'));
- this.page.main.css({
- 'min-height': '',
- 'max-height': '',
- 'overflow': 'visible',
- 'position': 'fixed',
- 'left': '0',
- 'top': '0'
- });
-
- $('.node-card').addClass('exported');
-
- html2canvas(document.querySelector('#hierarchy-chart-wrapper'), {
- scrollY: -window.scrollY,
- scrollX: 0
- }).then(function(canvas) {
- // Export the canvas to its data URI representation
- let dataURL = canvas.toDataURL('image/png');
-
- // download the image
- let a = document.createElement('a');
- a.href = dataURL;
- a.download = 'hierarchy_chart';
- a.click();
- }).finally(() => {
- frappe.dom.unfreeze();
- });
-
- this.setup_page_style();
- $('.node-card').removeClass('exported');
- }
-
- setup_hierarchy() {
- if (this.$hierarchy)
- this.$hierarchy.remove();
-
- $(`#connectors`).empty();
-
- // setup hierarchy
- this.$hierarchy = $(
- `<ul class="hierarchy">
- <li class="root-level level">
- <ul class="node-children"></ul>
- </li>
- </ul>`);
-
- this.page.main
- .find('#hierarchy-chart')
- .empty()
- .append(this.$hierarchy);
-
- this.nodes = {};
- }
-
- make_svg_markers() {
- $('#hierarchy-chart-wrapper').remove();
-
- this.page.main.append(`
- <div id="hierarchy-chart-wrapper">
- <svg id="arrows" width="100%" height="100%">
- <defs>
- <marker id="arrowhead-active" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="6" markerHeight="6" orient="auto" fill="var(--blue-500)">
- <path d="M 0 0 L 10 5 L 0 10 z"></path>
- </marker>
- <marker id="arrowhead-collapsed" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="6" markerHeight="6" orient="auto" fill="var(--blue-300)">
- <path d="M 0 0 L 10 5 L 0 10 z"></path>
- </marker>
-
- <marker id="arrowstart-active" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="8" markerHeight="8" orient="auto" fill="var(--blue-500)">
- <circle cx="4" cy="4" r="3.5" fill="white" stroke="var(--blue-500)"/>
- </marker>
- <marker id="arrowstart-collapsed" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="8" markerHeight="8" orient="auto" fill="var(--blue-300)">
- <circle cx="4" cy="4" r="3.5" fill="white" stroke="var(--blue-300)"/>
- </marker>
- </defs>
- <g id="connectors" fill="none">
- </g>
- </svg>
- <div id="hierarchy-chart">
- </div>
- </div>`);
- }
-
- render_root_nodes(expanded_view=false) {
- let me = this;
-
- return frappe.call({
- method: me.method,
- args: {
- company: me.company
- }
- }).then(r => {
- if (r.message.length) {
- let expand_node = undefined;
- let node = undefined;
-
- $.each(r.message, (_i, data) => {
- if ($(`[id="${data.id}"]`).length)
- return;
-
- node = new me.Node({
- id: data.id,
- parent: $('<li class="child-node"></li>').appendTo(me.$hierarchy.find('.node-children')),
- parent_id: undefined,
- image: data.image,
- name: data.name,
- title: data.title,
- expandable: true,
- connections: data.connections,
- is_root: true
- });
-
- if (!expand_node && data.connections)
- expand_node = node;
- });
-
- me.root_node = expand_node;
- if (!expanded_view) {
- me.expand_node(expand_node);
- }
- }
- });
- }
-
- expand_node(node) {
- const is_sibling = this.selected_node && this.selected_node.parent_id === node.parent_id;
- this.set_selected_node(node);
- this.show_active_path(node);
- this.collapse_previous_level_nodes(node);
-
- // since the previous node collapses, all connections to that node need to be rebuilt
- // if a sibling node is clicked, connections don't need to be rebuilt
- if (!is_sibling) {
- // rebuild outgoing connections
- this.refresh_connectors(node.parent_id);
-
- // rebuild incoming connections
- let grandparent = $(`[id="${node.parent_id}"]`).attr('data-parent');
- this.refresh_connectors(grandparent);
- }
-
- if (node.expandable && !node.expanded) {
- return this.load_children(node);
- }
- }
-
- collapse_node() {
- if (this.selected_node.expandable) {
- this.selected_node.$children.hide();
- $(`path[data-parent="${this.selected_node.id}"]`).hide();
- this.selected_node.expanded = false;
- }
- }
-
- show_active_path(node) {
- // mark node parent on active path
- $(`[id="${node.parent_id}"]`).addClass('active-path');
- }
-
- load_children(node, deep=false) {
- if (!deep) {
- frappe.run_serially([
- () => this.get_child_nodes(node.id),
- (child_nodes) => this.render_child_nodes(node, child_nodes)
- ]);
- } else {
- frappe.run_serially([
- () => frappe.dom.freeze(),
- () => this.setup_hierarchy(),
- () => this.render_root_nodes(true),
- () => this.get_all_nodes(),
- (data_list) => this.render_children_of_all_nodes(data_list),
- () => frappe.dom.unfreeze()
- ]);
- }
- }
-
- get_child_nodes(node_id) {
- let me = this;
- return new Promise(resolve => {
- frappe.call({
- method: me.method,
- args: {
- parent: node_id,
- company: me.company
- }
- }).then(r => resolve(r.message));
- });
- }
-
- render_child_nodes(node, child_nodes) {
- const last_level = this.$hierarchy.find('.level:last').index();
- const current_level = $(`[id="${node.id}"]`).parent().parent().parent().index();
-
- if (last_level === current_level) {
- this.$hierarchy.append(`
- <li class="level"></li>
- `);
- }
-
- if (!node.$children) {
- node.$children = $('<ul class="node-children"></ul>')
- .hide()
- .appendTo(this.$hierarchy.find('.level:last'));
-
- node.$children.empty();
-
- if (child_nodes) {
- $.each(child_nodes, (_i, data) => {
- if (!$(`[id="${data.id}"]`).length) {
- this.add_node(node, data);
- setTimeout(() => {
- this.add_connector(node.id, data.id);
- }, 250);
- }
- });
- }
- }
-
- node.$children.show();
- $(`path[data-parent="${node.id}"]`).show();
- node.expanded = true;
- }
-
- get_all_nodes() {
- let me = this;
- return new Promise(resolve => {
- frappe.call({
- method: 'erpnext.utilities.hierarchy_chart.get_all_nodes',
- args: {
- method: me.method,
- company: me.company
- },
- callback: (r) => {
- resolve(r.message);
- }
- });
- });
- }
-
- render_children_of_all_nodes(data_list) {
- let entry = undefined;
- let node = undefined;
-
- while (data_list.length) {
- // to avoid overlapping connectors
- entry = data_list.shift();
- node = this.nodes[entry.parent];
- if (node) {
- this.render_child_nodes_for_expanded_view(node, entry.data);
- } else if (data_list.length) {
- data_list.push(entry);
- }
- }
- }
-
- render_child_nodes_for_expanded_view(node, child_nodes) {
- node.$children = $('<ul class="node-children"></ul>');
-
- const last_level = this.$hierarchy.find('.level:last').index();
- const node_level = $(`[id="${node.id}"]`).parent().parent().parent().index();
-
- if (last_level === node_level) {
- this.$hierarchy.append(`
- <li class="level"></li>
- `);
- node.$children.appendTo(this.$hierarchy.find('.level:last'));
- } else {
- node.$children.appendTo(this.$hierarchy.find('.level:eq(' + (node_level + 1) + ')'));
- }
-
- node.$children.hide().empty();
-
- if (child_nodes) {
- $.each(child_nodes, (_i, data) => {
- this.add_node(node, data);
- setTimeout(() => {
- this.add_connector(node.id, data.id);
- }, 250);
- });
- }
-
- node.$children.show();
- $(`path[data-parent="${node.id}"]`).show();
- node.expanded = true;
- }
-
- add_node(node, data) {
- return new this.Node({
- id: data.id,
- parent: $('<li class="child-node"></li>').appendTo(node.$children),
- parent_id: node.id,
- image: data.image,
- name: data.name,
- title: data.title,
- expandable: data.expandable,
- connections: data.connections,
- children: undefined
- });
- }
-
- add_connector(parent_id, child_id) {
- // using pure javascript for better performance
- const parent_node = document.getElementById(`${parent_id}`);
- const child_node = document.getElementById(`${child_id}`);
-
- let path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-
- // we need to connect right side of the parent to the left side of the child node
- const pos_parent_right = {
- x: parent_node.offsetLeft + parent_node.offsetWidth,
- y: parent_node.offsetTop + parent_node.offsetHeight / 2
- };
- const pos_child_left = {
- x: child_node.offsetLeft - 5,
- y: child_node.offsetTop + child_node.offsetHeight / 2
- };
-
- const connector = this.get_connector(pos_parent_right, pos_child_left);
-
- path.setAttribute('d', connector);
- this.set_path_attributes(path, parent_id, child_id);
-
- document.getElementById('connectors').appendChild(path);
- }
-
- get_connector(pos_parent_right, pos_child_left) {
- if (pos_parent_right.y === pos_child_left.y) {
- // don't add arcs if it's a straight line
- return "M" +
- (pos_parent_right.x) + "," + (pos_parent_right.y) + " " +
- "L"+
- (pos_child_left.x) + "," + (pos_child_left.y);
- } else {
- let arc_1 = "";
- let arc_2 = "";
- let offset = 0;
-
- if (pos_parent_right.y > pos_child_left.y) {
- // if child is above parent on Y axis 1st arc is anticlocwise
- // second arc is clockwise
- arc_1 = "a10,10 1 0 0 10,-10 ";
- arc_2 = "a10,10 0 0 1 10,-10 ";
- offset = 10;
- } else {
- // if child is below parent on Y axis 1st arc is clockwise
- // second arc is anticlockwise
- arc_1 = "a10,10 0 0 1 10,10 ";
- arc_2 = "a10,10 1 0 0 10,10 ";
- offset = -10;
- }
-
- return "M" + (pos_parent_right.x) + "," + (pos_parent_right.y) + " " +
- "L" +
- (pos_parent_right.x + 40) + "," + (pos_parent_right.y) + " " +
- arc_1 +
- "L" +
- (pos_parent_right.x + 50) + "," + (pos_child_left.y + offset) + " " +
- arc_2 +
- "L"+
- (pos_child_left.x) + "," + (pos_child_left.y);
- }
- }
-
- set_path_attributes(path, parent_id, child_id) {
- path.setAttribute("data-parent", parent_id);
- path.setAttribute("data-child", child_id);
- const parent = $(`[id="${parent_id}"]`);
-
- if (parent.hasClass('active')) {
- path.setAttribute("class", "active-connector");
- path.setAttribute("marker-start", "url(#arrowstart-active)");
- path.setAttribute("marker-end", "url(#arrowhead-active)");
- } else {
- path.setAttribute("class", "collapsed-connector");
- path.setAttribute("marker-start", "url(#arrowstart-collapsed)");
- path.setAttribute("marker-end", "url(#arrowhead-collapsed)");
- }
- }
-
- set_selected_node(node) {
- // remove active class from the current node
- if (this.selected_node)
- this.selected_node.$link.removeClass('active');
-
- // add active class to the newly selected node
- this.selected_node = node;
- node.$link.addClass('active');
- }
-
- collapse_previous_level_nodes(node) {
- let node_parent = $(`[id="${node.parent_id}"]`);
- let previous_level_nodes = node_parent.parent().parent().children('li');
- let node_card = undefined;
-
- previous_level_nodes.each(function() {
- node_card = $(this).find('.node-card');
-
- if (!node_card.hasClass('active-path')) {
- node_card.addClass('collapsed');
- }
- });
- }
-
- refresh_connectors(node_parent) {
- if (!node_parent) return;
-
- $(`path[data-parent="${node_parent}"]`).remove();
-
- frappe.run_serially([
- () => this.get_child_nodes(node_parent),
- (child_nodes) => {
- if (child_nodes) {
- $.each(child_nodes, (_i, data) => {
- this.add_connector(node_parent, data.id);
- });
- }
- }
- ]);
- }
-
- setup_node_click_action(node) {
- let me = this;
- let node_element = $(`[id="${node.id}"]`);
-
- node_element.click(function() {
- const is_sibling = me.selected_node.parent_id === node.parent_id;
-
- if (is_sibling) {
- me.collapse_node();
- } else if (node_element.is(':visible')
- && (node_element.hasClass('collapsed') || node_element.hasClass('active-path'))) {
- me.remove_levels_after_node(node);
- me.remove_orphaned_connectors();
- }
-
- me.expand_node(node);
- });
- }
-
- setup_edit_node_action(node) {
- let node_element = $(`[id="${node.id}"]`);
- let me = this;
-
- node_element.find('.btn-edit-node').click(function() {
- frappe.set_route('Form', me.doctype, node.id);
- });
- }
-
- remove_levels_after_node(node) {
- let level = $(`[id="${node.id}"]`).parent().parent().parent().index();
-
- level = $('.hierarchy > li:eq('+ level + ')');
- level.nextAll('li').remove();
-
- let nodes = level.find('.node-card');
- let node_object = undefined;
-
- $.each(nodes, (_i, element) => {
- node_object = this.nodes[element.id];
- node_object.expanded = 0;
- node_object.$children = undefined;
- });
-
- nodes.removeClass('collapsed active-path');
- }
-
- remove_orphaned_connectors() {
- let paths = $('#connectors > path');
- $.each(paths, (_i, path) => {
- const parent = $(path).data('parent');
- const child = $(path).data('child');
-
- if ($(`[id="${parent}"]`).length && $(`[id="${child}"]`).length)
- return;
-
- $(path).remove();
- });
- }
-};
diff --git a/erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js b/erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js
deleted file mode 100644
index 52236e7..0000000
--- a/erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js
+++ /dev/null
@@ -1,550 +0,0 @@
-erpnext.HierarchyChartMobile = class {
- /* Options:
- - doctype
- - wrapper: wrapper for the hierarchy view
- - method:
- - to get the data for each node
- - this method should return id, name, title, image, and connections for each node
- */
- constructor(doctype, wrapper, method) {
- this.page = wrapper.page;
- this.method = method;
- this.doctype = doctype;
-
- this.page.main.css({
- 'min-height': '300px',
- 'max-height': '600px',
- 'overflow': 'auto',
- 'position': 'relative'
- });
- this.page.main.addClass('frappe-card');
-
- this.nodes = {};
- this.setup_node_class();
- }
-
- setup_node_class() {
- let me = this;
- this.Node = class {
- constructor({
- id, parent, parent_id, image, name, title, expandable, connections, is_root // eslint-disable-line
- }) {
- // to setup values passed via constructor
- $.extend(this, arguments[0]);
-
- this.expanded = 0;
-
- me.nodes[this.id] = this;
- me.make_node_element(this);
- me.setup_node_click_action(this);
- me.setup_edit_node_action(this);
- }
- };
- }
-
- make_node_element(node) {
- let node_card = frappe.render_template('node_card', {
- id: node.id,
- name: node.name,
- title: node.title,
- image: node.image,
- parent: node.parent_id,
- connections: node.connections,
- is_mobile: true
- });
-
- node.parent.append(node_card);
- node.$link = $(`[id="${node.id}"]`);
- node.$link.addClass('mobile-node');
- }
-
- show() {
- let me = this;
- if ($(`[data-fieldname="company"]`).length) return;
-
- let company = this.page.add_field({
- fieldtype: 'Link',
- options: 'Company',
- fieldname: 'company',
- placeholder: __('Select Company'),
- default: frappe.defaults.get_default('company'),
- only_select: true,
- reqd: 1,
- change: () => {
- me.company = undefined;
-
- if (company.get_value() && me.company != company.get_value()) {
- me.company = company.get_value();
-
- // svg for connectors
- me.make_svg_markers();
-
- if (me.$sibling_group)
- me.$sibling_group.remove();
-
- // setup sibling group wrapper
- me.$sibling_group = $(`<div class="sibling-group mt-4 mb-4"></div>`);
- me.page.main.append(me.$sibling_group);
-
- me.setup_hierarchy();
- me.render_root_nodes();
- }
- }
- });
-
- company.refresh();
- $(`[data-fieldname="company"]`).trigger('change');
- }
-
- make_svg_markers() {
- $('#arrows').remove();
-
- this.page.main.prepend(`
- <svg id="arrows" width="100%" height="100%">
- <defs>
- <marker id="arrowhead-active" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="6" markerHeight="6" orient="auto" fill="var(--blue-500)">
- <path d="M 0 0 L 10 5 L 0 10 z"></path>
- </marker>
- <marker id="arrowhead-collapsed" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="6" markerHeight="6" orient="auto" fill="var(--blue-300)">
- <path d="M 0 0 L 10 5 L 0 10 z"></path>
- </marker>
-
- <marker id="arrowstart-active" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="8" markerHeight="8" orient="auto" fill="var(--blue-500)">
- <circle cx="4" cy="4" r="3.5" fill="white" stroke="var(--blue-500)"/>
- </marker>
- <marker id="arrowstart-collapsed" viewBox="0 0 10 10" refX="3" refY="5" markerWidth="8" markerHeight="8" orient="auto" fill="var(--blue-300)">
- <circle cx="4" cy="4" r="3.5" fill="white" stroke="var(--blue-300)"/>
- </marker>
- </defs>
- <g id="connectors" fill="none">
- </g>
- </svg>`);
- }
-
- setup_hierarchy() {
- $(`#connectors`).empty();
- if (this.$hierarchy)
- this.$hierarchy.remove();
-
- if (this.$sibling_group)
- this.$sibling_group.empty();
-
- this.$hierarchy = $(
- `<ul class="hierarchy-mobile">
- <li class="root-level level"></li>
- </ul>`);
-
- this.page.main.append(this.$hierarchy);
- }
-
- render_root_nodes() {
- let me = this;
-
- frappe.call({
- method: me.method,
- args: {
- company: me.company
- },
- }).then(r => {
- if (r.message.length) {
- let root_level = me.$hierarchy.find('.root-level');
- root_level.empty();
-
- $.each(r.message, (_i, data) => {
- return new me.Node({
- id: data.id,
- parent: root_level,
- parent_id: undefined,
- image: data.image,
- name: data.name,
- title: data.title,
- expandable: true,
- connections: data.connections,
- is_root: true
- });
- });
- }
- });
- }
-
- expand_node(node) {
- const is_same_node = (this.selected_node && this.selected_node.id === node.id);
- this.set_selected_node(node);
- this.show_active_path(node);
-
- if (this.$sibling_group) {
- const sibling_parent = this.$sibling_group.find('.node-group').attr('data-parent');
- if (node.parent_id !== undefined && node.parent_id != sibling_parent)
- this.$sibling_group.empty();
- }
-
- if (!is_same_node) {
- // since the previous/parent node collapses, all connections to that node need to be rebuilt
- // rebuild outgoing connections of parent
- this.refresh_connectors(node.parent_id, node.id);
-
- // rebuild incoming connections of parent
- let grandparent = $(`[id="${node.parent_id}"]`).attr('data-parent');
- this.refresh_connectors(grandparent, node.parent_id);
- }
-
- if (node.expandable && !node.expanded) {
- return this.load_children(node);
- }
- }
-
- collapse_node() {
- let node = this.selected_node;
- if (node.expandable && node.$children) {
- node.$children.hide();
- node.expanded = 0;
-
- // add a collapsed level to show the collapsed parent
- // and a button beside it to move to that level
- let node_parent = node.$link.parent();
- node_parent.prepend(
- `<div class="collapsed-level d-flex flex-row"></div>`
- );
-
- node_parent
- .find('.collapsed-level')
- .append(node.$link);
-
- frappe.run_serially([
- () => this.get_child_nodes(node.parent_id, node.id),
- (child_nodes) => this.get_node_group(child_nodes, node.parent_id),
- (node_group) => node_parent.find('.collapsed-level').append(node_group),
- () => this.setup_node_group_action()
- ]);
- }
- }
-
- show_active_path(node) {
- // mark node parent on active path
- $(`[id="${node.parent_id}"]`).addClass('active-path');
- }
-
- load_children(node) {
- frappe.run_serially([
- () => this.get_child_nodes(node.id),
- (child_nodes) => this.render_child_nodes(node, child_nodes)
- ]);
- }
-
- get_child_nodes(node_id, exclude_node=null) {
- let me = this;
- return new Promise(resolve => {
- frappe.call({
- method: me.method,
- args: {
- parent: node_id,
- company: me.company,
- exclude_node: exclude_node
- }
- }).then(r => resolve(r.message));
- });
- }
-
- render_child_nodes(node, child_nodes) {
- if (!node.$children) {
- node.$children = $('<ul class="node-children"></ul>')
- .hide()
- .appendTo(node.$link.parent());
-
- node.$children.empty();
-
- if (child_nodes) {
- $.each(child_nodes, (_i, data) => {
- this.add_node(node, data);
- $(`[id="${data.id}"]`).addClass('active-child');
-
- setTimeout(() => {
- this.add_connector(node.id, data.id);
- }, 250);
- });
- }
- }
-
- node.$children.show();
- node.expanded = 1;
- }
-
- add_node(node, data) {
- var $li = $('<li class="child-node"></li>');
-
- return new this.Node({
- id: data.id,
- parent: $li.appendTo(node.$children),
- parent_id: node.id,
- image: data.image,
- name: data.name,
- title: data.title,
- expandable: data.expandable,
- connections: data.connections,
- children: undefined
- });
- }
-
- add_connector(parent_id, child_id) {
- const parent_node = document.getElementById(`${parent_id}`);
- const child_node = document.getElementById(`${child_id}`);
-
- const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-
- let connector = undefined;
-
- if ($(`[id="${parent_id}"]`).hasClass('active')) {
- connector = this.get_connector_for_active_node(parent_node, child_node);
- } else if ($(`[id="${parent_id}"]`).hasClass('active-path')) {
- connector = this.get_connector_for_collapsed_node(parent_node, child_node);
- }
-
- path.setAttribute('d', connector);
- this.set_path_attributes(path, parent_id, child_id);
-
- document.getElementById('connectors').appendChild(path);
- }
-
- get_connector_for_active_node(parent_node, child_node) {
- // we need to connect the bottom left of the parent to the left side of the child node
- let pos_parent_bottom = {
- x: parent_node.offsetLeft + 20,
- y: parent_node.offsetTop + parent_node.offsetHeight
- };
- let pos_child_left = {
- x: child_node.offsetLeft - 5,
- y: child_node.offsetTop + child_node.offsetHeight / 2
- };
-
- let connector =
- "M" +
- (pos_parent_bottom.x) + "," + (pos_parent_bottom.y) + " " +
- "L" +
- (pos_parent_bottom.x) + "," + (pos_child_left.y - 10) + " " +
- "a10,10 1 0 0 10,10 " +
- "L" +
- (pos_child_left.x) + "," + (pos_child_left.y);
-
- return connector;
- }
-
- get_connector_for_collapsed_node(parent_node, child_node) {
- // we need to connect the bottom left of the parent to the top left of the child node
- let pos_parent_bottom = {
- x: parent_node.offsetLeft + 20,
- y: parent_node.offsetTop + parent_node.offsetHeight
- };
- let pos_child_top = {
- x: child_node.offsetLeft + 20,
- y: child_node.offsetTop
- };
-
- let connector =
- "M" +
- (pos_parent_bottom.x) + "," + (pos_parent_bottom.y) + " " +
- "L" +
- (pos_child_top.x) + "," + (pos_child_top.y);
-
- return connector;
- }
-
- set_path_attributes(path, parent_id, child_id) {
- path.setAttribute("data-parent", parent_id);
- path.setAttribute("data-child", child_id);
- const parent = $(`[id="${parent_id}"]`);
-
- if (parent.hasClass('active')) {
- path.setAttribute("class", "active-connector");
- path.setAttribute("marker-start", "url(#arrowstart-active)");
- path.setAttribute("marker-end", "url(#arrowhead-active)");
- } else if (parent.hasClass('active-path')) {
- path.setAttribute("class", "collapsed-connector");
- }
- }
-
- set_selected_node(node) {
- // remove .active class from the current node
- if (this.selected_node)
- this.selected_node.$link.removeClass('active');
-
- // add active class to the newly selected node
- this.selected_node = node;
- node.$link.addClass('active');
- }
-
- setup_node_click_action(node) {
- let me = this;
- let node_element = $(`[id="${node.id}"]`);
-
- node_element.click(function() {
- let el = undefined;
-
- if (node.is_root) {
- el = $(this).detach();
- me.$hierarchy.empty();
- $(`#connectors`).empty();
- me.add_node_to_hierarchy(el, node);
- } else if (node_element.is(':visible') && node_element.hasClass('active-path')) {
- me.remove_levels_after_node(node);
- me.remove_orphaned_connectors();
- } else {
- el = $(this).detach();
- me.add_node_to_hierarchy(el, node);
- me.collapse_node();
- }
-
- me.expand_node(node);
- });
- }
-
- setup_edit_node_action(node) {
- let node_element = $(`[id="${node.id}"]`);
- let me = this;
-
- node_element.find('.btn-edit-node').click(function() {
- frappe.set_route('Form', me.doctype, node.id);
- });
- }
-
- setup_node_group_action() {
- let me = this;
-
- $('.node-group').on('click', function() {
- let parent = $(this).attr('data-parent');
- if (parent === 'undefined') {
- me.setup_hierarchy();
- me.render_root_nodes();
- } else {
- me.expand_sibling_group_node(parent);
- }
- });
- }
-
- add_node_to_hierarchy(node_element, node) {
- this.$hierarchy.append(`<li class="level"></li>`);
- node_element.removeClass('active-child active-path');
- this.$hierarchy.find('.level:last').append(node_element);
-
- let node_object = this.nodes[node.id];
- node_object.expanded = 0;
- node_object.$children = undefined;
- this.nodes[node.id] = node_object;
- }
-
- get_node_group(nodes, parent, collapsed=true) {
- let limit = 2;
- const display_nodes = nodes.slice(0, limit);
- const extra_nodes = nodes.slice(limit);
-
- let html = display_nodes.map(node =>
- this.get_avatar(node)
- ).join('');
-
- if (extra_nodes.length === 1) {
- let node = extra_nodes[0];
- html += this.get_avatar(node);
- } else if (extra_nodes.length > 1) {
- html = `
- ${html}
- <span class="avatar avatar-small">
- <div class="avatar-frame standard-image avatar-extra-count"
- title="${extra_nodes.map(node => node.name).join(', ')}">
- +${extra_nodes.length}
- </div>
- </span>
- `;
- }
-
- if (html) {
- const $node_group =
- $(`<div class="node-group card cursor-pointer" data-parent=${parent}>
- <div class="avatar-group right overlap">
- ${html}
- </div>
- </div>`);
-
- if (collapsed)
- $node_group.addClass('collapsed');
-
- return $node_group;
- }
-
- return null;
- }
-
- get_avatar(node) {
- return `<span class="avatar avatar-small" title="${node.name}">
- <span class="avatar-frame" src=${node.image} style="background-image: url(${node.image})"></span>
- </span>`;
- }
-
- expand_sibling_group_node(parent) {
- let node_object = this.nodes[parent];
- let node = node_object.$link;
-
- node.removeClass('active-child active-path');
- node_object.expanded = 0;
- node_object.$children = undefined;
- this.nodes[node.id] = node_object;
-
- // show parent's siblings and expand parent node
- frappe.run_serially([
- () => this.get_child_nodes(node_object.parent_id, node_object.id),
- (child_nodes) => this.get_node_group(child_nodes, node_object.parent_id, false),
- (node_group) => {
- if (node_group)
- this.$sibling_group.empty().append(node_group);
- },
- () => this.setup_node_group_action(),
- () => this.reattach_and_expand_node(node, node_object)
- ]);
- }
-
- reattach_and_expand_node(node, node_object) {
- var el = node.detach();
-
- this.$hierarchy.empty().append(`
- <li class="level"></li>
- `);
- this.$hierarchy.find('.level').append(el);
- $(`#connectors`).empty();
- this.expand_node(node_object);
- }
-
- remove_levels_after_node(node) {
- let level = $(`[id="${node.id}"]`).parent().parent().index();
-
- level = $('.hierarchy-mobile > li:eq('+ level + ')');
- level.nextAll('li').remove();
-
- let node_object = this.nodes[node.id];
- let current_node = level.find(`[id="${node.id}"]`).detach();
-
- current_node.removeClass('active-child active-path');
-
- node_object.expanded = 0;
- node_object.$children = undefined;
-
- level.empty().append(current_node);
- }
-
- remove_orphaned_connectors() {
- let paths = $('#connectors > path');
- $.each(paths, (_i, path) => {
- const parent = $(path).data('parent');
- const child = $(path).data('child');
-
- if ($(`[id="${parent}"]`).length && $(`[id="${child}"]`).length)
- return;
-
- $(path).remove();
- });
- }
-
- refresh_connectors(node_parent, node_id) {
- if (!node_parent) return;
-
- $(`path[data-parent="${node_parent}"]`).remove();
- this.add_connector(node_parent, node_id);
- }
-};
diff --git a/erpnext/public/js/projects/timer.js b/erpnext/public/js/projects/timer.js
index 9dae711..0209f4c 100644
--- a/erpnext/public/js/projects/timer.js
+++ b/erpnext/public/js/projects/timer.js
@@ -68,7 +68,7 @@
// New activity if no activities found
var args = dialog.get_values();
if(!args) return;
- if (frm.doc.time_logs.length <= 1 && !frm.doc.time_logs[0].activity_type && !frm.doc.time_logs[0].from_time) {
+ if (frm.doc.time_logs.length == 1 && !frm.doc.time_logs[0].activity_type && !frm.doc.time_logs[0].from_time) {
frm.doc.time_logs = [];
}
row = frappe.model.add_child(frm.doc, "Timesheet Detail", "time_logs");
diff --git a/erpnext/public/js/telephony.js b/erpnext/public/js/telephony.js
index 1c3e314..f4b0b18 100644
--- a/erpnext/public/js/telephony.js
+++ b/erpnext/public/js/telephony.js
@@ -8,7 +8,7 @@
Object.values(this.frm.fields_dict).forEach(function(field) {
if (field.df.read_only === 1 && field.df.options === 'Phone'
&& field.disp_area.style[0] != 'display' && !field.has_icon) {
- field.setup_phone();
+ field.setup_phone && field.setup_phone();
field.has_icon = true;
}
});
diff --git a/erpnext/public/js/templates/node_card.html b/erpnext/public/js/templates/node_card.html
deleted file mode 100644
index 4cb6ee0..0000000
--- a/erpnext/public/js/templates/node_card.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="node-card card cursor-pointer" id="{%= id %}" data-parent="{%= parent %}">
- <div class="node-meta d-flex flex-row">
- <div class="mr-3">
- <span class="avatar node-image" title="{{ name }}">
- <span class="avatar-frame" src={{image}} style="background-image: url(\'{%= image %}\')"></span>
- </span>
- </div>
- <div>
- <div class="node-name d-flex flex-row mb-1">
- <span class="ellipsis">{{ name }}</span>
- <div class="btn-xs btn-edit-node d-flex flex-row">
- <a class="node-edit-icon">{{ frappe.utils.icon("edit", "xs") }}</a>
- <span class="edit-chart-node text-xs">{{ __("Edit") }}</span>
- </div>
- </div>
- <div class="node-info d-flex flex-row mb-1">
- <div class="node-title text-muted ellipsis">{{ title }}</div>
-
- {% if is_mobile %}
- <div class="node-connections text-muted ml-2 ellipsis">
- · {{ connections }} <span class="fa fa-level-down"></span>
- </div>
- {% else %}
- {% if connections == 1 %}
- <div class="node-connections text-muted ml-2 ellipsis">· {{ connections }} Connection</div>
- {% else %}
- <div class="node-connections text-muted ml-2 ellipsis">· {{ connections }} Connections</div>
- {% endif %}
- {% endif %}
- </div>
- </div>
- </div>
-</div>
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 58aa8d7..8633be8 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -350,6 +350,38 @@
}
},
+
+ pick_serial_and_batch_bundle(frm, cdt, cdn, type_of_transaction, warehouse_field) {
+ let item_row = frappe.get_doc(cdt, cdn);
+ item_row.type_of_transaction = type_of_transaction;
+
+ frappe.db.get_value("Item", item_row.item_code, ["has_batch_no", "has_serial_no"])
+ .then((r) => {
+ item_row.has_batch_no = r.message.has_batch_no;
+ item_row.has_serial_no = r.message.has_serial_no;
+
+ frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
+ new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
+ if (r) {
+ let update_values = {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ }
+
+ if (!warehouse_field) {
+ warehouse_field = "warehouse";
+ }
+
+ if (r.warehouse) {
+ update_values[warehouse_field] = r.warehouse;
+ }
+
+ frappe.model.set_value(item_row.doctype, item_row.name, update_values);
+ }
+ });
+ });
+ });
+ }
});
erpnext.utils.select_alternate_items = function(opts) {
@@ -600,7 +632,6 @@
fields.splice(3, 0, {
fieldtype: 'Float',
fieldname: "conversion_factor",
- in_list_view: 1,
label: __("Conversion Factor"),
precision: get_precision('conversion_factor')
})
@@ -608,6 +639,7 @@
new frappe.ui.Dialog({
title: __("Update Items"),
+ size: "extra-large",
fields: [
{
fieldname: "trans_items",
diff --git a/erpnext/public/js/utils/item_quick_entry.js b/erpnext/public/js/utils/item_quick_entry.js
deleted file mode 100644
index 7e0198d..0000000
--- a/erpnext/public/js/utils/item_quick_entry.js
+++ /dev/null
@@ -1,407 +0,0 @@
-frappe.provide('frappe.ui.form');
-
-frappe.ui.form.ItemQuickEntryForm = class ItemQuickEntryForm extends frappe.ui.form.QuickEntryForm {
- constructor(doctype, after_insert) {
- super(doctype, after_insert);
- }
-
- render_dialog() {
- this.mandatory = this.get_variant_fields().concat(this.mandatory);
- this.mandatory = this.mandatory.concat(this.get_attributes_fields());
- this.check_naming_series_based_on();
- super.render_dialog();
- this.init_post_render_dialog_operations();
- this.preset_fields_for_template();
- this.dialog.$wrapper.find('.edit-full').text(__('Edit in full page for more options like assets, serial nos, batches etc.'))
- }
-
- check_naming_series_based_on() {
- if (frappe.defaults.get_default("item_naming_by") === "Naming Series") {
- this.mandatory = this.mandatory.filter(d => d.fieldname !== "item_code");
- }
- }
-
- init_post_render_dialog_operations() {
- this.dialog.fields_dict.attribute_html.$wrapper.append(frappe.render_template("item_quick_entry"));
- this.init_for_create_variant_trigger();
- this.init_for_item_template_trigger();
- // explicitly hide manufacturing fields as hidden not working.
- this.toggle_manufacturer_fields();
- this.dialog.get_field("item_template").df.hidden = 1;
- this.dialog.get_field("item_template").refresh();
- }
-
- register_primary_action() {
- var me = this;
- this.dialog.set_primary_action(__('Save'), function() {
- if (me.dialog.working) return;
-
- var data = me.dialog.get_values();
- var variant_values = {};
-
- if (me.dialog.fields_dict.create_variant.$input.prop("checked")) {
- variant_values = me.get_variant_doc();
- if (!Object.keys(variant_values).length) {
- data = null;
- }
- variant_values.stock_uom = me.template_doc.stock_uom;
- variant_values.item_group = me.template_doc.item_group;
- }
-
- if (data) {
- me.dialog.working = true;
- var values = me.update_doc();
- //patch for manufacturer type variants as extend is overwriting it.
- if (variant_values['variant_based_on'] == "Manufacturer") {
- values['variant_based_on'] = "Manufacturer";
- }
- $.extend(variant_values, values);
- me.insert(variant_values);
- }
- });
- }
-
- insert(variant_values) {
- let me = this;
- return new Promise(resolve => {
- frappe.call({
- method: "frappe.client.insert",
- args: {
- doc: variant_values
- },
- callback: function(r) {
- me.dialog.hide();
- // delete the old doc
- frappe.model.clear_doc(me.dialog.doc.doctype, me.dialog.doc.name);
- me.dialog.doc = r.message;
- if (frappe._from_link) {
- frappe.ui.form.update_calling_link(me.dialog.doc);
- } else {
- if (me.after_insert) {
- me.after_insert(me.dialog.doc);
- } else {
- me.open_form_if_not_list();
- }
- }
- },
- error: function() {
- me.open_doc();
- },
- always: function() {
- me.dialog.working = false;
- resolve(me.dialog.doc);
- },
- freeze: true
- });
- });
- }
-
- open_doc() {
- this.dialog.hide();
- this.update_doc();
- if (this.dialog.fields_dict.create_variant.$input.prop("checked")) {
- var template = this.dialog.fields_dict.item_template.input.value;
- if (template)
- frappe.set_route("Form", this.doctype, template);
- } else {
- frappe.set_route('Form', this.doctype, this.doc.name);
- }
- }
-
- get_variant_fields() {
- var variant_fields = [{
- fieldname: "create_variant",
- fieldtype: "Check",
- label: __("Create Variant")
- },
- {
- fieldname: 'item_template',
- label: __('Item Template'),
- reqd: 0,
- fieldtype: 'Link',
- options: "Item",
- get_query: function() {
- return {
- filters: {
- "has_variants": 1
- }
- };
- }
- }];
-
- return variant_fields;
- }
-
- get_manufacturing_fields() {
- this.manufacturer_fields = [{
- fieldtype: 'Link',
- options: 'Manufacturer',
- label: 'Manufacturer',
- fieldname: "manufacturer",
- hidden: 1,
- reqd: 0
- }, {
- fieldtype: 'Data',
- label: 'Manufacturer Part Number',
- fieldname: 'manufacturer_part_no',
- hidden: 1,
- reqd: 0
- }];
- return this.manufacturer_fields;
- }
-
- get_attributes_fields() {
- var attribute_fields = [{
- fieldname: 'attribute_html',
- fieldtype: 'HTML'
- }]
-
- attribute_fields = attribute_fields.concat(this.get_manufacturing_fields());
- return attribute_fields;
- }
-
- init_for_create_variant_trigger() {
- var me = this;
-
- this.dialog.fields_dict.create_variant.$input.on("click", function() {
- me.preset_fields_for_template();
- me.init_post_template_trigger_operations(false, [], true);
- });
- }
-
- preset_fields_for_template() {
- var for_variant = this.dialog.get_value('create_variant');
-
- // setup template field, seen and mandatory if variant
- let template_field = this.dialog.get_field("item_template");
- template_field.df.reqd = for_variant;
- template_field.set_value('');
- template_field.df.hidden = !for_variant;
- template_field.refresh();
-
- // hide properties for variant
- ['item_code', 'item_name', 'item_group', 'stock_uom'].forEach((d) => {
- let f = this.dialog.get_field(d);
- f.df.hidden = for_variant;
- f.refresh();
- });
-
- this.dialog.get_field('attribute_html').toggle(false);
-
- // non mandatory for variants
- ['item_code', 'stock_uom', 'item_group'].forEach((d) => {
- let f = this.dialog.get_field(d);
- f.df.reqd = !for_variant;
- f.refresh();
- });
-
- }
-
- init_for_item_template_trigger() {
- var me = this;
-
- me.dialog.fields_dict["item_template"].df.onchange = () => {
- var template = me.dialog.fields_dict.item_template.input.value;
- me.template_doc = null;
- if (template) {
- frappe.call({
- method: "frappe.client.get",
- args: {
- doctype: "Item",
- name: template
- },
- callback: function(r) {
- me.template_doc = r.message;
- me.is_manufacturer = false;
-
- if (me.template_doc.variant_based_on === "Manufacturer") {
- me.init_post_template_trigger_operations(true, [], true);
- } else {
-
- me.init_post_template_trigger_operations(false, me.template_doc.attributes, false);
- me.render_attributes(me.template_doc.attributes);
- }
- }
- });
- } else {
- me.dialog.get_field('attribute_html').toggle(false);
- me.init_post_template_trigger_operations(false, [], true);
- }
- }
- }
-
- init_post_template_trigger_operations(is_manufacturer, attributes, attributes_flag) {
- this.attributes = attributes;
- this.attribute_values = {};
- this.attributes_count = attributes.length;
-
- this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes").empty();
- this.is_manufacturer = is_manufacturer;
- this.toggle_manufacturer_fields();
- this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes").toggleClass("hide-control", attributes_flag);
- this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes-header").toggleClass("hide-control", attributes_flag);
- }
-
- toggle_manufacturer_fields() {
- var me = this;
- $.each(this.manufacturer_fields, function(i, dialog_field) {
- me.dialog.get_field(dialog_field.fieldname).df.hidden = !me.is_manufacturer;
- me.dialog.get_field(dialog_field.fieldname).df.reqd = dialog_field.fieldname == 'manufacturer' ? me.is_manufacturer : false;
- me.dialog.get_field(dialog_field.fieldname).refresh();
- });
- }
-
- initiate_render_attributes() {
- this.dialog.fields_dict.attribute_html.$wrapper.find(".attributes").empty();
- this.render_attributes(this.attributes);
- }
-
- render_attributes(attributes) {
- var me = this;
-
- this.dialog.get_field('attribute_html').toggle(true);
-
- $.each(attributes, function(index, row) {
- var desc = "";
- var fieldtype = "Data";
- if (row.numeric_values) {
- fieldtype = "Float";
- desc = "Min Value: " + row.from_range + " , Max Value: " + row.to_range + ", in Increments of: " + row.increment;
- }
-
- me.init_make_control(fieldtype, row);
- me[row.attribute].set_value(me.attribute_values[row.attribute] || "");
- me[row.attribute].$wrapper.toggleClass("has-error", me.attribute_values[row.attribute] ? false : true);
-
- // Set Label explicitly as make_control is not displaying label
- $(me[row.attribute].label_area).text(__(row.attribute));
-
- if (desc) {
- $(repl(`<p class="help-box small text-muted hidden-xs">%(desc)s</p>`, {
- "desc": desc
- })).insertAfter(me[row.attribute].input_area);
- }
-
- if (!row.numeric_values) {
- me.init_awesomplete_for_attribute(row);
- } else {
- me[row.attribute].$input.on("change", function() {
- me.attribute_values[row.attribute] = $(this).val();
- $(this).closest(".frappe-control").toggleClass("has-error", $(this).val() ? false : true);
- });
- }
- });
- }
-
- init_make_control(fieldtype, row) {
- this[row.attribute] = frappe.ui.form.make_control({
- df: {
- "fieldtype": fieldtype,
- "label": row.attribute,
- "fieldname": row.attribute,
- "options": row.options || ""
- },
- parent: $(this.dialog.fields_dict.attribute_html.wrapper).find(".attributes"),
- only_input: false
- });
- this[row.attribute].make_input();
- }
-
- init_awesomplete_for_attribute(row) {
- var me = this;
-
- this[row.attribute].input.awesomplete = new Awesomplete(this[row.attribute].input, {
- minChars: 0,
- maxItems: 99,
- autoFirst: true,
- list: [],
- });
-
- this[row.attribute].$input.on('input', function(e) {
- frappe.call({
- method: "frappe.client.get_list",
- args: {
- doctype: "Item Attribute Value",
- filters: [
- ["parent", "=", $(e.target).attr("data-fieldname")],
- ["attribute_value", "like", e.target.value + "%"]
- ],
- fields: ["attribute_value"],
- parent: "Item Attribute"
- },
- callback: function(r) {
- if (r.message) {
- e.target.awesomplete.list = r.message.map(function(d) {
- return d.attribute_value;
- });
- }
- }
- });
- }).on('focus', function(e) {
- $(e.target).val('').trigger('input');
- }).on("awesomplete-close", function (e) {
- me.attribute_values[$(e.target).attr("data-fieldname")] = e.target.value;
- $(e.target).closest(".frappe-control").toggleClass("has-error", e.target.value ? false : true);
- });
- }
-
- get_variant_doc() {
- var me = this;
- var variant_doc = {};
- var attribute = this.validate_mandatory_attributes();
-
- if (Object.keys(attribute).length) {
- frappe.call({
- method: "erpnext.controllers.item_variant.create_variant_doc_for_quick_entry",
- args: {
- "template": me.dialog.fields_dict.item_template.$input.val(),
- args: attribute
- },
- async: false,
- callback: function(r) {
- if (Object.prototype.toString.call(r.message) == "[object Object]") {
- variant_doc = r.message;
- } else {
- var msgprint_dialog = frappe.msgprint(__("Item Variant {0} already exists with same attributes", [repl('<a class="strong variant-click" data-item-code="%(item)s" \
- >%(item)s</a>', {
- item: r.message
- })]));
-
- msgprint_dialog.$wrapper.find(".variant-click").on("click", function() {
- msgprint_dialog.hide();
- me.dialog.hide();
- if (frappe._from_link) {
- frappe._from_link.set_value($(this).attr("data-item-code"));
- } else {
- frappe.set_route('Form', "Item", $(this).attr("data-item-code"));
- }
- });
- }
- }
- })
- }
- return variant_doc;
- }
-
- validate_mandatory_attributes() {
- var me = this;
- var attribute = {};
- var mandatory = [];
-
- $.each(this.attributes, function(index, attr) {
- var value = me.attribute_values[attr.attribute] || "";
- if (value) {
- attribute[attr.attribute] = attr.numeric_values ? flt(value) : value;
- } else {
- mandatory.push(attr.attribute);
- }
- })
-
- if (this.is_manufacturer) {
- $.each(this.manufacturer_fields, function(index, field) {
- attribute[field.fieldname] = me.dialog.fields_dict[field.fieldname].input.value;
- });
- }
- return attribute;
- }
-};
diff --git a/erpnext/public/js/utils/ledger_preview.js b/erpnext/public/js/utils/ledger_preview.js
new file mode 100644
index 0000000..85d4a7d
--- /dev/null
+++ b/erpnext/public/js/utils/ledger_preview.js
@@ -0,0 +1,78 @@
+frappe.provide('erpnext.accounts');
+
+erpnext.accounts.ledger_preview = {
+ show_accounting_ledger_preview(frm) {
+ let me = this;
+ if(!frm.is_new() && frm.doc.docstatus == 0) {
+ frm.add_custom_button(__('Accounting Ledger'), function() {
+ frappe.call({
+ "type": "GET",
+ "method": "erpnext.controllers.stock_controller.show_accounting_ledger_preview",
+ "args": {
+ "company": frm.doc.company,
+ "doctype": frm.doc.doctype,
+ "docname": frm.doc.name
+ },
+ "callback": function(response) {
+ me.make_dialog("Accounting Ledger Preview", "accounting_ledger_preview_html", response.message.gl_columns, response.message.gl_data);
+ }
+ })
+ }, __("Preview"));
+ }
+ },
+
+ show_stock_ledger_preview(frm) {
+ let me = this
+ if(!frm.is_new() && frm.doc.docstatus == 0) {
+ frm.add_custom_button(__('Stock Ledger'), function() {
+ frappe.call({
+ "type": "GET",
+ "method": "erpnext.controllers.stock_controller.show_stock_ledger_preview",
+ "args": {
+ "company": frm.doc.company,
+ "doctype": frm.doc.doctype,
+ "docname": frm.doc.name
+ },
+ "callback": function(response) {
+ me.make_dialog("Stock Ledger Preview", "stock_ledger_preview_html", response.message.sl_columns, response.message.sl_data);
+ }
+ })
+ }, __("Preview"));
+ }
+ },
+
+ make_dialog(label, fieldname, columns, data) {
+ let me = this;
+ let dialog = new frappe.ui.Dialog({
+ "size": "extra-large",
+ "title": __(label),
+ "fields": [
+ {
+ "fieldtype": "HTML",
+ "fieldname": fieldname,
+ },
+ ]
+ });
+
+ setTimeout(function() {
+ me.get_datatable(columns, data, dialog.get_field(fieldname).wrapper);
+ }, 200);
+
+ dialog.show();
+ },
+
+ get_datatable(columns, data, wrapper) {
+ const datatable_options = {
+ columns: columns,
+ data: data,
+ dynamicRowHeight: true,
+ checkboxColumn: false,
+ inlineFilters: true,
+ };
+
+ new frappe.DataTable(
+ wrapper,
+ datatable_options
+ );
+ }
+}
\ No newline at end of file
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 644adff..5c41aa0 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -16,8 +16,8 @@
|| (frm.doc.party_name && in_list(['Quotation', 'Opportunity'], frm.doc.doctype))) {
let party_type = "Customer";
- if (frm.doc.quotation_to && frm.doc.quotation_to === "Lead") {
- party_type = "Lead";
+ if (frm.doc.quotation_to && in_list(["Lead", "Prospect"], frm.doc.quotation_to)) {
+ party_type = frm.doc.quotation_to;
}
args = {
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 64c5ee5..27a7968 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -1,618 +1,433 @@
+erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
+ constructor(frm, item, callback) {
+ this.frm = frm;
+ this.item = item;
+ this.qty = item.qty;
+ this.callback = callback;
+ this.bundle = this.item?.is_rejected ?
+ this.item.rejected_serial_and_batch_bundle : this.item.serial_and_batch_bundle;
-erpnext.SerialNoBatchSelector = class SerialNoBatchSelector {
- constructor(opts, show_dialog) {
- $.extend(this, opts);
- this.show_dialog = show_dialog;
- // frm, item, warehouse_details, has_batch, oldest
- let d = this.item;
- this.has_batch = 0; this.has_serial_no = 0;
-
- if (d && d.has_batch_no && (!d.batch_no || this.show_dialog)) this.has_batch = 1;
- // !(this.show_dialog == false) ensures that show_dialog is implictly true, even when undefined
- if(d && d.has_serial_no && !(this.show_dialog == false)) this.has_serial_no = 1;
-
- this.setup();
+ this.make();
+ this.render_data();
}
- setup() {
- this.item_code = this.item.item_code;
- this.qty = this.item.qty;
- this.make_dialog();
- this.on_close_dialog();
- }
+ make() {
+ let label = this.item?.has_serial_no ? __('Serial Nos') : __('Batch Nos');
+ let primary_label = this.bundle
+ ? __('Update') : __('Add');
- make_dialog() {
- var me = this;
-
- this.data = this.oldest ? this.oldest : [];
- let title = "";
- let fields = [
- {
- fieldname: 'item_code',
- read_only: 1,
- fieldtype:'Link',
- options: 'Item',
- label: __('Item Code'),
- default: me.item_code
- },
- {
- fieldname: 'warehouse',
- fieldtype:'Link',
- options: 'Warehouse',
- reqd: me.has_batch && !me.has_serial_no ? 0 : 1,
- label: __(me.warehouse_details.type),
- default: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
- onchange: function(e) {
- me.warehouse_details.name = this.get_value();
-
- if(me.has_batch && !me.has_serial_no) {
- fields = fields.concat(me.get_batch_fields());
- } else {
- fields = fields.concat(me.get_serial_no_fields());
- }
-
- var batches = this.layout.fields_dict.batches;
- if(batches) {
- batches.grid.df.data = [];
- batches.grid.refresh();
- batches.grid.add_new_row(null, null, null);
- }
- },
- get_query: function() {
- return {
- query: "erpnext.controllers.queries.warehouse_query",
- filters: [
- ["Bin", "item_code", "=", me.item_code],
- ["Warehouse", "is_group", "=", 0],
- ["Warehouse", "company", "=", me.frm.doc.company]
- ]
- }
- }
- },
- {fieldtype:'Column Break'},
- {
- fieldname: 'qty',
- fieldtype:'Float',
- read_only: me.has_batch && !me.has_serial_no,
- label: __(me.has_batch && !me.has_serial_no ? 'Selected Qty' : 'Qty'),
- default: flt(me.item.stock_qty) || flt(me.item.transfer_qty),
- },
- ...get_pending_qty_fields(me),
- {
- fieldname: 'uom',
- read_only: 1,
- fieldtype: 'Link',
- options: 'UOM',
- label: __('UOM'),
- default: me.item.uom
- },
- {
- fieldname: 'auto_fetch_button',
- fieldtype:'Button',
- hidden: me.has_batch && !me.has_serial_no,
- label: __('Auto Fetch'),
- description: __('Fetch Serial Numbers based on FIFO'),
- click: () => {
- let qty = this.dialog.fields_dict.qty.get_value();
- let already_selected_serial_nos = get_selected_serial_nos(me);
- let numbers = frappe.call({
- method: "erpnext.stock.doctype.serial_no.serial_no.auto_fetch_serial_number",
- args: {
- qty: qty,
- item_code: me.item_code,
- warehouse: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
- batch_nos: me.item.batch_no || null,
- posting_date: me.frm.doc.posting_date || me.frm.doc.transaction_date,
- exclude_sr_nos: already_selected_serial_nos
- }
- });
-
- numbers.then((data) => {
- let auto_fetched_serial_numbers = data.message;
- let records_length = auto_fetched_serial_numbers.length;
- if (!records_length) {
- const warehouse = me.dialog.fields_dict.warehouse.get_value().bold();
- frappe.msgprint(
- __('Serial numbers unavailable for Item {0} under warehouse {1}. Please try changing warehouse.', [me.item.item_code.bold(), warehouse])
- );
- }
- if (records_length < qty) {
- frappe.msgprint(__('Fetched only {0} available serial numbers.', [records_length]));
- }
- let serial_no_list_field = this.dialog.fields_dict.serial_no;
- numbers = auto_fetched_serial_numbers.join('\n');
- serial_no_list_field.set_value(numbers);
- });
- }
- }
- ];
-
- if (this.has_batch && !this.has_serial_no) {
- title = __("Select Batch Numbers");
- fields = fields.concat(this.get_batch_fields());
- } else {
- // if only serial no OR
- // if both batch_no & serial_no then only select serial_no and auto set batches nos
- title = __("Select Serial Numbers");
- fields = fields.concat(this.get_serial_no_fields());
+ if (this.item?.has_serial_no && this.item?.batch_no) {
+ label = __('Serial Nos / Batch Nos');
}
+ primary_label += ' ' + label;
+
this.dialog = new frappe.ui.Dialog({
- title: title,
- fields: fields
+ title: this.item?.title || primary_label,
+ fields: this.get_dialog_fields(),
+ primary_action_label: primary_label,
+ primary_action: () => this.update_bundle_entries(),
+ secondary_action_label: __('Edit Full Form'),
+ secondary_action: () => this.edit_full_form(),
});
- this.dialog.set_primary_action(__('Insert'), function() {
- me.values = me.dialog.get_values();
- if(me.validate()) {
- frappe.run_serially([
- () => me.update_batch_items(),
- () => me.update_serial_no_item(),
- () => me.update_batch_serial_no_items(),
- () => {
- refresh_field("items");
- refresh_field("packed_items");
- if (me.callback) {
- return me.callback(me.item);
- }
- },
- () => me.dialog.hide()
- ])
- }
- });
-
- if(this.show_dialog) {
- let d = this.item;
- if (this.item.serial_no) {
- this.dialog.fields_dict.serial_no.set_value(this.item.serial_no);
- }
-
- if (this.has_batch && !this.has_serial_no && d.batch_no) {
- this.frm.doc.items.forEach(data => {
- if(data.item_code == d.item_code) {
- this.dialog.fields_dict.batches.df.data.push({
- 'batch_no': data.batch_no,
- 'actual_qty': data.actual_qty,
- 'selected_qty': data.qty,
- 'available_qty': data.actual_batch_qty
- });
- }
- });
- this.dialog.fields_dict.batches.grid.refresh();
- }
- }
-
- if (this.has_batch && !this.has_serial_no) {
- this.update_total_qty();
- this.update_pending_qtys();
- }
-
+ this.dialog.set_value("qty", this.item.qty);
this.dialog.show();
}
- on_close_dialog() {
- this.dialog.get_close_btn().on('click', () => {
- this.on_close && this.on_close(this.item);
- });
+ get_serial_no_filters() {
+ let warehouse = this.item?.type_of_transaction === "Outward" ?
+ (this.item.warehouse || this.item.s_warehouse) : "";
+
+ return {
+ 'item_code': this.item.item_code,
+ 'warehouse': ["=", warehouse]
+ };
}
- validate() {
- let values = this.values;
- if(!values.warehouse) {
- frappe.throw(__("Please select a warehouse"));
- return false;
- }
- if(this.has_batch && !this.has_serial_no) {
- if(values.batches.length === 0 || !values.batches) {
- frappe.throw(__("Please select batches for batched item {0}", [values.item_code]));
- }
- values.batches.map((batch, i) => {
- if(!batch.selected_qty || batch.selected_qty === 0 ) {
- if (!this.show_dialog) {
- frappe.throw(__("Please select quantity on row {0}", [i+1]));
- }
- }
- });
- return true;
+ get_dialog_fields() {
+ let fields = [];
- } else {
- let serial_nos = values.serial_no || '';
- if (!serial_nos || !serial_nos.replace(/\s/g, '').length) {
- frappe.throw(__("Please enter serial numbers for serialized item {0}", [values.item_code]));
- }
- return true;
- }
- }
-
- update_batch_items() {
- // clones an items if muliple batches are selected.
- if(this.has_batch && !this.has_serial_no) {
- this.values.batches.map((batch, i) => {
- let batch_no = batch.batch_no;
- let row = '';
-
- if (i !== 0 && !this.batch_exists(batch_no)) {
- row = this.frm.add_child("items", { ...this.item });
- } else {
- row = this.frm.doc.items.find(i => i.batch_no === batch_no);
- }
-
- if (!row) {
- row = this.item;
- }
- // this ensures that qty & batch no is set
- this.map_row_values(row, batch, 'batch_no',
- 'selected_qty', this.values.warehouse);
- });
- }
- }
-
- update_serial_no_item() {
- // just updates serial no for the item
- if(this.has_serial_no && !this.has_batch) {
- this.map_row_values(this.item, this.values, 'serial_no', 'qty');
- }
- }
-
- update_batch_serial_no_items() {
- // if serial no selected is from different batches, adds new rows for each batch.
- if(this.has_batch && this.has_serial_no) {
- const selected_serial_nos = this.values.serial_no.split(/\n/g).filter(s => s);
-
- return frappe.db.get_list("Serial No", {
- filters: { 'name': ["in", selected_serial_nos]},
- fields: ["batch_no", "name"]
- }).then((data) => {
- // data = [{batch_no: 'batch-1', name: "SR-001"},
- // {batch_no: 'batch-2', name: "SR-003"}, {batch_no: 'batch-2', name: "SR-004"}]
- const batch_serial_map = data.reduce((acc, d) => {
- if (!acc[d['batch_no']]) acc[d['batch_no']] = [];
- acc[d['batch_no']].push(d['name'])
- return acc
- }, {})
- // batch_serial_map = { "batch-1": ['SR-001'], "batch-2": ["SR-003", "SR-004"]}
- Object.keys(batch_serial_map).map((batch_no, i) => {
- let row = '';
- const serial_no = batch_serial_map[batch_no];
- if (i == 0) {
- row = this.item;
- this.map_row_values(row, {qty: serial_no.length, batch_no: batch_no}, 'batch_no',
- 'qty', this.values.warehouse);
- } else if (!this.batch_exists(batch_no)) {
- row = this.frm.add_child("items", { ...this.item });
- row.batch_no = batch_no;
- } else {
- row = this.frm.doc.items.find(i => i.batch_no === batch_no);
- }
- const values = {
- 'qty': serial_no.length,
- 'serial_no': serial_no.join('\n')
- }
- this.map_row_values(row, values, 'serial_no',
- 'qty', this.values.warehouse);
- });
- })
- }
- }
-
- batch_exists(batch) {
- const batches = this.frm.doc.items.map(data => data.batch_no);
- return (batches && in_list(batches, batch)) ? true : false;
- }
-
- map_row_values(row, values, number, qty_field, warehouse) {
- row.qty = values[qty_field];
- row.transfer_qty = flt(values[qty_field]) * flt(row.conversion_factor);
- row[number] = values[number];
- if(this.warehouse_details.type === 'Source Warehouse') {
- row.s_warehouse = values.warehouse || warehouse;
- } else if(this.warehouse_details.type === 'Target Warehouse') {
- row.t_warehouse = values.warehouse || warehouse;
- } else {
- row.warehouse = values.warehouse || warehouse;
- }
-
- this.frm.dirty();
- }
-
- update_total_qty() {
- let qty_field = this.dialog.fields_dict.qty;
- let total_qty = 0;
-
- this.dialog.fields_dict.batches.df.data.forEach(data => {
- total_qty += flt(data.selected_qty);
- });
-
- qty_field.set_input(total_qty);
- }
-
- update_pending_qtys() {
- const pending_qty_field = this.dialog.fields_dict.pending_qty;
- const total_selected_qty_field = this.dialog.fields_dict.total_selected_qty;
-
- if (!pending_qty_field || !total_selected_qty_field) return;
-
- const me = this;
- const required_qty = this.dialog.fields_dict.required_qty.value;
- const selected_qty = this.dialog.fields_dict.qty.value;
- const total_selected_qty = selected_qty + calc_total_selected_qty(me);
- const pending_qty = required_qty - total_selected_qty;
-
- pending_qty_field.set_input(pending_qty);
- total_selected_qty_field.set_input(total_selected_qty);
- }
-
- get_batch_fields() {
- var me = this;
-
- return [
- {fieldtype:'Section Break', label: __('Batches')},
- {fieldname: 'batches', fieldtype: 'Table', label: __('Batch Entries'),
- fields: [
- {
- 'fieldtype': 'Link',
- 'read_only': 0,
- 'fieldname': 'batch_no',
- 'options': 'Batch',
- 'label': __('Select Batch'),
- 'in_list_view': 1,
- get_query: function () {
- return {
- filters: {
- item_code: me.item_code,
- warehouse: me.warehouse || typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : ''
- },
- query: 'erpnext.controllers.queries.get_batch_no'
- };
- },
- change: function () {
- const batch_no = this.get_value();
- if (!batch_no) {
- this.grid_row.on_grid_fields_dict
- .available_qty.set_value(0);
- return;
- }
- let selected_batches = this.grid.grid_rows.map((row) => {
- if (row === this.grid_row) {
- return "";
- }
-
- if (row.on_grid_fields_dict.batch_no) {
- return row.on_grid_fields_dict.batch_no.get_value();
- }
- });
- if (selected_batches.includes(batch_no)) {
- this.set_value("");
- frappe.throw(__('Batch {0} already selected.', [batch_no]));
- }
-
- if (me.warehouse_details.name) {
- frappe.call({
- method: 'erpnext.stock.doctype.batch.batch.get_batch_qty',
- args: {
- batch_no,
- warehouse: me.warehouse_details.name,
- item_code: me.item_code
- },
- callback: (r) => {
- this.grid_row.on_grid_fields_dict
- .available_qty.set_value(r.message || 0);
- }
- });
-
- } else {
- this.set_value("");
- frappe.throw(__('Please select a warehouse to get available quantities'));
- }
- // e.stopImmediatePropagation();
- }
- },
- {
- 'fieldtype': 'Float',
- 'read_only': 1,
- 'fieldname': 'available_qty',
- 'label': __('Available'),
- 'in_list_view': 1,
- 'default': 0,
- change: function () {
- this.grid_row.on_grid_fields_dict.selected_qty.set_value('0');
- }
- },
- {
- 'fieldtype': 'Float',
- 'read_only': 0,
- 'fieldname': 'selected_qty',
- 'label': __('Qty'),
- 'in_list_view': 1,
- 'default': 0,
- change: function () {
- var batch_no = this.grid_row.on_grid_fields_dict.batch_no.get_value();
- var available_qty = this.grid_row.on_grid_fields_dict.available_qty.get_value();
- var selected_qty = this.grid_row.on_grid_fields_dict.selected_qty.get_value();
-
- if (batch_no.length === 0 && parseInt(selected_qty) !== 0) {
- frappe.throw(__("Please select a batch"));
- }
- if (me.warehouse_details.type === 'Source Warehouse' &&
- parseFloat(available_qty) < parseFloat(selected_qty)) {
-
- this.set_value('0');
- frappe.throw(__('For transfer from source, selected quantity cannot be greater than available quantity'));
- } else {
- this.grid.refresh();
- }
-
- me.update_total_qty();
- me.update_pending_qtys();
- }
- },
- ],
- in_place_edit: true,
- data: this.data,
- get_data: function () {
- return this.data;
- },
- }
- ];
- }
-
- get_serial_no_fields() {
- var me = this;
- this.serial_list = [];
-
- let serial_no_filters = {
- item_code: me.item_code,
- delivery_document_no: ""
- }
-
- if (this.item.batch_no) {
- serial_no_filters["batch_no"] = this.item.batch_no;
- }
-
- if (me.warehouse_details.name) {
- serial_no_filters['warehouse'] = me.warehouse_details.name;
- }
-
- if (me.frm.doc.doctype === 'POS Invoice' && !this.showing_reserved_serial_nos_error) {
- frappe.call({
- method: "erpnext.stock.doctype.serial_no.serial_no.get_pos_reserved_serial_nos",
- args: {
+ fields.push({
+ fieldtype: 'Link',
+ fieldname: 'warehouse',
+ label: __('Warehouse'),
+ options: 'Warehouse',
+ default: this.get_warehouse(),
+ onchange: () => {
+ this.item.warehouse = this.dialog.get_value('warehouse');
+ this.get_auto_data()
+ },
+ get_query: () => {
+ return {
filters: {
- item_code: me.item_code,
- warehouse: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
+ 'is_group': 0,
+ 'company': this.frm.doc.company,
}
- }
- }).then((data) => {
- serial_no_filters['name'] = ["not in", data.message[0]]
- })
+ };
+ }
+ });
+
+ if (this.frm.doc.doctype === 'Stock Entry'
+ && this.frm.doc.purpose === 'Manufacture') {
+ fields.push({
+ fieldtype: 'Column Break',
+ });
+
+ fields.push({
+ fieldtype: 'Link',
+ fieldname: 'work_order',
+ label: __('For Work Order'),
+ options: 'Work Order',
+ read_only: 1,
+ default: this.frm.doc.work_order,
+ });
+
+ fields.push({
+ fieldtype: 'Section Break',
+ });
}
- return [
- {fieldtype: 'Section Break', label: __('Serial Numbers')},
- {
- fieldtype: 'Link', fieldname: 'serial_no_select', options: 'Serial No',
- label: __('Select to add Serial Number.'),
- get_query: function() {
+ fields.push({
+ fieldtype: 'Column Break',
+ });
+
+ if (this.item.has_serial_no) {
+ fields.push({
+ fieldtype: 'Data',
+ fieldname: 'scan_serial_no',
+ label: __('Scan Serial No'),
+ get_query: () => {
return {
- filters: serial_no_filters
+ filters: this.get_serial_no_filters()
};
},
- onchange: function(e) {
- if(this.in_local_change) return;
- this.in_local_change = 1;
+ onchange: () => this.update_serial_batch_no()
+ });
+ }
- let serial_no_list_field = this.layout.fields_dict.serial_no;
- let qty_field = this.layout.fields_dict.qty;
+ if (this.item.has_batch_no && this.item.has_serial_no) {
+ fields.push({
+ fieldtype: 'Column Break',
+ });
+ }
- let new_number = this.get_value();
- let list_value = serial_no_list_field.get_value();
- let new_line = '\n';
- if(!list_value) {
- new_line = '';
- } else {
- me.serial_list = list_value.replace(/\n/g, ' ').match(/\S+/g) || [];
- }
+ if (this.item.has_batch_no) {
+ fields.push({
+ fieldtype: 'Data',
+ fieldname: 'scan_batch_no',
+ label: __('Scan Batch No'),
+ onchange: () => this.update_serial_batch_no()
+ });
+ }
- if(!me.serial_list.includes(new_number)) {
- this.set_new_description('');
- serial_no_list_field.set_value(me.serial_list.join('\n') + new_line + new_number);
- me.serial_list = serial_no_list_field.get_value().replace(/\n/g, ' ').match(/\S+/g) || [];
- } else {
- this.set_new_description(new_number + ' is already selected.');
- }
+ if (this.item?.type_of_transaction === "Outward") {
+ fields = [...this.get_filter_fields(), ...fields];
+ } else {
+ fields = [...fields, ...this.get_attach_field()];
+ }
- qty_field.set_input(me.serial_list.length);
- this.$input.val("");
- this.in_local_change = 0;
- }
- },
- {fieldtype: 'Column Break'},
+ fields.push({
+ fieldtype: 'Section Break',
+ });
+
+ fields.push({
+ fieldname: 'entries',
+ fieldtype: 'Table',
+ allow_bulk_edit: true,
+ data: [],
+ fields: this.get_dialog_table_fields(),
+ });
+
+ return fields;
+ }
+
+ get_attach_field() {
+ let label = this.item?.has_serial_no ? __('Serial Nos') : __('Batch Nos');
+ let primary_label = this.bundle
+ ? __('Update') : __('Add');
+
+ if (this.item?.has_serial_no && this.item?.has_batch_no) {
+ label = __('Serial Nos / Batch Nos');
+ }
+
+ return [
{
- fieldname: 'serial_no',
- fieldtype: 'Small Text',
- label: __(me.has_batch && !me.has_serial_no ? 'Selected Batch Numbers' : 'Selected Serial Numbers'),
- onchange: function() {
- me.serial_list = this.get_value()
- .replace(/\n/g, ' ').match(/\S+/g) || [];
- this.layout.fields_dict.qty.set_input(me.serial_list.length);
+ fieldtype: 'Section Break',
+ label: __('{0} {1} via CSV File', [primary_label, label])
+ },
+ {
+ fieldtype: 'Button',
+ fieldname: 'download_csv',
+ label: __('Download CSV Template'),
+ click: () => this.download_csv_file()
+ },
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'Attach',
+ fieldname: 'attach_serial_batch_csv',
+ label: __('Attach CSV File'),
+ onchange: () => this.upload_csv_file()
+ }
+ ]
+ }
+
+ download_csv_file() {
+ let csvFileData = ['Serial No'];
+
+ if (this.item.has_serial_no && this.item.has_batch_no) {
+ csvFileData = ['Serial No', 'Batch No', 'Quantity'];
+ } else if (this.item.has_batch_no) {
+ csvFileData = ['Batch No', 'Quantity'];
+ }
+
+ const method = `/api/method/erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.download_blank_csv_template?content=${encodeURIComponent(JSON.stringify(csvFileData))}`;
+ const w = window.open(frappe.urllib.get_full_url(method));
+ if (!w) {
+ frappe.msgprint(__("Please enable pop-ups"));
+ }
+ }
+
+ upload_csv_file() {
+ const file_path = this.dialog.get_value("attach_serial_batch_csv")
+
+ frappe.call({
+ method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.upload_csv_file',
+ args: {
+ item_code: this.item.item_code,
+ file_path: file_path
+ },
+ callback: (r) => {
+ if (r.message.serial_nos && r.message.serial_nos.length) {
+ this.set_data(r.message.serial_nos);
+ } else if (r.message.batch_nos && r.message.batch_nos.length) {
+ this.set_data(r.message.batch_nos);
}
}
- ];
+ });
}
-};
-function get_pending_qty_fields(me) {
- if (!check_can_calculate_pending_qty(me)) return [];
- const { frm: { doc: { fg_completed_qty }}, item: { item_code, stock_qty }} = me;
- const { qty_consumed_per_unit } = erpnext.stock.bom.items[item_code];
+ get_filter_fields() {
+ return [
+ {
+ fieldtype: 'Section Break',
+ label: __('Auto Fetch')
+ },
+ {
+ fieldtype: 'Float',
+ fieldname: 'qty',
+ label: __('Qty to Fetch'),
+ onchange: () => this.get_auto_data()
+ },
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'Select',
+ options: ['FIFO', 'LIFO', 'Expiry'],
+ default: 'FIFO',
+ fieldname: 'based_on',
+ label: __('Fetch Based On'),
+ onchange: () => this.get_auto_data()
+ },
+ {
+ fieldtype: 'Section Break',
+ },
+ ]
- const total_selected_qty = calc_total_selected_qty(me);
- const required_qty = flt(fg_completed_qty) * flt(qty_consumed_per_unit);
- const pending_qty = required_qty - (flt(stock_qty) + total_selected_qty);
+ }
- const pending_qty_fields = [
- { fieldtype: 'Section Break', label: __('Pending Quantity') },
- {
- fieldname: 'required_qty',
- read_only: 1,
- fieldtype: 'Float',
- label: __('Required Qty'),
- default: required_qty
- },
- { fieldtype: 'Column Break' },
- {
- fieldname: 'total_selected_qty',
- read_only: 1,
- fieldtype: 'Float',
- label: __('Total Selected Qty'),
- default: total_selected_qty
- },
- { fieldtype: 'Column Break' },
- {
- fieldname: 'pending_qty',
- read_only: 1,
- fieldtype: 'Float',
- label: __('Pending Qty'),
- default: pending_qty
- },
- ];
- return pending_qty_fields;
-}
+ get_dialog_table_fields() {
+ let fields = []
-// get all items with same item code except row for which selector is open.
-function get_rows_with_same_item_code(me) {
- const { frm: { doc: { items }}, item: { name, item_code }} = me;
- return items.filter(item => (item.name !== name) && (item.item_code === item_code))
-}
+ if (this.item.has_serial_no) {
+ fields.push({
+ fieldtype: 'Link',
+ options: 'Serial No',
+ fieldname: 'serial_no',
+ label: __('Serial No'),
+ in_list_view: 1,
+ get_query: () => {
+ return {
+ filters: this.get_serial_no_filters()
+ }
+ }
+ })
+ }
-function calc_total_selected_qty(me) {
- const totalSelectedQty = get_rows_with_same_item_code(me)
- .map(item => flt(item.qty))
- .reduce((i, j) => i + j, 0);
- return totalSelectedQty;
-}
+ let batch_fields = []
+ if (this.item.has_batch_no) {
+ batch_fields = [
+ {
+ fieldtype: 'Link',
+ options: 'Batch',
+ fieldname: 'batch_no',
+ label: __('Batch No'),
+ in_list_view: 1,
+ get_query: () => {
+ if (this.item.type_of_transaction !== "Outward") {
+ return {
+ filters: {
+ 'item': this.item.item_code,
+ }
+ }
+ } else {
+ return {
+ query : "erpnext.controllers.queries.get_batch_no",
+ filters: {
+ 'item_code': this.item.item_code,
+ 'warehouse': this.get_warehouse()
+ }
+ }
+ }
+ },
+ }
+ ]
-function get_selected_serial_nos(me) {
- const selected_serial_nos = get_rows_with_same_item_code(me)
- .map(item => item.serial_no)
- .filter(serial => serial)
- .map(sr_no_string => sr_no_string.split('\n'))
- .reduce((acc, arr) => acc.concat(arr), [])
- .filter(serial => serial);
- return selected_serial_nos;
-};
+ if (!this.item.has_serial_no) {
+ batch_fields.push({
+ fieldtype: 'Float',
+ fieldname: 'qty',
+ label: __('Quantity'),
+ in_list_view: 1,
+ })
+ }
+ }
-function check_can_calculate_pending_qty(me) {
- const { frm: { doc }, item } = me;
- const docChecks = doc.bom_no
- && doc.fg_completed_qty
- && erpnext.stock.bom
- && erpnext.stock.bom.name === doc.bom_no;
- const itemChecks = !!item
- && !item.original_item
- && erpnext.stock.bom && erpnext.stock.bom.items
- && (item.item_code in erpnext.stock.bom.items);
- return docChecks && itemChecks;
-}
+ fields = [...fields, ...batch_fields];
-//# sourceURL=serial_no_batch_selector.js
+ fields.push({
+ fieldtype: 'Data',
+ fieldname: 'name',
+ label: __('Name'),
+ hidden: 1,
+ });
+
+ return fields;
+ }
+
+ get_auto_data() {
+ let { qty, based_on } = this.dialog.get_values();
+
+ if (!based_on) {
+ based_on = 'FIFO';
+ }
+
+ if (qty) {
+ frappe.call({
+ method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_auto_data',
+ args: {
+ item_code: this.item.item_code,
+ warehouse: this.item.warehouse || this.item.s_warehouse,
+ has_serial_no: this.item.has_serial_no,
+ has_batch_no: this.item.has_batch_no,
+ qty: qty,
+ based_on: based_on
+ },
+ callback: (r) => {
+ if (r.message) {
+ this.dialog.fields_dict.entries.df.data = r.message;
+ this.dialog.fields_dict.entries.grid.refresh();
+ }
+ }
+ });
+ }
+ }
+
+ update_serial_batch_no() {
+ const { scan_serial_no, scan_batch_no } = this.dialog.get_values();
+
+ if (scan_serial_no) {
+ this.dialog.fields_dict.entries.df.data.push({
+ serial_no: scan_serial_no
+ });
+
+ this.dialog.fields_dict.scan_serial_no.set_value('');
+ } else if (scan_batch_no) {
+ this.dialog.fields_dict.entries.df.data.push({
+ batch_no: scan_batch_no
+ });
+
+ this.dialog.fields_dict.scan_batch_no.set_value('');
+ }
+
+ this.dialog.fields_dict.entries.grid.refresh();
+ }
+
+ update_bundle_entries() {
+ let entries = this.dialog.get_values().entries;
+ let warehouse = this.dialog.get_value('warehouse');
+
+ if (entries && !entries.length || !entries) {
+ frappe.throw(__('Please add atleast one Serial No / Batch No'));
+ }
+
+ frappe.call({
+ method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.add_serial_batch_ledgers',
+ args: {
+ entries: entries,
+ child_row: this.item,
+ doc: this.frm.doc,
+ warehouse: warehouse,
+ }
+ }).then(r => {
+ this.callback && this.callback(r.message);
+ this.frm.save();
+ this.dialog.hide();
+ })
+ }
+
+ edit_full_form() {
+ let bundle_id = this.item.serial_and_batch_bundle
+ if (!bundle_id) {
+ _new = frappe.model.get_new_doc(
+ "Serial and Batch Bundle", null, null, true
+ );
+
+ _new.item_code = this.item.item_code;
+ _new.warehouse = this.get_warehouse();
+ _new.has_serial_no = this.item.has_serial_no;
+ _new.has_batch_no = this.item.has_batch_no;
+ _new.type_of_transaction = this.item.type_of_transaction;
+ _new.company = this.frm.doc.company;
+ _new.voucher_type = this.frm.doc.doctype;
+ bundle_id = _new.name;
+ }
+
+ frappe.set_route("Form", "Serial and Batch Bundle", bundle_id);
+ this.dialog.hide();
+ }
+
+ get_warehouse() {
+ return (this.item?.type_of_transaction === "Outward" ?
+ (this.item.warehouse || this.item.s_warehouse)
+ : (this.item.warehouse || this.item.t_warehouse));
+ }
+
+ render_data() {
+ if (!this.frm.is_new() && this.bundle) {
+ frappe.call({
+ method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_serial_batch_ledgers',
+ args: {
+ item_code: this.item.item_code,
+ name: this.bundle,
+ voucher_no: this.item.parent,
+ }
+ }).then(r => {
+ if (r.message) {
+ this.set_data(r.message);
+ }
+ })
+ }
+ }
+
+ set_data(data) {
+ data.forEach(d => {
+ this.dialog.fields_dict.entries.df.data.push(d);
+ });
+
+ this.dialog.fields_dict.entries.grid.refresh();
+ }
+}
\ No newline at end of file
diff --git a/erpnext/public/scss/erpnext.bundle.scss b/erpnext/public/scss/erpnext.bundle.scss
index b68ddf5..d3313c7 100644
--- a/erpnext/public/scss/erpnext.bundle.scss
+++ b/erpnext/public/scss/erpnext.bundle.scss
@@ -1,4 +1,3 @@
@import "./erpnext";
@import "./call_popup";
@import "./point-of-sale";
-@import "./hierarchy_chart";
diff --git a/erpnext/public/scss/hierarchy_chart.scss b/erpnext/public/scss/hierarchy_chart.scss
deleted file mode 100644
index 57d5e84..0000000
--- a/erpnext/public/scss/hierarchy_chart.scss
+++ /dev/null
@@ -1,313 +0,0 @@
-.node-card {
- background: white;
- stroke: 1px solid var(--gray-200);
- box-shadow: var(--shadow-base);
- border-radius: 0.5rem;
- padding: 0.75rem;
- margin-left: 3rem;
- width: 18rem;
- overflow: hidden;
-
- .btn-edit-node {
- display: none;
- }
-
- .edit-chart-node {
- display: none;
- }
-
- .node-edit-icon {
- display: none;
- }
-}
-
-.node-card.exported {
- box-shadow: none
-}
-
-.node-image {
- width: 3.0rem;
- height: 3.0rem;
-}
-
-.node-name {
- font-size: 1rem;
- line-height: 1.72;
-}
-
-.node-title {
- font-size: 0.75rem;
- line-height: 1.35;
-}
-
-.node-info {
- width: 12.7rem;
-}
-
-.node-connections {
- font-size: 0.75rem;
- line-height: 1.35;
-}
-
-.node-card.active {
- background: var(--blue-50);
- border: 1px solid var(--blue-500);
- box-shadow: var(--shadow-md);
- border-radius: 0.5rem;
- padding: 0.75rem;
- width: 18rem;
-
- .btn-edit-node {
- display: flex;
- background: var(--blue-100);
- color: var(--blue-500);
- padding: .25rem .5rem;
- font-size: .75rem;
- justify-content: center;
- box-shadow: var(--shadow-sm);
- margin-left: auto;
- }
-
- .edit-chart-node {
- display: block;
- margin-right: 0.25rem;
- }
-
- .node-edit-icon {
- display: block;
- }
-
- .node-edit-icon > .icon{
- stroke: var(--blue-500);
- }
-
- .node-name {
- align-items: center;
- justify-content: space-between;
- margin-bottom: 2px;
- width: 12.2rem;
- }
-}
-
-.node-card.active-path {
- background: var(--blue-100);
- border: 1px solid var(--blue-300);
- box-shadow: var(--shadow-sm);
- border-radius: 0.5rem;
- padding: 0.75rem;
- width: 15rem;
- height: 3.0rem;
-
- .btn-edit-node {
- display: none !important;
- }
-
- .edit-chart-node {
- display: none;
- }
-
- .node-edit-icon {
- display: none;
- }
-
- .node-info {
- display: none;
- }
-
- .node-title {
- display: none;
- }
-
- .node-connections {
- display: none;
- }
-
- .node-name {
- font-size: 0.85rem;
- line-height: 1.35;
- }
-
- .node-image {
- width: 1.5rem;
- height: 1.5rem;
- }
-
- .node-meta {
- align-items: baseline;
- }
-}
-
-.node-card.collapsed {
- background: white;
- stroke: 1px solid var(--gray-200);
- box-shadow: var(--shadow-sm);
- border-radius: 0.5rem;
- padding: 0.75rem;
- width: 15rem;
- height: 3.0rem;
-
- .btn-edit-node {
- display: none !important;
- }
-
- .edit-chart-node {
- display: none;
- }
-
- .node-edit-icon {
- display: none;
- }
-
- .node-info {
- display: none;
- }
-
- .node-title {
- display: none;
- }
-
- .node-connections {
- display: none;
- }
-
- .node-name {
- font-size: 0.85rem;
- line-height: 1.35;
- }
-
- .node-image {
- width: 1.5rem;
- height: 1.5rem;
- }
-
- .node-meta {
- align-items: baseline;
- }
-}
-
-// horizontal hierarchy tree view
-#hierarchy-chart-wrapper {
- padding-top: 30px;
-
- #arrows {
- margin-top: -80px;
- }
-}
-
-.hierarchy {
- display: flex;
-}
-
-.hierarchy li {
- list-style-type: none;
-}
-
-.child-node {
- margin: 0px 0px 16px 0px;
-}
-
-.hierarchy, .hierarchy-mobile {
- .level {
- margin-right: 8px;
- align-items: flex-start;
- flex-direction: column;
- }
-}
-
-#arrows {
- position: absolute;
- overflow: visible;
-}
-
-.active-connector {
- stroke: var(--blue-500);
-}
-
-.collapsed-connector {
- stroke: var(--blue-300);
-}
-
-// mobile
-
-.hierarchy-mobile {
- display: flex;
- flex-direction: column;
- align-items: center;
- padding-top: 10px;
- padding-left: 0px;
-}
-
-.hierarchy-mobile li {
- list-style-type: none;
- display: flex;
- flex-direction: column;
- align-items: flex-end;
-}
-
-.mobile-node {
- margin-left: 0;
-}
-
-.mobile-node.active-path {
- width: 12.25rem;
-}
-
-.active-child {
- width: 15.5rem;
-}
-
-.mobile-node .node-connections {
- max-width: 80px;
-}
-
-.hierarchy-mobile .node-children {
- margin-top: 16px;
-}
-
-.root-level .node-card {
- margin: 0 0 16px;
-}
-
-// node group
-
-.collapsed-level {
- margin-bottom: 16px;
- width: 18rem;
-}
-
-.node-group {
- background: white;
- border: 1px solid var(--gray-300);
- box-shadow: var(--shadow-sm);
- border-radius: 0.5rem;
- padding: 0.75rem;
- width: 18rem;
- height: 3rem;
- overflow: hidden;
- align-items: center;
-}
-
-.node-group .avatar-group {
- margin-left: 0px;
-}
-
-.node-group .avatar-extra-count {
- background-color: var(--blue-100);
- color: var(--blue-500);
-}
-
-.node-group .avatar-frame {
- width: 1.5rem;
- height: 1.5rem;
-}
-
-.node-group.collapsed {
- width: 5rem;
- margin-left: 12px;
-}
-
-.sibling-group {
- display: flex;
- flex-direction: column;
- align-items: center;
-}
diff --git a/erpnext/quality_management/workspace/quality/quality.json b/erpnext/quality_management/workspace/quality/quality.json
index 3effd59..8183de9 100644
--- a/erpnext/quality_management/workspace/quality/quality.json
+++ b/erpnext/quality_management/workspace/quality/quality.json
@@ -2,12 +2,14 @@
"charts": [],
"content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Quality Goal\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Quality Procedure\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Quality Inspection\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Quality Review\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Quality Action\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Non Conformance\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Goal and Procedure\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Feedback\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Meeting\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Review and Action\",\"col\":4}}]",
"creation": "2020-03-02 15:49:28.632014",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "quality",
"idx": 0,
+ "is_hidden": 0,
"label": "Quality",
"links": [
{
@@ -142,16 +144,18 @@
"type": "Link"
}
],
- "modified": "2022-01-13 17:42:20.105187",
+ "modified": "2023-05-24 14:47:22.597974",
"modified_by": "Administrator",
"module": "Quality Management",
"name": "Quality",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
+ "quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 21.0,
+ "sequence_id": 9.0,
"shortcuts": [
{
"color": "Grey",
diff --git a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
index c32ab6b..d332b4e 100644
--- a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
+++ b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
@@ -10,6 +10,7 @@
"tax_withholding_category",
"fiscal_year",
"column_break_3",
+ "company",
"certificate_no",
"section_break_3",
"supplier",
@@ -123,11 +124,18 @@
"label": "Tax Withholding Category",
"options": "Tax Withholding Category",
"reqd": 1
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "Company",
+ "options": "Company",
+ "reqd": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2021-10-23 18:33:38.962622",
+ "modified": "2023-04-18 08:25:35.302081",
"modified_by": "Administrator",
"module": "Regional",
"name": "Lower Deduction Certificate",
@@ -136,5 +144,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ 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"
index c75179e..6717989 100644
--- "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"
@@ -1,31 +1,135 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
-
import re
import frappe
from frappe import _
from frappe.utils import format_datetime
+COLUMNS = [
+ {
+ "label": "JournalCode",
+ "fieldname": "JournalCode",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "JournalLib",
+ "fieldname": "JournalLib",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "EcritureNum",
+ "fieldname": "EcritureNum",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "EcritureDate",
+ "fieldname": "EcritureDate",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "CompteNum",
+ "fieldname": "CompteNum",
+ "fieldtype": "Link",
+ "options": "Account",
+ "width": 100,
+ },
+ {
+ "label": "CompteLib",
+ "fieldname": "CompteLib",
+ "fieldtype": "Link",
+ "options": "Account",
+ "width": 200,
+ },
+ {
+ "label": "CompAuxNum",
+ "fieldname": "CompAuxNum",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "CompAuxLib",
+ "fieldname": "CompAuxLib",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "PieceRef",
+ "fieldname": "PieceRef",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "PieceDate",
+ "fieldname": "PieceDate",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "EcritureLib",
+ "fieldname": "EcritureLib",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "Debit",
+ "fieldname": "Debit",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "Credit",
+ "fieldname": "Credit",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "EcritureLet",
+ "fieldname": "EcritureLet",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "DateLet",
+ "fieldname": "DateLet",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "ValidDate",
+ "fieldname": "ValidDate",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "Montantdevise",
+ "fieldname": "Montantdevise",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+ {
+ "label": "Idevise",
+ "fieldname": "Idevise",
+ "fieldtype": "Data",
+ "width": 90,
+ },
+]
+
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
+ validate_filters(filters)
+ return COLUMNS, get_result(
+ company=filters["company"],
+ fiscal_year=filters["fiscal_year"],
+ )
-def validate_filters(filters, account_details):
+def validate_filters(filters):
if not filters.get("company"):
frappe.throw(_("{0} is mandatory").format(_("Company")))
@@ -33,107 +137,96 @@
frappe.throw(_("{0} is mandatory").format(_("Fiscal Year")))
-def set_account_currency(filters):
+def get_gl_entries(company, fiscal_year):
+ gle = frappe.qb.DocType("GL Entry")
+ sales_invoice = frappe.qb.DocType("Sales Invoice")
+ purchase_invoice = frappe.qb.DocType("Purchase Invoice")
+ journal_entry = frappe.qb.DocType("Journal Entry")
+ payment_entry = frappe.qb.DocType("Payment Entry")
+ customer = frappe.qb.DocType("Customer")
+ supplier = frappe.qb.DocType("Supplier")
+ employee = frappe.qb.DocType("Employee")
- filters["company_currency"] = frappe.get_cached_value(
- "Company", filters.company, "default_currency"
+ debit = frappe.query_builder.functions.Sum(gle.debit).as_("debit")
+ credit = frappe.query_builder.functions.Sum(gle.credit).as_("credit")
+ debit_currency = frappe.query_builder.functions.Sum(gle.debit_in_account_currency).as_(
+ "debitCurr"
+ )
+ credit_currency = frappe.query_builder.functions.Sum(gle.credit_in_account_currency).as_(
+ "creditCurr"
)
- 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"
+ query = (
+ frappe.qb.from_(gle)
+ .left_join(sales_invoice)
+ .on(gle.voucher_no == sales_invoice.name)
+ .left_join(purchase_invoice)
+ .on(gle.voucher_no == purchase_invoice.name)
+ .left_join(journal_entry)
+ .on(gle.voucher_no == journal_entry.name)
+ .left_join(payment_entry)
+ .on(gle.voucher_no == payment_entry.name)
+ .left_join(customer)
+ .on(gle.party == customer.name)
+ .left_join(supplier)
+ .on(gle.party == supplier.name)
+ .left_join(employee)
+ .on(gle.party == employee.name)
+ .select(
+ gle.posting_date.as_("GlPostDate"),
+ gle.name.as_("GlName"),
+ gle.account,
+ gle.transaction_date,
+ debit,
+ credit,
+ debit_currency,
+ credit_currency,
+ gle.voucher_type,
+ gle.voucher_no,
+ gle.against_voucher_type,
+ gle.against_voucher,
+ gle.account_currency,
+ gle.against,
+ gle.party_type,
+ gle.party,
+ sales_invoice.name.as_("InvName"),
+ sales_invoice.title.as_("InvTitle"),
+ sales_invoice.posting_date.as_("InvPostDate"),
+ purchase_invoice.name.as_("PurName"),
+ purchase_invoice.title.as_("PurTitle"),
+ purchase_invoice.posting_date.as_("PurPostDate"),
+ journal_entry.cheque_no.as_("JnlRef"),
+ journal_entry.posting_date.as_("JnlPostDate"),
+ journal_entry.title.as_("JnlTitle"),
+ payment_entry.name.as_("PayName"),
+ payment_entry.posting_date.as_("PayPostDate"),
+ payment_entry.title.as_("PayTitle"),
+ customer.customer_name,
+ customer.name.as_("cusName"),
+ supplier.supplier_name,
+ supplier.name.as_("supName"),
+ employee.employee_name,
+ employee.name.as_("empName"),
+ )
+ .where((gle.company == company) & (gle.fiscal_year == fiscal_year))
+ .groupby(gle.voucher_type, gle.voucher_no, gle.account)
+ .orderby(gle.posting_date, gle.voucher_no)
)
- gl_entries = frappe.db.sql(
- """
- select
- gl.posting_date as GlPostDate, gl.name as GlName, 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,
- inv.name as InvName, inv.title as InvTitle, inv.posting_date as InvPostDate,
- pur.name as PurName, pur.title as PurTitle, pur.posting_date as PurPostDate,
- jnl.cheque_no as JnlRef, jnl.posting_date as JnlPostDate, jnl.title as JnlTitle,
- pay.name as PayName, pay.posting_date as PayPostDate, pay.title as PayTitle,
- cus.customer_name, cus.name as cusName,
- sup.supplier_name, sup.name as supName,
- emp.employee_name, emp.name as empName,
- stu.title as student_name, stu.name as stuName,
- member_name, mem.name as memName
-
- from `tabGL Entry` gl
- left join `tabSales Invoice` inv on gl.voucher_no = inv.name
- left join `tabPurchase Invoice` pur on gl.voucher_no = pur.name
- left join `tabJournal Entry` jnl on gl.voucher_no = jnl.name
- left join `tabPayment Entry` pay on gl.voucher_no = pay.name
- left join `tabCustomer` cus on gl.party = cus.name
- left join `tabSupplier` sup on gl.party = sup.name
- left join `tabEmployee` emp on gl.party = emp.name
- left join `tabStudent` stu on gl.party = stu.name
- left join `tabMember` mem on gl.party = mem.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
+ return query.run(as_dict=True)
-def get_result_as_list(data, filters):
+def get_result(company, fiscal_year):
+ data = get_gl_entries(company, fiscal_year)
+
result = []
- company_currency = frappe.get_cached_value("Company", filters.company, "default_currency")
+ company_currency = frappe.get_cached_value("Company", company, "default_currency")
accounts = frappe.get_all(
- "Account", filters={"Company": filters.company}, fields=["name", "account_number"]
+ "Account", filters={"Company": company}, fields=["name", "account_number"]
)
for d in data:
-
JournalCode = re.split("-|/|[0-9]", d.get("voucher_no"))[0]
if d.get("voucher_no").startswith("{0}-".format(JournalCode)) or d.get("voucher_no").startswith(
@@ -141,9 +234,7 @@
):
EcritureNum = re.split("-|/", d.get("voucher_no"))[1]
else:
- EcritureNum = re.search(
- r"{0}(\d+)".format(JournalCode), d.get("voucher_no"), re.IGNORECASE
- ).group(1)
+ EcritureNum = re.search(r"{0}(\d+)".format(JournalCode), d.get("voucher_no"), re.IGNORECASE)[1]
EcritureDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
@@ -185,7 +276,7 @@
ValidDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
- PieceRef = d.get("voucher_no") if d.get("voucher_no") else "Sans Reference"
+ PieceRef = d.get("voucher_no") or "Sans Reference"
# EcritureLib is the reference title unless it is an opening entry
if d.get("is_opening") == "Yes":
diff --git a/erpnext/regional/report/irs_1099/irs_1099.py b/erpnext/regional/report/irs_1099/irs_1099.py
index 66ade1f..c5d8112 100644
--- a/erpnext/regional/report/irs_1099/irs_1099.py
+++ b/erpnext/regional/report/irs_1099/irs_1099.py
@@ -10,7 +10,7 @@
from frappe.utils.jinja import render_template
from frappe.utils.pdf import get_pdf
from frappe.utils.print_format import read_multi_pdf
-from PyPDF2 import PdfWriter
+from pypdf import PdfWriter
from erpnext.accounts.utils import get_fiscal_year
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index b53f339..60f0941 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -20,8 +20,8 @@
frm.set_query('customer_group', {'is_group': 0});
frm.set_query('default_price_list', { 'selling': 1});
frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
- var filters = {
+ let d = locals[cdt][cdn];
+ let filters = {
'account_type': 'Receivable',
'company': d.company,
"is_group": 0
@@ -35,6 +35,19 @@
}
});
+ frm.set_query('advance_account', 'accounts', function (doc, cdt, cdn) {
+ let d = locals[cdt][cdn];
+ return {
+ filters: {
+ "account_type": 'Receivable',
+ "root_type": "Liability",
+ "company": d.company,
+ "is_group": 0
+ }
+ }
+ });
+
+
if (frm.doc.__islocal == 1) {
frm.set_value("represents_company", "");
}
@@ -63,6 +76,14 @@
}
}
});
+
+ frm.set_query("user", "portal_users", function() {
+ return {
+ filters: {
+ "ignore_user_type": true,
+ }
+ };
+ });
},
customer_primary_address: function(frm){
if(frm.doc.customer_primary_address){
@@ -110,8 +131,6 @@
erpnext.toggle_naming_series();
}
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Customer'}
-
if(!frm.doc.__islocal) {
frappe.contacts.render_address_and_contact(frm);
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index c133cd3..be8f62f 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -81,7 +81,9 @@
"dn_required",
"column_break_53",
"is_frozen",
- "disabled"
+ "disabled",
+ "portal_users_tab",
+ "portal_users"
],
"fields": [
{
@@ -334,15 +336,15 @@
{
"fieldname": "default_receivable_accounts",
"fieldtype": "Section Break",
- "label": "Default Receivable Accounts"
+ "label": "Default Accounts"
},
{
- "description": "Mention if a non-standard receivable account",
- "fieldname": "accounts",
- "fieldtype": "Table",
- "label": "Receivable Accounts",
- "options": "Party Account"
- },
+ "description": "Mention if non-standard Receivable account",
+ "fieldname": "accounts",
+ "fieldtype": "Table",
+ "label": "Accounts",
+ "options": "Party Account"
+ },
{
"fieldname": "credit_limit_section",
"fieldtype": "Section Break",
@@ -555,6 +557,17 @@
{
"fieldname": "column_break_54",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "portal_users_tab",
+ "fieldtype": "Tab Break",
+ "label": "Portal Users"
+ },
+ {
+ "fieldname": "portal_users",
+ "fieldtype": "Table",
+ "label": "Customer Portal Users",
+ "options": "Portal User"
}
],
"icon": "fa fa-user",
@@ -568,7 +581,7 @@
"link_fieldname": "party"
}
],
- "modified": "2023-02-18 11:04:46.343527",
+ "modified": "2023-06-22 13:21:10.678382",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
@@ -607,7 +620,6 @@
"read": 1,
"report": 1,
"role": "Sales Master Manager",
- "set_user_permissions": 1,
"share": 1,
"write": 1
},
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 18336d2..555db59 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -22,6 +22,7 @@
get_timeline_data,
validate_party_accounts,
)
+from erpnext.controllers.website_list_for_contact import add_role_for_portal_user
from erpnext.utilities.transaction_base import TransactionBase
@@ -82,6 +83,7 @@
self.check_customer_group_change()
self.validate_default_bank_account()
self.validate_internal_customer()
+ self.add_role_for_user()
# set loyalty program tier
if frappe.db.exists("Customer", self.name):
@@ -170,6 +172,10 @@
self.update_customer_groups()
+ def add_role_for_user(self):
+ for portal_user in self.portal_users:
+ add_role_for_portal_user(portal_user, "Customer")
+
def update_customer_groups(self):
ignore_doctypes = ["Lead", "Opportunity", "POS Profile", "Tax Rule", "Pricing Rule"]
if frappe.flags.customer_group_changed:
@@ -454,12 +460,12 @@
customer_outstanding += flt(extra_amount)
if credit_limit > 0 and flt(customer_outstanding) > credit_limit:
- msgprint(
- _("Credit limit has been crossed for customer {0} ({1}/{2})").format(
- customer, customer_outstanding, credit_limit
- )
+ message = _("Credit limit has been crossed for customer {0} ({1}/{2})").format(
+ customer, customer_outstanding, credit_limit
)
+ message += "<br><br>"
+
# If not authorized person raise exception
credit_controller_role = frappe.db.get_single_value("Accounts Settings", "credit_controller")
if not credit_controller_role or credit_controller_role not in frappe.get_roles():
@@ -480,7 +486,7 @@
"<li>".join(credit_controller_users_formatted)
)
- message = _(
+ message += _(
"Please contact any of the following users to extend the credit limits for {0}: {1}"
).format(customer, user_list)
@@ -488,7 +494,7 @@
# prompt them to send out an email to the controller users
frappe.msgprint(
message,
- title="Notify",
+ title=_("Credit Limit Crossed"),
raise_exception=1,
primary_action={
"label": "Send Email",
@@ -519,7 +525,6 @@
customer, company, ignore_outstanding_sales_order=False, cost_center=None
):
# Outstanding based on GL Entries
-
cond = ""
if cost_center:
lft, rgt = frappe.get_cached_value("Cost Center", cost_center, ["lft", "rgt"])
@@ -617,11 +622,15 @@
if not credit_limit:
customer_group = frappe.get_cached_value("Customer", customer, "customer_group")
- credit_limit = frappe.db.get_value(
+
+ result = frappe.db.get_values(
"Customer Credit Limit",
{"parent": customer_group, "parenttype": "Customer Group", "company": company},
- "credit_limit",
+ fieldname=["credit_limit", "bypass_credit_limit_check"],
+ as_dict=True,
)
+ if result and not result[0].bypass_credit_limit_check:
+ credit_limit = result[0].credit_limit
if not credit_limit:
credit_limit = frappe.get_cached_value("Company", company, "credit_limit")
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index a621c73..6e737e4 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -345,7 +345,7 @@
def test_serach_fields_for_customer(self):
from erpnext.controllers.queries import customer_query
- frappe.db.set_value("Selling Settings", None, "cust_master_name", "Naming Series")
+ frappe.db.set_single_value("Selling Settings", "cust_master_name", "Naming Series")
make_property_setter(
"Customer", None, "search_fields", "customer_group", "Data", for_doctype="Doctype"
@@ -371,7 +371,7 @@
self.assertEqual(data[0].territory, "_Test Territory")
self.assertTrue("territory" in data[0])
- frappe.db.set_value("Selling Settings", None, "cust_master_name", "Customer Name")
+ frappe.db.set_single_value("Selling Settings", "cust_master_name", "Customer Name")
def get_customer_dict(customer_name):
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 27a3b35..dd6f8a8 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -7,6 +7,27 @@
frm.set_query('customer_address', erpnext.queries.address_query);
frm.set_query('contact_person', erpnext.queries.contact_query);
frm.set_query('customer', erpnext.queries.customer);
+ frm.set_query("serial_and_batch_bundle", "items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
},
onload: function(frm) {
if(!frm.doc.status) {
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 765bc5c..18c7d08 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -1,812 +1,267 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "beta": 0,
- "creation": "2013-04-30 13:13:06",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 0,
+ "actions": [],
+ "autoname": "naming_series:",
+ "creation": "2013-04-30 13:13:06",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+ "installation_note",
+ "column_break0",
+ "naming_series",
+ "customer",
+ "customer_address",
+ "contact_person",
+ "customer_name",
+ "address_display",
+ "contact_display",
+ "contact_mobile",
+ "contact_email",
+ "territory",
+ "customer_group",
+ "column_break1",
+ "inst_date",
+ "inst_time",
+ "status",
+ "company",
+ "amended_from",
+ "remarks",
+ "item_details",
+ "items"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "installation_note",
- "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": "Installation Note",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "installation_note",
+ "fieldtype": "Section Break",
+ "label": "Installation Note",
+ "oldfieldtype": "Section Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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,
- "translatable": 0,
- "unique": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "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": "MAT-INS-.YYYY.-",
- "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": 1,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "MAT-INS-.YYYY.-",
+ "reqd": 1,
+ "set_only_once": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": 1,
- "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": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "in_global_search": 1,
+ "in_standard_filter": 1,
+ "label": "Customer",
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "customer",
+ "fieldname": "customer_address",
+ "fieldtype": "Link",
+ "label": "Customer Address",
+ "options": "Address",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "fieldname": "contact_person",
- "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": "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,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "customer",
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "label": "Contact Person",
+ "options": "Contact",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer_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": "Name",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "customer_name",
- "oldfieldtype": "Data",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "bold": 1,
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "label": "Name",
+ "oldfieldname": "customer_name",
+ "oldfieldtype": "Data",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "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": "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Address",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "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",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "in_global_search": 1,
+ "label": "Contact",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "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": "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,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "customer",
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "in_global_search": 1,
+ "label": "Mobile No",
+ "options": "Phone",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "fieldname": "contact_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": "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,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "customer",
+ "fieldname": "contact_email",
+ "fieldtype": "Data",
+ "label": "Contact Email",
+ "options": "Email",
+ "print_hide": 1,
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "description": "",
- "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,
- "print_hide": 1,
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "customer",
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "label": "Territory",
+ "options": "Territory",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "description": "",
- "fieldname": "customer_group",
- "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 Group",
- "length": 0,
- "no_copy": 0,
- "options": "Customer Group",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "depends_on": "customer",
+ "fieldname": "customer_group",
+ "fieldtype": "Link",
+ "label": "Customer Group",
+ "options": "Customer Group",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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,
- "translatable": 0,
- "unique": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "inst_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": "Installation Date",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "inst_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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "inst_date",
+ "fieldtype": "Date",
+ "label": "Installation Date",
+ "oldfieldname": "inst_date",
+ "oldfieldtype": "Date",
+ "reqd": 1,
+ "search_index": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "inst_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": "Installation Time",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "inst_time",
- "oldfieldtype": "Time",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "inst_time",
+ "fieldtype": "Time",
+ "label": "Installation Time",
+ "oldfieldname": "inst_time",
+ "oldfieldtype": "Time"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Draft",
- "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,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "Draft\nSubmitted\nCancelled",
- "permlevel": 0,
- "print_hide": 1,
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_standard_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "Draft\nSubmitted\nCancelled",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "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": "Select",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_standard_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Select",
+ "options": "Company",
+ "print_hide": 1,
+ "remember_last_selected_value": 1,
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": "Data",
- "options": "Installation Note",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Data",
+ "options": "Installation Note",
+ "print_hide": 1,
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "remarks",
- "fieldtype": "Small Text",
- "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": "Remarks",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "remarks",
- "oldfieldtype": "Small Text",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "remarks",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Remarks",
+ "oldfieldname": "remarks",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "item_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",
- "options": "Simple",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "item_details",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break",
+ "options": "Simple"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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,
- "oldfieldname": "installed_item_details",
- "oldfieldtype": "Table",
- "options": "Installation Note 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,
- "translatable": 0,
- "unique": 0
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "oldfieldname": "installed_item_details",
+ "oldfieldtype": "Table",
+ "options": "Installation Note Item",
+ "reqd": 1
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-wrench",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-08-21 14:44:28.000728",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Installation Note",
- "owner": "Administrator",
+ ],
+ "icon": "fa fa-wrench",
+ "idx": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-06-03 16:31:08.386961",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Installation Note",
+ "naming_rule": "By \"Naming Series\" field",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 1,
- "print": 0,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "permlevel": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User"
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "customer",
- "title_field": "customer_name",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "timeline_field": "customer",
+ "title_field": "customer_name"
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note_item/installation_note_item.json b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
index 79bcf10..3e49fc9 100644
--- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json
+++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -1,260 +1,126 @@
{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2013-02-22 01:27:51",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-02-22 01:27:51",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "item_code",
+ "serial_and_batch_bundle",
+ "serial_no",
+ "qty",
+ "description",
+ "prevdoc_detail_docname",
+ "prevdoc_docname",
+ "prevdoc_doctype"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "item_code",
- "fieldtype": "Link",
- "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": "Item Code",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_code",
- "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
- },
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_global_search": 1,
+ "in_list_view": 1,
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "reqd": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "serial_no",
- "fieldtype": "Small Text",
- "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": "Serial No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "serial_no",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "180px",
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "fieldname": "serial_no",
+ "fieldtype": "Small Text",
+ "label": "Serial No",
+ "no_copy": 1,
+ "oldfieldname": "serial_no",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1,
+ "print_width": "180px",
"width": "180px"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "qty",
- "fieldtype": "Float",
- "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": "Installed Qty",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "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": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Installed Qty",
+ "oldfieldname": "qty",
+ "oldfieldtype": "Currency",
+ "reqd": 1
+ },
{
- "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": 1,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "300px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "in_global_search": 1,
+ "in_list_view": 1,
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Data",
+ "print_width": "300px",
+ "read_only": 1,
"width": "300px"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "prevdoc_detail_docname",
- "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": "Against Document Detail No",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "prevdoc_detail_docname",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "150px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "fieldname": "prevdoc_detail_docname",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Against Document Detail No",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_detail_docname",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
"width": "150px"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "prevdoc_docname",
- "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": "Against Document No",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "prevdoc_docname",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "150px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0,
+ "fieldname": "prevdoc_docname",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Against Document No",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_docname",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "prevdoc_doctype",
- "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": "Document Type",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "prevdoc_doctype",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "150px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0,
+ "fieldname": "prevdoc_doctype",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Document Type",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_doctype",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "search_index": 1,
"width": "150px"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2017-02-20 13:24:18.142419",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Installation Note Item",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "ASC",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2023-03-12 13:47:08.257955",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Installation Note Item",
+ "naming_rule": "Random",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "states": [],
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 83fa472..67c392c 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -13,7 +13,7 @@
frm.set_query("quotation_to", function() {
return{
"filters": {
- "name": ["in", ["Customer", "Lead"]],
+ "name": ["in", ["Customer", "Lead", "Prospect"]],
}
}
});
@@ -34,6 +34,29 @@
}
};
});
+
+ frm.set_query("serial_and_batch_bundle", "packed_items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('packed_items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'warehouse': row.doc.warehouse,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
},
refresh: function(frm) {
@@ -160,19 +183,16 @@
}
set_dynamic_field_label(){
- if (this.frm.doc.quotation_to == "Customer")
- {
+ if (this.frm.doc.quotation_to == "Customer") {
this.frm.set_df_property("party_name", "label", "Customer");
this.frm.fields_dict.party_name.get_query = null;
- }
-
- if (this.frm.doc.quotation_to == "Lead")
- {
+ } else if (this.frm.doc.quotation_to == "Lead") {
this.frm.set_df_property("party_name", "label", "Lead");
-
this.frm.fields_dict.party_name.get_query = function() {
return{ query: "erpnext.controllers.queries.lead_query" }
}
+ } else if (this.frm.doc.quotation_to == "Prospect") {
+ this.frm.set_df_property("party_name", "label", "Prospect");
}
}
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index eb2c0a4..8c816cf 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -291,6 +291,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -416,7 +417,6 @@
"fieldname": "items_section",
"fieldtype": "Section Break",
"hide_border": 1,
- "label": "Items",
"oldfieldtype": "Section Break",
"options": "fa fa-shopping-cart"
},
@@ -424,6 +424,7 @@
"allow_bulk_edit": 1,
"fieldname": "items",
"fieldtype": "Table",
+ "label": "Items",
"oldfieldname": "quotation_details",
"oldfieldtype": "Table",
"options": "Quotation Item",
@@ -1072,7 +1073,7 @@
"idx": 82,
"is_submittable": 1,
"links": [],
- "modified": "2022-12-12 18:32:28.671332",
+ "modified": "2023-06-03 16:21:04.980033",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index fc66db2..8ff681b 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -286,7 +286,20 @@
target.commission_rate = frappe.get_value(
"Sales Partner", source.referral_sales_partner, "commission_rate"
)
+
+ # sales team
+ for d in customer.get("sales_team") or []:
+ target.append(
+ "sales_team",
+ {
+ "sales_person": d.sales_person,
+ "allocated_percentage": d.allocated_percentage or None,
+ "commission_rate": d.commission_rate,
+ },
+ )
+
target.flags.ignore_permissions = ignore_permissions
+ target.delivery_date = nowdate()
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")
@@ -294,6 +307,7 @@
balance_qty = obj.qty - ordered_items.get(obj.item_code, 0.0)
target.qty = balance_qty if balance_qty > 0 else 0
target.stock_qty = flt(target.qty) * flt(obj.conversion_factor)
+ target.delivery_date = nowdate()
if obj.against_blanket_order:
target.against_blanket_order = obj.against_blanket_order
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index 67f6518..5623a12 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -60,9 +60,9 @@
sales_order = make_sales_order(quotation.name)
sales_order.currency = "USD"
sales_order.conversion_rate = 20.0
- sales_order.delivery_date = "2019-01-01"
sales_order.naming_series = "_T-Quotation-"
sales_order.transaction_date = nowdate()
+ sales_order.delivery_date = nowdate()
sales_order.insert()
self.assertEqual(sales_order.currency, "USD")
@@ -644,8 +644,6 @@
},
)
- qo.delivery_date = add_days(qo.transaction_date, 10)
-
if not args.do_not_save:
qo.insert()
if not args.do_not_submit:
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 449d461..5d43a07 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -47,21 +47,50 @@
frm.set_df_property('packed_items', 'cannot_add_rows', true);
frm.set_df_property('packed_items', 'cannot_delete_rows', true);
},
+
refresh: function(frm) {
- if(frm.doc.docstatus === 1 && frm.doc.status !== 'Closed'
- && flt(frm.doc.per_delivered, 6) < 100 && flt(frm.doc.per_billed, 6) < 100) {
- frm.add_custom_button(__('Update Items'), () => {
- erpnext.utils.update_child_items({
- frm: frm,
- child_docname: "items",
- child_doctype: "Sales Order Detail",
- cannot_add_row: false,
- })
- });
+ if(frm.doc.docstatus === 1) {
+ if (frm.doc.status !== 'Closed' && flt(frm.doc.per_delivered, 6) < 100 && flt(frm.doc.per_billed, 6) < 100) {
+ frm.add_custom_button(__('Update Items'), () => {
+ erpnext.utils.update_child_items({
+ frm: frm,
+ child_docname: "items",
+ child_doctype: "Sales Order Detail",
+ cannot_add_row: false,
+ })
+ });
+
+ // Stock Reservation > Reserve button will be only visible if the SO has unreserved stock.
+ if (frm.doc.__onload && frm.doc.__onload.has_unreserved_stock) {
+ frm.add_custom_button(__('Reserve'), () => frm.events.create_stock_reservation_entries(frm), __('Stock Reservation'));
+ }
+ }
+
+ // Stock Reservation > Unreserve button will be only visible if the SO has reserved stock.
+ if (frm.doc.__onload && frm.doc.__onload.has_reserved_stock) {
+ frm.add_custom_button(__('Unreserve'), () => frm.events.cancel_stock_reservation_entries(frm), __('Stock Reservation'));
+ }
}
- if (frm.doc.docstatus === 0 && frm.doc.is_internal_customer) {
- frm.events.get_items_from_internal_purchase_order(frm);
+ if (frm.doc.docstatus === 0) {
+ if (frm.doc.is_internal_customer) {
+ frm.events.get_items_from_internal_purchase_order(frm);
+ }
+
+ if (frm.is_new()) {
+ frappe.db.get_single_value("Stock Settings", "enable_stock_reservation").then((value) => {
+ if (value) {
+ frappe.db.get_single_value("Stock Settings", "reserve_stock_on_sales_order_submission").then((value) => {
+ // If `Reserve Stock on Sales Order Submission` is enabled in Stock Settings, set Reserve Stock to 1 else 0.
+ frm.set_value("reserve_stock", value ? 1 : 0);
+ })
+ } else {
+ // If `Stock Reservation` is disabled in Stock Settings, set Reserve Stock to 0 and read only.
+ frm.set_value("reserve_stock", 0);
+ frm.set_df_property("reserve_stock", "read_only", 1);
+ }
+ })
+ }
}
},
@@ -137,6 +166,108 @@
if(!d.delivery_date) d.delivery_date = frm.doc.delivery_date;
});
refresh_field("items");
+ },
+
+ create_stock_reservation_entries(frm) {
+ let items_data = [];
+
+ const dialog = frappe.prompt({fieldname: 'items', fieldtype: 'Table', label: __('Items to Reserve'),
+ fields: [
+ {
+ fieldtype: 'Data',
+ fieldname: 'name',
+ label: __('Name'),
+ reqd: 1,
+ read_only: 1,
+ },
+ {
+ fieldtype: 'Link',
+ fieldname: 'item_code',
+ label: __('Item Code'),
+ options: 'Item',
+ reqd: 1,
+ read_only: 1,
+ in_list_view: 1,
+ },
+ {
+ fieldtype: 'Link',
+ fieldname: 'warehouse',
+ label: __('Warehouse'),
+ options: 'Warehouse',
+ reqd: 1,
+ in_list_view: 1,
+ get_query: function () {
+ return {
+ filters: [
+ ["Warehouse", "is_group", "!=", 1]
+ ]
+ };
+ },
+ },
+ {
+ fieldtype: 'Float',
+ fieldname: 'qty_to_reserve',
+ label: __('Qty'),
+ reqd: 1,
+ in_list_view: 1
+ }
+ ],
+ data: items_data,
+ in_place_edit: true,
+ get_data: function() {
+ return items_data;
+ }
+ }, function(data) {
+ if (data.items.length > 0) {
+ frappe.call({
+ doc: frm.doc,
+ method: 'create_stock_reservation_entries',
+ args: {
+ items_details: data.items,
+ notify: true
+ },
+ freeze: true,
+ freeze_message: __('Reserving Stock...'),
+ callback: (r) => {
+ frm.doc.__onload.has_unreserved_stock = false;
+ frm.reload_doc();
+ }
+ });
+ }
+ }, __("Stock Reservation"), __("Reserve Stock"));
+
+ frm.doc.items.forEach(item => {
+ if (item.reserve_stock) {
+ let unreserved_qty = (flt(item.stock_qty) - (flt(item.delivered_qty) * flt(item.conversion_factor)) - flt(item.stock_reserved_qty))
+
+ if (unreserved_qty > 0) {
+ dialog.fields_dict.items.df.data.push({
+ 'name': item.name,
+ 'item_code': item.item_code,
+ 'warehouse': item.warehouse,
+ 'qty_to_reserve': (unreserved_qty / flt(item.conversion_factor))
+ });
+ }
+ }
+ });
+
+ dialog.fields_dict.items.grid.refresh();
+ },
+
+ cancel_stock_reservation_entries(frm) {
+ frappe.call({
+ method: 'erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry.cancel_stock_reservation_entries',
+ args: {
+ voucher_type: frm.doctype,
+ voucher_no: frm.docname
+ },
+ freeze: true,
+ freeze_message: __('Unreserving Stock...'),
+ callback: (r) => {
+ frm.doc.__onload.has_reserved_stock = false;
+ frm.reload_doc();
+ }
+ })
}
});
@@ -264,7 +395,7 @@
}
}
// payment request
- if(flt(doc.per_billed)<100) {
+ if(flt(doc.per_billed, precision('per_billed', doc)) < 100 + frappe.boot.sysdefaults.over_billing_allowance) {
this.frm.add_custom_button(__('Payment Request'), () => this.make_payment_request(), __('Create'));
this.frm.add_custom_button(__('Payment'), () => this.make_payment_entry(), __('Create'));
}
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index ccea840..f65969e 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -30,10 +30,6 @@
"cost_center",
"dimension_col_break",
"project",
- "column_break_77",
- "source",
- "campaign",
- "custom_dimensions_section",
"currency_and_price_list",
"currency",
"conversion_rate",
@@ -46,6 +42,7 @@
"scan_barcode",
"column_break_28",
"set_warehouse",
+ "reserve_stock",
"items_section",
"items",
"section_break_31",
@@ -162,7 +159,9 @@
"is_internal_customer",
"represents_company",
"column_break_152",
+ "source",
"inter_company_order_reference",
+ "campaign",
"party_account_currency",
"connections_tab"
],
@@ -399,6 +398,7 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -1165,12 +1165,6 @@
"read_only": 1
},
{
- "fieldname": "column_break_77",
- "fieldtype": "Column Break",
- "hide_days": 1,
- "hide_seconds": 1
- },
- {
"fieldname": "source",
"fieldtype": "Link",
"hide_days": 1,
@@ -1482,6 +1476,7 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "Phone",
+ "options": "Phone",
"read_only": 1
},
{
@@ -1613,10 +1608,6 @@
"fieldtype": "Column Break"
},
{
- "fieldname": "custom_dimensions_section",
- "fieldtype": "Section Break"
- },
- {
"collapsible": 1,
"fieldname": "additional_info_section",
"fieldtype": "Section Break",
@@ -1637,13 +1628,24 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval: (doc.docstatus == 0 || doc.reserve_stock)",
+ "description": "If checked, Stock Reservation Entries will be created on <b>Submit</b>",
+ "fieldname": "reserve_stock",
+ "fieldtype": "Check",
+ "label": "Reserve Stock",
+ "no_copy": 1,
+ "print_hide": 1,
+ "report_hide": 1
}
],
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2022-12-12 18:34:00.681780",
+ "modified": "2023-06-03 16:16:23.411247",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -1676,7 +1678,6 @@
"read": 1,
"report": 1,
"role": "Sales Manager",
- "set_user_permissions": 1,
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index ee9161b..624dadb 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -30,6 +30,11 @@
from erpnext.selling.doctype.customer.customer import check_credit_limit
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
from erpnext.stock.doctype.item.item import get_item_defaults
+from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ cancel_stock_reservation_entries,
+ get_sre_reserved_qty_details_for_voucher,
+ has_reserved_stock,
+)
from erpnext.stock.get_item_details import get_default_bom, get_price_list_rate
from erpnext.stock.stock_balance import get_reserved_qty, update_bin_qty
@@ -44,6 +49,14 @@
def __init__(self, *args, **kwargs):
super(SalesOrder, self).__init__(*args, **kwargs)
+ def onload(self) -> None:
+ if frappe.get_cached_value("Stock Settings", None, "enable_stock_reservation"):
+ if self.has_unreserved_stock():
+ self.set_onload("has_unreserved_stock", True)
+
+ if has_reserved_stock(self.doctype, self.name):
+ self.set_onload("has_reserved_stock", True)
+
def validate(self):
super(SalesOrder, self).validate()
self.validate_delivery_date()
@@ -158,7 +171,8 @@
frappe.msgprint(
_("Expected Delivery Date should be after Sales Order Date"),
indicator="orange",
- title=_("Warning"),
+ title=_("Invalid Delivery Date"),
+ raise_exception=True,
)
else:
frappe.throw(_("Please enter Delivery Date"))
@@ -217,6 +231,7 @@
frappe.throw(_("Quotation {0} is cancelled").format(quotation))
doc.set_status(update=True)
+ doc.update_opportunity("Converted" if flag == "submit" else "Quotation")
def validate_drop_ship(self):
for d in self.get("items"):
@@ -241,6 +256,9 @@
update_coupon_code_count(self.coupon_code, "used")
+ if self.get("reserve_stock"):
+ self.create_stock_reservation_entries()
+
def on_cancel(self):
self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
super(SalesOrder, self).on_cancel()
@@ -257,6 +275,7 @@
self.db_set("status", "Cancelled")
self.update_blanket_order()
+ cancel_stock_reservation_entries("Sales Order", self.name)
unlink_inter_company_doc(self.doctype, self.name, self.inter_company_order_reference)
if self.coupon_code:
@@ -398,10 +417,17 @@
def update_picking_status(self):
total_picked_qty = 0.0
total_qty = 0.0
+ per_picked = 0.0
+
for so_item in self.items:
- total_picked_qty += flt(so_item.picked_qty)
- total_qty += flt(so_item.stock_qty)
- per_picked = total_picked_qty / total_qty * 100
+ if cint(
+ frappe.get_cached_value("Item", so_item.item_code, "is_stock_item")
+ ) or self.has_product_bundle(so_item.item_code):
+ total_picked_qty += flt(so_item.picked_qty)
+ total_qty += flt(so_item.stock_qty)
+
+ if total_picked_qty and total_qty:
+ per_picked = total_picked_qty / total_qty * 100
self.db_set("per_picked", flt(per_picked), update_modified=False)
@@ -485,6 +511,166 @@
).format(item.item_code)
)
+ def has_unreserved_stock(self) -> bool:
+ """Returns True if there is any unreserved item in the Sales Order."""
+
+ reserved_qty_details = get_sre_reserved_qty_details_for_voucher("Sales Order", self.name)
+
+ for item in self.get("items"):
+ if not item.get("reserve_stock"):
+ continue
+
+ unreserved_qty = get_unreserved_qty(item, reserved_qty_details)
+ if unreserved_qty > 0:
+ return True
+
+ return False
+
+ @frappe.whitelist()
+ def create_stock_reservation_entries(self, items_details=None, notify=True):
+ """Creates Stock Reservation Entries for Sales Order Items."""
+
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ get_available_qty_to_reserve,
+ validate_stock_reservation_settings,
+ )
+
+ validate_stock_reservation_settings(self)
+
+ allow_partial_reservation = frappe.db.get_single_value(
+ "Stock Settings", "allow_partial_reservation"
+ )
+
+ items = []
+ if items_details:
+ for item in items_details:
+ so_item = frappe.get_doc("Sales Order Item", item["name"])
+ so_item.reserve_stock = 1
+ so_item.warehouse = item["warehouse"]
+ so_item.qty_to_reserve = flt(item["qty_to_reserve"]) * flt(so_item.conversion_factor)
+ items.append(so_item)
+
+ sre_count = 0
+ reserved_qty_details = get_sre_reserved_qty_details_for_voucher("Sales Order", self.name)
+ for item in items or self.get("items"):
+ # Skip if `Reserved Stock` is not checked for the item.
+ if not item.get("reserve_stock"):
+ continue
+
+ # Skip if Non-Stock Item.
+ if not frappe.get_cached_value("Item", item.item_code, "is_stock_item"):
+ frappe.msgprint(
+ _("Row #{0}: Stock cannot be reserved for a non-stock Item {1}").format(
+ item.idx, frappe.bold(item.item_code)
+ ),
+ title=_("Stock Reservation"),
+ indicator="yellow",
+ )
+ item.db_set("reserve_stock", 0)
+ continue
+
+ # Skip if Group Warehouse.
+ if frappe.get_cached_value("Warehouse", item.warehouse, "is_group"):
+ frappe.msgprint(
+ _("Row #{0}: Stock cannot be reserved in group warehouse {1}.").format(
+ item.idx, frappe.bold(item.warehouse)
+ ),
+ title=_("Stock Reservation"),
+ indicator="yellow",
+ )
+ continue
+
+ unreserved_qty = get_unreserved_qty(item, reserved_qty_details)
+
+ # Stock is already reserved for the item, notify the user and skip the item.
+ if unreserved_qty <= 0:
+ frappe.msgprint(
+ _("Row #{0}: Stock is already reserved for the Item {1}.").format(
+ item.idx, frappe.bold(item.item_code)
+ ),
+ title=_("Stock Reservation"),
+ indicator="yellow",
+ )
+ continue
+
+ available_qty_to_reserve = get_available_qty_to_reserve(item.item_code, item.warehouse)
+
+ # No stock available to reserve, notify the user and skip the item.
+ if available_qty_to_reserve <= 0:
+ frappe.msgprint(
+ _("Row #{0}: No available stock to reserve for the Item {1} in Warehouse {2}.").format(
+ item.idx, frappe.bold(item.item_code), frappe.bold(item.warehouse)
+ ),
+ title=_("Stock Reservation"),
+ indicator="orange",
+ )
+ continue
+
+ # The quantity which can be reserved.
+ qty_to_be_reserved = min(unreserved_qty, available_qty_to_reserve)
+
+ if hasattr(item, "qty_to_reserve"):
+ if item.qty_to_reserve <= 0:
+ frappe.msgprint(
+ _("Row #{0}: Quantity to reserve for the Item {1} should be greater than 0.").format(
+ item.idx, frappe.bold(item.item_code)
+ ),
+ title=_("Stock Reservation"),
+ indicator="orange",
+ )
+ continue
+ else:
+ qty_to_be_reserved = min(qty_to_be_reserved, item.qty_to_reserve)
+
+ # Partial Reservation
+ if qty_to_be_reserved < unreserved_qty:
+ if not item.get("qty_to_reserve") or qty_to_be_reserved < flt(item.get("qty_to_reserve")):
+ frappe.msgprint(
+ _("Row #{0}: Only {1} available to reserve for the Item {2}").format(
+ item.idx,
+ frappe.bold(str(qty_to_be_reserved / item.conversion_factor) + " " + item.uom),
+ frappe.bold(item.item_code),
+ ),
+ title=_("Stock Reservation"),
+ indicator="orange",
+ )
+
+ # Skip the item if `Partial Reservation` is disabled in the Stock Settings.
+ if not allow_partial_reservation:
+ continue
+
+ # Create and Submit Stock Reservation Entry
+ sre = frappe.new_doc("Stock Reservation Entry")
+ sre.item_code = item.item_code
+ sre.warehouse = item.warehouse
+ sre.voucher_type = self.doctype
+ sre.voucher_no = self.name
+ sre.voucher_detail_no = item.name
+ sre.available_qty = available_qty_to_reserve
+ sre.voucher_qty = item.stock_qty
+ sre.reserved_qty = qty_to_be_reserved
+ sre.company = self.company
+ sre.stock_uom = item.stock_uom
+ sre.project = self.project
+ sre.save()
+ sre.submit()
+
+ sre_count += 1
+
+ if sre_count and notify:
+ frappe.msgprint(_("Stock Reservation Entries Created"), alert=True, indicator="green")
+
+
+def get_unreserved_qty(item: object, reserved_qty_details: dict) -> float:
+ """Returns the unreserved quantity for the Sales Order Item."""
+
+ existing_reserved_qty = reserved_qty_details.get(item.name, 0)
+ return (
+ item.stock_qty
+ - flt(item.delivered_qty) * item.get("conversion_factor", 1)
+ - existing_reserved_qty
+ )
+
def get_list_context(context=None):
from erpnext.controllers.website_list_for_contact import get_list_context
@@ -547,7 +733,7 @@
# qty is for packed items, because packed items don't have stock_qty field
qty = source.get("qty")
target.project = source_parent.project
- target.qty = qty - requested_item_qty.get(source.name, 0)
+ target.qty = qty - requested_item_qty.get(source.name, 0) - source.delivered_qty
target.stock_qty = flt(target.qty) * flt(target.conversion_factor)
args = target.as_dict().copy()
@@ -581,7 +767,7 @@
"doctype": "Material Request Item",
"field_map": {"name": "sales_order_item", "parent": "sales_order"},
"condition": lambda doc: not frappe.db.exists("Product Bundle", doc.item_code)
- and doc.stock_qty > requested_item_qty.get(doc.name, 0),
+ and (doc.stock_qty - doc.delivered_qty) > requested_item_qty.get(doc.name, 0),
"postprocess": update_item,
},
},
@@ -620,6 +806,8 @@
@frappe.whitelist()
def make_delivery_note(source_name, target_doc=None, skip_item_mapping=False):
+ from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
+
def set_missing_values(source, target):
target.run_method("set_missing_values")
target.run_method("set_po_nos")
@@ -634,6 +822,8 @@
if target.company_address:
target.update(get_fetch_values("Delivery Note", "company_address", target.company_address))
+ make_packing_list(target)
+
def update_item(source, target, source_parent):
target.base_amount = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.base_rate)
target.amount = (flt(source.qty) - flt(source.delivered_qty)) * flt(source.rate)
@@ -676,7 +866,6 @@
}
target_doc = get_mapped_doc("Sales Order", source_name, mapper, target_doc, set_missing_values)
-
target_doc.set_onload("ignore_price_list", True)
return target_doc
@@ -1340,8 +1529,9 @@
.select(Sum(wo.qty))
.where(
(wo.production_item == i.item_code)
- & (wo.sales_order == so.name) * (wo.sales_order_item == i.name)
- & (wo.docstatus.lte(2))
+ & (wo.sales_order == so.name)
+ & (wo.sales_order_item == i.name)
+ & (wo.docstatus.lt(2))
)
.run()[0][0]
)
diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
index cbc40bb..c840097 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
+++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
@@ -11,6 +11,7 @@
"Payment Request": "reference_name",
"Auto Repeat": "reference_document",
"Maintenance Visit": "prevdoc_docname",
+ "Stock Reservation Entry": "voucher_no",
},
"internal_links": {
"Quotation": ["items", "prevdoc_docname"],
@@ -23,7 +24,7 @@
{"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]},
{"label": _("Projects"), "items": ["Project"]},
{"label": _("Manufacturing"), "items": ["Work Order"]},
- {"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]},
+ {"label": _("Reference"), "items": ["Quotation", "Auto Repeat", "Stock Reservation Entry"]},
{"label": _("Payment"), "items": ["Payment Entry", "Payment Request", "Journal Entry"]},
],
}
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 4691190..64c58ef 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -57,7 +57,7 @@
});
listview.page.add_action_item(__("Advance Payment"), ()=>{
- erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Advance Payment");
+ erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Payment Entry");
});
}
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 627914f..45100d7 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -43,11 +43,8 @@
@classmethod
def tearDownClass(cls) -> None:
# reset config to previous state
- frappe.db.set_value(
- "Accounts Settings",
- "Accounts Settings",
- "unlink_advance_payment_on_cancelation_of_order",
- cls.unlink_setting,
+ frappe.db.set_single_value(
+ "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", cls.unlink_setting
)
super().tearDownClass()
@@ -705,7 +702,7 @@
self.assertEqual(so.taxes[0].total, 110)
old_stock_settings_value = frappe.db.get_single_value("Stock Settings", "default_warehouse")
- frappe.db.set_value("Stock Settings", None, "default_warehouse", "_Test Warehouse - _TC")
+ frappe.db.set_single_value("Stock Settings", "default_warehouse", "_Test Warehouse - _TC")
items = json.dumps(
[
@@ -741,7 +738,7 @@
so.delete()
new_item_with_tax.delete()
frappe.get_doc("Item Tax Template", "Test Update Items Template - _TC").delete()
- frappe.db.set_value("Stock Settings", None, "default_warehouse", old_stock_settings_value)
+ frappe.db.set_single_value("Stock Settings", "default_warehouse", old_stock_settings_value)
def test_warehouse_user(self):
test_user = create_user("test_so_warehouse_user@example.com", "Sales User", "Stock User")
@@ -820,7 +817,7 @@
def test_auto_insert_price(self):
make_item("_Test Item for Auto Price List", {"is_stock_item": 0})
make_item("_Test Item for Auto Price List with Discount Percentage", {"is_stock_item": 0})
- frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
+ frappe.db.set_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing", 1)
item_price = frappe.db.get_value(
"Item Price", {"price_list": "_Test Price List", "item_code": "_Test Item for Auto Price List"}
@@ -861,7 +858,7 @@
)
# do not update price list
- frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 0)
+ frappe.db.set_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing", 0)
item_price = frappe.db.get_value(
"Item Price", {"price_list": "_Test Price List", "item_code": "_Test Item for Auto Price List"}
@@ -882,7 +879,7 @@
None,
)
- frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
+ frappe.db.set_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing", 1)
def test_drop_shipping(self):
from erpnext.buying.doctype.purchase_order.purchase_order import update_status
@@ -1254,117 +1251,11 @@
)
self.assertEqual(wo_qty[0][0], so_item_name.get(item))
- def test_serial_no_based_delivery(self):
- frappe.set_value("Stock Settings", None, "automatically_set_serial_nos_based_on_fifo", 1)
- item = make_item(
- "_Reserved_Serialized_Item",
- {
- "is_stock_item": 1,
- "maintain_stock": 1,
- "has_serial_no": 1,
- "serial_no_series": "SI.####",
- "valuation_rate": 500,
- "item_defaults": [{"default_warehouse": "_Test Warehouse - _TC", "company": "_Test Company"}],
- },
- )
- frappe.db.sql("""delete from `tabSerial No` where item_code=%s""", (item.item_code))
- make_item(
- "_Test Item A",
- {
- "maintain_stock": 1,
- "valuation_rate": 100,
- "item_defaults": [{"default_warehouse": "_Test Warehouse - _TC", "company": "_Test Company"}],
- },
- )
- make_item(
- "_Test Item B",
- {
- "maintain_stock": 1,
- "valuation_rate": 200,
- "item_defaults": [{"default_warehouse": "_Test Warehouse - _TC", "company": "_Test Company"}],
- },
- )
- from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
-
- make_bom(item=item.item_code, rate=1000, raw_materials=["_Test Item A", "_Test Item B"])
-
- so = make_sales_order(
- **{
- "item_list": [
- {
- "item_code": item.item_code,
- "ensure_delivery_based_on_produced_serial_no": 1,
- "qty": 1,
- "rate": 1000,
- }
- ]
- }
- )
- so.submit()
- from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
-
- work_order = make_wo_order_test_record(item=item.item_code, qty=1, do_not_save=True)
- work_order.fg_warehouse = "_Test Warehouse - _TC"
- work_order.sales_order = so.name
- work_order.submit()
- make_stock_entry(item_code=item.item_code, target="_Test Warehouse - _TC", qty=1)
- item_serial_no = frappe.get_doc("Serial No", {"item_code": item.item_code})
- from erpnext.manufacturing.doctype.work_order.work_order import (
- make_stock_entry as make_production_stock_entry,
- )
-
- se = frappe.get_doc(make_production_stock_entry(work_order.name, "Manufacture", 1))
- se.submit()
- reserved_serial_no = se.get("items")[2].serial_no
- serial_no_so = frappe.get_value("Serial No", reserved_serial_no, "sales_order")
- self.assertEqual(serial_no_so, so.name)
- dn = make_delivery_note(so.name)
- dn.save()
- self.assertEqual(reserved_serial_no, dn.get("items")[0].serial_no)
- item_line = dn.get("items")[0]
- item_line.serial_no = item_serial_no.name
- item_line = dn.get("items")[0]
- item_line.serial_no = reserved_serial_no
- dn.submit()
- dn.load_from_db()
- dn.cancel()
- si = make_sales_invoice(so.name)
- si.update_stock = 1
- si.save()
- self.assertEqual(si.get("items")[0].serial_no, reserved_serial_no)
- item_line = si.get("items")[0]
- item_line.serial_no = item_serial_no.name
- self.assertRaises(frappe.ValidationError, dn.submit)
- item_line = si.get("items")[0]
- item_line.serial_no = reserved_serial_no
- self.assertTrue(si.submit)
- si.submit()
- si.load_from_db()
- si.cancel()
- si = make_sales_invoice(so.name)
- si.update_stock = 0
- si.submit()
- from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
- make_delivery_note as make_delivery_note_from_invoice,
- )
-
- dn = make_delivery_note_from_invoice(si.name)
- dn.save()
- dn.submit()
- self.assertEqual(dn.get("items")[0].serial_no, reserved_serial_no)
- dn.load_from_db()
- dn.cancel()
- si.load_from_db()
- si.cancel()
- se.load_from_db()
- se.cancel()
- self.assertFalse(frappe.db.exists("Serial No", {"sales_order": so.name}))
-
def test_advance_payment_entry_unlink_against_sales_order(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
+ frappe.db.set_single_value(
+ "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
)
so = make_sales_order()
@@ -1418,8 +1309,8 @@
so = make_sales_order()
# disable unlinking of payment entry
- frappe.db.set_value(
- "Accounts Settings", "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
+ frappe.db.set_single_value(
+ "Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
)
# create a payment entry against sales order
@@ -1878,6 +1769,248 @@
self.assertEqual(pe.references[1].reference_name, so.name)
self.assertEqual(pe.references[1].allocated_amount, 300)
+ @change_settings(
+ "Stock Settings",
+ {
+ "enable_stock_reservation": 1,
+ "auto_create_serial_and_batch_bundle_for_outward": 1,
+ "pick_serial_and_batch_based_on": "FIFO",
+ },
+ )
+ def test_stock_reservation_against_sales_order(self) -> None:
+ from random import randint, uniform
+
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ cancel_stock_reservation_entries,
+ get_sre_reserved_qty_details_for_voucher,
+ get_stock_reservation_entries_for_voucher,
+ has_reserved_stock,
+ )
+ from erpnext.stock.doctype.stock_reservation_entry.test_stock_reservation_entry import (
+ create_items,
+ create_material_receipt,
+ )
+
+ items_details, warehouse = create_items(), "_Test Warehouse - _TC"
+ se = create_material_receipt(items_details, warehouse, qty=10)
+
+ item_list = []
+ for item_code, properties in items_details.items():
+ stock_uom = properties.stock_uom
+ item_list.append(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "qty": flt(uniform(11, 100), 0 if stock_uom == "Nos" else 3),
+ "uom": stock_uom,
+ "rate": randint(10, 200),
+ }
+ )
+
+ so = make_sales_order(
+ item_list=item_list,
+ warehouse="_Test Warehouse - _TC",
+ )
+
+ # Test - 1: Stock should not be reserved if the Available Qty to Reserve is less than the Ordered Qty and Partial Reservation is disabled in Stock Settings.
+ with change_settings("Stock Settings", {"allow_partial_reservation": 0}):
+ so.create_stock_reservation_entries()
+ self.assertFalse(has_reserved_stock("Sales Order", so.name))
+
+ # Test - 2: Stock should be Partially Reserved if the Partial Reservation is enabled in Stock Settings.
+ with change_settings("Stock Settings", {"allow_partial_reservation": 1}):
+ so.create_stock_reservation_entries()
+ so.load_from_db()
+ self.assertTrue(has_reserved_stock("Sales Order", so.name))
+
+ for item in so.items:
+ sre_details = get_stock_reservation_entries_for_voucher(
+ "Sales Order", so.name, item.name, fields=["reserved_qty", "status"]
+ )
+ self.assertEqual(item.stock_reserved_qty, sre_details[0].reserved_qty)
+ self.assertEqual(sre_details[0].status, "Partially Reserved")
+
+ se.cancel()
+
+ # Test - 3: Stock should be fully Reserved if the Available Qty to Reserve is greater than the Un-reserved Qty.
+ create_material_receipt(items_details, warehouse, qty=110)
+ so.create_stock_reservation_entries()
+ so.load_from_db()
+
+ reserved_qty_details = get_sre_reserved_qty_details_for_voucher("Sales Order", so.name)
+ for item in so.items:
+ reserved_qty = reserved_qty_details[item.name]
+ self.assertEqual(item.stock_reserved_qty, reserved_qty)
+ self.assertEqual(item.stock_qty, item.stock_reserved_qty)
+
+ # Test - 4: Stock should get unreserved on cancellation of Stock Reservation Entries.
+ cancel_stock_reservation_entries("Sales Order", so.name)
+ so.load_from_db()
+ self.assertFalse(has_reserved_stock("Sales Order", so.name))
+
+ for item in so.items:
+ self.assertEqual(item.stock_reserved_qty, 0)
+
+ # Test - 5: Re-reserve the stock.
+ so.create_stock_reservation_entries()
+ self.assertTrue(has_reserved_stock("Sales Order", so.name))
+
+ # Test - 6: Stock should get unreserved on cancellation of Sales Order.
+ so.cancel()
+ so.load_from_db()
+ self.assertFalse(has_reserved_stock("Sales Order", so.name))
+
+ for item in so.items:
+ self.assertEqual(item.stock_reserved_qty, 0)
+
+ # Create Sales Order and Reserve Stock.
+ so = make_sales_order(
+ item_list=item_list,
+ warehouse="_Test Warehouse - _TC",
+ )
+ so.create_stock_reservation_entries()
+
+ # Test - 7: Partial Delivery against Sales Order.
+ dn1 = make_delivery_note(so.name)
+
+ for item in dn1.items:
+ item.qty = flt(uniform(1, 10), 0 if item.stock_uom == "Nos" else 3)
+
+ dn1.save()
+ dn1.submit()
+
+ for item in so.items:
+ sre_details = get_stock_reservation_entries_for_voucher(
+ "Sales Order", so.name, item.name, fields=["delivered_qty", "status"]
+ )
+ self.assertGreater(sre_details[0].delivered_qty, 0)
+ self.assertEqual(sre_details[0].status, "Partially Delivered")
+
+ # Test - 8: Over Delivery against Sales Order, SRE Delivered Qty should not be greater than the SRE Reserved Qty.
+ with change_settings("Stock Settings", {"over_delivery_receipt_allowance": 100}):
+ dn2 = make_delivery_note(so.name)
+
+ for item in dn2.items:
+ item.qty += flt(uniform(1, 10), 0 if item.stock_uom == "Nos" else 3)
+
+ dn2.save()
+ dn2.submit()
+
+ for item in so.items:
+ sre_details = frappe.db.get_all(
+ "Stock Reservation Entry",
+ filters={
+ "voucher_type": "Sales Order",
+ "voucher_no": so.name,
+ "voucher_detail_no": item.name,
+ },
+ fields=["status", "reserved_qty", "delivered_qty"],
+ )
+
+ for sre_detail in sre_details:
+ self.assertEqual(sre_detail.reserved_qty, sre_detail.delivered_qty)
+ self.assertEqual(sre_detail.status, "Delivered")
+
+ def test_delivered_item_material_request(self):
+ "SO -> MR (Manufacture) -> WO. Test if WO Qty is updated in SO."
+ from erpnext.manufacturing.doctype.work_order.work_order import (
+ make_stock_entry as make_se_from_wo,
+ )
+ from erpnext.stock.doctype.material_request.material_request import raise_work_orders
+
+ so = make_sales_order(
+ item_list=[
+ {"item_code": "_Test FG Item", "qty": 10, "rate": 100, "warehouse": "Work In Progress - _TC"}
+ ]
+ )
+
+ make_stock_entry(
+ item_code="_Test FG Item", target="Work In Progress - _TC", qty=4, basic_rate=100
+ )
+
+ dn = make_delivery_note(so.name)
+ dn.items[0].qty = 4
+ dn.submit()
+
+ so.load_from_db()
+ self.assertEqual(so.items[0].delivered_qty, 4)
+
+ mr = make_material_request(so.name)
+ mr.material_request_type = "Purchase"
+ mr.schedule_date = today()
+ mr.save()
+
+ self.assertEqual(mr.items[0].qty, 6)
+
+ def test_packed_items_for_partial_sales_order(self):
+ # test Update Items with product bundle
+ for product_bundle in [
+ "_Test Product Bundle Item Partial 1",
+ "_Test Product Bundle Item Partial 2",
+ ]:
+ if not frappe.db.exists("Item", product_bundle):
+ bundle_item = make_item(product_bundle, {"is_stock_item": 0})
+ bundle_item.append(
+ "item_defaults", {"company": "_Test Company", "default_warehouse": "_Test Warehouse - _TC"}
+ )
+ bundle_item.save(ignore_permissions=True)
+
+ for product_bundle in ["_Packed Item Partial 1", "_Packed Item Partial 2"]:
+ if not frappe.db.exists("Item", product_bundle):
+ make_item(product_bundle, {"is_stock_item": 1, "stock_uom": "Nos"})
+
+ make_stock_entry(item=product_bundle, target="_Test Warehouse - _TC", qty=2, rate=10)
+
+ make_product_bundle("_Test Product Bundle Item Partial 1", ["_Packed Item Partial 1"], 1)
+
+ make_product_bundle("_Test Product Bundle Item Partial 2", ["_Packed Item Partial 2"], 1)
+
+ so = make_sales_order(
+ item_code="_Test Product Bundle Item Partial 1",
+ warehouse="_Test Warehouse - _TC",
+ qty=1,
+ uom="Nos",
+ stock_uom="Nos",
+ conversion_factor=1,
+ transaction_date=nowdate(),
+ delivery_note=nowdate(),
+ do_not_submit=1,
+ )
+
+ so.append(
+ "items",
+ {
+ "item_code": "_Test Product Bundle Item Partial 2",
+ "warehouse": "_Test Warehouse - _TC",
+ "qty": 1,
+ "uom": "Nos",
+ "stock_uom": "Nos",
+ "conversion_factor": 1,
+ "delivery_note": nowdate(),
+ },
+ )
+
+ so.save()
+ so.submit()
+
+ dn = make_delivery_note(so.name)
+ dn.remove(dn.items[1])
+ dn.save()
+ dn.submit()
+
+ self.assertEqual(len(dn.items), 1)
+ self.assertEqual(len(dn.packed_items), 1)
+ self.assertEqual(dn.items[0].item_code, "_Test Product Bundle Item Partial 1")
+
+ so.load_from_db()
+
+ dn = make_delivery_note(so.name)
+ dn.save()
+
+ self.assertEqual(len(dn.items), 1)
+ self.assertEqual(len(dn.packed_items), 1)
+ self.assertEqual(dn.items[0].item_code, "_Test Product Bundle Item Partial 2")
+
def automatically_fetch_payment_terms(enable=1):
accounts_settings = frappe.get_doc("Accounts Settings")
@@ -1944,7 +2077,7 @@
def create_dn_against_so(so, delivered_qty=0):
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
dn = make_delivery_note(so)
dn.get("items")[0].qty = delivered_qty or 5
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index d0dabad..5c7e10a 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -10,6 +10,7 @@
"item_code",
"customer_item_code",
"ensure_delivery_based_on_produced_serial_no",
+ "reserve_stock",
"col_break1",
"delivery_date",
"item_name",
@@ -27,6 +28,7 @@
"uom",
"conversion_factor",
"stock_qty",
+ "stock_reserved_qty",
"section_break_16",
"price_list_rate",
"base_price_list_rate",
@@ -859,12 +861,33 @@
"fieldname": "material_request_item",
"fieldtype": "Data",
"label": "Material Request Item"
+ },
+ {
+ "allow_on_submit": 1,
+ "default": "1",
+ "fieldname": "reserve_stock",
+ "fieldtype": "Check",
+ "label": "Reserve Stock",
+ "print_hide": 1,
+ "report_hide": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "eval: doc.stock_reserved_qty",
+ "fieldname": "stock_reserved_qty",
+ "fieldtype": "Float",
+ "label": "Stock Reserved Qty (in Stock UOM)",
+ "no_copy": 1,
+ "non_negative": 1,
+ "print_hide": 1,
+ "read_only": 1,
+ "report_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-12-25 02:51:10.247569",
+ "modified": "2023-04-04 10:44:05.707488",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/selling/form_tour/quotation/quotation.json b/erpnext/selling/form_tour/quotation/quotation.json
index 2a2aa5e..8c97700 100644
--- a/erpnext/selling/form_tour/quotation/quotation.json
+++ b/erpnext/selling/form_tour/quotation/quotation.json
@@ -2,9 +2,11 @@
"creation": "2021-11-23 12:00:36.138824",
"docstatus": 0,
"doctype": "Form Tour",
+ "first_document": 0,
"idx": 0,
+ "include_name_field": 0,
"is_standard": 1,
- "modified": "2021-11-23 12:02:48.010298",
+ "modified": "2023-05-23 12:51:48.684517",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
@@ -14,51 +16,43 @@
"steps": [
{
"description": "Select a customer or lead for whom this quotation is being prepared. Let's select a Customer.",
- "field": "",
"fieldname": "quotation_to",
"fieldtype": "Link",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Quotation To",
- "parent_field": "",
"position": "Right",
"title": "Quotation To"
},
{
"description": "Select a specific Customer to whom this quotation will be sent.",
- "field": "",
"fieldname": "party_name",
"fieldtype": "Dynamic Link",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Party",
- "parent_field": "",
"position": "Right",
"title": "Party"
},
{
"child_doctype": "Quotation Item",
"description": "Select an item for which you will be quoting a price.",
- "field": "",
"fieldname": "items",
"fieldtype": "Table",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Items",
- "parent_field": "",
"parent_fieldname": "items",
"position": "Bottom",
"title": "Items"
},
{
"description": "You can select pre-populated Sales Taxes and Charges from here.",
- "field": "",
"fieldname": "taxes",
"fieldtype": "Table",
"has_next_condition": 0,
"is_table_field": 0,
"label": "Sales Taxes and Charges",
- "parent_field": "",
"position": "Bottom",
"title": "Sales Taxes and Charges"
}
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 62b3105..fd23381 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -65,7 +65,7 @@
"item_code": item_code,
"batch_no": batch_no,
},
- fields=["uom", "stock_uom", "currency", "price_list_rate", "batch_no"],
+ fields=["uom", "currency", "price_list_rate", "batch_no"],
)
def __sort(p):
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 46320e5..016ebf0 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -559,8 +559,10 @@
item_row = this.frm.add_child('items', new_item);
- if (field === 'qty' && value !== 0 && !this.allow_negative_stock)
- await this.check_stock_availability(item_row, value, this.frm.doc.set_warehouse);
+ if (field === 'qty' && value !== 0 && !this.allow_negative_stock) {
+ const qty_needed = value * item_row.conversion_factor;
+ await this.check_stock_availability(item_row, qty_needed, this.frm.doc.set_warehouse);
+ }
await this.trigger_new_item_events(item_row);
diff --git a/erpnext/selling/page/point_of_sale/pos_item_details.js b/erpnext/selling/page/point_of_sale/pos_item_details.js
index f9b5bb2..b6e567c 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_details.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_details.js
@@ -44,7 +44,8 @@
<div class="item-image"></div>
</div>
<div class="discount-section"></div>
- <div class="form-container"></div>`
+ <div class="form-container"></div>
+ <div class="serial-batch-container"></div>`
)
this.$item_name = this.$component.find('.item-name');
@@ -53,6 +54,7 @@
this.$item_image = this.$component.find('.item-image');
this.$form_container = this.$component.find('.form-container');
this.$dicount_section = this.$component.find('.discount-section');
+ this.$serial_batch_container = this.$component.find('.serial-batch-container');
}
compare_with_current_item(item) {
@@ -101,12 +103,9 @@
const serialized = item_row.has_serial_no;
const batched = item_row.has_batch_no;
- const no_serial_selected = !item_row.serial_no;
- const no_batch_selected = !item_row.batch_no;
+ const no_bundle_selected = !item_row.serial_and_batch_bundle;
- if ((serialized && no_serial_selected) || (batched && no_batch_selected) ||
- (serialized && batched && (no_batch_selected || no_serial_selected))) {
-
+ if ((serialized && no_bundle_selected) || (batched && no_bundle_selected)) {
frappe.show_alert({
message: __("Item is removed since no serial / batch no selected."),
indicator: 'orange'
@@ -200,13 +199,8 @@
}
make_auto_serial_selection_btn(item) {
- if (item.has_serial_no) {
- if (!item.has_batch_no) {
- this.$form_container.append(
- `<div class="grid-filler no-select"></div>`
- );
- }
- const label = __('Auto Fetch Serial Numbers');
+ if (item.has_serial_no || item.has_batch_no) {
+ const label = item.has_serial_no ? __('Select Serial No') : __('Select Batch No');
this.$form_container.append(
`<div class="btn btn-sm btn-secondary auto-fetch-btn">${label}</div>`
);
@@ -382,40 +376,19 @@
bind_auto_serial_fetch_event() {
this.$form_container.on('click', '.auto-fetch-btn', () => {
- this.batch_no_control && this.batch_no_control.set_value('');
- let qty = this.qty_control.get_value();
- let conversion_factor = this.conversion_factor_control.get_value();
- let expiry_date = this.item_row.has_batch_no ? this.events.get_frm().doc.posting_date : "";
+ frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", () => {
+ let frm = this.events.get_frm();
+ let item_row = this.item_row;
+ item_row.type_of_transaction = "Outward";
- let numbers = frappe.call({
- method: "erpnext.stock.doctype.serial_no.serial_no.auto_fetch_serial_number",
- args: {
- qty: qty * conversion_factor,
- item_code: this.current_item.item_code,
- warehouse: this.warehouse_control.get_value() || '',
- batch_nos: this.current_item.batch_no || '',
- posting_date: expiry_date,
- for_doctype: 'POS Invoice'
- }
- });
-
- numbers.then((data) => {
- let auto_fetched_serial_numbers = data.message;
- let records_length = auto_fetched_serial_numbers.length;
- if (!records_length) {
- const warehouse = this.warehouse_control.get_value().bold();
- const item_code = this.current_item.item_code.bold();
- frappe.msgprint(
- __('Serial numbers unavailable for Item {0} under warehouse {1}. Please try changing warehouse.', [item_code, warehouse])
- );
- } else if (records_length < qty) {
- frappe.msgprint(
- __('Fetched only {0} available serial numbers.', [records_length])
- );
- this.qty_control.set_value(records_length);
- }
- numbers = auto_fetched_serial_numbers.join(`\n`);
- this.serial_no_control.set_value(numbers);
+ new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
+ if (r) {
+ frappe.model.set_value(item_row.doctype, item_row.name, {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ });
+ }
+ });
});
})
}
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index f1df3a1..87c0fae 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -196,48 +196,6 @@
refresh_field("incentives",row.name,row.parentfield);
}
- warehouse(doc, cdt, cdn) {
- var me = this;
- var item = frappe.get_doc(cdt, cdn);
-
- // check if serial nos entered are as much as qty in row
- if (item.serial_no) {
- let serial_nos = item.serial_no.split(`\n`).filter(sn => sn.trim()); // filter out whitespaces
- if (item.qty === serial_nos.length) return;
- }
-
- if (item.serial_no && !item.batch_no) {
- item.serial_no = null;
- }
-
- var has_batch_no;
- frappe.db.get_value('Item', {'item_code': item.item_code}, 'has_batch_no', (r) => {
- has_batch_no = r && r.has_batch_no;
- if(item.item_code && item.warehouse) {
- return this.frm.call({
- method: "erpnext.stock.get_item_details.get_bin_details_and_serial_nos",
- child: item,
- args: {
- item_code: item.item_code,
- warehouse: item.warehouse,
- has_batch_no: has_batch_no || 0,
- stock_qty: item.stock_qty,
- serial_no: item.serial_no || "",
- },
- callback:function(r){
- if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
- if (doc.doctype === 'Sales Invoice' && (!doc.update_stock)) return;
- if (has_batch_no) {
- me.set_batch_number(cdt, cdn);
- me.batch_no(doc, cdt, cdn);
- }
- }
- }
- });
- }
- })
- }
-
toggle_editable_price_list_rate() {
var df = frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "price_list_rate", this.frm.doc.name);
var editable_price_list_rate = cint(frappe.defaults.get_default("editable_price_list_rate"));
@@ -298,35 +256,6 @@
}
}
- batch_no(doc, cdt, cdn) {
- var me = this;
- var item = frappe.get_doc(cdt, cdn);
-
- if (item.serial_no) {
- return;
- }
-
- item.serial_no = null;
- var has_serial_no;
- frappe.db.get_value('Item', {'item_code': item.item_code}, 'has_serial_no', (r) => {
- has_serial_no = r && r.has_serial_no;
- if(item.warehouse && item.item_code && item.batch_no) {
- return this.frm.call({
- method: "erpnext.stock.get_item_details.get_batch_qty_and_serial_no",
- child: item,
- args: {
- "batch_no": item.batch_no,
- "stock_qty": item.stock_qty || item.qty, //if stock_qty field is not available fetch qty (in case of Packed Items table)
- "warehouse": item.warehouse,
- "item_code": item.item_code,
- "has_serial_no": has_serial_no
- },
- "fieldname": "actual_batch_qty"
- });
- }
- })
- }
-
set_dynamic_labels() {
super.set_dynamic_labels();
this.set_product_bundle_help(this.frm.doc);
@@ -371,56 +300,45 @@
conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate) {
super.conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate);
- if(frappe.meta.get_docfield(cdt, "stock_qty", cdn) &&
- in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
- if (doc.doctype === 'Sales Invoice' && (!doc.update_stock)) return;
- this.set_batch_number(cdt, cdn);
- }
- }
-
- batch_no(doc, cdt, cdn) {
- super.batch_no(doc, cdt, cdn);
}
qty(doc, cdt, cdn) {
super.qty(doc, cdt, cdn);
-
- if(in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
- if (doc.doctype === 'Sales Invoice' && (!doc.update_stock)) return;
- this.set_batch_number(cdt, cdn);
- }
}
- /* Determine appropriate batch number and set it in the form.
- * @param {string} cdt - Document Doctype
- * @param {string} cdn - Document name
- */
- set_batch_number(cdt, cdn) {
- const doc = frappe.get_doc(cdt, cdn);
- if (doc && doc.has_batch_no && doc.warehouse) {
- this._set_batch_number(doc);
- }
- }
+ pick_serial_and_batch(doc, cdt, cdn) {
+ let item = locals[cdt][cdn];
+ let me = this;
+ let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
- _set_batch_number(doc) {
- if (doc.batch_no) {
- return
- }
+ frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
+ .then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ item.has_serial_no = r.message.has_serial_no;
+ item.has_batch_no = r.message.has_batch_no;
+ item.type_of_transaction = item.qty > 0 ? "Outward":"Inward";
- let args = {'item_code': doc.item_code, 'warehouse': doc.warehouse, 'qty': flt(doc.qty) * flt(doc.conversion_factor)};
- if (doc.has_serial_no && doc.serial_no) {
- args['serial_no'] = doc.serial_no
- }
+ item.title = item.has_serial_no ?
+ __("Select Serial No") : __("Select Batch No");
- return frappe.call({
- method: 'erpnext.stock.doctype.batch.batch.get_batch_no',
- args: args,
- callback: function(r) {
- if(r.message) {
- frappe.model.set_value(doc.doctype, doc.name, 'batch_no', r.message);
+ if (item.has_serial_no && item.has_batch_no) {
+ item.title = __("Select Serial and Batch");
+ }
+
+ frappe.require(path, function() {
+ new erpnext.SerialBatchPackageSelector(
+ me.frm, item, (r) => {
+ if (r) {
+ frappe.model.set_value(item.doctype, item.name, {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ });
+ }
+ }
+ );
+ });
}
- }
- });
+ });
}
update_auto_repeat_reference(doc) {
diff --git a/erpnext/selling/workspace/retail/retail.json b/erpnext/selling/workspace/retail/retail.json
deleted file mode 100644
index 5bce3ca..0000000
--- a/erpnext/selling/workspace/retail/retail.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Point Of Sale\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings & Configurations\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Loyalty Program\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Opening & Closing\",\"col\":4}}]",
- "creation": "2020-03-02 17:18:32.505616",
- "docstatus": 0,
- "doctype": "Workspace",
- "for_user": "",
- "hide_custom": 0,
- "icon": "retail",
- "idx": 0,
- "label": "Retail",
- "links": [
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Settings & Configurations",
- "link_count": 2,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Point-of-Sale Profile",
- "link_count": 0,
- "link_to": "POS Profile",
- "link_type": "DocType",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "POS Settings",
- "link_count": 0,
- "link_to": "POS Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loyalty Program",
- "link_count": 2,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loyalty Program",
- "link_count": 0,
- "link_to": "Loyalty Program",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Loyalty Point Entry",
- "link_count": 0,
- "link_to": "Loyalty Point Entry",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Opening & Closing",
- "link_count": 2,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "POS Opening Entry",
- "link_count": 0,
- "link_to": "POS Opening Entry",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "POS Closing Entry",
- "link_count": 0,
- "link_to": "POS Closing Entry",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- }
- ],
- "modified": "2022-01-13 18:07:56.711095",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Retail",
- "owner": "Administrator",
- "parent_page": "",
- "public": 1,
- "restrict_to_domain": "Retail",
- "roles": [],
- "sequence_id": 22.0,
- "shortcuts": [
- {
- "doc_view": "",
- "label": "Point Of Sale",
- "link_to": "point-of-sale",
- "type": "Page"
- }
- ],
- "title": "Retail"
-}
\ No newline at end of file
diff --git a/erpnext/selling/workspace/selling/selling.json b/erpnext/selling/workspace/selling/selling.json
index 45e160d..e13bdec 100644
--- a/erpnext/selling/workspace/selling/selling.json
+++ b/erpnext/selling/workspace/selling/selling.json
@@ -5,14 +5,16 @@
"label": "Sales Order Trends"
}
],
- "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Selling\",\"col\":12}},{\"type\":\"chart\",\"data\":{\"chart_name\":\"Sales Order Trends\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Quick Access</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Order\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Analytics\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Order Analysis\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Selling\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Items and Pricing\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}}]",
+ "content": "[{\"id\":\"ow595dYDrI\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Selling\",\"col\":12}},{\"id\":\"vBSf8Vi9U8\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Sales Order Trends\",\"col\":12}},{\"id\":\"aW2i5R5GRP\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"1it3dCOnm6\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Quick Access</b></span>\",\"col\":12}},{\"id\":\"x7pLl-spS4\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"SSGrXWmY-H\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Order\",\"col\":3}},{\"id\":\"-5J_yLxDaS\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Analytics\",\"col\":3}},{\"id\":\"6YEYpnIBKV\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Point of Sale\",\"col\":3}},{\"id\":\"c_GjZuZ2oN\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"mX-9DJSyT2\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Sales Management\",\"col\":3}},{\"id\":\"oNjjNbnUHp\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"0BcePLg0g1\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"uze5dJ1ipL\",\"type\":\"card\",\"data\":{\"card_name\":\"Selling\",\"col\":4}},{\"id\":\"3j2fYwMAkq\",\"type\":\"card\",\"data\":{\"card_name\":\"Point of Sale\",\"col\":4}},{\"id\":\"xImm8NepFt\",\"type\":\"card\",\"data\":{\"card_name\":\"Items and Pricing\",\"col\":4}},{\"id\":\"6MjIe7KCQo\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"id\":\"lBu2EKgmJF\",\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"id\":\"1ARHrjg4kI\",\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}}]",
"creation": "2020-01-28 11:49:12.092882",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "sell",
"idx": 0,
+ "is_hidden": 0,
"label": "Selling",
"links": [
{
@@ -317,140 +319,68 @@
{
"hidden": 0,
"is_query_report": 0,
- "label": "Other Reports",
- "link_count": 12,
+ "label": "Point of Sale",
+ "link_count": 6,
"onboard": 0,
"type": "Card Break"
},
{
- "dependencies": "Lead",
"hidden": 0,
- "is_query_report": 1,
- "label": "Lead Details",
+ "is_query_report": 0,
+ "label": "Point-of-Sale Profile",
"link_count": 0,
- "link_to": "Lead Details",
- "link_type": "Report",
+ "link_to": "POS Profile",
+ "link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
- "dependencies": "Address",
"hidden": 0,
- "is_query_report": 1,
- "label": "Customer Addresses And Contacts",
+ "is_query_report": 0,
+ "label": "POS Settings",
"link_count": 0,
- "link_to": "Address And Contacts",
- "link_type": "Report",
+ "link_to": "POS Settings",
+ "link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
- "dependencies": "Item",
"hidden": 0,
- "is_query_report": 1,
- "label": "Available Stock for Packing Items",
+ "is_query_report": 0,
+ "label": "POS Opening Entry",
"link_count": 0,
- "link_to": "Available Stock for Packing Items",
- "link_type": "Report",
+ "link_to": "POS Opening Entry",
+ "link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
- "dependencies": "Sales Order",
"hidden": 0,
- "is_query_report": 1,
- "label": "Pending SO Items For Purchase Request",
+ "is_query_report": 0,
+ "label": "POS Closing Entry",
"link_count": 0,
- "link_to": "Pending SO Items For Purchase Request",
- "link_type": "Report",
+ "link_to": "POS Closing Entry",
+ "link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
- "dependencies": "Delivery Note",
"hidden": 0,
- "is_query_report": 1,
- "label": "Delivery Note Trends",
+ "is_query_report": 0,
+ "label": "Loyalty Program",
"link_count": 0,
- "link_to": "Delivery Note Trends",
- "link_type": "Report",
+ "link_to": "Loyalty Program",
+ "link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
- "dependencies": "Sales Invoice",
"hidden": 0,
- "is_query_report": 1,
- "label": "Sales Invoice Trends",
+ "is_query_report": 0,
+ "label": "Loyalty Point Entry",
"link_count": 0,
- "link_to": "Sales Invoice Trends",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Customer",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Customer Credit Balance",
- "link_count": 0,
- "link_to": "Customer Credit Balance",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Customer",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Customers Without Any Sales Transactions",
- "link_count": 0,
- "link_to": "Customers Without Any Sales Transactions",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Customer",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Sales Partners Commission",
- "link_count": 0,
- "link_to": "Sales Partners Commission",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Sales Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Territory Target Variance Based On Item Group",
- "link_count": 0,
- "link_to": "Territory Target Variance Based On Item Group",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Sales Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Sales Person Target Variance Based On Item Group",
- "link_count": 0,
- "link_to": "Sales Person Target Variance Based On Item Group",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Sales Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Sales Partner Target Variance Based On Item Group",
- "link_count": 0,
- "link_to": "Sales Partner Target Variance based on Item Group",
- "link_type": "Report",
+ "link_to": "Loyalty Point Entry",
+ "link_type": "DocType",
"onboard": 0,
"type": "Link"
},
@@ -458,7 +388,7 @@
"hidden": 0,
"is_query_report": 0,
"label": "Key Reports",
- "link_count": 22,
+ "link_count": 9,
"onboard": 0,
"type": "Card Break"
},
@@ -562,15 +492,12 @@
"type": "Link"
},
{
- "dependencies": "Lead",
"hidden": 0,
- "is_query_report": 1,
- "label": "Lead Details",
- "link_count": 0,
- "link_to": "Lead Details",
- "link_type": "Report",
+ "is_query_report": 0,
+ "label": "Other Reports",
+ "link_count": 11,
"onboard": 0,
- "type": "Link"
+ "type": "Card Break"
},
{
"dependencies": "Address",
@@ -692,31 +619,35 @@
"link_type": "Report",
"onboard": 0,
"type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 1,
- "label": "Payment Terms Status for Sales Order",
- "link_count": 0,
- "link_to": "Payment Terms Status for Sales Order",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
}
],
- "modified": "2022-04-26 13:29:55.087240",
+ "modified": "2023-07-04 14:35:58.204465",
"modified_by": "Administrator",
"module": "Selling",
"name": "Selling",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
+ "quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 23.0,
+ "sequence_id": 6.0,
"shortcuts": [
{
"color": "Grey",
+ "doc_view": "List",
+ "label": "Learn Sales Management",
+ "type": "URL",
+ "url": "https://frappe.school/courses/sales-management-course?utm_source=in_app"
+ },
+ {
+ "label": "Point of Sale",
+ "link_to": "point-of-sale",
+ "type": "Page"
+ },
+ {
+ "color": "Grey",
"format": "{} Available",
"label": "Item",
"link_to": "Item",
@@ -740,11 +671,6 @@
"type": "Report"
},
{
- "label": "Sales Order Analysis",
- "link_to": "Sales Order Analysis",
- "type": "Report"
- },
- {
"label": "Dashboard",
"link_to": "Selling",
"type": "Dashboard"
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index e50ce44..f4682c1 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -81,8 +81,6 @@
disbale_coa_fields(frm);
frappe.contacts.render_address_and_contact(frm);
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Company'}
-
if (frappe.perm.has_perm("Cost Center", 0, 'read')) {
frm.add_custom_button(__('Cost Centers'), function() {
frappe.set_route('Tree', 'Cost Center', {'company': frm.doc.name});
@@ -226,7 +224,9 @@
["capital_work_in_progress_account", {"account_type": "Capital Work in Progress"}],
["asset_received_but_not_billed", {"account_type": "Asset Received But Not Billed"}],
["unrealized_profit_loss_account", {"root_type": ["in", ["Liability", "Asset"]]}],
- ["default_provisional_account", {"root_type": ["in", ["Liability", "Asset"]]}]
+ ["default_provisional_account", {"root_type": ["in", ["Liability", "Asset"]]}],
+ ["default_advance_received_account", {"root_type": "Liability", "account_type": "Receivable"}],
+ ["default_advance_paid_account", {"root_type": "Asset", "account_type": "Payable"}],
], function(i, v) {
erpnext.company.set_custom_query(frm, v);
});
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index f087d99..ed2852e 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -70,6 +70,11 @@
"payment_terms",
"cost_center",
"default_finance_book",
+ "advance_payments_section",
+ "book_advance_payments_in_separate_party_account",
+ "column_break_fwcf",
+ "default_advance_received_account",
+ "default_advance_paid_account",
"auto_accounting_for_stock_settings",
"enable_perpetual_inventory",
"enable_provisional_accounting_for_non_stock_items",
@@ -90,6 +95,10 @@
"depreciation_cost_center",
"capital_work_in_progress_account",
"asset_received_but_not_billed",
+ "exchange_rate_revaluation_settings_section",
+ "auto_exchange_rate_revaluation",
+ "auto_err_frequency",
+ "submit_err_jv",
"budget_detail",
"exception_budget_approver_role",
"registration_info",
@@ -694,6 +703,61 @@
"label": "Default Provisional Account",
"no_copy": 1,
"options": "Account"
+ },
+ {
+ "fieldname": "advance_payments_section",
+ "fieldtype": "Section Break",
+ "label": "Advance Payments"
+ },
+ {
+ "depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
+ "fieldname": "default_advance_received_account",
+ "fieldtype": "Link",
+ "label": "Default Advance Received Account",
+ "mandatory_depends_on": "book_advance_payments_as_liability",
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
+ "fieldname": "default_advance_paid_account",
+ "fieldtype": "Link",
+ "label": "Default Advance Paid Account",
+ "mandatory_depends_on": "book_advance_payments_as_liability",
+ "options": "Account"
+ },
+ {
+ "fieldname": "column_break_fwcf",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "description": "Enabling this option will allow you to record - <br><br> 1. Advances Received in a <b>Liability Account</b> instead of the <b>Asset Account</b><br><br>2. Advances Paid in an <b>Asset Account</b> instead of the <b> Liability Account</b>",
+ "fieldname": "book_advance_payments_in_separate_party_account",
+ "fieldtype": "Check",
+ "label": "Book Advance Payments in Separate Party Account"
+ },
+ {
+ "fieldname": "exchange_rate_revaluation_settings_section",
+ "fieldtype": "Section Break",
+ "label": "Exchange Rate Revaluation Settings"
+ },
+ {
+ "default": "0",
+ "fieldname": "auto_exchange_rate_revaluation",
+ "fieldtype": "Check",
+ "label": "Auto Create Exchange Rate Revaluation"
+ },
+ {
+ "fieldname": "auto_err_frequency",
+ "fieldtype": "Select",
+ "label": "Frequency",
+ "options": "Daily\nWeekly"
+ },
+ {
+ "default": "0",
+ "fieldname": "submit_err_jv",
+ "fieldtype": "Check",
+ "label": "Submit ERR Journals?"
}
],
"icon": "fa fa-building",
@@ -701,7 +765,7 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
- "modified": "2022-08-16 16:09:02.327724",
+ "modified": "2023-07-07 05:41:41.537256",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
diff --git a/erpnext/setup/doctype/company/test_records.json b/erpnext/setup/doctype/company/test_records.json
index 19b6ef2..e21bd2a 100644
--- a/erpnext/setup/doctype/company/test_records.json
+++ b/erpnext/setup/doctype/company/test_records.json
@@ -80,5 +80,30 @@
"chart_of_accounts": "Standard",
"enable_perpetual_inventory": 1,
"default_holiday_list": "_Test Holiday List"
+ },
+ {
+ "abbr": "_TC6",
+ "company_name": "_Test Company 6",
+ "is_group": 1,
+ "country": "India",
+ "default_currency": "INR",
+ "doctype": "Company",
+ "domain": "Manufacturing",
+ "chart_of_accounts": "Standard",
+ "default_holiday_list": "_Test Holiday List",
+ "enable_perpetual_inventory": 0
+ },
+ {
+ "abbr": "_TC7",
+ "company_name": "_Test Company 7",
+ "parent_company": "_Test Company 6",
+ "is_group": 1,
+ "country": "United States",
+ "default_currency": "USD",
+ "doctype": "Company",
+ "domain": "Manufacturing",
+ "chart_of_accounts": "Standard",
+ "default_holiday_list": "_Test Holiday List",
+ "enable_perpetual_inventory": 0
}
]
diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
index e3d281a..3b48c2b 100644
--- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@@ -87,13 +87,13 @@
cache.delete(key)
def tearDown(self):
- frappe.db.set_value("Accounts Settings", None, "allow_stale", 1)
+ frappe.db.set_single_value("Accounts Settings", "allow_stale", 1)
self.clear_cache()
def test_exchange_rate(self, mock_get):
save_new_records(test_records)
- frappe.db.set_value("Accounts Settings", None, "allow_stale", 1)
+ frappe.db.set_single_value("Accounts Settings", "allow_stale", 1)
# Start with allow_stale is True
exchange_rate = get_exchange_rate("USD", "INR", "2016-01-01", "for_buying")
@@ -124,7 +124,7 @@
settings.save()
# Update exchange
- frappe.db.set_value("Accounts Settings", None, "allow_stale", 1)
+ frappe.db.set_single_value("Accounts Settings", "allow_stale", 1)
# Start with allow_stale is True
exchange_rate = get_exchange_rate("USD", "INR", "2016-01-01", "for_buying")
@@ -152,8 +152,8 @@
def test_exchange_rate_strict(self, mock_get):
# strict currency settings
- frappe.db.set_value("Accounts Settings", None, "allow_stale", 0)
- frappe.db.set_value("Accounts Settings", None, "stale_days", 1)
+ frappe.db.set_single_value("Accounts Settings", "allow_stale", 0)
+ frappe.db.set_single_value("Accounts Settings", "stale_days", 1)
exchange_rate = get_exchange_rate("USD", "INR", "2016-01-01", "for_buying")
self.assertEqual(exchange_rate, 60.0)
@@ -175,8 +175,8 @@
exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15", "for_buying")
self.assertEqual(exchange_rate, 65.1)
- frappe.db.set_value("Accounts Settings", None, "allow_stale", 0)
- frappe.db.set_value("Accounts Settings", None, "stale_days", 1)
+ frappe.db.set_single_value("Accounts Settings", "allow_stale", 0)
+ frappe.db.set_single_value("Accounts Settings", "stale_days", 1)
self.clear_cache()
exchange_rate = get_exchange_rate("USD", "INR", "2016-01-30", "for_buying")
diff --git a/erpnext/setup/doctype/customer_group/customer_group.js b/erpnext/setup/doctype/customer_group/customer_group.js
index 44a5019..49a90f9 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.js
+++ b/erpnext/setup/doctype/customer_group/customer_group.js
@@ -16,23 +16,36 @@
}
}
-//get query select Customer Group
-cur_frm.fields_dict['parent_customer_group'].get_query = function(doc,cdt,cdn) {
- return {
- filters: {
- 'is_group': 1,
- 'name': ['!=', cur_frm.doc.customer_group_name]
- }
- }
-}
+frappe.ui.form.on("Customer Group", {
+ setup: function(frm){
+ frm.set_query('parent_customer_group', function (doc) {
+ return {
+ filters: {
+ 'is_group': 1,
+ 'name': ['!=', cur_frm.doc.customer_group_name]
+ }
+ }
+ });
-cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
- return {
- filters: {
- 'account_type': 'Receivable',
- 'company': d.company,
- "is_group": 0
- }
+ frm.set_query('account', 'accounts', function (doc, cdt, cdn) {
+ return {
+ filters: {
+ "account_type": 'Receivable',
+ "company": locals[cdt][cdn].company,
+ "is_group": 0
+ }
+ }
+ });
+
+ frm.set_query('advance_account', 'accounts', function (doc, cdt, cdn) {
+ return {
+ filters: {
+ "root_type": 'Liability',
+ "account_type": "Receivable",
+ "company": locals[cdt][cdn].company,
+ "is_group": 0
+ }
+ }
+ });
}
-}
+});
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index d6a431e..4c36bc7 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -113,7 +113,7 @@
{
"fieldname": "default_receivable_account",
"fieldtype": "Section Break",
- "label": "Default Receivable Account"
+ "label": "Default Accounts"
},
{
"depends_on": "eval:!doc.__islocal",
@@ -139,7 +139,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2022-12-24 11:15:17.142746",
+ "modified": "2023-06-02 13:40:34.435822",
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",
@@ -171,7 +171,6 @@
"read": 1,
"report": 1,
"role": "Sales Master Manager",
- "set_user_permissions": 1,
"share": 1,
"write": 1
},
diff --git a/erpnext/setup/doctype/employee/employee.json b/erpnext/setup/doctype/employee/employee.json
index 99693d9..6cb4292 100644
--- a/erpnext/setup/doctype/employee/employee.json
+++ b/erpnext/setup/doctype/employee/employee.json
@@ -78,7 +78,9 @@
"salary_mode",
"bank_details_section",
"bank_name",
+ "column_break_heye",
"bank_ac_no",
+ "iban",
"personal_details",
"marital_status",
"family_background",
@@ -804,17 +806,26 @@
{
"fieldname": "column_break_104",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_heye",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:doc.salary_mode == 'Bank'",
+ "fieldname": "iban",
+ "fieldtype": "Data",
+ "label": "IBAN"
}
],
"icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"links": [],
- "modified": "2022-09-13 10:27:14.579197",
+ "modified": "2023-03-30 15:57:05.174592",
"modified_by": "Administrator",
"module": "Setup",
"name": "Employee",
- "name_case": "Title Case",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py
index ece5a7d..566392c 100755
--- a/erpnext/setup/doctype/employee/employee.py
+++ b/erpnext/setup/doctype/employee/employee.py
@@ -257,7 +257,9 @@
def get_holiday_list_for_employee(employee, raise_exception=True):
if employee:
- holiday_list, company = frappe.db.get_value("Employee", employee, ["holiday_list", "company"])
+ holiday_list, company = frappe.get_cached_value(
+ "Employee", employee, ["holiday_list", "company"]
+ )
else:
holiday_list = ""
company = frappe.db.get_single_value("Global Defaults", "default_company")
diff --git a/erpnext/setup/doctype/holiday_list/holiday_list.py b/erpnext/setup/doctype/holiday_list/holiday_list.py
index fad827a..84d0d35 100644
--- a/erpnext/setup/doctype/holiday_list/holiday_list.py
+++ b/erpnext/setup/doctype/holiday_list/holiday_list.py
@@ -115,6 +115,8 @@
if date is None:
date = today()
if holiday_list:
- return bool(frappe.get_all("Holiday List", dict(name=holiday_list, holiday_date=date)))
+ return bool(
+ frappe.db.exists("Holiday", {"parent": holiday_list, "holiday_date": date}, cache=True)
+ )
else:
return False
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 5656d43..f9e3770 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -3,8 +3,6 @@
frappe.ui.form.on('Sales Partner', {
refresh: function(frm) {
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Sales Partner'}
-
if(frm.doc.__islocal){
hide_field(['address_html', 'contact_html', 'address_contacts']);
frappe.contacts.clear_address_and_contact(frm);
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.js b/erpnext/setup/doctype/supplier_group/supplier_group.js
index e75030d..b2acfd7 100644
--- a/erpnext/setup/doctype/supplier_group/supplier_group.js
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.js
@@ -16,23 +16,36 @@
}
};
-// get query select Customer Group
-cur_frm.fields_dict['parent_supplier_group'].get_query = function() {
- return {
- filters: {
- 'is_group': 1,
- 'name': ['!=', cur_frm.doc.supplier_group_name]
- }
- };
-};
+frappe.ui.form.on("Supplier Group", {
+ setup: function(frm){
+ frm.set_query('parent_supplier_group', function (doc) {
+ return {
+ filters: {
+ 'is_group': 1,
+ 'name': ['!=', cur_frm.doc.supplier_group_name]
+ }
+ }
+ });
-cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
- return {
- filters: {
- 'account_type': 'Payable',
- 'company': d.company,
- "is_group": 0
- }
- };
-};
+ frm.set_query('account', 'accounts', function (doc, cdt, cdn) {
+ return {
+ filters: {
+ 'account_type': 'Payable',
+ 'company': locals[cdt][cdn].company,
+ "is_group": 0
+ }
+ }
+ });
+
+ frm.set_query('advance_account', 'accounts', function (doc, cdt, cdn) {
+ return {
+ filters: {
+ "root_type": 'Asset',
+ "account_type": "Payable",
+ "company": locals[cdt][cdn].company,
+ "is_group": 0
+ }
+ }
+ });
+ }
+});
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 088958d..85eaf5f 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -2,13 +2,14 @@
# License: GNU General Public License v3. See license.txt
+import click
import frappe
from frappe import _
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
from frappe.utils import cint
-from erpnext.accounts.doctype.cash_flow_mapper.default_cash_flow_mapper import DEFAULT_MAPPERS
+import erpnext
from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
from erpnext.setup.doctype.incoterm.incoterm import create_incoterms
@@ -23,14 +24,15 @@
set_single_defaults()
create_print_setting_custom_fields()
add_all_roles_to("Administrator")
- create_default_cash_flow_mapper_templates()
create_default_success_action()
create_default_energy_point_rules()
create_incoterms()
+ create_default_role_profiles()
add_company_to_session_defaults()
add_standard_navbar_items()
add_app_name()
setup_log_settings()
+ hide_workspaces()
frappe.db.commit()
@@ -41,6 +43,25 @@
frappe.throw(message) # nosemgrep
+def check_frappe_version():
+ def major_version(v: str) -> str:
+ return v.split(".")[0]
+
+ frappe_version = major_version(frappe.__version__)
+ erpnext_version = major_version(erpnext.__version__)
+
+ if frappe_version == erpnext_version:
+ return
+
+ click.secho(
+ f"You're attempting to install ERPNext version {erpnext_version} with Frappe version {frappe_version}. "
+ "This is not supported and will result in broken install. Switch to correct branch before installing.",
+ fg="red",
+ )
+
+ raise SystemExit(1)
+
+
def set_single_defaults():
for dt in (
"Accounts Settings",
@@ -115,13 +136,6 @@
)
-def create_default_cash_flow_mapper_templates():
- for mapper in DEFAULT_MAPPERS:
- if not frappe.db.exists("Cash Flow Mapper", mapper["section_name"]):
- doc = frappe.get_doc(mapper)
- doc.insert(ignore_permissions=True)
-
-
def create_default_success_action():
for success_action in get_default_success_action():
if not frappe.db.exists("Success Action", success_action.get("ref_doctype")):
@@ -155,13 +169,19 @@
{
"item_label": "Documentation",
"item_type": "Route",
- "route": "https://docs.erpnext.com/docs/v14/user/manual/en/introduction",
+ "route": "https://docs.erpnext.com/",
"is_standard": 1,
},
{
"item_label": "User Forum",
"item_type": "Route",
- "route": "https://discuss.erpnext.com",
+ "route": "https://discuss.frappe.io",
+ "is_standard": 1,
+ },
+ {
+ "item_label": "Frappe School",
+ "item_type": "Route",
+ "route": "https://frappe.school?utm_source=in_app",
"is_standard": 1,
},
{
@@ -197,7 +217,7 @@
def add_app_name():
- frappe.db.set_value("System Settings", None, "app_name", "ERPNext")
+ frappe.db.set_single_value("System Settings", "app_name", "ERPNext")
def setup_log_settings():
@@ -205,3 +225,47 @@
log_settings.append("logs_to_clear", {"ref_doctype": "Repost Item Valuation", "days": 60})
log_settings.save(ignore_permissions=True)
+
+
+def hide_workspaces():
+ for ws in ["Integration", "Settings"]:
+ frappe.db.set_value("Workspace", ws, "public", 0)
+
+
+def create_default_role_profiles():
+ for role_profile_name, roles in DEFAULT_ROLE_PROFILES.items():
+ role_profile = frappe.new_doc("Role Profile")
+ role_profile.role_profile = role_profile_name
+ for role in roles:
+ role_profile.append("roles", {"role": role})
+
+ role_profile.insert(ignore_permissions=True)
+
+
+DEFAULT_ROLE_PROFILES = {
+ "Inventory": [
+ "Stock User",
+ "Stock Manager",
+ "Item Manager",
+ ],
+ "Manufacturing": [
+ "Stock User",
+ "Manufacturing User",
+ "Manufacturing Manager",
+ ],
+ "Accounts": [
+ "Accounts User",
+ "Accounts Manager",
+ ],
+ "Sales": [
+ "Sales User",
+ "Stock User",
+ "Sales Manager",
+ ],
+ "Purchase": [
+ "Item Manager",
+ "Stock User",
+ "Purchase User",
+ "Purchase Manager",
+ ],
+}
diff --git a/erpnext/setup/module_onboarding/home/home.json b/erpnext/setup/module_onboarding/home/home.json
index f02fc45..7b0d77f 100644
--- a/erpnext/setup/module_onboarding/home/home.json
+++ b/erpnext/setup/module_onboarding/home/home.json
@@ -22,41 +22,26 @@
"creation": "2021-11-22 12:19:15.888642",
"docstatus": 0,
"doctype": "Module Onboarding",
- "documentation_url": "https://docs.erpnext.com/docs/v13/user/manual/en/setting-up/company-setup",
+ "documentation_url": "https://docs.erpnext.com/docs/v14/user/manual/en/setting-up/company-setup",
"idx": 0,
"is_complete": 0,
- "modified": "2022-06-07 14:31:00.575193",
+ "modified": "2023-05-23 13:20:19.703506",
"modified_by": "Administrator",
"module": "Setup",
"name": "Home",
"owner": "Administrator",
"steps": [
{
- "step": "Company Set Up"
- },
- {
- "step": "Navigation Help"
- },
- {
- "step": "Data import"
- },
- {
"step": "Create an Item"
},
{
"step": "Create a Customer"
},
{
- "step": "Create a Supplier"
- },
- {
- "step": "Create a Quotation"
- },
- {
- "step": "Letterhead"
+ "step": "Create Your First Sales Invoice"
}
],
- "subtitle": "Company, Item, Customer, Supplier, Navigation Help, Data Import, Letter Head, Quotation",
- "success_message": "Masters are all set up!",
- "title": "Let's Set Up Some Masters"
+ "subtitle": "Item, Customer, Supplier and Quotation",
+ "success_message": "You're ready to start your journey with ERPNext",
+ "title": "Let's begin your journey with ERPNext"
}
\ No newline at end of file
diff --git a/erpnext/setup/onboarding_step/company_set_up/company_set_up.json b/erpnext/setup/onboarding_step/company_set_up/company_set_up.json
index 6f65832..fae2de0 100644
--- a/erpnext/setup/onboarding_step/company_set_up/company_set_up.json
+++ b/erpnext/setup/onboarding_step/company_set_up/company_set_up.json
@@ -5,11 +5,11 @@
"description": "# Set Up a Company\n\nA company is a legal entity for which you will set up your books of account and create accounting transactions. In ERPNext, you can create multiple companies, and establish relationships (group/subsidiary) among them.\n\nWithin the company master, you can capture various default accounts for that Company and set crucial settings related to the accounting methodology followed for a company.\n",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-12-15 14:22:18.317423",
+ "modified": "2023-05-15 09:18:42.895537",
"modified_by": "Administrator",
"name": "Company Set Up",
"owner": "Administrator",
diff --git a/erpnext/setup/onboarding_step/create_a_customer/create_a_customer.json b/erpnext/setup/onboarding_step/create_a_customer/create_a_customer.json
index f74d745..dc07578 100644
--- a/erpnext/setup/onboarding_step/create_a_customer/create_a_customer.json
+++ b/erpnext/setup/onboarding_step/create_a_customer/create_a_customer.json
@@ -5,17 +5,17 @@
"description": "# Create a Customer\n\nThe Customer master is at the heart of your sales transactions. Customers are linked in Quotations, Sales Orders, Invoices, and Payments. Customers can be either numbered or identified by name (you would typically do this based on the number of customers you have).\n\nThrough Customer\u2019s master, you can effectively track essentials like:\n - Customer\u2019s multiple address and contacts\n - Account Receivables\n - Credit Limit and Credit Period\n",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-12-15 14:20:31.197564",
+ "modified": "2023-05-23 12:45:55.138580",
"modified_by": "Administrator",
"name": "Create a Customer",
"owner": "Administrator",
"reference_document": "Customer",
"show_form_tour": 0,
"show_full_form": 0,
- "title": "Manage Customers",
+ "title": "Create a Customer",
"validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/setup/onboarding_step/create_a_quotation/create_a_quotation.json b/erpnext/setup/onboarding_step/create_a_quotation/create_a_quotation.json
index 8bdb621..92b45b4 100644
--- a/erpnext/setup/onboarding_step/create_a_quotation/create_a_quotation.json
+++ b/erpnext/setup/onboarding_step/create_a_quotation/create_a_quotation.json
@@ -5,11 +5,11 @@
"description": "# Create a Quotation\n\nLet\u2019s get started with business transactions by creating your first Quotation. You can create a Quotation for an existing customer or a prospect. It will be an approved document, with items you sell and the proposed price + taxes applied. After completing the instructions, you will get a Quotation in a ready to share print format.",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-12-15 14:21:31.675330",
+ "modified": "2023-05-15 09:18:42.984170",
"modified_by": "Administrator",
"name": "Create a Quotation",
"owner": "Administrator",
diff --git a/erpnext/setup/onboarding_step/create_a_supplier/create_a_supplier.json b/erpnext/setup/onboarding_step/create_a_supplier/create_a_supplier.json
index 9574141..4ac26e2 100644
--- a/erpnext/setup/onboarding_step/create_a_supplier/create_a_supplier.json
+++ b/erpnext/setup/onboarding_step/create_a_supplier/create_a_supplier.json
@@ -5,17 +5,17 @@
"description": "# Create a Supplier\n\nAlso known as Vendor, is a master at the center of your purchase transactions. Suppliers are linked in Request for Quotation, Purchase Orders, Receipts, and Payments. Suppliers can be either numbered or identified by name.\n\nThrough Supplier\u2019s master, you can effectively track essentials like:\n - Supplier\u2019s multiple address and contacts\n - Account Receivables\n - Credit Limit and Credit Period\n",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-12-15 14:21:23.518301",
+ "modified": "2023-05-19 15:32:55.069257",
"modified_by": "Administrator",
"name": "Create a Supplier",
"owner": "Administrator",
"reference_document": "Supplier",
"show_form_tour": 0,
"show_full_form": 0,
- "title": "Manage Suppliers",
+ "title": "Create a Supplier",
"validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/setup/onboarding_step/create_an_item/create_an_item.json b/erpnext/setup/onboarding_step/create_an_item/create_an_item.json
index cd29683..4115196 100644
--- a/erpnext/setup/onboarding_step/create_an_item/create_an_item.json
+++ b/erpnext/setup/onboarding_step/create_an_item/create_an_item.json
@@ -6,18 +6,18 @@
"docstatus": 0,
"doctype": "Onboarding Step",
"form_tour": "Item General",
- "idx": 0,
+ "idx": 1,
"intro_video_url": "",
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-12-15 14:19:56.297772",
+ "modified": "2023-05-23 12:43:08.484206",
"modified_by": "Administrator",
"name": "Create an Item",
"owner": "Administrator",
"reference_document": "Item",
"show_form_tour": 1,
- "show_full_form": 1,
- "title": "Manage Items",
+ "show_full_form": 0,
+ "title": "Create an Item",
"validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/setup/onboarding_step/create_your_first_sales_invoice/create_your_first_sales_invoice.json b/erpnext/setup/onboarding_step/create_your_first_sales_invoice/create_your_first_sales_invoice.json
new file mode 100644
index 0000000..96fa68e
--- /dev/null
+++ b/erpnext/setup/onboarding_step/create_your_first_sales_invoice/create_your_first_sales_invoice.json
@@ -0,0 +1,20 @@
+{
+ "action": "Create Entry",
+ "creation": "2020-05-14 17:48:21.019019",
+ "description": "# All about sales invoice\n\nA Sales Invoice is a bill that you send to your Customers against which the Customer makes the payment. Sales Invoice is an accounting transaction. On submission of Sales Invoice, the system updates the receivable and books income against a Customer Account.",
+ "docstatus": 0,
+ "doctype": "Onboarding Step",
+ "idx": 0,
+ "is_complete": 0,
+ "is_single": 0,
+ "is_skipped": 0,
+ "modified": "2023-05-22 21:20:15.589644",
+ "modified_by": "Administrator",
+ "name": "Create Your First Sales Invoice",
+ "owner": "Administrator",
+ "reference_document": "Sales Invoice",
+ "show_form_tour": 1,
+ "show_full_form": 1,
+ "title": "Create Your First Sales Invoice ",
+ "validate_action": 1
+}
\ No newline at end of file
diff --git a/erpnext/setup/onboarding_step/data_import/data_import.json b/erpnext/setup/onboarding_step/data_import/data_import.json
index 4999a36..e5dd7da 100644
--- a/erpnext/setup/onboarding_step/data_import/data_import.json
+++ b/erpnext/setup/onboarding_step/data_import/data_import.json
@@ -5,11 +5,11 @@
"description": "# Import Data from Spreadsheet\n\nIn ERPNext, you can easily migrate your historical data using spreadsheets. You can use it for migrating not just masters (like Customer, Supplier, Items), but also for transactions like (outstanding invoices, opening stock and accounting entries, etc).",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2022-06-07 14:28:51.390813",
+ "modified": "2023-05-15 09:18:42.962231",
"modified_by": "Administrator",
"name": "Data import",
"owner": "Administrator",
diff --git a/erpnext/setup/onboarding_step/letterhead/letterhead.json b/erpnext/setup/onboarding_step/letterhead/letterhead.json
index 8e1bb8c..584fd48 100644
--- a/erpnext/setup/onboarding_step/letterhead/letterhead.json
+++ b/erpnext/setup/onboarding_step/letterhead/letterhead.json
@@ -5,11 +5,11 @@
"description": "# Create a Letter Head\n\nA Letter Head contains your organization's name, logo, address, etc which appears at the header and footer portion in documents. You can learn more about Setting up Letter Head in ERPNext here.\n",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-12-15 14:21:39.037742",
+ "modified": "2023-05-15 09:18:42.995184",
"modified_by": "Administrator",
"name": "Letterhead",
"owner": "Administrator",
diff --git a/erpnext/setup/onboarding_step/navigation_help/navigation_help.json b/erpnext/setup/onboarding_step/navigation_help/navigation_help.json
index cf07968..f57818b 100644
--- a/erpnext/setup/onboarding_step/navigation_help/navigation_help.json
+++ b/erpnext/setup/onboarding_step/navigation_help/navigation_help.json
@@ -2,14 +2,14 @@
"action": "Watch Video",
"action_label": "Learn about Navigation options",
"creation": "2021-11-22 12:09:52.233872",
- "description": "# Navigation in ERPNext\n\nEase of navigating and browsing around the ERPNext is one of our core strengths. In the following video, you will learn how to reach a specific feature in ERPNext via module page or awesome bar\u2019s shortcut.\n",
+ "description": "# Navigation in ERPNext\n\nEase of navigating and browsing around the ERPNext is one of our core strengths. In the following video, you will learn how to reach a specific feature in ERPNext via module page or AwesomeBar.",
"docstatus": 0,
"doctype": "Onboarding Step",
- "idx": 0,
+ "idx": 1,
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2022-06-07 14:28:00.901082",
+ "modified": "2023-05-16 12:53:25.939908",
"modified_by": "Administrator",
"name": "Navigation Help",
"owner": "Administrator",
diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 5750914..3532d6b 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -581,6 +581,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
@@ -1339,6 +1344,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
@@ -2097,6 +2107,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
@@ -2849,6 +2864,11 @@
"title": "Bauleistungen nach § 13b UStG",
"is_default": 0,
"taxes": []
+ },
+ {
+ "title": "Nullsteuersatz nach § 12 Abs. 3 UStG",
+ "is_default": 0,
+ "taxes": []
}
],
"purchase_tax_templates": [
diff --git a/erpnext/setup/setup_wizard/operations/defaults_setup.py b/erpnext/setup/setup_wizard/operations/defaults_setup.py
index eed8f73..756409b 100644
--- a/erpnext/setup/setup_wizard/operations/defaults_setup.py
+++ b/erpnext/setup/setup_wizard/operations/defaults_setup.py
@@ -36,7 +36,6 @@
stock_settings.stock_uom = _("Nos")
stock_settings.auto_indent = 1
stock_settings.auto_insert_price_list_rate_if_missing = 1
- stock_settings.automatically_set_serial_nos_based_on_fifo = 1
stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
stock_settings.save()
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 6bc1771..8e61fe2 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -486,7 +486,6 @@
stock_settings.stock_uom = _("Nos")
stock_settings.auto_indent = 1
stock_settings.auto_insert_price_list_rate_if_missing = 1
- stock_settings.automatically_set_serial_nos_based_on_fifo = 1
stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
stock_settings.save()
diff --git a/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json b/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
index 4c0f2b5..5806fd1 100644
--- a/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
+++ b/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
@@ -1,31 +1,467 @@
{
"charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Projects Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Accounts Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"HR Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Selling Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Buying Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Support Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Shopping Cart Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Portal Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Domain Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Products Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Naming Series\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Manufacturing Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Education Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Hotel Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"CRM Settings\",\"col\":3}}]",
+ "content": "[{\"id\":\"NO5yYHJopc\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t</b></span>\",\"col\":12}},{\"id\":\"CDxIM-WuZ9\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"System Settings\",\"col\":3}},{\"id\":\"-Uh7DKJNJX\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Accounts Settings\",\"col\":3}},{\"id\":\"K9ST9xcDXh\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Settings\",\"col\":3}},{\"id\":\"27IdVHVQMb\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Selling Settings\",\"col\":3}},{\"id\":\"Rwp5zff88b\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Buying Settings\",\"col\":3}},{\"id\":\"hkfnQ2sevf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Global Defaults\",\"col\":3}},{\"id\":\"jjxI_PDawD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Print Settings\",\"col\":3}},{\"id\":\"R3CoYYFXye\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"yynbm1J_VO\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Settings</b></span>\",\"col\":12}},{\"id\":\"KDCv2MvSg3\",\"type\":\"card\",\"data\":{\"card_name\":\"Module Settings\",\"col\":4}},{\"id\":\"Q0_bqT7cxQ\",\"type\":\"card\",\"data\":{\"card_name\":\"Email / Notifications\",\"col\":4}},{\"id\":\"UnqK5haBnh\",\"type\":\"card\",\"data\":{\"card_name\":\"Website\",\"col\":4}},{\"id\":\"kp7u1H5hCd\",\"type\":\"card\",\"data\":{\"card_name\":\"Core\",\"col\":4}},{\"id\":\"Ufc3jycgy9\",\"type\":\"card\",\"data\":{\"card_name\":\"Printing\",\"col\":4}},{\"id\":\"89bSNzv3Yh\",\"type\":\"card\",\"data\":{\"card_name\":\"Workflow\",\"col\":4}}]",
"creation": "2022-01-27 13:14:47.349433",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "setting",
"idx": 0,
+ "is_hidden": 0,
"label": "ERPNext Settings",
- "links": [],
- "modified": "2022-06-27 16:53:07.056620",
+ "links": [
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Import Data",
+ "link_count": 0,
+ "link_to": "Data Import",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Export Data",
+ "link_count": 0,
+ "link_to": "Data Export",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Bulk Update",
+ "link_count": 0,
+ "link_to": "Bulk Update",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Download Backups",
+ "link_count": 0,
+ "link_to": "backups",
+ "link_type": "Page",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Deleted Documents",
+ "link_count": 0,
+ "link_to": "Deleted Document",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Email / Notifications",
+ "link_count": 0,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Email Account",
+ "link_count": 0,
+ "link_to": "Email Account",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Email Domain",
+ "link_count": 0,
+ "link_to": "Email Domain",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Notification",
+ "link_count": 0,
+ "link_to": "Notification",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Email Template",
+ "link_count": 0,
+ "link_to": "Email Template",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Auto Email Report",
+ "link_count": 0,
+ "link_to": "Auto Email Report",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Newsletter",
+ "link_count": 0,
+ "link_to": "Newsletter",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Notification Settings",
+ "link_count": 0,
+ "link_to": "Notification Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Website",
+ "link_count": 0,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Website Settings",
+ "link_count": 0,
+ "link_to": "Website Settings",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Website Theme",
+ "link_count": 0,
+ "link_to": "Website Theme",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Website Script",
+ "link_count": 0,
+ "link_to": "Website Script",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "About Us Settings",
+ "link_count": 0,
+ "link_to": "About Us Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Contact Us Settings",
+ "link_count": 0,
+ "link_to": "Contact Us Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Printing",
+ "link_count": 0,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Print Format Builder",
+ "link_count": 0,
+ "link_to": "print-format-builder",
+ "link_type": "Page",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Print Settings",
+ "link_count": 0,
+ "link_to": "Print Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Print Format",
+ "link_count": 0,
+ "link_to": "Print Format",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Print Style",
+ "link_count": 0,
+ "link_to": "Print Style",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Workflow",
+ "link_count": 0,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Workflow",
+ "link_count": 0,
+ "link_to": "Workflow",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Workflow State",
+ "link_count": 0,
+ "link_to": "Workflow State",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Workflow Action",
+ "link_count": 0,
+ "link_to": "Workflow Action",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Core",
+ "link_count": 3,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "System Settings",
+ "link_count": 0,
+ "link_to": "System Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Domain Settings",
+ "link_count": 0,
+ "link_to": "Domain Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Global Defaults",
+ "link_count": 0,
+ "link_to": "Global Defaults",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Module Settings",
+ "link_count": 8,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Accounts Settings",
+ "link_count": 0,
+ "link_to": "Accounts Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Stock Settings",
+ "link_count": 0,
+ "link_to": "Stock Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Selling Settings",
+ "link_count": 0,
+ "link_to": "Selling Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Buying Settings",
+ "link_count": 0,
+ "link_to": "Buying Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Manufacturing Settings",
+ "link_count": 0,
+ "link_to": "Manufacturing Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "CRM Settings",
+ "link_count": 0,
+ "link_to": "CRM Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Projects Settings",
+ "link_count": 0,
+ "link_to": "Projects Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Support Settings",
+ "link_count": 0,
+ "link_to": "Support Settings",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ }
+ ],
+ "modified": "2023-05-24 14:47:25.356531",
"modified_by": "Administrator",
"module": "Setup",
"name": "ERPNext Settings",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
"quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 12.0,
+ "sequence_id": 19.0,
"shortcuts": [
{
- "icon": "project",
- "label": "Projects Settings",
- "link_to": "Projects Settings",
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "Print Settings",
+ "link_to": "Print Settings",
+ "type": "DocType"
+ },
+ {
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "System Settings",
+ "link_to": "System Settings",
"type": "DocType"
},
{
@@ -35,6 +471,13 @@
"type": "DocType"
},
{
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "Global Defaults",
+ "link_to": "Global Defaults",
+ "type": "DocType"
+ },
+ {
"icon": "stock",
"label": "Stock Settings",
"link_to": "Stock Settings",
@@ -51,44 +494,6 @@
"label": "Buying Settings",
"link_to": "Buying Settings",
"type": "DocType"
- },
- {
- "icon": "support",
- "label": "Support Settings",
- "link_to": "Support Settings",
- "type": "DocType"
- },
- {
- "icon": "retail",
- "label": "E Commerce Settings",
- "link_to": "E Commerce Settings",
- "type": "DocType"
- },
- {
- "icon": "website",
- "label": "Portal Settings",
- "link_to": "Portal Settings",
- "type": "DocType"
- },
- {
- "icon": "organization",
- "label": "Manufacturing Settings",
- "link_to": "Manufacturing Settings",
- "restrict_to_domain": "Manufacturing",
- "type": "DocType"
- },
- {
- "icon": "setting",
- "label": "Domain Settings",
- "link_to": "Domain Settings",
- "type": "DocType"
- },
- {
- "doc_view": "",
- "icon": "crm",
- "label": "CRM Settings",
- "link_to": "CRM Settings",
- "type": "DocType"
}
],
"title": "ERPNext Settings"
diff --git a/erpnext/setup/workspace/home/home.json b/erpnext/setup/workspace/home/home.json
index d26e576..1fc1f78 100644
--- a/erpnext/setup/workspace/home/home.json
+++ b/erpnext/setup/workspace/home/home.json
@@ -1,13 +1,15 @@
{
"charts": [],
- "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Home\",\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customer\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Supplier\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Invoice\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Leaderboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Accounting\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Stock\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Human Resources\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"CRM\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Data Import and Settings\",\"col\":4}}]",
+ "content": "[{\"id\":\"aCk49ShVRs\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Home\",\"col\":12}},{\"id\":\"kb3XPLg8lb\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"nWd2KJPW8l\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"snrzfbFr5Y\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customer\",\"col\":3}},{\"id\":\"SHJKakmLLf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Supplier\",\"col\":3}},{\"id\":\"CPxEyhaf3G\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Invoice\",\"col\":3}},{\"id\":\"WU4F-HUcIQ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Leaderboard\",\"col\":3}},{\"id\":\"d_KVM1gsf9\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"JVu8-FJZCu\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"JiuSi0ubOg\",\"type\":\"card\",\"data\":{\"card_name\":\"Accounting\",\"col\":4}},{\"id\":\"ji2Jlm3Q8i\",\"type\":\"card\",\"data\":{\"card_name\":\"Stock\",\"col\":4}},{\"id\":\"N61oiXpuwK\",\"type\":\"card\",\"data\":{\"card_name\":\"CRM\",\"col\":4}},{\"id\":\"6J0CVl1mPo\",\"type\":\"card\",\"data\":{\"card_name\":\"Data Import and Settings\",\"col\":4}}]",
"creation": "2020-01-23 13:46:38.833076",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "getting-started",
"idx": 0,
+ "is_hidden": 0,
"label": "Home",
"links": [
{
@@ -230,10 +232,11 @@
"type": "Link"
}
],
- "modified": "2022-06-27 16:54:35.462176",
+ "modified": "2023-05-24 14:47:18.765388",
"modified_by": "Administrator",
"module": "Setup",
"name": "Home",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 62936fc..db1cc49 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -21,6 +21,10 @@
bootinfo.sysdefaults.allow_stale = cint(
frappe.db.get_single_value("Accounts Settings", "allow_stale")
)
+ bootinfo.sysdefaults.over_billing_allowance = frappe.db.get_single_value(
+ "Accounts Settings", "over_billing_allowance"
+ )
+
bootinfo.sysdefaults.quotation_valid_till = cint(
frappe.db.get_single_value("CRM Settings", "default_valid_till")
)
diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py
new file mode 100644
index 0000000..2f1270e
--- /dev/null
+++ b/erpnext/stock/deprecated_serial_batch.py
@@ -0,0 +1,240 @@
+import frappe
+from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.utils import flt
+from frappe.utils.deprecations import deprecated
+from pypika import Order
+
+
+class DeprecatedSerialNoValuation:
+ @deprecated
+ def calculate_stock_value_from_deprecarated_ledgers(self):
+ serial_nos = list(
+ filter(lambda x: x not in self.serial_no_incoming_rate and x, self.get_serial_nos())
+ )
+
+ actual_qty = flt(self.sle.actual_qty)
+
+ stock_value_change = 0
+ if actual_qty < 0:
+ if not self.sle.is_cancelled:
+ outgoing_value = self.get_incoming_value_for_serial_nos(serial_nos)
+ stock_value_change = -1 * outgoing_value
+
+ self.stock_value_change += stock_value_change
+
+ @deprecated
+ def get_incoming_value_for_serial_nos(self, serial_nos):
+ # get rate from serial nos within same company
+ all_serial_nos = frappe.get_all(
+ "Serial No", fields=["purchase_rate", "name", "company"], filters={"name": ("in", serial_nos)}
+ )
+
+ incoming_values = 0.0
+ for d in all_serial_nos:
+ if d.company == self.sle.company:
+ self.serial_no_incoming_rate[d.name] += flt(d.purchase_rate)
+ incoming_values += flt(d.purchase_rate)
+
+ # Get rate for serial nos which has been transferred to other company
+ invalid_serial_nos = [d.name for d in all_serial_nos if d.company != self.sle.company]
+ for serial_no in invalid_serial_nos:
+ table = frappe.qb.DocType("Stock Ledger Entry")
+ incoming_rate = (
+ frappe.qb.from_(table)
+ .select(table.incoming_rate)
+ .where(
+ (
+ (table.serial_no == serial_no)
+ | (table.serial_no.like(serial_no + "\n%"))
+ | (table.serial_no.like("%\n" + serial_no))
+ | (table.serial_no.like("%\n" + serial_no + "\n%"))
+ )
+ & (table.company == self.sle.company)
+ & (table.serial_and_batch_bundle.isnull())
+ & (table.actual_qty > 0)
+ & (table.is_cancelled == 0)
+ )
+ .orderby(table.posting_date, order=Order.desc)
+ .limit(1)
+ ).run()
+
+ self.serial_no_incoming_rate[serial_no] += flt(incoming_rate[0][0]) if incoming_rate else 0
+ incoming_values += self.serial_no_incoming_rate[serial_no]
+
+ return incoming_values
+
+
+class DeprecatedBatchNoValuation:
+ @deprecated
+ def calculate_avg_rate_from_deprecarated_ledgers(self):
+ entries = self.get_sle_for_batches()
+ for ledger in entries:
+ self.stock_value_differece[ledger.batch_no] += flt(ledger.batch_value)
+ self.available_qty[ledger.batch_no] += flt(ledger.batch_qty)
+
+ @deprecated
+ def get_sle_for_batches(self):
+ if not self.batchwise_valuation_batches:
+ return []
+
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+
+ timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime(
+ self.sle.posting_date, self.sle.posting_time
+ )
+ if self.sle.creation:
+ timestamp_condition |= (
+ CombineDatetime(sle.posting_date, sle.posting_time)
+ == CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+ ) & (sle.creation < self.sle.creation)
+
+ query = (
+ frappe.qb.from_(sle)
+ .select(
+ sle.batch_no,
+ Sum(sle.stock_value_difference).as_("batch_value"),
+ Sum(sle.actual_qty).as_("batch_qty"),
+ )
+ .where(
+ (sle.item_code == self.sle.item_code)
+ & (sle.warehouse == self.sle.warehouse)
+ & (sle.batch_no.isin(self.batchwise_valuation_batches))
+ & (sle.batch_no.isnotnull())
+ & (sle.is_cancelled == 0)
+ )
+ .where(timestamp_condition)
+ .groupby(sle.batch_no)
+ )
+
+ if self.sle.name:
+ query = query.where(sle.name != self.sle.name)
+
+ return query.run(as_dict=True)
+
+ @deprecated
+ def calculate_avg_rate_for_non_batchwise_valuation(self):
+ if not self.non_batchwise_valuation_batches:
+ return
+
+ self.non_batchwise_balance_value = 0.0
+ self.non_batchwise_balance_qty = 0.0
+
+ self.set_balance_value_for_non_batchwise_valuation_batches()
+
+ for batch_no, ledger in self.batch_nos.items():
+ if batch_no not in self.non_batchwise_valuation_batches:
+ continue
+
+ if not self.non_batchwise_balance_qty:
+ continue
+
+ self.batch_avg_rate[batch_no] = (
+ self.non_batchwise_balance_value / self.non_batchwise_balance_qty
+ )
+
+ stock_value_change = self.batch_avg_rate[batch_no] * ledger.qty
+ self.stock_value_change += stock_value_change
+
+ frappe.db.set_value(
+ "Serial and Batch Entry",
+ ledger.name,
+ {
+ "stock_value_difference": stock_value_change,
+ "incoming_rate": self.batch_avg_rate[batch_no],
+ },
+ )
+
+ @deprecated
+ def set_balance_value_for_non_batchwise_valuation_batches(self):
+ self.set_balance_value_from_sl_entries()
+ self.set_balance_value_from_bundle()
+
+ @deprecated
+ def set_balance_value_from_sl_entries(self) -> None:
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+ batch = frappe.qb.DocType("Batch")
+
+ timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime(
+ self.sle.posting_date, self.sle.posting_time
+ )
+ if self.sle.creation:
+ timestamp_condition |= (
+ CombineDatetime(sle.posting_date, sle.posting_time)
+ == CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+ ) & (sle.creation < self.sle.creation)
+
+ query = (
+ frappe.qb.from_(sle)
+ .inner_join(batch)
+ .on(sle.batch_no == batch.name)
+ .select(
+ sle.batch_no,
+ Sum(sle.actual_qty).as_("batch_qty"),
+ Sum(sle.stock_value_difference).as_("batch_value"),
+ )
+ .where(
+ (sle.item_code == self.sle.item_code)
+ & (sle.warehouse == self.sle.warehouse)
+ & (sle.batch_no.isnotnull())
+ & (batch.use_batchwise_valuation == 0)
+ & (sle.is_cancelled == 0)
+ )
+ .where(timestamp_condition)
+ .groupby(sle.batch_no)
+ )
+
+ if self.sle.name:
+ query = query.where(sle.name != self.sle.name)
+
+ for d in query.run(as_dict=True):
+ self.non_batchwise_balance_value += flt(d.batch_value)
+ self.non_batchwise_balance_qty += flt(d.batch_qty)
+ self.available_qty[d.batch_no] += flt(d.batch_qty)
+
+ @deprecated
+ def set_balance_value_from_bundle(self) -> None:
+ bundle = frappe.qb.DocType("Serial and Batch Bundle")
+ bundle_child = frappe.qb.DocType("Serial and Batch Entry")
+ batch = frappe.qb.DocType("Batch")
+
+ timestamp_condition = CombineDatetime(
+ bundle.posting_date, bundle.posting_time
+ ) < CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+
+ if self.sle.creation:
+ timestamp_condition |= (
+ CombineDatetime(bundle.posting_date, bundle.posting_time)
+ == CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+ ) & (bundle.creation < self.sle.creation)
+
+ query = (
+ frappe.qb.from_(bundle)
+ .inner_join(bundle_child)
+ .on(bundle.name == bundle_child.parent)
+ .inner_join(batch)
+ .on(bundle_child.batch_no == batch.name)
+ .select(
+ bundle_child.batch_no,
+ Sum(bundle_child.qty).as_("batch_qty"),
+ Sum(bundle_child.stock_value_difference).as_("batch_value"),
+ )
+ .where(
+ (bundle.item_code == self.sle.item_code)
+ & (bundle.warehouse == self.sle.warehouse)
+ & (bundle_child.batch_no.isnotnull())
+ & (batch.use_batchwise_valuation == 0)
+ & (bundle.is_cancelled == 0)
+ & (bundle.docstatus == 1)
+ & (bundle.type_of_transaction.isin(["Inward", "Outward"]))
+ )
+ .where(timestamp_condition)
+ .groupby(bundle_child.batch_no)
+ )
+
+ if self.sle.serial_and_batch_bundle:
+ query = query.where(bundle.name != self.sle.serial_and_batch_bundle)
+
+ for d in query.run(as_dict=True):
+ self.non_batchwise_balance_value += flt(d.batch_value)
+ self.non_batchwise_balance_qty += flt(d.batch_qty)
+ self.available_qty[d.batch_no] += flt(d.batch_qty)
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 967c572..e6cb351 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -207,7 +207,7 @@
"image_field": "image",
"links": [],
"max_attachments": 5,
- "modified": "2022-02-21 08:08:23.999236",
+ "modified": "2023-03-12 15:56:09.516586",
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 3b9fe7b..5919d7c 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -2,12 +2,14 @@
# License: GNU General Public License v3. See license.txt
+from collections import defaultdict
+
import frappe
from frappe import _
from frappe.model.document import Document
from frappe.model.naming import make_autoname, revert_series_if_last
-from frappe.query_builder.functions import CurDate, Sum, Timestamp
-from frappe.utils import cint, flt, get_link_to_form, nowtime
+from frappe.query_builder.functions import CurDate, Sum
+from frappe.utils import cint, flt, get_link_to_form, nowtime, today
from frappe.utils.data import add_days
from frappe.utils.jinja import render_template
@@ -128,9 +130,7 @@
frappe.throw(_("The selected item cannot have Batch"))
def set_batchwise_valuation(self):
- from erpnext.stock.stock_ledger import get_valuation_method
-
- if self.is_new() and get_valuation_method(self.item) != "Moving Average":
+ if self.is_new():
self.use_batchwise_valuation = 1
def before_save(self):
@@ -166,7 +166,12 @@
@frappe.whitelist()
def get_batch_qty(
- batch_no=None, warehouse=None, item_code=None, posting_date=None, posting_time=None
+ batch_no=None,
+ warehouse=None,
+ item_code=None,
+ posting_date=None,
+ posting_time=None,
+ ignore_voucher_nos=None,
):
"""Returns batch actual qty if warehouse is passed,
or returns dict of qty by warehouse if warehouse is None
@@ -177,43 +182,31 @@
:param warehouse: Optional - give qty for this warehouse
:param item_code: Optional - give qty for this item"""
- sle = frappe.qb.DocType("Stock Ledger Entry")
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_auto_batch_nos,
+ )
- out = 0
- if batch_no and warehouse:
- query = (
- frappe.qb.from_(sle)
- .select(Sum(sle.actual_qty))
- .where((sle.is_cancelled == 0) & (sle.warehouse == warehouse) & (sle.batch_no == batch_no))
- )
+ batchwise_qty = defaultdict(float)
+ kwargs = frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "posting_date": posting_date,
+ "posting_time": posting_time,
+ "batch_no": batch_no,
+ "ignore_voucher_nos": ignore_voucher_nos,
+ }
+ )
- if posting_date:
- if posting_time is None:
- posting_time = nowtime()
+ batches = get_auto_batch_nos(kwargs)
- query = query.where(
- Timestamp(sle.posting_date, sle.posting_time) <= Timestamp(posting_date, posting_time)
- )
+ if not (batch_no and warehouse):
+ return batches
- out = query.run(as_list=True)[0][0] or 0
+ for batch in batches:
+ batchwise_qty[batch.get("batch_no")] += batch.get("qty")
- if batch_no and not warehouse:
- out = (
- frappe.qb.from_(sle)
- .select(sle.warehouse, Sum(sle.actual_qty).as_("qty"))
- .where((sle.is_cancelled == 0) & (sle.batch_no == batch_no))
- .groupby(sle.warehouse)
- ).run(as_dict=True)
-
- if not batch_no and item_code and warehouse:
- out = (
- frappe.qb.from_(sle)
- .select(sle.batch_no, Sum(sle.actual_qty).as_("qty"))
- .where((sle.is_cancelled == 0) & (sle.item_code == item_code) & (sle.warehouse == warehouse))
- .groupby(sle.batch_no)
- ).run(as_dict=True)
-
- return out
+ return batchwise_qty[batch_no]
@frappe.whitelist()
@@ -229,13 +222,37 @@
@frappe.whitelist()
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()
+ qty = flt(qty)
- company = frappe.db.get_value(
- "Stock Ledger Entry",
- dict(item_code=item_code, batch_no=batch_no, warehouse=warehouse),
- ["company"],
+ company = frappe.db.get_value("Warehouse", warehouse, "company")
+
+ from_bundle_id = make_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "batches": frappe._dict({batch_no: qty}),
+ "company": company,
+ "type_of_transaction": "Outward",
+ "qty": qty,
+ }
+ )
+ )
+
+ to_bundle_id = make_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "batches": frappe._dict({batch.name: qty}),
+ "company": company,
+ "type_of_transaction": "Inward",
+ "qty": qty,
+ }
+ )
)
stock_entry = frappe.get_doc(
@@ -244,8 +261,12 @@
purpose="Repack",
company=company,
items=[
- dict(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),
+ dict(
+ item_code=item_code, qty=qty, s_warehouse=warehouse, serial_and_batch_bundle=from_bundle_id
+ ),
+ dict(
+ item_code=item_code, qty=qty, t_warehouse=warehouse, serial_and_batch_bundle=to_bundle_id
+ ),
],
)
)
@@ -256,52 +277,27 @@
return batch.name
-def set_batch_nos(doc, warehouse_field, throw=False, child_table="items"):
- """Automatically select `batch_no` for outgoing items in item table"""
- for d in doc.get(child_table):
- qty = d.get("stock_qty") or d.get("transfer_qty") or d.get("qty") or 0
- warehouse = d.get(warehouse_field, None)
- if warehouse and qty > 0 and frappe.db.get_value("Item", d.item_code, "has_batch_no"):
- if not d.batch_no:
- d.batch_no = get_batch_no(d.item_code, warehouse, qty, throw, d.serial_no)
- else:
- batch_qty = get_batch_qty(batch_no=d.batch_no, warehouse=warehouse)
- 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)
- )
+def make_batch_bundle(kwargs):
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
-
-@frappe.whitelist()
-def get_batch_no(item_code, warehouse, qty=1, throw=False, serial_no=None):
- """
- Get batch number using First Expiring First Out method.
- :param item_code: `item_code` of Item Document
- :param warehouse: name of Warehouse to check
- :param qty: quantity of Items
- :return: String represent batch number of batch with sufficient quantity else an empty String
- """
-
- batch_no = None
- batches = get_batches(item_code, warehouse, qty, throw, serial_no)
-
- for batch in batches:
- if flt(qty) <= flt(batch.qty):
- batch_no = batch.batch_id
- break
-
- if not batch_no:
- frappe.msgprint(
- _(
- "Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement"
- ).format(frappe.bold(item_code))
+ return (
+ SerialBatchCreation(
+ {
+ "item_code": kwargs.item_code,
+ "warehouse": kwargs.warehouse,
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "voucher_type": "Stock Entry",
+ "qty": flt(kwargs.qty),
+ "type_of_transaction": kwargs.type_of_transaction,
+ "company": kwargs.company,
+ "batches": kwargs.batches,
+ "do_not_submit": True,
+ }
)
- if throw:
- raise UnableToSelectBatchError
-
- return batch_no
+ .make_serial_and_batch_bundle()
+ .name
+ )
def get_batches(item_code, warehouse, qty=1, throw=False, serial_no=None):
@@ -361,10 +357,10 @@
frappe.throw(_("There is no batch found against the {0}: {1}").format(message, serial_no_link))
-def make_batch(args):
- if frappe.db.get_value("Item", args.item, "has_batch_no"):
- args.doctype = "Batch"
- frappe.get_doc(args).insert().name
+def make_batch(kwargs):
+ if frappe.db.get_value("Item", kwargs.item, "has_batch_no"):
+ kwargs.doctype = "Batch"
+ return frappe.get_doc(kwargs).insert().name
@frappe.whitelist()
@@ -376,7 +372,7 @@
p = frappe.qb.DocType("POS Invoice").as_("p")
item = frappe.qb.DocType("POS Invoice Item").as_("item")
- sum_qty = frappe.query_builder.functions.Sum(item.qty).as_("qty")
+ sum_qty = frappe.query_builder.functions.Sum(item.stock_qty).as_("qty")
reserved_batch_qty = (
frappe.qb.from_(p)
@@ -397,3 +393,28 @@
flt_reserved_batch_qty = flt(reserved_batch_qty[0][0])
return flt_reserved_batch_qty
+
+
+def get_available_batches(kwargs):
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_auto_batch_nos,
+ )
+
+ batchwise_qty = defaultdict(float)
+
+ batches = get_auto_batch_nos(kwargs)
+ for batch in batches:
+ batchwise_qty[batch.get("batch_no")] += batch.get("qty")
+
+ return batchwise_qty
+
+
+def get_batch_no(bundle_id):
+ from erpnext.stock.serial_batch_bundle import get_batch_nos
+
+ batches = defaultdict(float)
+
+ for batch_id, d in get_batch_nos(bundle_id).items():
+ batches[batch_id] += abs(d.get("qty"))
+
+ return batches
diff --git a/erpnext/stock/doctype/batch/batch_dashboard.py b/erpnext/stock/doctype/batch/batch_dashboard.py
index 84b64f3..a222c42 100644
--- a/erpnext/stock/doctype/batch/batch_dashboard.py
+++ b/erpnext/stock/doctype/batch/batch_dashboard.py
@@ -7,7 +7,7 @@
"transactions": [
{"label": _("Buy"), "items": ["Purchase Invoice", "Purchase Receipt"]},
{"label": _("Sell"), "items": ["Sales Invoice", "Delivery Note"]},
- {"label": _("Move"), "items": ["Stock Entry"]},
+ {"label": _("Move"), "items": ["Serial and Batch Bundle"]},
{"label": _("Quality"), "items": ["Quality Inspection"]},
],
}
diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py
index 271e2e0..7fb672c 100644
--- a/erpnext/stock/doctype/batch/test_batch.py
+++ b/erpnext/stock/doctype/batch/test_batch.py
@@ -10,15 +10,18 @@
from frappe.utils.data import add_to_date, getdate
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
-from erpnext.stock.doctype.batch.batch import UnableToSelectBatchError, get_batch_no, get_batch_qty
+from erpnext.stock.doctype.batch.batch import get_batch_qty
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
-from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
-from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
- create_stock_reconciliation,
+from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ BatchNegativeStockError,
)
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+)
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.get_item_details import get_item_details
-from erpnext.stock.stock_ledger import get_valuation_rate
+from erpnext.stock.serial_batch_bundle import SerialBatchCreation
class TestBatch(FrappeTestCase):
@@ -49,11 +52,80 @@
).insert()
receipt.submit()
- self.assertTrue(receipt.items[0].batch_no)
- self.assertEqual(get_batch_qty(receipt.items[0].batch_no, receipt.items[0].warehouse), batch_qty)
+ receipt.load_from_db()
+ self.assertTrue(receipt.items[0].serial_and_batch_bundle)
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
+ self.assertEqual(get_batch_qty(batch_no, receipt.items[0].warehouse), batch_qty)
return receipt
+ def test_batch_stock_levels(self, batch_qty=100):
+ """Test automated batch creation from Purchase Receipt"""
+ self.make_batch_item("ITEM-BATCH-1")
+
+ receipt = frappe.get_doc(
+ dict(
+ doctype="Purchase Receipt",
+ supplier="_Test Supplier",
+ company="_Test Company",
+ items=[dict(item_code="ITEM-BATCH-1", qty=10, rate=10, warehouse="Stores - _TC")],
+ )
+ ).insert()
+ receipt.submit()
+
+ receipt.load_from_db()
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
+
+ bundle_id = (
+ SerialBatchCreation(
+ {
+ "item_code": "ITEM-BATCH-1",
+ "warehouse": "_Test Warehouse - _TC",
+ "actual_qty": 20,
+ "voucher_type": "Purchase Receipt",
+ "batches": frappe._dict({batch_no: 20}),
+ "type_of_transaction": "Inward",
+ "company": receipt.company,
+ }
+ )
+ .make_serial_and_batch_bundle()
+ .name
+ )
+
+ receipt2 = frappe.get_doc(
+ dict(
+ doctype="Purchase Receipt",
+ supplier="_Test Supplier",
+ company="_Test Company",
+ items=[
+ dict(
+ item_code="ITEM-BATCH-1",
+ qty=20,
+ rate=10,
+ warehouse="_Test Warehouse - _TC",
+ serial_and_batch_bundle=bundle_id,
+ )
+ ],
+ )
+ ).insert()
+ receipt2.submit()
+
+ receipt.load_from_db()
+ receipt2.load_from_db()
+
+ self.assertTrue(receipt.items[0].serial_and_batch_bundle)
+ self.assertTrue(receipt2.items[0].serial_and_batch_bundle)
+
+ batchwise_qty = frappe._dict({})
+ for receipt in [receipt, receipt2]:
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
+ key = (batch_no, receipt.items[0].warehouse)
+ batchwise_qty[key] = receipt.items[0].qty
+
+ batches = get_batch_qty(batch_no)
+ for d in batches:
+ self.assertEqual(d.qty, batchwise_qty[(d.batch_no, d.warehouse)])
+
def test_stock_entry_incoming(self):
"""Test batch creation via Stock Entry (Work Order)"""
@@ -80,9 +152,12 @@
stock_entry.insert()
stock_entry.submit()
- self.assertTrue(stock_entry.items[0].batch_no)
+ stock_entry.load_from_db()
+
+ bundle = stock_entry.items[0].serial_and_batch_bundle
+ self.assertTrue(bundle)
self.assertEqual(
- get_batch_qty(stock_entry.items[0].batch_no, stock_entry.items[0].t_warehouse), 90
+ get_batch_qty(get_batch_from_bundle(bundle), stock_entry.items[0].t_warehouse), 90
)
def test_delivery_note(self):
@@ -91,37 +166,71 @@
receipt = self.test_purchase_receipt(batch_qty)
item_code = "ITEM-BATCH-1"
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
+
+ bundle_id = (
+ SerialBatchCreation(
+ {
+ "item_code": item_code,
+ "warehouse": receipt.items[0].warehouse,
+ "actual_qty": batch_qty,
+ "voucher_type": "Stock Entry",
+ "batches": frappe._dict({batch_no: batch_qty}),
+ "type_of_transaction": "Outward",
+ "company": receipt.company,
+ }
+ )
+ .make_serial_and_batch_bundle()
+ .name
+ )
+
delivery_note = frappe.get_doc(
dict(
doctype="Delivery Note",
customer="_Test Customer",
company=receipt.company,
items=[
- dict(item_code=item_code, qty=batch_qty, rate=10, warehouse=receipt.items[0].warehouse)
+ dict(
+ item_code=item_code,
+ qty=batch_qty,
+ rate=10,
+ warehouse=receipt.items[0].warehouse,
+ serial_and_batch_bundle=bundle_id,
+ )
],
)
).insert()
delivery_note.submit()
+ receipt.load_from_db()
+ delivery_note.load_from_db()
+
# shipped from FEFO batch
self.assertEqual(
- delivery_note.items[0].batch_no, get_batch_no(item_code, receipt.items[0].warehouse, batch_qty)
+ get_batch_from_bundle(delivery_note.items[0].serial_and_batch_bundle),
+ batch_no,
)
- def test_delivery_note_fail(self):
+ def test_batch_negative_stock_error(self):
"""Test automatic batch selection for outgoing items"""
receipt = self.test_purchase_receipt(100)
- delivery_note = frappe.get_doc(
- dict(
- doctype="Delivery Note",
- customer="_Test Customer",
- company=receipt.company,
- items=[
- dict(item_code="ITEM-BATCH-1", qty=5000, rate=10, warehouse=receipt.items[0].warehouse)
- ],
- )
+
+ receipt.load_from_db()
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
+ sn_doc = SerialBatchCreation(
+ {
+ "item_code": "ITEM-BATCH-1",
+ "warehouse": receipt.items[0].warehouse,
+ "voucher_type": "Delivery Note",
+ "qty": 5000,
+ "avg_rate": 10,
+ "batches": frappe._dict({batch_no: 5000}),
+ "type_of_transaction": "Outward",
+ "company": receipt.company,
+ }
)
- self.assertRaises(UnableToSelectBatchError, delivery_note.insert)
+
+ self.assertRaises(BatchNegativeStockError, sn_doc.make_serial_and_batch_bundle)
def test_stock_entry_outgoing(self):
"""Test automatic batch selection for outgoing stock entry"""
@@ -130,6 +239,24 @@
receipt = self.test_purchase_receipt(batch_qty)
item_code = "ITEM-BATCH-1"
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
+
+ bundle_id = (
+ SerialBatchCreation(
+ {
+ "item_code": item_code,
+ "warehouse": receipt.items[0].warehouse,
+ "actual_qty": batch_qty,
+ "voucher_type": "Stock Entry",
+ "batches": frappe._dict({batch_no: batch_qty}),
+ "type_of_transaction": "Outward",
+ "company": receipt.company,
+ }
+ )
+ .make_serial_and_batch_bundle()
+ .name
+ )
+
stock_entry = frappe.get_doc(
dict(
doctype="Stock Entry",
@@ -140,6 +267,7 @@
item_code=item_code,
qty=batch_qty,
s_warehouse=receipt.items[0].warehouse,
+ serial_and_batch_bundle=bundle_id,
)
],
)
@@ -148,10 +276,11 @@
stock_entry.set_stock_entry_type()
stock_entry.insert()
stock_entry.submit()
+ stock_entry.load_from_db()
- # assert same batch is selected
self.assertEqual(
- stock_entry.items[0].batch_no, get_batch_no(item_code, receipt.items[0].warehouse, batch_qty)
+ get_batch_from_bundle(stock_entry.items[0].serial_and_batch_bundle),
+ get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle),
)
def test_batch_split(self):
@@ -159,11 +288,11 @@
receipt = self.test_purchase_receipt()
from erpnext.stock.doctype.batch.batch import split_batch
- new_batch = split_batch(
- receipt.items[0].batch_no, "ITEM-BATCH-1", receipt.items[0].warehouse, 22
- )
+ batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
- self.assertEqual(get_batch_qty(receipt.items[0].batch_no, receipt.items[0].warehouse), 78)
+ new_batch = split_batch(batch_no, "ITEM-BATCH-1", receipt.items[0].warehouse, 22)
+
+ self.assertEqual(get_batch_qty(batch_no, receipt.items[0].warehouse), 78)
self.assertEqual(get_batch_qty(new_batch, receipt.items[0].warehouse), 22)
def test_get_batch_qty(self):
@@ -174,7 +303,10 @@
self.assertEqual(
get_batch_qty(item_code="ITEM-BATCH-2", warehouse="_Test Warehouse - _TC"),
- [{"batch_no": "batch a", "qty": 90.0}, {"batch_no": "batch b", "qty": 90.0}],
+ [
+ {"batch_no": "batch a", "qty": 90.0, "warehouse": "_Test Warehouse - _TC"},
+ {"batch_no": "batch b", "qty": 90.0, "warehouse": "_Test Warehouse - _TC"},
+ ],
)
self.assertEqual(get_batch_qty("batch a", "_Test Warehouse - _TC"), 90)
@@ -201,6 +333,19 @@
)
batch.save()
+ sn_doc = SerialBatchCreation(
+ {
+ "item_code": item_name,
+ "warehouse": warehouse,
+ "voucher_type": "Stock Entry",
+ "qty": 90,
+ "avg_rate": 10,
+ "batches": frappe._dict({batch_name: 90}),
+ "type_of_transaction": "Inward",
+ "company": "_Test Company",
+ }
+ ).make_serial_and_batch_bundle()
+
stock_entry = frappe.get_doc(
dict(
doctype="Stock Entry",
@@ -210,10 +355,10 @@
dict(
item_code=item_name,
qty=90,
+ serial_and_batch_bundle=sn_doc.name,
t_warehouse=warehouse,
cost_center="Main - _TC",
rate=10,
- batch_no=batch_name,
allow_zero_valuation_rate=1,
)
],
@@ -320,7 +465,8 @@
batches = {}
for rate in rates:
se = make_stock_entry(item_code=item_code, qty=10, rate=rate, target=warehouse)
- batches[se.items[0].batch_no] = rate
+ batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
+ batches[batch_no] = rate
LOW, HIGH = list(batches.keys())
@@ -341,7 +487,9 @@
sle = frappe.get_last_doc("Stock Ledger Entry", {"is_cancelled": 0, "voucher_no": se.name})
- stock_value_difference = sle.actual_qty * batches[sle.batch_no]
+ stock_value_difference = (
+ sle.actual_qty * batches[get_batch_from_bundle(sle.serial_and_batch_bundle)]
+ )
self.assertAlmostEqual(sle.stock_value_difference, stock_value_difference)
stock_value += stock_value_difference
@@ -353,51 +501,12 @@
self.assertEqual(json.loads(sle.stock_queue), []) # queues don't apply on batched items
- def test_moving_batch_valuation_rates(self):
- item_code = "_TestBatchWiseVal"
- warehouse = "_Test Warehouse - _TC"
- self.make_batch_item(item_code)
-
- def assertValuation(expected):
- actual = get_valuation_rate(
- item_code, warehouse, "voucher_type", "voucher_no", batch_no=batch_no
- )
- self.assertAlmostEqual(actual, expected)
-
- se = make_stock_entry(item_code=item_code, qty=100, rate=10, target=warehouse)
- batch_no = se.items[0].batch_no
- assertValuation(10)
-
- # consumption should never affect current valuation rate
- make_stock_entry(item_code=item_code, qty=20, source=warehouse)
- assertValuation(10)
-
- make_stock_entry(item_code=item_code, qty=30, source=warehouse)
- assertValuation(10)
-
- # 50 * 10 = 500 current value, add more item with higher valuation
- make_stock_entry(item_code=item_code, qty=50, rate=20, target=warehouse, batch_no=batch_no)
- assertValuation(15)
-
- # consuming again shouldn't do anything
- make_stock_entry(item_code=item_code, qty=20, source=warehouse)
- assertValuation(15)
-
- # reset rate with stock reconiliation
- create_stock_reconciliation(
- item_code=item_code, warehouse=warehouse, qty=10, rate=25, batch_no=batch_no
- )
- assertValuation(25)
-
- make_stock_entry(item_code=item_code, qty=20, rate=20, target=warehouse, batch_no=batch_no)
- assertValuation((20 * 20 + 10 * 25) / (10 + 20))
-
def test_update_batch_properties(self):
item_code = "_TestBatchWiseVal"
self.make_batch_item(item_code)
se = make_stock_entry(item_code=item_code, qty=100, rate=10, target="_Test Warehouse - _TC")
- batch_no = se.items[0].batch_no
+ batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
batch = frappe.get_doc("Batch", batch_no)
expiry_date = add_to_date(batch.manufacturing_date, days=30)
@@ -426,8 +535,17 @@
pr_1 = make_purchase_receipt(item_code=item_code, qty=1, batch_no=manually_created_batch)
pr_2 = make_purchase_receipt(item_code=item_code, qty=1)
- self.assertNotEqual(pr_1.items[0].batch_no, pr_2.items[0].batch_no)
- self.assertEqual("BATCHEXISTING002", pr_2.items[0].batch_no)
+ pr_1.load_from_db()
+ pr_2.load_from_db()
+
+ self.assertNotEqual(
+ get_batch_from_bundle(pr_1.items[0].serial_and_batch_bundle),
+ get_batch_from_bundle(pr_2.items[0].serial_and_batch_bundle),
+ )
+
+ self.assertEqual(
+ "BATCHEXISTING002", get_batch_from_bundle(pr_2.items[0].serial_and_batch_bundle)
+ )
def create_batch(item_code, rate, create_item_price_for_batch):
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index d822f4a..a115727 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -15,6 +15,7 @@
"projected_qty",
"reserved_qty_for_production",
"reserved_qty_for_sub_contract",
+ "reserved_qty_for_production_plan",
"ma_rate",
"stock_uom",
"fcfs_rate",
@@ -165,13 +166,19 @@
"oldfieldname": "stock_value",
"oldfieldtype": "Currency",
"read_only": 1
+ },
+ {
+ "fieldname": "reserved_qty_for_production_plan",
+ "fieldtype": "Float",
+ "label": "Reserved Qty for Production Plan",
+ "read_only": 1
}
],
"hide_toolbar": 1,
"idx": 1,
"in_create": 1,
"links": [],
- "modified": "2022-03-30 07:22:23.868602",
+ "modified": "2023-05-02 23:26:21.806965",
"modified_by": "Administrator",
"module": "Stock",
"name": "Bin",
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 72654e6..5abea9e 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -24,8 +24,30 @@
- flt(self.reserved_qty)
- flt(self.reserved_qty_for_production)
- flt(self.reserved_qty_for_sub_contract)
+ - flt(self.reserved_qty_for_production_plan)
)
+ def update_reserved_qty_for_production_plan(self, skip_project_qty_update=False):
+ """Update qty reserved for production from Production Plan tables
+ in open production plan"""
+ from erpnext.manufacturing.doctype.production_plan.production_plan import (
+ get_reserved_qty_for_production_plan,
+ )
+
+ self.reserved_qty_for_production_plan = get_reserved_qty_for_production_plan(
+ self.item_code, self.warehouse
+ )
+
+ self.db_set(
+ "reserved_qty_for_production_plan",
+ flt(self.reserved_qty_for_production_plan),
+ update_modified=True,
+ )
+
+ if not skip_project_qty_update:
+ self.set_projected_qty()
+ self.db_set("projected_qty", self.projected_qty, update_modified=True)
+
def update_reserved_qty_for_production(self):
"""Update qty reserved for production from Production Item tables
in open work orders"""
@@ -35,11 +57,13 @@
self.item_code, self.warehouse
)
- self.set_projected_qty()
-
self.db_set(
"reserved_qty_for_production", flt(self.reserved_qty_for_production), update_modified=True
)
+
+ self.update_reserved_qty_for_production_plan(skip_project_qty_update=True)
+
+ self.set_projected_qty()
self.db_set("projected_qty", self.projected_qty, update_modified=True)
def update_reserved_qty_for_sub_contracting(self, subcontract_doctype="Subcontracting Order"):
@@ -141,6 +165,7 @@
"planned_qty",
"reserved_qty_for_production",
"reserved_qty_for_sub_contract",
+ "reserved_qty_for_production_plan",
],
as_dict=1,
)
@@ -188,6 +213,7 @@
- flt(reserved_qty)
- flt(bin_details.reserved_qty_for_production)
- flt(bin_details.reserved_qty_for_sub_contract)
+ - flt(bin_details.reserved_qty_for_production_plan)
)
frappe.db.set_value(
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/__init__.py b/erpnext/stock/doctype/closing_stock_balance/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/cash_flow_mapper/__init__.py
copy to erpnext/stock/doctype/closing_stock_balance/__init__.py
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.js b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.js
new file mode 100644
index 0000000..5c807a8
--- /dev/null
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Closing Stock Balance", {
+ refresh(frm) {
+ frm.trigger("generate_closing_balance");
+ frm.trigger("regenerate_closing_balance");
+ },
+
+ generate_closing_balance(frm) {
+ if (in_list(["Queued", "Failed"], frm.doc.status)) {
+ frm.add_custom_button(__("Generate Closing Stock Balance"), () => {
+ frm.call({
+ method: "enqueue_job",
+ doc: frm.doc,
+ freeze: true,
+ callback: () => {
+ frm.reload_doc();
+ }
+ })
+ })
+ }
+ },
+
+ regenerate_closing_balance(frm) {
+ if (frm.doc.status == "Completed") {
+ frm.add_custom_button(__("Regenerate Closing Stock Balance"), () => {
+ frm.call({
+ method: "regenerate_closing_balance",
+ doc: frm.doc,
+ freeze: true,
+ callback: () => {
+ frm.reload_doc();
+ }
+ })
+ })
+ }
+ }
+});
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
new file mode 100644
index 0000000..225da6d
--- /dev/null
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
@@ -0,0 +1,148 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2023-05-17 09:58:42.086911",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "naming_series",
+ "company",
+ "status",
+ "column_break_p0s0",
+ "from_date",
+ "to_date",
+ "filters_section",
+ "item_code",
+ "item_group",
+ "include_uom",
+ "column_break_rm5w",
+ "warehouse",
+ "warehouse_type",
+ "amended_from"
+ ],
+ "fields": [
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Naming Series",
+ "options": "CBAL-.#####"
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "Company",
+ "options": "Company"
+ },
+ {
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "in_preview": 1,
+ "label": "Status",
+ "options": "Draft\nQueued\nIn Progress\nCompleted\nFailed\nCanceled",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_p0s0",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date"
+ },
+ {
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "filters_section",
+ "fieldtype": "Section Break",
+ "label": "Filters"
+ },
+ {
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "label": "Item Code",
+ "options": "Item"
+ },
+ {
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "label": "Item Group",
+ "options": "Item Group"
+ },
+ {
+ "fieldname": "column_break_rm5w",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "label": "Warehouse",
+ "options": "Warehouse"
+ },
+ {
+ "fieldname": "warehouse_type",
+ "fieldtype": "Link",
+ "label": "Warehouse Type",
+ "options": "Warehouse Type"
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Closing Stock Balance",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Closing Stock Balance",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "include_uom",
+ "fieldtype": "Link",
+ "label": "Include UOM",
+ "options": "UOM"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-05-17 11:46:04.448220",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Closing Stock Balance",
+ "naming_rule": "By \"Naming Series\" field",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
new file mode 100644
index 0000000..295d979
--- /dev/null
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
@@ -0,0 +1,133 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import json
+
+import frappe
+from frappe import _
+from frappe.core.doctype.prepared_report.prepared_report import create_json_gz_file
+from frappe.desk.form.load import get_attachments
+from frappe.model.document import Document
+from frappe.utils import get_link_to_form, gzip_decompress, parse_json
+from frappe.utils.background_jobs import enqueue
+
+from erpnext.stock.report.stock_balance.stock_balance import execute
+
+
+class ClosingStockBalance(Document):
+ def before_save(self):
+ self.set_status()
+
+ def set_status(self, save=False):
+ self.status = "Queued"
+ if self.docstatus == 2:
+ self.status = "Canceled"
+
+ if self.docstatus == 0:
+ self.status = "Draft"
+
+ if save:
+ self.db_set("status", self.status)
+
+ def validate(self):
+ self.validate_duplicate()
+
+ def validate_duplicate(self):
+ table = frappe.qb.DocType("Closing Stock Balance")
+
+ query = (
+ frappe.qb.from_(table)
+ .select(table.name)
+ .where(
+ (table.docstatus == 1)
+ & (table.company == self.company)
+ & (
+ (table.from_date.between(self.from_date, self.to_date))
+ | (table.to_date.between(self.from_date, self.to_date))
+ | (table.from_date >= self.from_date and table.to_date <= self.to_date)
+ )
+ )
+ )
+
+ for fieldname in ["warehouse", "item_code", "item_group", "warehouse_type"]:
+ if self.get(fieldname):
+ query = query.where(table[fieldname] == self.get(fieldname))
+
+ query = query.run(as_dict=True)
+
+ if query and query[0].name:
+ name = get_link_to_form("Closing Stock Balance", query[0].name)
+ msg = f"Closing Stock Balance {name} already exists for the selected date range"
+ frappe.throw(_(msg), title=_("Duplicate Closing Stock Balance"))
+
+ def on_submit(self):
+ self.set_status(save=True)
+ self.enqueue_job()
+
+ def on_cancel(self):
+ self.set_status(save=True)
+ self.clear_attachment()
+
+ @frappe.whitelist()
+ def enqueue_job(self):
+ self.db_set("status", "In Progress")
+ self.clear_attachment()
+ enqueue(prepare_closing_stock_balance, name=self.name, queue="long", timeout=1500)
+
+ @frappe.whitelist()
+ def regenerate_closing_balance(self):
+ self.enqueue_job()
+
+ def clear_attachment(self):
+ if attachments := get_attachments(self.doctype, self.name):
+ attachment = attachments[0]
+ frappe.delete_doc("File", attachment.name)
+
+ def create_closing_stock_balance_entries(self):
+ columns, data = execute(
+ filters=frappe._dict(
+ {
+ "company": self.company,
+ "from_date": self.from_date,
+ "to_date": self.to_date,
+ "warehouse": self.warehouse,
+ "item_code": self.item_code,
+ "item_group": self.item_group,
+ "warehouse_type": self.warehouse_type,
+ "include_uom": self.include_uom,
+ "ignore_closing_balance": 1,
+ "show_variant_attributes": 1,
+ "show_stock_ageing_data": 1,
+ }
+ )
+ )
+
+ create_json_gz_file({"columns": columns, "data": data}, self.doctype, self.name)
+
+ def get_prepared_data(self):
+ if attachments := get_attachments(self.doctype, self.name):
+ attachment = attachments[0]
+ attached_file = frappe.get_doc("File", attachment.name)
+
+ data = gzip_decompress(attached_file.get_content())
+ if data := json.loads(data.decode("utf-8")):
+ data = data
+
+ return parse_json(data)
+
+ return frappe._dict({})
+
+
+def prepare_closing_stock_balance(name):
+ doc = frappe.get_doc("Closing Stock Balance", name)
+
+ doc.db_set("status", "In Progress")
+
+ try:
+ doc.create_closing_stock_balance_entries()
+ doc.db_set("status", "Completed")
+ except Exception as e:
+ doc.db_set("status", "Failed")
+ traceback = frappe.get_traceback()
+
+ frappe.log_error("Closing Stock Balance Failed", traceback, doc.doctype, doc.name)
diff --git a/erpnext/stock/doctype/closing_stock_balance/test_closing_stock_balance.py b/erpnext/stock/doctype/closing_stock_balance/test_closing_stock_balance.py
new file mode 100644
index 0000000..7d61f5c
--- /dev/null
+++ b/erpnext/stock/doctype/closing_stock_balance/test_closing_stock_balance.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestClosingStockBalance(FrappeTestCase):
+ pass
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index ae56645..a648195 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -185,11 +185,14 @@
}
if(doc.docstatus==0 && !doc.__islocal) {
- this.frm.add_custom_button(__('Packing Slip'), function() {
- frappe.model.open_mapped_doc({
- method: "erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip",
- frm: me.frm
- }) }, __('Create'));
+ if (doc.__onload && doc.__onload.has_unpacked_items) {
+ this.frm.add_custom_button(__('Packing Slip'), function() {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip",
+ frm: me.frm
+ }) }, __('Create')
+ );
+ }
}
if (!doc.__islocal && doc.docstatus==1) {
@@ -197,6 +200,9 @@
}
}
+ erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm);
+ erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
+
if (doc.docstatus > 0) {
this.show_stock_ledger();
if (erpnext.is_perpetual_inventory_enabled(doc.company)) {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 0c1f820..6a9e241 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -28,8 +28,6 @@
"column_break_18",
"project",
"dimension_col_break",
- "campaign",
- "source",
"custom_dimensions_section",
"currency_and_price_list",
"currency",
@@ -161,11 +159,12 @@
"inter_company_reference",
"customer_group",
"territory",
+ "source",
+ "campaign",
"column_break5",
"excise_page",
"instructions",
- "connections_tab",
- "column_break_25"
+ "connections_tab"
],
"fields": [
{
@@ -375,6 +374,7 @@
"fieldtype": "Small Text",
"hidden": 1,
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -1223,7 +1223,8 @@
"hidden": 1,
"label": "Pick List",
"options": "Pick List",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"default": "0",
@@ -1340,10 +1341,6 @@
"fieldtype": "Column Break"
},
{
- "fieldname": "column_break_25",
- "fieldtype": "Column Break"
- },
- {
"fieldname": "section_break_30",
"fieldtype": "Section Break",
"hide_border": 1
@@ -1403,7 +1400,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2023-02-14 04:45:44.179670",
+ "modified": "2023-06-16 14:58:55.066602",
"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 9f9f5cb..ea20a26 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -12,7 +12,6 @@
from erpnext.controllers.accounts_controller import get_taxes_and_charges
from erpnext.controllers.selling_controller import SellingController
-from erpnext.stock.doctype.batch.batch import set_batch_nos
from erpnext.stock.doctype.serial_no.serial_no import get_delivery_note_serial_no
form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
@@ -86,6 +85,10 @@
]
)
+ def onload(self):
+ if self.docstatus == 0:
+ self.set_onload("has_unpacked_items", self.has_unpacked_items())
+
def before_print(self, settings=None):
def toggle_print_hide(meta, fieldname):
df = meta.get_field(fieldname)
@@ -118,7 +121,7 @@
def so_required(self):
"""check in manage account if sales order required or not"""
- if frappe.db.get_value("Selling Settings", None, "so_required") == "Yes":
+ if frappe.db.get_single_value("Selling Settings", "so_required") == "Yes":
for d in self.get("items"):
if not d.against_sales_order:
frappe.throw(_("Sales Order required for Item {0}").format(d.item_code))
@@ -134,19 +137,17 @@
self.validate_uom_is_integer("stock_uom", "stock_qty")
self.validate_uom_is_integer("uom", "qty")
self.validate_with_previous_doc()
+ self.set_serial_and_batch_bundle_from_pick_list()
from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
make_packing_list(self)
-
- if self._action != "submit" and not self.is_return:
- set_batch_nos(self, "warehouse", throw=True)
- set_batch_nos(self, "warehouse", throw=True, child_table="packed_items")
-
self.update_current_stock()
if not self.installation_status:
self.installation_status = "Not Installed"
+
+ self.validate_against_stock_reservation_entries()
self.reset_default_field_value("set_warehouse", "items", "warehouse")
def validate_with_previous_doc(self):
@@ -187,6 +188,24 @@
]
)
+ def set_serial_and_batch_bundle_from_pick_list(self):
+ if not self.pick_list:
+ return
+
+ for item in self.items:
+ if item.pick_list_item:
+ filters = {
+ "item_code": item.item_code,
+ "voucher_type": "Pick List",
+ "voucher_no": self.pick_list,
+ "voucher_detail_no": item.pick_list_item,
+ }
+
+ bundle_id = frappe.db.get_value("Serial and Batch Bundle", filters, "name")
+
+ if bundle_id:
+ item.serial_and_batch_bundle = bundle_id
+
def validate_proj_cust(self):
"""check for does customer belong to same project as entered.."""
if self.project and self.customer:
@@ -205,7 +224,7 @@
super(DeliveryNote, self).validate_warehouse()
for d in self.get_item_list():
- if not d["warehouse"] and frappe.db.get_value("Item", d["item_code"], "is_stock_item") == 1:
+ if not d["warehouse"] and frappe.get_cached_value("Item", d["item_code"], "is_stock_item") == 1:
frappe.throw(_("Warehouse required for stock Item {0}").format(d["item_code"]))
def update_current_stock(self):
@@ -239,6 +258,8 @@
self.update_prevdoc_status()
self.update_billing_status()
+ self.update_stock_reservation_entries()
+
if not self.is_return:
self.check_credit_limit()
elif self.issue_credit_note:
@@ -266,11 +287,103 @@
self.make_gl_entries_on_cancel()
self.repost_future_sle_and_gle()
- self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
+ self.ignore_linked_doctypes = (
+ "GL Entry",
+ "Stock Ledger Entry",
+ "Repost Item Valuation",
+ "Serial and Batch Bundle",
+ )
+
+ def update_stock_reservation_entries(self) -> None:
+ """Updates Delivered Qty in Stock Reservation Entries."""
+
+ # Don't update Delivered Qty on Return or Cancellation.
+ if self.is_return or self._action == "cancel":
+ return
+
+ for item in self.get("items"):
+ # Skip if `Sales Order` or `Sales Order Item` reference is not set.
+ if not item.against_sales_order or not item.so_detail:
+ continue
+
+ sre_list = frappe.db.get_all(
+ "Stock Reservation Entry",
+ {
+ "docstatus": 1,
+ "voucher_type": "Sales Order",
+ "voucher_no": item.against_sales_order,
+ "voucher_detail_no": item.so_detail,
+ "warehouse": item.warehouse,
+ "status": ["not in", ["Delivered", "Cancelled"]],
+ },
+ order_by="creation",
+ )
+
+ # Skip if no Stock Reservation Entries.
+ if not sre_list:
+ continue
+
+ available_qty_to_deliver = item.stock_qty
+ for sre in sre_list:
+ if available_qty_to_deliver <= 0:
+ break
+
+ sre_doc = frappe.get_doc("Stock Reservation Entry", sre)
+
+ # `Delivered Qty` should be less than or equal to `Reserved Qty`.
+ qty_to_be_deliver = min(sre_doc.reserved_qty - sre_doc.delivered_qty, available_qty_to_deliver)
+
+ sre_doc.delivered_qty += qty_to_be_deliver
+ sre_doc.db_update()
+
+ # Update Stock Reservation Entry `Status` based on `Delivered Qty`.
+ sre_doc.update_status()
+
+ available_qty_to_deliver -= qty_to_be_deliver
+
+ def validate_against_stock_reservation_entries(self):
+ """Validates if Stock Reservation Entries are available for the Sales Order Item reference."""
+
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ get_sre_reserved_qty_details_for_voucher_detail_no,
+ )
+
+ # Don't validate if Return
+ if self.is_return:
+ return
+
+ for item in self.get("items"):
+ # Skip if `Sales Order` or `Sales Order Item` reference is not set.
+ if not item.against_sales_order or not item.so_detail:
+ continue
+
+ sre_data = get_sre_reserved_qty_details_for_voucher_detail_no(
+ "Sales Order", item.against_sales_order, item.so_detail
+ )
+
+ # Skip if stock is not reserved.
+ if not sre_data:
+ continue
+
+ # Set `Warehouse` from SRE if not set.
+ if not item.warehouse:
+ item.warehouse = sre_data[0]
+ else:
+ # Throw if `Warehouse` is different from SRE.
+ if item.warehouse != sre_data[0]:
+ frappe.throw(
+ _("Row #{0}: Stock is reserved for Item {1} in Warehouse {2}.").format(
+ item.idx, frappe.bold(item.item_code), frappe.bold(sre_data[0])
+ ),
+ title=_("Stock Reservation Warehouse Mismatch"),
+ )
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
+ if self.per_billed == 100:
+ return
+
extra_amount = 0
validate_against_credit_limit = False
bypass_credit_limit_check_at_sales_order = cint(
@@ -299,20 +412,21 @@
)
def validate_packed_qty(self):
- """
- Validate that if packed qty exists, it should be equal to qty
- """
- if not any(flt(d.get("packed_qty")) for d in self.get("items")):
- return
- has_error = False
- for d in self.get("items"):
- if flt(d.get("qty")) != flt(d.get("packed_qty")):
- frappe.msgprint(
- _("Packed quantity must equal quantity for Item {0} in row {1}").format(d.item_code, d.idx)
- )
- has_error = True
- if has_error:
- raise frappe.ValidationError
+ """Validate that if packed qty exists, it should be equal to qty"""
+
+ if frappe.db.exists("Packing Slip", {"docstatus": 1, "delivery_note": self.name}):
+ product_bundle_list = self.get_product_bundle_list()
+ for item in self.items + self.packed_items:
+ if (
+ item.item_code not in product_bundle_list
+ and flt(item.packed_qty)
+ and flt(item.packed_qty) != flt(item.qty)
+ ):
+ frappe.throw(
+ _("Row {0}: Packed Qty must be equal to {1} Qty.").format(
+ item.idx, frappe.bold(item.doctype)
+ )
+ )
def update_pick_list_status(self):
from erpnext.stock.doctype.pick_list.pick_list import update_pick_list_status
@@ -390,6 +504,23 @@
)
)
+ def has_unpacked_items(self):
+ product_bundle_list = self.get_product_bundle_list()
+
+ for item in self.items + self.packed_items:
+ if item.item_code not in product_bundle_list and flt(item.packed_qty) < flt(item.qty):
+ return True
+
+ return False
+
+ def get_product_bundle_list(self):
+ items_list = [item.item_code for item in self.items]
+ return frappe.db.get_all(
+ "Product Bundle",
+ filters={"new_item_code": ["in", items_list]},
+ pluck="name",
+ )
+
def update_billed_amount_based_on_so(so_detail, update_modified=True):
from frappe.query_builder.functions import Sum
@@ -681,6 +812,12 @@
@frappe.whitelist()
def make_packing_slip(source_name, target_doc=None):
+ def set_missing_values(source, target):
+ target.run_method("set_missing_values")
+
+ def update_item(obj, target, source_parent):
+ target.qty = flt(obj.qty) - flt(obj.packed_qty)
+
doclist = get_mapped_doc(
"Delivery Note",
source_name,
@@ -695,12 +832,34 @@
"field_map": {
"item_code": "item_code",
"item_name": "item_name",
+ "batch_no": "batch_no",
"description": "description",
"qty": "qty",
+ "stock_uom": "stock_uom",
+ "name": "dn_detail",
},
+ "postprocess": update_item,
+ "condition": lambda item: (
+ not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code})
+ and flt(item.packed_qty) < flt(item.qty)
+ ),
+ },
+ "Packed Item": {
+ "doctype": "Packing Slip Item",
+ "field_map": {
+ "item_code": "item_code",
+ "item_name": "item_name",
+ "batch_no": "batch_no",
+ "description": "description",
+ "qty": "qty",
+ "name": "pi_detail",
+ },
+ "postprocess": update_item,
+ "condition": lambda item: (flt(item.packed_qty) < flt(item.qty)),
},
},
target_doc,
+ set_missing_values,
)
return doclist
@@ -904,8 +1063,6 @@
"field_map": {
source_document_warehouse_field: target_document_warehouse_field,
"name": "delivery_note_item",
- "batch_no": "batch_no",
- "serial_no": "serial_no",
"purchase_order": "purchase_order",
"purchase_order_item": "purchase_order_item",
"material_request": "material_request",
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 22d8135..0ef3027 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -23,7 +23,11 @@
)
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
-from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError, get_serial_nos
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.test_stock_entry import (
get_qty_after_transaction,
make_serialized_item,
@@ -39,7 +43,7 @@
class TestDeliveryNote(FrappeTestCase):
def test_over_billing_against_dn(self):
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
dn = create_delivery_note(do_not_submit=True)
self.assertRaises(frappe.ValidationError, make_sales_invoice, dn.name)
@@ -135,42 +139,6 @@
dn.cancel()
- def test_serialized(self):
- se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
-
- dn = create_delivery_note(item_code="_Test Serialized Item With Series", serial_no=serial_no)
-
- self.check_serial_no_values(serial_no, {"warehouse": "", "delivery_document_no": dn.name})
-
- si = make_sales_invoice(dn.name)
- si.insert(ignore_permissions=True)
- self.assertEqual(dn.items[0].serial_no, si.items[0].serial_no)
-
- dn.cancel()
-
- self.check_serial_no_values(
- serial_no, {"warehouse": "_Test Warehouse - _TC", "delivery_document_no": ""}
- )
-
- def test_serialized_partial_sales_invoice(self):
- se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)
- serial_no = "\n".join(serial_no)
-
- dn = create_delivery_note(
- item_code="_Test Serialized Item With Series", qty=2, serial_no=serial_no
- )
-
- si = make_sales_invoice(dn.name)
- si.items[0].qty = 1
- si.submit()
- self.assertEqual(si.items[0].qty, 1)
-
- si = make_sales_invoice(dn.name)
- si.submit()
- self.assertEqual(si.items[0].qty, len(get_serial_nos(si.items[0].serial_no)))
-
def test_serialize_status(self):
from frappe.model.naming import make_autoname
@@ -178,16 +146,28 @@
{
"doctype": "Serial No",
"item_code": "_Test Serialized Item With Series",
- "serial_no": make_autoname("SR", "Serial No"),
+ "serial_no": make_autoname("SRDD", "Serial No"),
}
)
serial_no.save()
- dn = create_delivery_note(
- item_code="_Test Serialized Item With Series", serial_no=serial_no.name, do_not_submit=True
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": "_Test Serialized Item With Series",
+ "warehouse": "_Test Warehouse - _TC",
+ "qty": -1,
+ "voucher_type": "Delivery Note",
+ "serial_nos": [serial_no.name],
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "type_of_transaction": "Outward",
+ "do_not_save": True,
+ }
+ )
)
- self.assertRaises(SerialNoWarehouseError, dn.submit)
+ self.assertRaises(frappe.ValidationError, bundle_id.make_serial_and_batch_bundle)
def check_serial_no_values(self, serial_no, field_values):
serial_no = frappe.get_doc("Serial No", serial_no)
@@ -338,6 +318,37 @@
self.assertEqual(dn.per_returned, 100)
self.assertEqual(dn.status, "Return Issued")
+ def test_delivery_note_return_valuation_on_different_warehuose(self):
+ from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+
+ company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company")
+ item_code = "Test Return Valuation For DN"
+ make_item("Test Return Valuation For DN", {"is_stock_item": 1})
+ return_warehouse = create_warehouse("Returned Test Warehouse", company=company)
+
+ make_stock_entry(item_code=item_code, target="Stores - TCP1", qty=5, basic_rate=150)
+
+ dn = create_delivery_note(
+ item_code=item_code,
+ qty=5,
+ rate=500,
+ warehouse="Stores - TCP1",
+ company=company,
+ expense_account="Cost of Goods Sold - TCP1",
+ cost_center="Main - TCP1",
+ )
+
+ dn.submit()
+ self.assertEqual(dn.items[0].incoming_rate, 150)
+
+ from erpnext.controllers.sales_and_purchase_return import make_return_doc
+
+ return_dn = make_return_doc(dn.doctype, dn.name)
+ return_dn.items[0].warehouse = return_warehouse
+ return_dn.save().submit()
+
+ self.assertEqual(return_dn.items[0].incoming_rate, 150)
+
def test_return_single_item_from_bundled_items(self):
company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company")
@@ -532,13 +543,14 @@
def test_return_for_serialized_items(self):
se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
+
+ serial_no = [get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]]
dn = create_delivery_note(
item_code="_Test Serialized Item With Series", rate=500, serial_no=serial_no
)
- self.check_serial_no_values(serial_no, {"warehouse": "", "delivery_document_no": dn.name})
+ self.check_serial_no_values(serial_no, {"warehouse": ""})
# return entry
dn1 = create_delivery_note(
@@ -550,23 +562,17 @@
serial_no=serial_no,
)
- self.check_serial_no_values(
- serial_no, {"warehouse": "_Test Warehouse - _TC", "delivery_document_no": ""}
- )
+ self.check_serial_no_values(serial_no, {"warehouse": "_Test Warehouse - _TC"})
dn1.cancel()
- self.check_serial_no_values(serial_no, {"warehouse": "", "delivery_document_no": dn.name})
+ self.check_serial_no_values(serial_no, {"warehouse": ""})
dn.cancel()
self.check_serial_no_values(
serial_no,
- {
- "warehouse": "_Test Warehouse - _TC",
- "delivery_document_no": "",
- "purchase_document_no": se.name,
- },
+ {"warehouse": "_Test Warehouse - _TC"},
)
def test_delivery_of_bundled_items_to_target_warehouse(self):
@@ -734,7 +740,7 @@
# Testing if Customer's Purchase Order No was rightly copied
self.assertEqual(so.po_no, si.po_no)
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
dn1 = make_delivery_note(so.name)
dn1.get("items")[0].qty = 2
@@ -766,7 +772,7 @@
make_sales_invoice as make_sales_invoice_from_so,
)
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
so = make_sales_order()
@@ -956,7 +962,7 @@
"is_stock_item": 1,
"has_batch_no": 1,
"create_new_batch": 1,
- "batch_number_series": "TESTBATCH.#####",
+ "batch_number_series": "TESTBATCHIUU.#####",
},
)
make_product_bundle(parent=batched_bundle.name, items=[batched_item.name])
@@ -964,16 +970,11 @@
item_code=batched_item.name, target="_Test Warehouse - _TC", qty=10, basic_rate=42
)
- try:
- dn = create_delivery_note(item_code=batched_bundle.name, qty=1)
- except frappe.ValidationError as e:
- if "batch" in str(e).lower():
- self.fail("Batch numbers not getting added to bundled items in DN.")
- raise e
+ dn = create_delivery_note(item_code=batched_bundle.name, qty=1)
+ dn.load_from_db()
- self.assertTrue(
- "TESTBATCH" in dn.packed_items[0].batch_no, "Batch number not added in packed item"
- )
+ batch_no = get_batch_from_bundle(dn.packed_items[0].serial_and_batch_bundle)
+ self.assertTrue(batch_no)
def test_payment_terms_are_fetched_when_creating_sales_invoice(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import (
@@ -1167,10 +1168,11 @@
pi = make_purchase_receipt(qty=1, item_code=item.name)
- dn = create_delivery_note(qty=1, item_code=item.name, batch_no=pi.items[0].batch_no)
+ pr_batch_no = get_batch_from_bundle(pi.items[0].serial_and_batch_bundle)
+ dn = create_delivery_note(qty=1, item_code=item.name, batch_no=pr_batch_no)
dn.load_from_db()
- batch_no = dn.items[0].batch_no
+ batch_no = get_batch_from_bundle(dn.items[0].serial_and_batch_bundle)
self.assertTrue(batch_no)
frappe.db.set_value("Batch", batch_no, "expiry_date", add_days(today(), -1))
@@ -1241,6 +1243,36 @@
dn.is_return = args.is_return
dn.return_against = args.return_against
+ bundle_id = None
+ if args.get("batch_no") or args.get("serial_no"):
+ type_of_transaction = args.type_of_transaction or "Outward"
+
+ if dn.is_return:
+ type_of_transaction = "Inward"
+
+ qty = args.get("qty") or 1
+ qty *= -1 if type_of_transaction == "Outward" else 1
+ batches = {}
+ if args.get("batch_no"):
+ batches = frappe._dict({args.batch_no: qty})
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": args.item or args.item_code or "_Test Item",
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": qty,
+ "batches": batches,
+ "voucher_type": "Delivery Note",
+ "serial_nos": args.serial_no,
+ "posting_date": dn.posting_date,
+ "posting_time": dn.posting_time,
+ "type_of_transaction": type_of_transaction,
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
dn.append(
"items",
{
@@ -1249,11 +1281,10 @@
"qty": args.qty or 1,
"rate": args.rate if args.get("rate") is not None else 100,
"conversion_factor": 1.0,
+ "serial_and_batch_bundle": bundle_id,
"allow_zero_valuation_rate": args.allow_zero_valuation_rate or 1,
"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
"cost_center": args.cost_center or "_Test Cost Center - _TC",
- "serial_no": args.serial_no,
- "batch_no": args.batch_no or None,
"target_warehouse": args.target_warehouse,
},
)
@@ -1262,6 +1293,9 @@
dn.insert()
if not args.do_not_submit:
dn.submit()
+
+ dn.load_from_db()
+
return dn
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 180adee..ba0f28a 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -70,6 +70,7 @@
"target_warehouse",
"quality_inspection",
"col_break4",
+ "allow_zero_valuation_rate",
"against_sales_order",
"so_detail",
"against_sales_invoice",
@@ -77,17 +78,21 @@
"dn_detail",
"pick_list_item",
"section_break_40",
- "batch_no",
+ "pick_serial_and_batch",
+ "serial_and_batch_bundle",
+ "column_break_eaoe",
"serial_no",
+ "batch_no",
+ "available_qty_section",
"actual_batch_qty",
"actual_qty",
"installed_qty",
"item_tax_rate",
"column_break_atna",
+ "packed_qty",
"received_qty",
"accounting_details_section",
"expense_account",
- "allow_zero_valuation_rate",
"column_break_71",
"internal_transfer_section",
"material_request",
@@ -504,17 +509,8 @@
},
{
"fieldname": "section_break_40",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "batch_no",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Batch No",
- "oldfieldname": "batch_no",
- "oldfieldtype": "Link",
- "options": "Batch",
- "print_hide": 1
+ "fieldtype": "Section Break",
+ "label": "Serial and Batch No"
},
{
"allow_on_submit": 1,
@@ -542,15 +538,6 @@
"width": "150px"
},
{
- "fieldname": "serial_no",
- "fieldtype": "Text",
- "in_list_view": 1,
- "label": "Serial No",
- "no_copy": 1,
- "oldfieldname": "serial_no",
- "oldfieldtype": "Text"
- },
- {
"fieldname": "item_group",
"fieldtype": "Link",
"hidden": 1,
@@ -629,7 +616,8 @@
"no_copy": 1,
"options": "Sales Order",
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "against_sales_invoice",
@@ -662,7 +650,8 @@
"label": "Against Sales Invoice Item",
"no_copy": 1,
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "installed_qty",
@@ -848,13 +837,61 @@
"print_hide": 1,
"read_only": 1,
"report_hide": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "eval: doc.packed_qty",
+ "fieldname": "packed_qty",
+ "fieldtype": "Float",
+ "label": "Packed Qty",
+ "no_copy": 1,
+ "non_negative": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "pick_serial_and_batch",
+ "fieldtype": "Button",
+ "label": "Pick Serial / Batch No"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "available_qty_section",
+ "fieldtype": "Section Break",
+ "label": "Available Qty"
+ },
+ {
+ "fieldname": "column_break_eaoe",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "serial_no",
+ "fieldtype": "Text",
+ "hidden": 1,
+ "label": "Serial No",
+ "read_only": 1
+ },
+ {
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Batch No",
+ "options": "Batch",
+ "read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-04-06 09:28:29.182053",
+ "modified": "2023-05-02 21:05:14.175640",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.json b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
index 11b71c2..9d8fe46 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.json
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
@@ -66,8 +66,7 @@
"fieldname": "driver",
"fieldtype": "Link",
"label": "Driver",
- "options": "Driver",
- "reqd": 1
+ "options": "Driver"
},
{
"fetch_from": "driver.full_name",
@@ -189,10 +188,11 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2021-04-30 21:21:36.610142",
+ "modified": "2023-06-27 11:22:27.927637",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Trip",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -228,5 +228,6 @@
],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"title_field": "driver_name"
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index 1febbde..af2f411 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -24,6 +24,9 @@
)
def validate(self):
+ if self._action == "submit" and not self.driver:
+ frappe.throw(_("A driver must be set to submit."))
+
self.validate_stop_addresses()
def on_submit(self):
diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
index db2b5d0..8bff4d5 100644
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
@@ -75,7 +75,16 @@
self.delete_custom_fields()
def delete_custom_fields(self):
- filters = {"fieldname": self.source_fieldname}
+ filters = {
+ "fieldname": (
+ "in",
+ [
+ self.source_fieldname,
+ f"to_{self.source_fieldname}",
+ f"from_{self.source_fieldname}",
+ ],
+ )
+ }
if self.document_type:
filters["dt"] = self.document_type
@@ -88,6 +97,8 @@
def reset_value(self):
if self.apply_to_all_doctypes:
+ self.type_of_transaction = ""
+
self.istable = 0
for field in ["document_type", "condition"]:
self.set(field, None)
@@ -111,12 +122,35 @@
def on_update(self):
self.add_custom_fields()
- def add_custom_fields(self):
- dimension_fields = [
+ @staticmethod
+ def get_insert_after_fieldname(doctype):
+ return frappe.get_all(
+ "DocField",
+ fields=["fieldname"],
+ filters={"parent": doctype},
+ order_by="idx desc",
+ limit=1,
+ )[0].fieldname
+
+ def get_dimension_fields(self, doctype=None):
+ if not doctype:
+ doctype = self.document_type
+
+ label_start_with = ""
+ if doctype in ["Purchase Invoice Item", "Purchase Receipt Item"]:
+ label_start_with = "Target"
+ elif doctype in ["Sales Invoice Item", "Delivery Note Item", "Stock Entry Detail"]:
+ label_start_with = "Source"
+
+ label = self.dimension_name
+ if label_start_with:
+ label = f"{label_start_with} {self.dimension_name}"
+
+ return [
dict(
fieldname="inventory_dimension",
fieldtype="Section Break",
- insert_after="warehouse",
+ insert_after=self.get_insert_after_fieldname(doctype),
label="Inventory Dimension",
collapsible=1,
),
@@ -125,24 +159,37 @@
fieldtype="Link",
insert_after="inventory_dimension",
options=self.reference_document,
- label=self.dimension_name,
+ label=label,
reqd=self.reqd,
mandatory_depends_on=self.mandatory_depends_on,
),
]
+ def add_custom_fields(self):
custom_fields = {}
+ dimension_fields = []
if self.apply_to_all_doctypes:
for doctype in get_inventory_documents():
- if not field_exists(doctype[0], self.source_fieldname):
- custom_fields.setdefault(doctype[0], dimension_fields)
+ if field_exists(doctype[0], self.source_fieldname):
+ continue
+
+ dimension_fields = self.get_dimension_fields(doctype[0])
+ self.add_transfer_field(doctype[0], dimension_fields)
+ custom_fields.setdefault(doctype[0], dimension_fields)
elif not field_exists(self.document_type, self.source_fieldname):
+ dimension_fields = self.get_dimension_fields()
+
+ self.add_transfer_field(self.document_type, dimension_fields)
custom_fields.setdefault(self.document_type, dimension_fields)
- if not frappe.db.get_value(
- "Custom Field", {"dt": "Stock Ledger Entry", "fieldname": self.target_fieldname}
- ) and not field_exists("Stock Ledger Entry", self.target_fieldname):
+ if (
+ dimension_fields
+ and not frappe.db.get_value(
+ "Custom Field", {"dt": "Stock Ledger Entry", "fieldname": self.target_fieldname}
+ )
+ and not field_exists("Stock Ledger Entry", self.target_fieldname)
+ ):
dimension_field = dimension_fields[1]
dimension_field["mandatory_depends_on"] = ""
dimension_field["reqd"] = 0
@@ -152,6 +199,53 @@
if custom_fields:
create_custom_fields(custom_fields)
+ def add_transfer_field(self, doctype, dimension_fields):
+ if doctype not in [
+ "Stock Entry Detail",
+ "Sales Invoice Item",
+ "Delivery Note Item",
+ "Purchase Invoice Item",
+ "Purchase Receipt Item",
+ ]:
+ return
+
+ fieldname_start_with = "to"
+ label_start_with = "Target"
+ display_depends_on = ""
+
+ if doctype in ["Purchase Invoice Item", "Purchase Receipt Item"]:
+ fieldname_start_with = "from"
+ label_start_with = "Source"
+ display_depends_on = "eval:parent.is_internal_supplier == 1"
+ elif doctype != "Stock Entry Detail":
+ display_depends_on = "eval:parent.is_internal_customer == 1"
+ elif doctype == "Stock Entry Detail":
+ display_depends_on = "eval:parent.purpose != 'Material Issue'"
+
+ fieldname = f"{fieldname_start_with}_{self.source_fieldname}"
+ label = f"{label_start_with} {self.dimension_name}"
+
+ if field_exists(doctype, fieldname):
+ return
+
+ dimension_fields.extend(
+ [
+ dict(
+ fieldname="inventory_dimension_col_break",
+ fieldtype="Column Break",
+ insert_after=self.source_fieldname,
+ ),
+ dict(
+ fieldname=fieldname,
+ fieldtype="Link",
+ insert_after="inventory_dimension_col_break",
+ options=self.reference_document,
+ label=label,
+ depends_on=display_depends_on,
+ ),
+ ]
+ )
+
def field_exists(doctype, fieldname) -> str or None:
return frappe.db.get_value("DocField", {"parent": doctype, "fieldname": fieldname}, "name")
@@ -185,18 +279,19 @@
dimensions = get_document_wise_inventory_dimensions(doc.doctype)
filter_dimensions = []
for row in dimensions:
- if (
- row.type_of_transaction == "Inward"
- if doc.docstatus == 1
- else row.type_of_transaction != "Inward"
- ) and sl_dict.actual_qty < 0:
- continue
- elif (
- row.type_of_transaction == "Outward"
- if doc.docstatus == 1
- else row.type_of_transaction != "Outward"
- ) and sl_dict.actual_qty > 0:
- continue
+ if row.type_of_transaction:
+ if (
+ row.type_of_transaction == "Inward"
+ if doc.docstatus == 1
+ else row.type_of_transaction != "Inward"
+ ) and sl_dict.actual_qty < 0:
+ continue
+ elif (
+ row.type_of_transaction == "Outward"
+ if doc.docstatus == 1
+ else row.type_of_transaction != "Outward"
+ ) and sl_dict.actual_qty > 0:
+ continue
evals = {"doc": doc}
if parent_doc:
diff --git a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
index 28b1ed9..2d273c6 100644
--- a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
+++ b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
@@ -4,6 +4,7 @@
import frappe
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from frappe.tests.utils import FrappeTestCase
+from frappe.utils import nowdate, nowtime
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import (
@@ -12,6 +13,7 @@
DoNotChangeError,
delete_dimension,
)
+from erpnext.stock.doctype.item.test_item import create_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
@@ -20,6 +22,7 @@
class TestInventoryDimension(FrappeTestCase):
def setUp(self):
prepare_test_data()
+ create_store_dimension()
def test_validate_inventory_dimension(self):
# Can not be child doc
@@ -73,6 +76,8 @@
self.assertFalse(custom_field)
def test_inventory_dimension(self):
+ frappe.local.document_wise_inventory_dimensions = {}
+
warehouse = "Shelf Warehouse - _TC"
item_code = "_Test Item"
@@ -143,6 +148,8 @@
self.assertRaises(DoNotChangeError, inv_dim1.save)
def test_inventory_dimension_for_purchase_receipt_and_delivery_note(self):
+ frappe.local.document_wise_inventory_dimensions = {}
+
inv_dimension = create_inventory_dimension(
reference_document="Rack", dimension_name="Rack", apply_to_all_doctypes=1
)
@@ -250,6 +257,191 @@
)
)
+ def test_for_purchase_sales_and_stock_transaction(self):
+ from erpnext.controllers.sales_and_purchase_return import make_return_doc
+
+ create_inventory_dimension(
+ reference_document="Store",
+ type_of_transaction="Outward",
+ dimension_name="Store",
+ apply_to_all_doctypes=1,
+ )
+
+ item_code = "Test Inventory Dimension Item"
+ create_item(item_code)
+ warehouse = create_warehouse("Store Warehouse")
+
+ # Purchase Receipt -> Inward in Store 1
+ pr_doc = make_purchase_receipt(
+ item_code=item_code, warehouse=warehouse, qty=10, rate=100, do_not_submit=True
+ )
+
+ pr_doc.items[0].store = "Store 1"
+ pr_doc.save()
+ pr_doc.submit()
+
+ entries = get_voucher_sl_entries(pr_doc.name, ["warehouse", "store", "incoming_rate"])
+
+ self.assertEqual(entries[0].warehouse, warehouse)
+ self.assertEqual(entries[0].store, "Store 1")
+
+ # Stock Entry -> Transfer from Store 1 to Store 2
+ se_doc = make_stock_entry(
+ item_code=item_code, qty=10, from_warehouse=warehouse, to_warehouse=warehouse, do_not_save=True
+ )
+
+ se_doc.items[0].store = "Store 1"
+ se_doc.items[0].to_store = "Store 2"
+
+ se_doc.save()
+ se_doc.submit()
+
+ entries = get_voucher_sl_entries(
+ se_doc.name, ["warehouse", "store", "incoming_rate", "actual_qty"]
+ )
+
+ for entry in entries:
+ self.assertEqual(entry.warehouse, warehouse)
+ if entry.actual_qty > 0:
+ self.assertEqual(entry.store, "Store 2")
+ self.assertEqual(entry.incoming_rate, 100.0)
+ else:
+ self.assertEqual(entry.store, "Store 1")
+
+ # Delivery Note -> Outward from Store 2
+
+ dn_doc = create_delivery_note(item_code=item_code, qty=10, warehouse=warehouse, do_not_save=True)
+
+ dn_doc.items[0].store = "Store 2"
+ dn_doc.save()
+ dn_doc.submit()
+
+ entries = get_voucher_sl_entries(dn_doc.name, ["warehouse", "store", "actual_qty"])
+
+ self.assertEqual(entries[0].warehouse, warehouse)
+ self.assertEqual(entries[0].store, "Store 2")
+ self.assertEqual(entries[0].actual_qty, -10.0)
+
+ return_dn = make_return_doc("Delivery Note", dn_doc.name)
+ return_dn.submit()
+ entries = get_voucher_sl_entries(return_dn.name, ["warehouse", "store", "actual_qty"])
+
+ self.assertEqual(entries[0].warehouse, warehouse)
+ self.assertEqual(entries[0].store, "Store 2")
+ self.assertEqual(entries[0].actual_qty, 10.0)
+
+ se_doc = make_stock_entry(
+ item_code=item_code, qty=10, from_warehouse=warehouse, to_warehouse=warehouse, do_not_save=True
+ )
+
+ se_doc.items[0].store = "Store 2"
+ se_doc.items[0].to_store = "Store 1"
+
+ se_doc.save()
+ se_doc.submit()
+
+ return_pr = make_return_doc("Purchase Receipt", pr_doc.name)
+ return_pr.submit()
+ entries = get_voucher_sl_entries(return_pr.name, ["warehouse", "store", "actual_qty"])
+
+ self.assertEqual(entries[0].warehouse, warehouse)
+ self.assertEqual(entries[0].store, "Store 1")
+ self.assertEqual(entries[0].actual_qty, -10.0)
+
+ def test_inter_transfer_return_against_inventory_dimension(self):
+ from erpnext.controllers.sales_and_purchase_return import make_return_doc
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
+
+ data = prepare_data_for_internal_transfer()
+
+ dn_doc = create_delivery_note(
+ customer=data.customer,
+ company=data.company,
+ warehouse=data.from_warehouse,
+ target_warehouse=data.to_warehouse,
+ qty=5,
+ cost_center=data.cost_center,
+ expense_account=data.expense_account,
+ do_not_submit=True,
+ )
+
+ dn_doc.items[0].store = "Inter Transfer Store 1"
+ dn_doc.items[0].to_store = "Inter Transfer Store 2"
+ dn_doc.save()
+ dn_doc.submit()
+
+ for d in get_voucher_sl_entries(dn_doc.name, ["store", "actual_qty"]):
+ if d.actual_qty > 0:
+ self.assertEqual(d.store, "Inter Transfer Store 2")
+ else:
+ self.assertEqual(d.store, "Inter Transfer Store 1")
+
+ pr_doc = make_inter_company_purchase_receipt(dn_doc.name)
+ pr_doc.items[0].warehouse = data.store_warehouse
+ pr_doc.items[0].from_store = "Inter Transfer Store 2"
+ pr_doc.items[0].store = "Inter Transfer Store 3"
+ pr_doc.save()
+ pr_doc.submit()
+
+ for d in get_voucher_sl_entries(pr_doc.name, ["store", "actual_qty"]):
+ if d.actual_qty > 0:
+ self.assertEqual(d.store, "Inter Transfer Store 3")
+ else:
+ self.assertEqual(d.store, "Inter Transfer Store 2")
+
+ return_doc = make_return_doc("Purchase Receipt", pr_doc.name)
+ return_doc.submit()
+
+ for d in get_voucher_sl_entries(return_doc.name, ["store", "actual_qty"]):
+ if d.actual_qty > 0:
+ self.assertEqual(d.store, "Inter Transfer Store 2")
+ else:
+ self.assertEqual(d.store, "Inter Transfer Store 3")
+
+ dn_doc.load_from_db()
+
+ return_doc1 = make_return_doc("Delivery Note", dn_doc.name)
+ return_doc1.posting_date = nowdate()
+ return_doc1.posting_time = nowtime()
+ return_doc1.items[0].target_warehouse = dn_doc.items[0].target_warehouse
+ return_doc1.items[0].warehouse = dn_doc.items[0].warehouse
+ return_doc1.save()
+ return_doc1.submit()
+
+ for d in get_voucher_sl_entries(return_doc1.name, ["store", "actual_qty"]):
+ if d.actual_qty > 0:
+ self.assertEqual(d.store, "Inter Transfer Store 1")
+ else:
+ self.assertEqual(d.store, "Inter Transfer Store 2")
+
+
+def get_voucher_sl_entries(voucher_no, fields):
+ return frappe.get_all(
+ "Stock Ledger Entry", filters={"voucher_no": voucher_no}, fields=fields, order_by="creation"
+ )
+
+
+def create_store_dimension():
+ if not frappe.db.exists("DocType", "Store"):
+ frappe.get_doc(
+ {
+ "doctype": "DocType",
+ "name": "Store",
+ "module": "Stock",
+ "custom": 1,
+ "naming_rule": "By fieldname",
+ "autoname": "field:store_name",
+ "fields": [{"label": "Store Name", "fieldname": "store_name", "fieldtype": "Data"}],
+ "permissions": [
+ {"role": "System Manager", "permlevel": 0, "read": 1, "write": 1, "create": 1, "delete": 1}
+ ],
+ }
+ ).insert(ignore_permissions=True)
+
+ for store in ["Store 1", "Store 2"]:
+ if not frappe.db.exists("Store", store):
+ frappe.get_doc({"doctype": "Store", "store_name": store}).insert(ignore_permissions=True)
+
def prepare_test_data():
if not frappe.db.exists("DocType", "Shelf"):
@@ -326,3 +518,79 @@
doc.insert(ignore_permissions=True)
return doc
+
+
+def prepare_data_for_internal_transfer():
+ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
+ from erpnext.selling.doctype.customer.test_customer import create_internal_customer
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+ from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+
+ company = "_Test Company with perpetual inventory"
+
+ customer = create_internal_customer(
+ "_Test Internal Customer 3",
+ company,
+ company,
+ )
+
+ supplier = create_internal_supplier(
+ "_Test Internal Supplier 3",
+ company,
+ company,
+ )
+
+ for store in ["Inter Transfer Store 1", "Inter Transfer Store 2", "Inter Transfer Store 3"]:
+ if not frappe.db.exists("Store", store):
+ frappe.get_doc({"doctype": "Store", "store_name": store}).insert(ignore_permissions=True)
+
+ warehouse = create_warehouse("_Test Internal Warehouse New A", company=company)
+
+ to_warehouse = create_warehouse("_Test Internal Warehouse GIT A", company=company)
+
+ pr_doc = make_purchase_receipt(
+ company=company, warehouse=warehouse, qty=10, rate=100, do_not_submit=True
+ )
+ pr_doc.items[0].store = "Inter Transfer Store 1"
+ pr_doc.submit()
+
+ if not frappe.db.get_value("Company", company, "unrealized_profit_loss_account"):
+ account = "Unrealized Profit and Loss - TCP1"
+ if not frappe.db.exists("Account", account):
+ frappe.get_doc(
+ {
+ "doctype": "Account",
+ "account_name": "Unrealized Profit and Loss",
+ "parent_account": "Direct Income - TCP1",
+ "company": company,
+ "is_group": 0,
+ "account_type": "Income Account",
+ }
+ ).insert()
+
+ frappe.db.set_value("Company", company, "unrealized_profit_loss_account", account)
+
+ cost_center = frappe.db.get_value("Company", company, "cost_center") or frappe.db.get_value(
+ "Cost Center", {"company": company}, "name"
+ )
+
+ expene_account = frappe.db.get_value(
+ "Company", company, "stock_adjustment_account"
+ ) or frappe.db.get_value(
+ "Account", {"company": company, "account_type": "Expense Account"}, "name"
+ )
+
+ return frappe._dict(
+ {
+ "from_warehouse": warehouse,
+ "to_warehouse": to_warehouse,
+ "customer": customer,
+ "supplier": supplier,
+ "company": company,
+ "cost_center": cost_center,
+ "expene_account": expene_account,
+ "store_warehouse": frappe.db.get_value(
+ "Warehouse", {"name": ("like", "Store%"), "company": company}, "name"
+ ),
+ }
+ )
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 9a9ddf4..31a3ecb 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -590,7 +590,7 @@
let selected_attributes = {};
me.multiple_variant_dialog.$wrapper.find('.form-column').each((i, col) => {
if(i===0) return;
- let attribute_name = $(col).find('.control-label').html().trim();
+ let attribute_name = $(col).find('.column-label').html().trim();
selected_attributes[attribute_name] = [];
let checked_opts = $(col).find('.checkbox input');
checked_opts.each((i, opt) => {
@@ -772,12 +772,6 @@
if (modal) {
$(modal).removeClass("modal-dialog-scrollable");
}
- })
- .on("awesomplete-close", () => {
- let modal = field.$input.parents('.modal-dialog')[0];
- if (modal) {
- $(modal).addClass("modal-dialog-scrollable");
- }
});
});
},
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 3cc59be..ef4155e 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -585,7 +585,7 @@
existing_allow_negative_stock = frappe.db.get_value(
"Stock Settings", None, "allow_negative_stock"
)
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
repost_stock_for_warehouses = frappe.get_all(
"Stock Ledger Entry",
@@ -601,8 +601,8 @@
for warehouse in repost_stock_for_warehouses:
repost_stock(new_name, warehouse)
- frappe.db.set_value(
- "Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock
+ frappe.db.set_single_value(
+ "Stock Settings", "allow_negative_stock", existing_allow_negative_stock
)
def update_bom_item_desc(self):
@@ -714,6 +714,7 @@
template=self,
now=frappe.flags.in_test,
timeout=600,
+ enqueue_after_commit=True,
)
def validate_has_variants(self):
@@ -772,7 +773,7 @@
rows = ""
for docname, attr_list in not_included.items():
- link = "<a href='/app/Form/Item/{0}'>{0}</a>".format(frappe.bold(_(docname)))
+ link = f"<a href='/app/item/{docname}'>{frappe.bold(docname)}</a>"
rows += table_row(link, body(attr_list))
error_description = _(
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index 534b341..22d38e8 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,5 +1,5 @@
frappe.listview_settings['Item'] = {
- add_fields: ["item_name", "stock_uom", "item_group", "image", "variant_of",
+ add_fields: ["item_name", "stock_uom", "item_group", "image",
"has_variants", "end_of_life", "disabled"],
filters: [["disabled", "=", "0"]],
diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json
index fb4c558..a03bd45 100644
--- a/erpnext/stock/doctype/item_reorder/item_reorder.json
+++ b/erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -81,7 +81,7 @@
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
- "reqd": 1,
+ "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -147,7 +147,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-07-28 19:15:38.270046",
+ "modified": "2023-06-21 15:13:38.270046",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Reorder",
@@ -158,4 +158,4 @@
"read_only_onload": 0,
"sort_order": "ASC",
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index 00fa168..257f263 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -4,7 +4,7 @@
import frappe
from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_days, add_to_date, flt, now
+from frappe.utils import add_days, add_to_date, flt, now, nowtime, today
from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
@@ -15,11 +15,17 @@
get_gl_entries,
make_purchase_receipt,
)
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
+from erpnext.stock.serial_batch_bundle import SerialNoValuation
class TestLandedCostVoucher(FrappeTestCase):
def test_landed_cost_voucher(self):
- frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+ frappe.db.set_single_value("Buying Settings", "allow_multiple_items", 1)
pr = make_purchase_receipt(
company="_Test Company with perpetual inventory",
@@ -297,9 +303,8 @@
self.assertEqual(expected_values[gle.account][1], gle.credit)
def test_landed_cost_voucher_for_serialized_item(self):
- frappe.db.sql(
- "delete from `tabSerial No` where name in ('SN001', 'SN002', 'SN003', 'SN004', 'SN005')"
- )
+ frappe.db.set_value("Item", "_Test Serialized Item", "serial_no_series", "SNJJ.###")
+
pr = make_purchase_receipt(
company="_Test Company with perpetual inventory",
warehouse="Stores - TCP1",
@@ -310,17 +315,42 @@
)
pr.items[0].item_code = "_Test Serialized Item"
- pr.items[0].serial_no = "SN001\nSN002\nSN003\nSN004\nSN005"
pr.submit()
+ pr.load_from_db()
- serial_no_rate = frappe.db.get_value("Serial No", "SN001", "purchase_rate")
+ serial_no = get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle)[0]
+
+ sn_obj = SerialNoValuation(
+ sle=frappe._dict(
+ {
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "item_code": "_Test Serialized Item",
+ "warehouse": "Stores - TCP1",
+ "serial_nos": [serial_no],
+ }
+ )
+ )
+
+ serial_no_rate = sn_obj.get_incoming_rate_of_serial_no(serial_no)
create_landed_cost_voucher("Purchase Receipt", pr.name, pr.company)
- serial_no = frappe.db.get_value("Serial No", "SN001", ["warehouse", "purchase_rate"], as_dict=1)
+ sn_obj = SerialNoValuation(
+ sle=frappe._dict(
+ {
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "item_code": "_Test Serialized Item",
+ "warehouse": "Stores - TCP1",
+ "serial_nos": [serial_no],
+ }
+ )
+ )
- self.assertEqual(serial_no.purchase_rate - serial_no_rate, 5.0)
- self.assertEqual(serial_no.warehouse, "Stores - TCP1")
+ new_serial_no_rate = sn_obj.get_incoming_rate_of_serial_no(serial_no)
+
+ self.assertEqual(new_serial_no_rate - serial_no_rate, 5.0)
def test_serialized_lcv_delivered(self):
"""In some cases you'd want to deliver before you can know all the
@@ -337,23 +367,44 @@
item_code = "_Test Serialized Item"
warehouse = "Stores - TCP1"
+ if not frappe.db.exists("Serial No", serial_no):
+ frappe.get_doc(
+ {
+ "doctype": "Serial No",
+ "item_code": item_code,
+ "serial_no": serial_no,
+ }
+ ).insert()
+
pr = make_purchase_receipt(
company="_Test Company with perpetual inventory",
warehouse=warehouse,
qty=1,
rate=200,
item_code=item_code,
- serial_no=serial_no,
+ serial_no=[serial_no],
)
- serial_no_rate = frappe.db.get_value("Serial No", serial_no, "purchase_rate")
+ sn_obj = SerialNoValuation(
+ sle=frappe._dict(
+ {
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "item_code": "_Test Serialized Item",
+ "warehouse": "Stores - TCP1",
+ "serial_nos": [serial_no],
+ }
+ )
+ )
+
+ serial_no_rate = sn_obj.get_incoming_rate_of_serial_no(serial_no)
# deliver it before creating LCV
dn = create_delivery_note(
item_code=item_code,
company="_Test Company with perpetual inventory",
warehouse="Stores - TCP1",
- serial_no=serial_no,
+ serial_no=[serial_no],
qty=1,
rate=500,
cost_center="Main - TCP1",
@@ -362,14 +413,24 @@
charges = 10
create_landed_cost_voucher("Purchase Receipt", pr.name, pr.company, charges=charges)
-
new_purchase_rate = serial_no_rate + charges
- serial_no = frappe.db.get_value(
- "Serial No", serial_no, ["warehouse", "purchase_rate"], as_dict=1
+ sn_obj = SerialNoValuation(
+ sle=frappe._dict(
+ {
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "item_code": "_Test Serialized Item",
+ "warehouse": "Stores - TCP1",
+ "serial_nos": [serial_no],
+ }
+ )
)
- self.assertEqual(serial_no.purchase_rate, new_purchase_rate)
+ new_serial_no_rate = sn_obj.get_incoming_rate_of_serial_no(serial_no)
+
+ # Since the serial no is already delivered the rate must be zero
+ self.assertFalse(new_serial_no_rate)
stock_value_difference = frappe.db.get_value(
"Stock Ledger Entry",
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.js b/erpnext/stock/doctype/manufacturer/manufacturer.js
index bb7e314..5b4990f 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.js
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.js
@@ -3,7 +3,6 @@
frappe.ui.form.on('Manufacturer', {
refresh: function(frm) {
- frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Manufacturer' };
if (frm.doc.__islocal) {
hide_field(['address_html','contact_html']);
frappe.contacts.clear_address_and_contact(frm);
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 413c373..ae39470 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -280,6 +280,7 @@
{
"fieldname": "set_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"in_list_view": 1,
"label": "Set Target Warehouse",
"options": "Warehouse"
@@ -355,7 +356,7 @@
"idx": 70,
"is_submittable": 1,
"links": [],
- "modified": "2022-09-27 17:58:26.366469",
+ "modified": "2023-05-07 20:17:29.108095",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 8aeb751..ee247fd 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -115,7 +115,7 @@
"""Set title as comma separated list of items"""
if not self.title:
items = ", ".join([d.item_name for d in self.items][:3])
- self.title = _("{0} Request for {1}").format(self.material_request_type, items)[:100]
+ self.title = _("{0} Request for {1}").format(_(self.material_request_type), items)[:100]
def on_submit(self):
self.update_requested_qty()
@@ -616,9 +616,19 @@
target.set_transfer_qty()
target.set_actual_qty()
target.calculate_rate_and_amount(raise_error_if_no_rate=False)
- target.set_stock_entry_type()
+ target.stock_entry_type = target.purpose
target.set_job_card_data()
+ if source.job_card:
+ job_card_details = frappe.get_all(
+ "Job Card", filters={"name": source.job_card}, fields=["bom_no", "for_quantity"]
+ )
+
+ if job_card_details and job_card_details[0]:
+ target.bom_no = job_card_details[0].bom_no
+ target.fg_completed_qty = job_card_details[0].for_quantity
+ target.from_bom = 1
+
doclist = get_mapped_doc(
"Material Request",
source_name,
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index a707c74..e5aff38 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -54,6 +54,8 @@
mr.submit()
se = make_stock_entry(mr.name)
+ self.assertEqual(se.stock_entry_type, "Material Transfer")
+ self.assertEqual(se.purpose, "Material Transfer")
self.assertEqual(se.doctype, "Stock Entry")
self.assertEqual(len(se.get("items")), len(mr.get("items")))
@@ -69,6 +71,8 @@
in_transit_warehouse = get_in_transit_warehouse(mr.company)
se = make_in_transit_stock_entry(mr.name, in_transit_warehouse)
+ self.assertEqual(se.stock_entry_type, "Material Transfer")
+ self.assertEqual(se.purpose, "Material Transfer")
self.assertEqual(se.doctype, "Stock Entry")
for row in se.get("items"):
self.assertEqual(row.t_warehouse, in_transit_warehouse)
@@ -396,7 +400,7 @@
mr.insert()
mr.submit()
- frappe.db.set_value("Stock Settings", None, "mr_qty_allowance", 20)
+ frappe.db.set_single_value("Stock Settings", "mr_qty_allowance", 20)
# map a stock entry
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index dd66cff..770dacd 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -419,6 +419,7 @@
"depends_on": "eval:parent.material_request_type == \"Material Transfer\"",
"fieldname": "from_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Source Warehouse",
"options": "Warehouse"
},
@@ -451,16 +452,16 @@
"fieldname": "job_card_item",
"fieldtype": "Data",
"hidden": 1,
+ "label": "Job Card Item",
"no_copy": 1,
- "print_hide": 1,
- "label": "Job Card Item"
+ "print_hide": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-03-10 18:42:42.705190",
+ "modified": "2023-05-07 20:23:31.250252",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
@@ -469,5 +470,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index cb8eb30..5dd8934 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -19,6 +19,8 @@
"rate",
"uom",
"section_break_9",
+ "pick_serial_and_batch",
+ "serial_and_batch_bundle",
"serial_no",
"column_break_11",
"batch_no",
@@ -27,6 +29,7 @@
"actual_qty",
"projected_qty",
"ordered_qty",
+ "packed_qty",
"column_break_16",
"incoming_rate",
"picked_qty",
@@ -117,7 +120,8 @@
{
"fieldname": "serial_no",
"fieldtype": "Text",
- "label": "Serial No"
+ "label": "Serial No",
+ "read_only": 1
},
{
"fieldname": "column_break_11",
@@ -127,7 +131,8 @@
"fieldname": "batch_no",
"fieldtype": "Link",
"label": "Batch No",
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"fieldname": "section_break_13",
@@ -242,13 +247,36 @@
"label": "Picked Qty",
"no_copy": 1,
"read_only": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "eval: doc.packed_qty",
+ "fieldname": "packed_qty",
+ "fieldtype": "Float",
+ "label": "Packed Qty",
+ "no_copy": 1,
+ "non_negative": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "pick_serial_and_batch",
+ "fieldtype": "Button",
+ "label": "Pick Serial / Batch No"
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-04-27 05:23:08.683245",
+ "modified": "2023-04-28 13:16:38.460806",
"modified_by": "Administrator",
"module": "Stock",
"name": "Packed Item",
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.js b/erpnext/stock/doctype/packing_slip/packing_slip.js
index 40d4685..95e5ea3 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.js
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.js
@@ -1,113 +1,46 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
-cur_frm.fields_dict['delivery_note'].get_query = function(doc, cdt, cdn) {
- return{
- filters:{ 'docstatus': 0}
- }
-}
+frappe.ui.form.on('Packing Slip', {
+ setup: (frm) => {
+ frm.set_query('delivery_note', () => {
+ return {
+ filters: {
+ docstatus: 0,
+ }
+ }
+ });
+ frm.set_query('item_code', 'items', (doc, cdt, cdn) => {
+ if (!doc.delivery_note) {
+ frappe.throw(__('Please select a Delivery Note'));
+ } else {
+ let d = locals[cdt][cdn];
+ return {
+ query: 'erpnext.stock.doctype.packing_slip.packing_slip.item_details',
+ filters: {
+ delivery_note: doc.delivery_note,
+ }
+ }
+ }
+ });
+ },
-cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
- if(!doc.delivery_note) {
- frappe.throw(__("Please select a Delivery Note"));
- } else {
- return {
- query: "erpnext.stock.doctype.packing_slip.packing_slip.item_details",
- filters:{ 'delivery_note': doc.delivery_note}
+ refresh: (frm) => {
+ frm.toggle_display('misc_details', frm.doc.amended_from);
+ },
+
+ delivery_note: (frm) => {
+ frm.set_value('items', null);
+
+ if (frm.doc.delivery_note) {
+ erpnext.utils.map_current_doc({
+ method: 'erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip',
+ source_name: frm.doc.delivery_note,
+ target_doc: frm,
+ freeze: true,
+ freeze_message: __('Creating Packing Slip ...'),
+ });
}
- }
-}
-
-cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
- if(doc.delivery_note && doc.__islocal) {
- cur_frm.cscript.get_items(doc, cdt, cdn);
- }
-}
-
-cur_frm.cscript.get_items = function(doc, cdt, cdn) {
- return this.frm.call({
- doc: this.frm.doc,
- method: "get_items",
- callback: function(r) {
- if(!r.exc) cur_frm.refresh();
- }
- });
-}
-
-cur_frm.cscript.refresh = function(doc, dt, dn) {
- cur_frm.toggle_display("misc_details", doc.amended_from);
-}
-
-cur_frm.cscript.validate = function(doc, cdt, cdn) {
- cur_frm.cscript.validate_case_nos(doc);
- cur_frm.cscript.validate_calculate_item_details(doc);
-}
-
-// To Case No. cannot be less than From Case No.
-cur_frm.cscript.validate_case_nos = function(doc) {
- doc = locals[doc.doctype][doc.name];
- if(cint(doc.from_case_no)==0) {
- frappe.msgprint(__("The 'From Package No.' field must neither be empty nor it's value less than 1."));
- frappe.validated = false;
- } else if(!cint(doc.to_case_no)) {
- doc.to_case_no = doc.from_case_no;
- refresh_field('to_case_no');
- } else if(cint(doc.to_case_no) < cint(doc.from_case_no)) {
- frappe.msgprint(__("'To Case No.' cannot be less than 'From Case No.'"));
- frappe.validated = false;
- }
-}
-
-
-cur_frm.cscript.validate_calculate_item_details = function(doc) {
- doc = locals[doc.doctype][doc.name];
- var ps_detail = doc.items || [];
-
- cur_frm.cscript.validate_duplicate_items(doc, ps_detail);
- cur_frm.cscript.calc_net_total_pkg(doc, ps_detail);
-}
-
-
-// Do not allow duplicate items i.e. items with same item_code
-// Also check for 0 qty
-cur_frm.cscript.validate_duplicate_items = function(doc, ps_detail) {
- for(var i=0; i<ps_detail.length; i++) {
- for(var j=0; j<ps_detail.length; j++) {
- if(i!=j && ps_detail[i].item_code && ps_detail[i].item_code==ps_detail[j].item_code) {
- frappe.msgprint(__("You have entered duplicate items. Please rectify and try again."));
- frappe.validated = false;
- return;
- }
- }
- if(flt(ps_detail[i].qty)<=0) {
- frappe.msgprint(__("Invalid quantity specified for item {0}. Quantity should be greater than 0.", [ps_detail[i].item_code]));
- frappe.validated = false;
- }
- }
-}
-
-
-// Calculate Net Weight of Package
-cur_frm.cscript.calc_net_total_pkg = function(doc, ps_detail) {
- var net_weight_pkg = 0;
- doc.net_weight_uom = (ps_detail && ps_detail.length) ? ps_detail[0].weight_uom : '';
- doc.gross_weight_uom = doc.net_weight_uom;
-
- for(var i=0; i<ps_detail.length; i++) {
- var item = ps_detail[i];
- if(item.weight_uom != doc.net_weight_uom) {
- frappe.msgprint(__("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."));
- frappe.validated = false;
- }
- net_weight_pkg += flt(item.net_weight) * flt(item.qty);
- }
-
- doc.net_weight_pkg = roundNumber(net_weight_pkg, 2);
- if(!flt(doc.gross_weight_pkg)) {
- doc.gross_weight_pkg = doc.net_weight_pkg;
- }
- refresh_many(['net_weight_pkg', 'net_weight_uom', 'gross_weight_uom', 'gross_weight_pkg']);
-}
-
-// TODO: validate gross weight field
+ },
+});
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index ec8d57c..86ed794 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -1,264 +1,262 @@
{
- "allow_import": 1,
- "autoname": "MAT-PAC-.YYYY.-.#####",
- "creation": "2013-04-11 15:32:24",
- "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
- "doctype": "DocType",
- "document_type": "Document",
- "engine": "InnoDB",
- "field_order": [
- "packing_slip_details",
- "column_break0",
- "delivery_note",
- "column_break1",
- "naming_series",
- "section_break0",
- "column_break2",
- "from_case_no",
- "column_break3",
- "to_case_no",
- "package_item_details",
- "get_items",
- "items",
- "package_weight_details",
- "net_weight_pkg",
- "net_weight_uom",
- "column_break4",
- "gross_weight_pkg",
- "gross_weight_uom",
- "letter_head_details",
- "letter_head",
- "misc_details",
- "amended_from"
- ],
- "fields": [
- {
- "fieldname": "packing_slip_details",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "column_break0",
- "fieldtype": "Column Break"
- },
- {
- "description": "Indicates that the package is a part of this delivery (Only Draft)",
- "fieldname": "delivery_note",
- "fieldtype": "Link",
- "in_global_search": 1,
- "in_list_view": 1,
- "label": "Delivery Note",
- "options": "Delivery Note",
- "reqd": 1
- },
- {
- "fieldname": "column_break1",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "options": "MAT-PAC-.YYYY.-",
- "print_hide": 1,
- "reqd": 1,
- "set_only_once": 1
- },
- {
- "fieldname": "section_break0",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "column_break2",
- "fieldtype": "Column Break"
- },
- {
- "description": "Identification of the package for the delivery (for print)",
- "fieldname": "from_case_no",
- "fieldtype": "Int",
- "in_list_view": 1,
- "label": "From Package No.",
- "no_copy": 1,
- "reqd": 1,
- "width": "50px"
- },
- {
- "fieldname": "column_break3",
- "fieldtype": "Column Break"
- },
- {
- "description": "If more than one package of the same type (for print)",
- "fieldname": "to_case_no",
- "fieldtype": "Int",
- "in_list_view": 1,
- "label": "To Package No.",
- "no_copy": 1,
- "width": "50px"
- },
- {
- "fieldname": "package_item_details",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "get_items",
- "fieldtype": "Button",
- "label": "Get Items"
- },
- {
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "options": "Packing Slip Item",
- "reqd": 1
- },
- {
- "fieldname": "package_weight_details",
- "fieldtype": "Section Break",
- "label": "Package Weight Details"
- },
- {
- "description": "The net weight of this package. (calculated automatically as sum of net weight of items)",
- "fieldname": "net_weight_pkg",
- "fieldtype": "Float",
- "label": "Net Weight",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "net_weight_uom",
- "fieldtype": "Link",
- "label": "Net Weight UOM",
- "no_copy": 1,
- "options": "UOM",
- "read_only": 1
- },
- {
- "fieldname": "column_break4",
- "fieldtype": "Column Break"
- },
- {
- "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)",
- "fieldname": "gross_weight_pkg",
- "fieldtype": "Float",
- "label": "Gross Weight",
- "no_copy": 1
- },
- {
- "fieldname": "gross_weight_uom",
- "fieldtype": "Link",
- "label": "Gross Weight UOM",
- "no_copy": 1,
- "options": "UOM"
- },
- {
- "fieldname": "letter_head_details",
- "fieldtype": "Section Break",
- "label": "Letter Head"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "options": "Letter Head",
- "print_hide": 1
- },
- {
- "fieldname": "misc_details",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "options": "Packing Slip",
- "print_hide": 1,
- "read_only": 1
- }
- ],
- "icon": "fa fa-suitcase",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2019-09-09 04:45:08.082862",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Packing Slip",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock User",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales User",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Item Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- }
- ],
- "search_fields": "delivery_note",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "MAT-PAC-.YYYY.-.#####",
+ "creation": "2013-04-11 15:32:24",
+ "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+ "packing_slip_details",
+ "column_break0",
+ "delivery_note",
+ "column_break1",
+ "naming_series",
+ "section_break0",
+ "column_break2",
+ "from_case_no",
+ "column_break3",
+ "to_case_no",
+ "package_item_details",
+ "items",
+ "package_weight_details",
+ "net_weight_pkg",
+ "net_weight_uom",
+ "column_break4",
+ "gross_weight_pkg",
+ "gross_weight_uom",
+ "letter_head_details",
+ "letter_head",
+ "misc_details",
+ "amended_from"
+ ],
+ "fields": [
+ {
+ "fieldname": "packing_slip_details",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break"
+ },
+ {
+ "description": "Indicates that the package is a part of this delivery (Only Draft)",
+ "fieldname": "delivery_note",
+ "fieldtype": "Link",
+ "in_global_search": 1,
+ "in_list_view": 1,
+ "label": "Delivery Note",
+ "options": "Delivery Note",
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "options": "MAT-PAC-.YYYY.-",
+ "print_hide": 1,
+ "reqd": 1,
+ "set_only_once": 1
+ },
+ {
+ "fieldname": "section_break0",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "description": "Identification of the package for the delivery (for print)",
+ "fieldname": "from_case_no",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "From Package No.",
+ "no_copy": 1,
+ "reqd": 1,
+ "width": "50px"
+ },
+ {
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "description": "If more than one package of the same type (for print)",
+ "fieldname": "to_case_no",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "To Package No.",
+ "no_copy": 1,
+ "width": "50px"
+ },
+ {
+ "fieldname": "package_item_details",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "options": "Packing Slip Item",
+ "reqd": 1
+ },
+ {
+ "fieldname": "package_weight_details",
+ "fieldtype": "Section Break",
+ "label": "Package Weight Details"
+ },
+ {
+ "description": "The net weight of this package. (calculated automatically as sum of net weight of items)",
+ "fieldname": "net_weight_pkg",
+ "fieldtype": "Float",
+ "label": "Net Weight",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "net_weight_uom",
+ "fieldtype": "Link",
+ "label": "Net Weight UOM",
+ "no_copy": 1,
+ "options": "UOM",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)",
+ "fieldname": "gross_weight_pkg",
+ "fieldtype": "Float",
+ "label": "Gross Weight",
+ "no_copy": 1
+ },
+ {
+ "fieldname": "gross_weight_uom",
+ "fieldtype": "Link",
+ "label": "Gross Weight UOM",
+ "no_copy": 1,
+ "options": "UOM"
+ },
+ {
+ "fieldname": "letter_head_details",
+ "fieldtype": "Section Break",
+ "label": "Letter Head"
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "misc_details",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Packing Slip",
+ "print_hide": 1,
+ "read_only": 1
}
+ ],
+ "icon": "fa fa-suitcase",
+ "idx": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-04-28 18:01:37.341619",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Packing Slip",
+ "naming_rule": "Expression (old style)",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales User",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Item Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "search_fields": "delivery_note",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index e5b9de8..6ea5938 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -4,193 +4,181 @@
import frappe
from frappe import _
-from frappe.model import no_value_fields
-from frappe.model.document import Document
from frappe.utils import cint, flt
+from erpnext.controllers.status_updater import StatusUpdater
-class PackingSlip(Document):
- def validate(self):
- """
- * Validate existence of submitted Delivery Note
- * Case nos do not overlap
- * Check if packed qty doesn't exceed actual qty of delivery note
- It is necessary to validate case nos before checking quantity
- """
- self.validate_delivery_note()
- self.validate_items_mandatory()
- self.validate_case_nos()
- self.validate_qty()
+class PackingSlip(StatusUpdater):
+ def __init__(self, *args, **kwargs) -> None:
+ super(PackingSlip, self).__init__(*args, **kwargs)
+ self.status_updater = [
+ {
+ "target_dt": "Delivery Note Item",
+ "join_field": "dn_detail",
+ "target_field": "packed_qty",
+ "target_parent_dt": "Delivery Note",
+ "target_ref_field": "qty",
+ "source_dt": "Packing Slip Item",
+ "source_field": "qty",
+ },
+ {
+ "target_dt": "Packed Item",
+ "join_field": "pi_detail",
+ "target_field": "packed_qty",
+ "target_parent_dt": "Delivery Note",
+ "target_ref_field": "qty",
+ "source_dt": "Packing Slip Item",
+ "source_field": "qty",
+ },
+ ]
+ def validate(self) -> None:
from erpnext.utilities.transaction_base import validate_uom_is_integer
+ self.validate_delivery_note()
+ self.validate_case_nos()
+ self.validate_items()
+
validate_uom_is_integer(self, "stock_uom", "qty")
validate_uom_is_integer(self, "weight_uom", "net_weight")
- def validate_delivery_note(self):
- """
- Validates if delivery note has status as draft
- """
- if cint(frappe.db.get_value("Delivery Note", self.delivery_note, "docstatus")) != 0:
- frappe.throw(_("Delivery Note {0} must not be submitted").format(self.delivery_note))
+ self.set_missing_values()
+ self.calculate_net_total_pkg()
- def validate_items_mandatory(self):
- rows = [d.item_code for d in self.get("items")]
- if not rows:
- frappe.msgprint(_("No Items to pack"), raise_exception=1)
+ def on_submit(self):
+ self.update_prevdoc_status()
+
+ def on_cancel(self):
+ self.update_prevdoc_status()
+
+ def validate_delivery_note(self):
+ """Raises an exception if the `Delivery Note` status is not Draft"""
+
+ if cint(frappe.db.get_value("Delivery Note", self.delivery_note, "docstatus")) != 0:
+ frappe.throw(
+ _("A Packing Slip can only be created for Draft Delivery Note.").format(self.delivery_note)
+ )
def validate_case_nos(self):
- """
- Validate if case nos overlap. If they do, recommend next case no.
- """
- if not cint(self.from_case_no):
- frappe.msgprint(_("Please specify a valid 'From Case No.'"), raise_exception=1)
+ """Validate if case nos overlap. If they do, recommend next case no."""
+
+ if cint(self.from_case_no) <= 0:
+ frappe.throw(
+ _("The 'From Package No.' field must neither be empty nor it's value less than 1.")
+ )
elif not self.to_case_no:
self.to_case_no = self.from_case_no
- elif cint(self.from_case_no) > cint(self.to_case_no):
- frappe.msgprint(_("'To Case No.' cannot be less than 'From Case No.'"), raise_exception=1)
+ elif cint(self.to_case_no) < cint(self.from_case_no):
+ frappe.throw(_("'To Package No.' cannot be less than 'From Package No.'"))
+ else:
+ ps = frappe.qb.DocType("Packing Slip")
+ res = (
+ frappe.qb.from_(ps)
+ .select(
+ ps.name,
+ )
+ .where(
+ (ps.delivery_note == self.delivery_note)
+ & (ps.docstatus == 1)
+ & (
+ (ps.from_case_no.between(self.from_case_no, self.to_case_no))
+ | (ps.to_case_no.between(self.from_case_no, self.to_case_no))
+ | ((ps.from_case_no <= self.from_case_no) & (ps.to_case_no >= self.from_case_no))
+ )
+ )
+ ).run()
- res = frappe.db.sql(
- """SELECT name FROM `tabPacking Slip`
- WHERE delivery_note = %(delivery_note)s AND docstatus = 1 AND
- ((from_case_no BETWEEN %(from_case_no)s AND %(to_case_no)s)
- OR (to_case_no BETWEEN %(from_case_no)s AND %(to_case_no)s)
- OR (%(from_case_no)s BETWEEN from_case_no AND to_case_no))
- """,
- {
- "delivery_note": self.delivery_note,
- "from_case_no": self.from_case_no,
- "to_case_no": self.to_case_no,
- },
- )
+ if res:
+ frappe.throw(
+ _("""Package No(s) already in use. Try from Package No {0}""").format(
+ self.get_recommended_case_no()
+ )
+ )
- if res:
- frappe.throw(
- _("""Case No(s) already in use. Try from Case No {0}""").format(self.get_recommended_case_no())
+ def validate_items(self):
+ for item in self.items:
+ if item.qty <= 0:
+ frappe.throw(_("Row {0}: Qty must be greater than 0.").format(item.idx))
+
+ if not item.dn_detail and not item.pi_detail:
+ frappe.throw(
+ _("Row {0}: Either Delivery Note Item or Packed Item reference is mandatory.").format(
+ item.idx
+ )
+ )
+
+ remaining_qty = frappe.db.get_value(
+ "Delivery Note Item" if item.dn_detail else "Packed Item",
+ {"name": item.dn_detail or item.pi_detail, "docstatus": 0},
+ ["sum(qty - packed_qty)"],
)
- def validate_qty(self):
- """Check packed qty across packing slips and delivery note"""
- # Get Delivery Note Items, Item Quantity Dict and No. of Cases for this Packing slip
- dn_details, ps_item_qty, no_of_cases = self.get_details_for_packing()
+ if remaining_qty is None:
+ frappe.throw(
+ _("Row {0}: Please provide a valid Delivery Note Item or Packed Item reference.").format(
+ item.idx
+ )
+ )
+ elif remaining_qty <= 0:
+ frappe.throw(
+ _("Row {0}: Packing Slip is already created for Item {1}.").format(
+ item.idx, frappe.bold(item.item_code)
+ )
+ )
+ elif item.qty > remaining_qty:
+ frappe.throw(
+ _("Row {0}: Qty cannot be greater than {1} for the Item {2}.").format(
+ item.idx, frappe.bold(remaining_qty), frappe.bold(item.item_code)
+ )
+ )
- for item in dn_details:
- new_packed_qty = (flt(ps_item_qty[item["item_code"]]) * no_of_cases) + flt(item["packed_qty"])
- if new_packed_qty > flt(item["qty"]) and no_of_cases:
- self.recommend_new_qty(item, ps_item_qty, no_of_cases)
-
- def get_details_for_packing(self):
- """
- Returns
- * 'Delivery Note Items' query result as a list of dict
- * Item Quantity dict of current packing slip doc
- * No. of Cases of this packing slip
- """
-
- rows = [d.item_code for d in self.get("items")]
-
- # also pick custom fields from delivery note
- custom_fields = ", ".join(
- "dni.`{0}`".format(d.fieldname)
- for d in frappe.get_meta("Delivery Note Item").get_custom_fields()
- if d.fieldtype not in no_value_fields
- )
-
- if custom_fields:
- custom_fields = ", " + custom_fields
-
- condition = ""
- if rows:
- condition = " and item_code in (%s)" % (", ".join(["%s"] * len(rows)))
-
- # gets item code, qty per item code, latest packed qty per item code and stock uom
- res = frappe.db.sql(
- """select item_code, sum(qty) as qty,
- (select sum(psi.qty * (abs(ps.to_case_no - ps.from_case_no) + 1))
- from `tabPacking Slip` ps, `tabPacking Slip Item` psi
- where ps.name = psi.parent and ps.docstatus = 1
- and ps.delivery_note = dni.parent and psi.item_code=dni.item_code) as packed_qty,
- stock_uom, item_name, description, dni.batch_no {custom_fields}
- from `tabDelivery Note Item` dni
- where parent=%s {condition}
- group by item_code""".format(
- condition=condition, custom_fields=custom_fields
- ),
- tuple([self.delivery_note] + rows),
- as_dict=1,
- )
-
- ps_item_qty = dict([[d.item_code, d.qty] for d in self.get("items")])
- no_of_cases = cint(self.to_case_no) - cint(self.from_case_no) + 1
-
- return res, ps_item_qty, no_of_cases
-
- def recommend_new_qty(self, item, ps_item_qty, no_of_cases):
- """
- Recommend a new quantity and raise a validation exception
- """
- item["recommended_qty"] = (flt(item["qty"]) - flt(item["packed_qty"])) / no_of_cases
- item["specified_qty"] = flt(ps_item_qty[item["item_code"]])
- if not item["packed_qty"]:
- item["packed_qty"] = 0
-
- frappe.throw(
- _("Quantity for Item {0} must be less than {1}").format(
- item.get("item_code"), item.get("recommended_qty")
- )
- )
-
- def update_item_details(self):
- """
- Fill empty columns in Packing Slip Item
- """
+ def set_missing_values(self):
if not self.from_case_no:
self.from_case_no = self.get_recommended_case_no()
- for d in self.get("items"):
- res = frappe.db.get_value("Item", d.item_code, ["weight_per_unit", "weight_uom"], as_dict=True)
+ for item in self.items:
+ stock_uom, weight_per_unit, weight_uom = frappe.db.get_value(
+ "Item", item.item_code, ["stock_uom", "weight_per_unit", "weight_uom"]
+ )
- if res and len(res) > 0:
- d.net_weight = res["weight_per_unit"]
- d.weight_uom = res["weight_uom"]
+ item.stock_uom = stock_uom
+ if weight_per_unit and not item.net_weight:
+ item.net_weight = weight_per_unit
+ if weight_uom and not item.weight_uom:
+ item.weight_uom = weight_uom
def get_recommended_case_no(self):
- """
- Returns the next case no. for a new packing slip for a delivery
- note
- """
- recommended_case_no = frappe.db.sql(
- """SELECT MAX(to_case_no) FROM `tabPacking Slip`
- WHERE delivery_note = %s AND docstatus=1""",
- self.delivery_note,
+ """Returns the next case no. for a new packing slip for a delivery note"""
+
+ return (
+ cint(
+ frappe.db.get_value(
+ "Packing Slip", {"delivery_note": self.delivery_note, "docstatus": 1}, ["max(to_case_no)"]
+ )
+ )
+ + 1
)
- return cint(recommended_case_no[0][0]) + 1
+ def calculate_net_total_pkg(self):
+ self.net_weight_uom = self.items[0].weight_uom if self.items else None
+ self.gross_weight_uom = self.net_weight_uom
- @frappe.whitelist()
- def get_items(self):
- self.set("items", [])
+ net_weight_pkg = 0
+ for item in self.items:
+ if item.weight_uom != self.net_weight_uom:
+ frappe.throw(
+ _(
+ "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."
+ )
+ )
- custom_fields = frappe.get_meta("Delivery Note Item").get_custom_fields()
+ net_weight_pkg += flt(item.net_weight) * flt(item.qty)
- dn_details = self.get_details_for_packing()[0]
- for item in dn_details:
- if flt(item.qty) > flt(item.packed_qty):
- ch = self.append("items", {})
- ch.item_code = item.item_code
- ch.item_name = item.item_name
- ch.stock_uom = item.stock_uom
- ch.description = item.description
- ch.batch_no = item.batch_no
- ch.qty = flt(item.qty) - flt(item.packed_qty)
+ self.net_weight_pkg = round(net_weight_pkg, 2)
- # copy custom fields
- for d in custom_fields:
- if item.get(d.fieldname):
- ch.set(d.fieldname, item.get(d.fieldname))
-
- self.update_item_details()
+ if not flt(self.gross_weight_pkg):
+ self.gross_weight_pkg = self.net_weight_pkg
@frappe.whitelist()
diff --git a/erpnext/stock/doctype/packing_slip/test_packing_slip.py b/erpnext/stock/doctype/packing_slip/test_packing_slip.py
index bc405b2..96da23d 100644
--- a/erpnext/stock/doctype/packing_slip/test_packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/test_packing_slip.py
@@ -3,9 +3,118 @@
import unittest
-# test_records = frappe.get_test_records('Packing Slip')
+import frappe
from frappe.tests.utils import FrappeTestCase
+from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle
+from erpnext.stock.doctype.delivery_note.delivery_note import make_packing_slip
+from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+from erpnext.stock.doctype.item.test_item import make_item
-class TestPackingSlip(unittest.TestCase):
- pass
+
+class TestPackingSlip(FrappeTestCase):
+ def test_packing_slip(self):
+ # Step - 1: Create a Product Bundle
+ items = create_items()
+ make_product_bundle(items[0], items[1:], 5)
+
+ # Step - 2: Create a Delivery Note (Draft) with Product Bundle
+ dn = create_delivery_note(
+ item_code=items[0],
+ qty=2,
+ do_not_save=True,
+ )
+ dn.append(
+ "items",
+ {
+ "item_code": items[1],
+ "warehouse": "_Test Warehouse - _TC",
+ "qty": 10,
+ },
+ )
+ dn.save()
+
+ # Step - 3: Make a Packing Slip from Delivery Note for 4 Qty
+ ps1 = make_packing_slip(dn.name)
+ for item in ps1.items:
+ item.qty = 4
+ ps1.save()
+ ps1.submit()
+
+ # Test - 1: `Packed Qty` should be updated to 4 in Delivery Note Items and Packed Items.
+ dn.load_from_db()
+ for item in dn.items:
+ if not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code}):
+ self.assertEqual(item.packed_qty, 4)
+
+ for item in dn.packed_items:
+ self.assertEqual(item.packed_qty, 4)
+
+ # Step - 4: Make another Packing Slip from Delivery Note for 6 Qty
+ ps2 = make_packing_slip(dn.name)
+ ps2.save()
+ ps2.submit()
+
+ # Test - 2: `Packed Qty` should be updated to 10 in Delivery Note Items and Packed Items.
+ dn.load_from_db()
+ for item in dn.items:
+ if not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code}):
+ self.assertEqual(item.packed_qty, 10)
+
+ for item in dn.packed_items:
+ self.assertEqual(item.packed_qty, 10)
+
+ # Step - 5: Cancel Packing Slip [1]
+ ps1.cancel()
+
+ # Test - 3: `Packed Qty` should be updated to 4 in Delivery Note Items and Packed Items.
+ dn.load_from_db()
+ for item in dn.items:
+ if not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code}):
+ self.assertEqual(item.packed_qty, 6)
+
+ for item in dn.packed_items:
+ self.assertEqual(item.packed_qty, 6)
+
+ # Step - 6: Cancel Packing Slip [2]
+ ps2.cancel()
+
+ # Test - 4: `Packed Qty` should be updated to 0 in Delivery Note Items and Packed Items.
+ dn.load_from_db()
+ for item in dn.items:
+ if not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code}):
+ self.assertEqual(item.packed_qty, 0)
+
+ for item in dn.packed_items:
+ self.assertEqual(item.packed_qty, 0)
+
+ # Step - 7: Make Packing Slip for more Qty than Delivery Note
+ ps3 = make_packing_slip(dn.name)
+ ps3.items[0].qty = 20
+
+ # Test - 5: Should throw an ValidationError, as Packing Slip Qty is more than Delivery Note Qty
+ self.assertRaises(frappe.exceptions.ValidationError, ps3.save)
+
+ # Step - 8: Make Packing Slip for less Qty than Delivery Note
+ ps4 = make_packing_slip(dn.name)
+ ps4.items[0].qty = 5
+ ps4.save()
+ ps4.submit()
+
+ # Test - 6: Delivery Note should throw a ValidationError on Submit, as Packed Qty and Delivery Note Qty are not the same
+ dn.load_from_db()
+ self.assertRaises(frappe.exceptions.ValidationError, dn.submit)
+
+
+def create_items():
+ items_properties = [
+ {"is_stock_item": 0},
+ {"is_stock_item": 1, "stock_uom": "Nos"},
+ {"is_stock_item": 1, "stock_uom": "Box"},
+ ]
+
+ items = []
+ for properties in items_properties:
+ items.append(make_item(properties=properties).name)
+
+ return items
diff --git a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
index 4270839..4bd9035 100644
--- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
+++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
@@ -20,7 +20,8 @@
"stock_uom",
"weight_uom",
"page_break",
- "dn_detail"
+ "dn_detail",
+ "pi_detail"
],
"fields": [
{
@@ -121,13 +122,23 @@
"fieldtype": "Data",
"hidden": 1,
"in_list_view": 1,
- "label": "DN Detail"
+ "label": "Delivery Note Item",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "pi_detail",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Delivery Note Packed Item",
+ "no_copy": 1,
+ "read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2021-12-14 01:22:00.715935",
+ "modified": "2023-04-28 15:00:14.079306",
"modified_by": "Administrator",
"module": "Stock",
"name": "Packing Slip Item",
@@ -136,5 +147,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js
index 8213adb..35c35a6 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.js
+++ b/erpnext/stock/doctype/pick_list/pick_list.js
@@ -3,6 +3,8 @@
frappe.ui.form.on('Pick List', {
setup: (frm) => {
+ frm.ignore_doctypes_on_cancel_all = ["Serial and Batch Bundle"];
+
frm.set_indicator_formatter('item_code',
function(doc) { return (doc.stock_qty === 0) ? "red" : "green"; });
@@ -10,6 +12,7 @@
'Delivery Note': 'Delivery Note',
'Stock Entry': 'Stock Entry',
};
+
frm.set_query('parent_warehouse', () => {
return {
filters: {
@@ -18,6 +21,7 @@
}
};
});
+
frm.set_query('work_order', () => {
return {
query: 'erpnext.stock.doctype.pick_list.pick_list.get_pending_work_orders',
@@ -26,6 +30,7 @@
}
};
});
+
frm.set_query('material_request', () => {
return {
filters: {
@@ -33,9 +38,11 @@
}
};
});
+
frm.set_query('item_code', 'locations', () => {
return erpnext.queries.item({ "is_stock_item": 1 });
});
+
frm.set_query('batch_no', 'locations', (frm, cdt, cdn) => {
const row = locals[cdt][cdn];
return {
@@ -46,6 +53,29 @@
},
};
});
+
+ frm.set_query("serial_and_batch_bundle", "locations", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('locations', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'warehouse': row.doc.warehouse,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
},
set_item_locations:(frm, save) => {
if (!(frm.doc.locations && frm.doc.locations.length)) {
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index 46d6e9e..922f76c 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -12,14 +12,18 @@
from frappe.model.mapper import map_child_doc
from frappe.query_builder import Case
from frappe.query_builder.custom import GROUP_CONCAT
-from frappe.query_builder.functions import Coalesce, IfNull, Locate, Replace, Sum
-from frappe.utils import cint, floor, flt, today
+from frappe.query_builder.functions import Coalesce, Locate, Replace, Sum
+from frappe.utils import cint, floor, flt
from frappe.utils.nestedset import get_descendants_of
from erpnext.selling.doctype.sales_order.sales_order import (
make_delivery_note as create_delivery_note_from_sales_order,
)
+from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_auto_batch_nos,
+)
from erpnext.stock.get_item_details import get_conversion_factor
+from erpnext.stock.serial_batch_bundle import SerialBatchCreation
# TODO: Prioritize SO or WO group warehouse
@@ -29,13 +33,14 @@
self.validate_for_qty()
def before_save(self):
+ self.update_status()
self.set_item_locations()
# set percentage picked in SO
for location in self.get("locations"):
if (
location.sales_order
- and frappe.db.get_value("Sales Order", location.sales_order, "per_picked") == 100
+ and frappe.db.get_value("Sales Order", location.sales_order, "per_picked", cache=True) == 100
):
frappe.throw(
_("Row #{}: item {} has been picked already.").format(location.idx, location.item_code)
@@ -58,51 +63,69 @@
# if the user has not entered any picked qty, set it to stock_qty, before submit
item.picked_qty = item.stock_qty
- if not frappe.get_cached_value("Item", item.item_code, "has_serial_no"):
- continue
-
- if not item.serial_no:
- frappe.throw(
- _("Row #{0}: {1} does not have any available serial numbers in {2}").format(
- frappe.bold(item.idx), frappe.bold(item.item_code), frappe.bold(item.warehouse)
- ),
- title=_("Serial Nos Required"),
- )
-
- if len(item.serial_no.split("\n")) != item.picked_qty:
- frappe.throw(
- _(
- "For item {0} at row {1}, count of serial numbers does not match with the picked quantity"
- ).format(frappe.bold(item.item_code), frappe.bold(item.idx)),
- title=_("Quantity Mismatch"),
- )
-
def on_submit(self):
+ self.validate_serial_and_batch_bundle()
self.update_status()
self.update_bundle_picked_qty()
self.update_reference_qty()
self.update_sales_order_picking_status()
def on_cancel(self):
+ self.ignore_linked_doctypes = "Serial and Batch Bundle"
+
self.update_status()
self.update_bundle_picked_qty()
self.update_reference_qty()
self.update_sales_order_picking_status()
+ self.delink_serial_and_batch_bundle()
+
+ def delink_serial_and_batch_bundle(self):
+ for row in self.locations:
+ if row.serial_and_batch_bundle:
+ frappe.db.set_value(
+ "Serial and Batch Bundle",
+ row.serial_and_batch_bundle,
+ {"is_cancelled": 1, "voucher_no": ""},
+ )
+
+ row.db_set("serial_and_batch_bundle", None)
+
+ def on_update(self):
+ self.linked_serial_and_batch_bundle()
+
+ def linked_serial_and_batch_bundle(self):
+ for row in self.locations:
+ if row.serial_and_batch_bundle:
+ frappe.get_doc(
+ "Serial and Batch Bundle", row.serial_and_batch_bundle
+ ).set_serial_and_batch_values(self, row)
+
+ def remove_serial_and_batch_bundle(self):
+ for row in self.locations:
+ if row.serial_and_batch_bundle:
+ frappe.delete_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+
+ def validate_serial_and_batch_bundle(self):
+ for row in self.locations:
+ if row.serial_and_batch_bundle:
+ doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+ if doc.docstatus == 0:
+ doc.submit()
def update_status(self, status=None, update_modified=True):
if not status:
if self.docstatus == 0:
status = "Draft"
elif self.docstatus == 1:
- if self.status == "Draft":
- status = "Open"
- elif target_document_exists(self.name, self.purpose):
+ if target_document_exists(self.name, self.purpose):
status = "Completed"
+ else:
+ status = "Open"
elif self.docstatus == 2:
status = "Cancelled"
if status:
- frappe.db.set_value("Pick List", self.name, "status", status, update_modified=update_modified)
+ self.db_set("status", status)
def update_reference_qty(self):
packed_items = []
@@ -191,6 +214,7 @@
locations_replica = self.get("locations")
# reset
+ self.remove_serial_and_batch_bundle()
self.delete_key("locations")
updated_locations = frappe._dict()
for item_doc in items:
@@ -264,6 +288,10 @@
for item in locations:
if not item.item_code:
frappe.throw("Row #{0}: Item Code is Mandatory".format(item.idx))
+ if not cint(
+ frappe.get_cached_value("Item", item.item_code, "is_stock_item")
+ ) and not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code}):
+ continue
item_code = item.item_code
reference = item.sales_order_item or item.material_request_item
key = (item_code, item.uom, item.warehouse, item.batch_no, reference)
@@ -346,6 +374,7 @@
pi_item.item_code,
pi_item.warehouse,
pi_item.batch_no,
+ pi_item.serial_and_batch_bundle,
Sum(Case().when(pi_item.picked_qty > 0, pi_item.picked_qty).else_(pi_item.stock_qty)).as_(
"picked_qty"
),
@@ -355,6 +384,7 @@
(pi_item.item_code.isin([x.item_code for x in items]))
& ((pi_item.picked_qty > 0) | (pi_item.stock_qty > 0))
& (pi.status != "Completed")
+ & (pi.status != "Cancelled")
& (pi_item.docstatus != 2)
)
.groupby(
@@ -459,7 +489,7 @@
item_doc.qty if (docstatus == 1 and item_doc.stock_qty == 0) else item_doc.stock_qty
)
- while remaining_stock_qty > 0 and available_locations:
+ while flt(remaining_stock_qty) > 0 and available_locations:
item_location = available_locations.pop(0)
item_location = frappe._dict(item_location)
@@ -468,25 +498,20 @@
)
qty = stock_qty / (item_doc.conversion_factor or 1)
- uom_must_be_whole_number = frappe.db.get_value("UOM", item_doc.uom, "must_be_whole_number")
+ uom_must_be_whole_number = frappe.get_cached_value("UOM", item_doc.uom, "must_be_whole_number")
if uom_must_be_whole_number:
qty = floor(qty)
stock_qty = qty * item_doc.conversion_factor
if not stock_qty:
break
- serial_nos = None
- if item_location.serial_no:
- serial_nos = "\n".join(item_location.serial_no[0 : cint(stock_qty)])
-
locations.append(
frappe._dict(
{
"qty": qty,
"stock_qty": stock_qty,
"warehouse": item_location.warehouse,
- "serial_no": serial_nos,
- "batch_no": item_location.batch_no,
+ "serial_and_batch_bundle": item_location.serial_and_batch_bundle,
}
)
)
@@ -522,11 +547,7 @@
has_serial_no = frappe.get_cached_value("Item", item_code, "has_serial_no")
has_batch_no = frappe.get_cached_value("Item", item_code, "has_batch_no")
- if has_batch_no and has_serial_no:
- locations = get_available_item_locations_for_serial_and_batched_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty
- )
- elif has_serial_no:
+ if has_serial_no:
locations = get_available_item_locations_for_serialized_item(
item_code, from_warehouses, required_qty, company, total_picked_qty
)
@@ -552,23 +573,6 @@
if picked_item_details:
for location in list(locations):
- key = (
- (location["warehouse"], location["batch_no"])
- if location.get("batch_no")
- else location["warehouse"]
- )
-
- if key in picked_item_details:
- picked_detail = picked_item_details[key]
-
- if picked_detail.get("serial_no") and location.get("serial_no"):
- location["serial_no"] = list(
- set(location["serial_no"]).difference(set(picked_detail["serial_no"]))
- )
- location["qty"] = len(location["serial_no"])
- else:
- location["qty"] -= picked_detail.get("picked_qty")
-
if location["qty"] < 1:
locations.remove(location)
@@ -594,7 +598,7 @@
frappe.qb.from_(sn)
.select(sn.name, sn.warehouse)
.where((sn.item_code == item_code) & (sn.company == company))
- .orderby(sn.purchase_date)
+ .orderby(sn.creation)
.limit(cint(required_qty + total_picked_qty))
)
@@ -606,12 +610,39 @@
serial_nos = query.run(as_list=True)
warehouse_serial_nos_map = frappe._dict()
+ picked_qty = required_qty
for serial_no, warehouse in serial_nos:
+ if picked_qty <= 0:
+ break
+
warehouse_serial_nos_map.setdefault(warehouse, []).append(serial_no)
+ picked_qty -= 1
locations = []
for warehouse, serial_nos in warehouse_serial_nos_map.items():
- locations.append({"qty": len(serial_nos), "warehouse": warehouse, "serial_no": serial_nos})
+ qty = len(serial_nos)
+
+ bundle_doc = SerialBatchCreation(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "voucher_type": "Pick List",
+ "total_qty": qty * -1,
+ "serial_nos": serial_nos,
+ "type_of_transaction": "Outward",
+ "company": company,
+ "do_not_submit": True,
+ }
+ ).make_serial_and_batch_bundle()
+
+ locations.append(
+ {
+ "qty": qty,
+ "warehouse": warehouse,
+ "item_code": item_code,
+ "serial_and_batch_bundle": bundle_doc.name,
+ }
+ )
return locations
@@ -619,63 +650,48 @@
def get_available_item_locations_for_batched_item(
item_code, from_warehouses, required_qty, company, total_picked_qty=0
):
- sle = frappe.qb.DocType("Stock Ledger Entry")
- batch = frappe.qb.DocType("Batch")
-
- query = (
- frappe.qb.from_(sle)
- .from_(batch)
- .select(sle.warehouse, sle.batch_no, Sum(sle.actual_qty).as_("qty"))
- .where(
- (sle.batch_no == batch.name)
- & (sle.item_code == item_code)
- & (sle.company == company)
- & (batch.disabled == 0)
- & (sle.is_cancelled == 0)
- & (IfNull(batch.expiry_date, "2200-01-01") > today())
+ locations = []
+ data = get_auto_batch_nos(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": from_warehouses,
+ "qty": required_qty + total_picked_qty,
+ }
)
- .groupby(sle.warehouse, sle.batch_no, sle.item_code)
- .having(Sum(sle.actual_qty) > 0)
- .orderby(IfNull(batch.expiry_date, "2200-01-01"), batch.creation, sle.batch_no, sle.warehouse)
- .limit(cint(required_qty + total_picked_qty))
)
- if from_warehouses:
- query = query.where(sle.warehouse.isin(from_warehouses))
+ warehouse_wise_batches = frappe._dict()
+ for d in data:
+ if d.warehouse not in warehouse_wise_batches:
+ warehouse_wise_batches.setdefault(d.warehouse, defaultdict(float))
- return query.run(as_dict=True)
+ warehouse_wise_batches[d.warehouse][d.batch_no] += d.qty
+ for warehouse, batches in warehouse_wise_batches.items():
+ qty = sum(batches.values())
-def get_available_item_locations_for_serial_and_batched_item(
- item_code, from_warehouses, required_qty, company, total_picked_qty=0
-):
- # Get batch nos by FIFO
- locations = get_available_item_locations_for_batched_item(
- item_code, from_warehouses, required_qty, company
- )
+ bundle_doc = SerialBatchCreation(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "voucher_type": "Pick List",
+ "total_qty": qty * -1,
+ "batches": batches,
+ "type_of_transaction": "Outward",
+ "company": company,
+ "do_not_submit": True,
+ }
+ ).make_serial_and_batch_bundle()
- if locations:
- sn = frappe.qb.DocType("Serial No")
- conditions = (sn.item_code == item_code) & (sn.company == company)
-
- for location in locations:
- location.qty = (
- required_qty if location.qty > required_qty else location.qty
- ) # if extra qty in batch
-
- serial_nos = (
- frappe.qb.from_(sn)
- .select(sn.name)
- .where(
- (conditions) & (sn.batch_no == location.batch_no) & (sn.warehouse == location.warehouse)
- )
- .orderby(sn.purchase_date)
- .limit(cint(location.qty + total_picked_qty))
- ).run(as_dict=True)
-
- serial_nos = [sn.name for sn in serial_nos]
- location.serial_no = serial_nos
- location.qty = len(serial_nos)
+ locations.append(
+ {
+ "qty": qty,
+ "warehouse": warehouse,
+ "item_code": item_code,
+ "serial_and_batch_bundle": bundle_doc.name,
+ }
+ )
return locations
diff --git a/erpnext/stock/doctype/pick_list/test_pick_list.py b/erpnext/stock/doctype/pick_list/test_pick_list.py
index 1254fe3..56c44bf 100644
--- a/erpnext/stock/doctype/pick_list/test_pick_list.py
+++ b/erpnext/stock/doctype/pick_list/test_pick_list.py
@@ -11,6 +11,11 @@
from erpnext.stock.doctype.packed_item.test_packed_item import create_product_bundle
from erpnext.stock.doctype.pick_list.pick_list import create_delivery_note
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import (
EmptyStockReconciliationItemsError,
@@ -139,6 +144,18 @@
self.assertEqual(pick_list.locations[1].qty, 10)
def test_pick_list_shows_serial_no_for_serialized_item(self):
+ serial_nos = ["SADD-0001", "SADD-0002", "SADD-0003", "SADD-0004", "SADD-0005"]
+
+ for serial_no in serial_nos:
+ if not frappe.db.exists("Serial No", serial_no):
+ frappe.get_doc(
+ {
+ "doctype": "Serial No",
+ "company": "_Test Company",
+ "item_code": "_Test Serialized Item",
+ "serial_no": serial_no,
+ }
+ ).insert()
stock_reconciliation = frappe.get_doc(
{
@@ -151,7 +168,20 @@
"warehouse": "_Test Warehouse - _TC",
"valuation_rate": 100,
"qty": 5,
- "serial_no": "123450\n123451\n123452\n123453\n123454",
+ "serial_and_batch_bundle": make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": "_Test Serialized Item",
+ "warehouse": "_Test Warehouse - _TC",
+ "qty": 5,
+ "rate": 100,
+ "type_of_transaction": "Inward",
+ "do_not_submit": True,
+ "voucher_type": "Stock Reconciliation",
+ "serial_nos": serial_nos,
+ }
+ )
+ ).name,
}
],
}
@@ -162,6 +192,10 @@
except EmptyStockReconciliationItemsError:
pass
+ so = make_sales_order(
+ item_code="_Test Serialized Item", warehouse="_Test Warehouse - _TC", qty=5, rate=1000
+ )
+
pick_list = frappe.get_doc(
{
"doctype": "Pick List",
@@ -175,18 +209,20 @@
"qty": 1000,
"stock_qty": 1000,
"conversion_factor": 1,
- "sales_order": "_T-Sales Order-1",
- "sales_order_item": "_T-Sales Order-1_item",
+ "sales_order": so.name,
+ "sales_order_item": so.items[0].name,
}
],
}
)
- pick_list.set_item_locations()
+ pick_list.save()
self.assertEqual(pick_list.locations[0].item_code, "_Test Serialized Item")
self.assertEqual(pick_list.locations[0].warehouse, "_Test Warehouse - _TC")
self.assertEqual(pick_list.locations[0].qty, 5)
- self.assertEqual(pick_list.locations[0].serial_no, "123450\n123451\n123452\n123453\n123454")
+ self.assertEqual(
+ get_serial_nos_from_bundle(pick_list.locations[0].serial_and_batch_bundle), serial_nos
+ )
def test_pick_list_shows_batch_no_for_batched_item(self):
# check if oldest batch no is picked
@@ -245,8 +281,8 @@
pr1 = make_purchase_receipt(item_code="Batched and Serialised Item", qty=2, rate=100.0)
pr1.load_from_db()
- oldest_batch_no = pr1.items[0].batch_no
- oldest_serial_nos = pr1.items[0].serial_no
+ oldest_batch_no = get_batch_from_bundle(pr1.items[0].serial_and_batch_bundle)
+ oldest_serial_nos = get_serial_nos_from_bundle(pr1.items[0].serial_and_batch_bundle)
pr2 = make_purchase_receipt(item_code="Batched and Serialised Item", qty=2, rate=100.0)
@@ -267,8 +303,12 @@
)
pick_list.set_item_locations()
- self.assertEqual(pick_list.locations[0].batch_no, oldest_batch_no)
- self.assertEqual(pick_list.locations[0].serial_no, oldest_serial_nos)
+ self.assertEqual(
+ get_batch_from_bundle(pick_list.locations[0].serial_and_batch_bundle), oldest_batch_no
+ )
+ self.assertEqual(
+ get_serial_nos_from_bundle(pick_list.locations[0].serial_and_batch_bundle), oldest_serial_nos
+ )
pr1.cancel()
pr2.cancel()
@@ -697,114 +737,3 @@
pl.cancel()
pl.reload()
self.assertEqual(pl.status, "Cancelled")
-
- def test_consider_existing_pick_list(self):
- def create_items(items_properties):
- items = []
-
- for properties in items_properties:
- properties.update({"maintain_stock": 1})
- item_code = make_item(properties=properties).name
- properties.update({"item_code": item_code})
- items.append(properties)
-
- return items
-
- def create_stock_entries(items):
- warehouses = ["Stores - _TC", "Finished Goods - _TC"]
-
- for item in items:
- for warehouse in warehouses:
- se = make_stock_entry(
- item=item.get("item_code"),
- to_warehouse=warehouse,
- qty=5,
- )
-
- def get_item_list(items, qty, warehouse="All Warehouses - _TC"):
- return [
- {
- "item_code": item.get("item_code"),
- "qty": qty,
- "warehouse": warehouse,
- }
- for item in items
- ]
-
- def get_picked_items_details(pick_list_doc):
- items_data = {}
-
- for location in pick_list_doc.locations:
- key = (location.warehouse, location.batch_no) if location.batch_no else location.warehouse
- serial_no = [x for x in location.serial_no.split("\n") if x] if location.serial_no else None
- data = {"picked_qty": location.picked_qty}
- if serial_no:
- data["serial_no"] = serial_no
- if location.item_code not in items_data:
- items_data[location.item_code] = {key: data}
- else:
- items_data[location.item_code][key] = data
-
- return items_data
-
- # Step - 1: Setup - Create Items and Stock Entries
- items_properties = [
- {
- "valuation_rate": 100,
- },
- {
- "valuation_rate": 200,
- "has_batch_no": 1,
- "create_new_batch": 1,
- },
- {
- "valuation_rate": 300,
- "has_serial_no": 1,
- "serial_no_series": "SNO.###",
- },
- {
- "valuation_rate": 400,
- "has_batch_no": 1,
- "create_new_batch": 1,
- "has_serial_no": 1,
- "serial_no_series": "SNO.###",
- },
- ]
-
- items = create_items(items_properties)
- create_stock_entries(items)
-
- # Step - 2: Create Sales Order [1]
- so1 = make_sales_order(item_list=get_item_list(items, qty=6))
-
- # Step - 3: Create and Submit Pick List [1] for Sales Order [1]
- pl1 = create_pick_list(so1.name)
- pl1.submit()
-
- # Step - 4: Create Sales Order [2] with same Item(s) as Sales Order [1]
- so2 = make_sales_order(item_list=get_item_list(items, qty=4))
-
- # Step - 5: Create Pick List [2] for Sales Order [2]
- pl2 = create_pick_list(so2.name)
- pl2.save()
-
- # Step - 6: Assert
- picked_items_details = get_picked_items_details(pl1)
-
- for location in pl2.locations:
- key = (location.warehouse, location.batch_no) if location.batch_no else location.warehouse
- item_data = picked_items_details.get(location.item_code, {}).get(key, {})
- picked_qty = item_data.get("picked_qty", 0)
- picked_serial_no = picked_items_details.get("serial_no", [])
- bin_actual_qty = frappe.db.get_value(
- "Bin", {"item_code": location.item_code, "warehouse": location.warehouse}, "actual_qty"
- )
-
- # Available Qty to pick should be equal to [Actual Qty - Picked Qty]
- self.assertEqual(location.stock_qty, bin_actual_qty - picked_qty)
-
- # Serial No should not be in the Picked Serial No list
- if location.serial_no:
- a = set(picked_serial_no)
- b = set([x for x in location.serial_no.split("\n") if x])
- self.assertSetEqual(b, b.difference(a))
diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
index a6f8c0d..2b519f5 100644
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -21,6 +21,8 @@
"conversion_factor",
"stock_uom",
"serial_no_and_batch_section",
+ "pick_serial_and_batch",
+ "serial_and_batch_bundle",
"serial_no",
"column_break_20",
"batch_no",
@@ -72,14 +74,16 @@
"depends_on": "serial_no",
"fieldname": "serial_no",
"fieldtype": "Small Text",
- "label": "Serial No"
+ "label": "Serial No",
+ "read_only": 1
},
{
"depends_on": "batch_no",
"fieldname": "batch_no",
"fieldtype": "Link",
"label": "Batch No",
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"fieldname": "column_break_2",
@@ -149,7 +153,8 @@
"fieldtype": "Data",
"hidden": 1,
"label": "Sales Order Item",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "serial_no_and_batch_section",
@@ -187,11 +192,24 @@
"hidden": 1,
"label": "Product Bundle Item",
"read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "pick_serial_and_batch",
+ "fieldtype": "Button",
+ "label": "Pick Serial / Batch No"
}
],
"istable": 1,
"links": [],
- "modified": "2022-04-22 05:27:38.497997",
+ "modified": "2023-06-16 14:05:51.719959",
"modified_by": "Administrator",
"module": "Stock",
"name": "Pick List Item",
@@ -202,4 +220,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 312c166..35aad78 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -121,6 +121,10 @@
refresh() {
var me = this;
super.refresh();
+
+ erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm);
+ erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
+
if(this.frm.doc.docstatus > 0) {
this.show_stock_ledger();
//removed for temporary
@@ -209,10 +213,43 @@
}
make_purchase_return() {
- frappe.model.open_mapped_doc({
- method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_return",
- frm: cur_frm
+ let me = this;
+
+ let has_rejected_items = cur_frm.doc.items.filter((item) => {
+ if (item.rejected_qty > 0) {
+ return true;
+ }
})
+
+ if (has_rejected_items && has_rejected_items.length > 0) {
+ frappe.prompt([
+ {
+ label: __("Return Qty from Rejected Warehouse"),
+ fieldtype: "Check",
+ fieldname: "return_for_rejected_warehouse",
+ default: 1
+ },
+ ], function(values){
+ if (values.return_for_rejected_warehouse) {
+ frappe.call({
+ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_return_against_rejected_warehouse",
+ args: {
+ source_name: cur_frm.doc.name
+ },
+ callback: function(r) {
+ if(r.message) {
+ frappe.model.sync(r.message);
+ frappe.set_route("Form", r.message.doctype, r.message.name);
+ }
+ }
+ })
+ } else {
+ cur_frm.cscript._make_purchase_return();
+ }
+ }, __("Return Qty"), __("Make Return Entry"));
+ } else {
+ cur_frm.cscript._make_purchase_return();
+ }
}
close_purchase_receipt() {
@@ -322,6 +359,13 @@
},
});
+cur_frm.cscript._make_purchase_return = function() {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_return",
+ frm: cur_frm
+ });
+}
+
cur_frm.cscript['Make Stock Entry'] = function() {
frappe.model.open_mapped_doc({
method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_stock_entry",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 8f04358..912b908 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -326,6 +326,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -437,6 +438,7 @@
{
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"oldfieldname": "rejected_warehouse",
@@ -1113,6 +1115,7 @@
"depends_on": "eval: doc.is_internal_supplier",
"fieldname": "set_from_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Set From Warehouse",
"options": "Warehouse"
},
@@ -1238,7 +1241,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2022-12-12 18:40:32.447752",
+ "modified": "2023-07-04 17:23:17.025390",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index d268cc1..0b5dc05 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -118,12 +118,11 @@
self.validate_posting_time()
super(PurchaseReceipt, self).validate()
- if self._action == "submit":
- self.make_batches("warehouse")
- else:
+ if self._action != "submit":
self.set_status()
self.po_required()
+ self.validate_items_quality_inspection()
self.validate_with_previous_doc()
self.validate_uom_is_integer("uom", ["qty", "received_qty"])
self.validate_uom_is_integer("stock_uom", "stock_qty")
@@ -197,6 +196,26 @@
if not d.purchase_order:
frappe.throw(_("Purchase Order number required for Item {0}").format(d.item_code))
+ def validate_items_quality_inspection(self):
+ for item in self.get("items"):
+ if item.quality_inspection:
+ qi = frappe.db.get_value(
+ "Quality Inspection",
+ item.quality_inspection,
+ ["reference_type", "reference_name", "item_code"],
+ as_dict=True,
+ )
+
+ if qi.reference_type != self.doctype or qi.reference_name != self.name:
+ msg = f"""Row #{item.idx}: Please select a valid Quality Inspection with Reference Type
+ {frappe.bold(self.doctype)} and Reference Name {frappe.bold(self.name)}."""
+ frappe.throw(_(msg))
+
+ if qi.item_code != item.item_code:
+ msg = f"""Row #{item.idx}: Please select a valid Quality Inspection with Item Code
+ {frappe.bold(item.item_code)}."""
+ frappe.throw(_(msg))
+
def get_already_received_qty(self, po, po_detail):
qty = frappe.db.sql(
"""select sum(qty) from `tabPurchase Receipt Item`
@@ -242,11 +261,6 @@
# because updating ordered qty, reserved_qty_for_subcontract in bin
# depends upon updated ordered qty in PO
self.update_stock_ledger()
-
- from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
-
- update_serial_nos_after_submit(self, "items")
-
self.make_gl_entries()
self.repost_future_sle_and_gle()
self.set_consumed_qty_in_subcontract_order()
@@ -283,7 +297,12 @@
self.update_stock_ledger()
self.make_gl_entries_on_cancel()
self.repost_future_sle_and_gle()
- self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
+ self.ignore_linked_doctypes = (
+ "GL Entry",
+ "Stock Ledger Entry",
+ "Repost Item Valuation",
+ "Serial and Batch Bundle",
+ )
self.delete_auto_created_batches()
self.set_consumed_qty_in_subcontract_order()
@@ -379,8 +398,20 @@
)
outgoing_amount = d.base_net_amount
- if self.is_internal_supplier and d.valuation_rate:
- outgoing_amount = d.valuation_rate * d.stock_qty
+ if self.is_internal_transfer() and d.valuation_rate:
+ outgoing_amount = abs(
+ frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "voucher_type": "Purchase Receipt",
+ "voucher_no": self.name,
+ "voucher_detail_no": d.name,
+ "warehouse": d.from_warehouse,
+ "is_cancelled": 0,
+ },
+ "stock_value_difference",
+ )
+ )
credit_amount = outgoing_amount
if credit_amount:
@@ -1106,6 +1137,13 @@
@frappe.whitelist()
+def make_purchase_return_against_rejected_warehouse(source_name):
+ from erpnext.controllers.sales_and_purchase_return import make_return_doc
+
+ return make_return_doc("Purchase Receipt", source_name, return_against_rejected_qty=True)
+
+
+@frappe.whitelist()
def make_purchase_return(source_name, target_doc=None):
from erpnext.controllers.sales_and_purchase_return import make_return_doc
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 7567cfe..6134bfa 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -3,7 +3,7 @@
import frappe
from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, cint, cstr, flt, today
+from frappe.utils import add_days, cint, cstr, flt, nowtime, today
from pypika import functions as fn
import erpnext
@@ -11,14 +11,23 @@
from erpnext.controllers.buying_controller import QtyMismatchError
from erpnext.stock.doctype.item.test_item import create_item, make_item
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
-from erpnext.stock.doctype.serial_no.serial_no import SerialNoDuplicateError, get_serial_nos
+from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ SerialNoDuplicateError,
+ SerialNoExistsInFutureTransactionError,
+)
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
+from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
from erpnext.stock.stock_ledger import SerialNoExistsInFutureTransaction
class TestPurchaseReceipt(FrappeTestCase):
def setUp(self):
- frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+ frappe.db.set_single_value("Buying Settings", "allow_multiple_items", 1)
def test_purchase_receipt_received_qty(self):
"""
@@ -63,6 +72,11 @@
self.assertEqual(sl_entry_cancelled[1].actual_qty, -0.5)
def test_make_purchase_invoice(self):
+ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_term
+
+ create_payment_term("_Test Payment Term 1 for Purchase Invoice")
+ create_payment_term("_Test Payment Term 2 for Purchase Invoice")
+
if not frappe.db.exists(
"Payment Terms Template", "_Test Payment Terms Template For Purchase Invoice"
):
@@ -74,12 +88,14 @@
"terms": [
{
"doctype": "Payment Terms Template Detail",
+ "payment_term": "_Test Payment Term 1 for Purchase Invoice",
"invoice_portion": 50.00,
"credit_days_based_on": "Day(s) after invoice date",
"credit_days": 00,
},
{
"doctype": "Payment Terms Template Detail",
+ "payment_term": "_Test Payment Term 2 for Purchase Invoice",
"invoice_portion": 50.00,
"credit_days_based_on": "Day(s) after invoice date",
"credit_days": 30,
@@ -184,14 +200,11 @@
self.assertTrue(frappe.db.get_value("Batch", {"item": item.name, "reference_name": pr.name}))
pr.load_from_db()
- batch_no = pr.items[0].batch_no
pr.cancel()
- self.assertFalse(frappe.db.get_value("Batch", {"item": item.name, "reference_name": pr.name}))
- self.assertFalse(frappe.db.get_all("Serial No", {"batch_no": batch_no}))
-
def test_duplicate_serial_nos(self):
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
item = frappe.db.exists("Item", {"item_name": "Test Serialized Item 123"})
if not item:
@@ -206,67 +219,86 @@
pr = make_purchase_receipt(item_code=item.name, qty=2, rate=500)
pr.load_from_db()
- serial_nos = frappe.db.get_value(
+ bundle_id = frappe.db.get_value(
"Stock Ledger Entry",
{"voucher_type": "Purchase Receipt", "voucher_no": pr.name, "item_code": item.name},
- "serial_no",
+ "serial_and_batch_bundle",
)
- serial_nos = get_serial_nos(serial_nos)
+ serial_nos = get_serial_nos_from_bundle(bundle_id)
- self.assertEquals(get_serial_nos(pr.items[0].serial_no), serial_nos)
+ self.assertEquals(get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle), serial_nos)
- # Then tried to receive same serial nos in difference company
- pr_different_company = make_purchase_receipt(
- item_code=item.name,
- qty=2,
- rate=500,
- serial_no="\n".join(serial_nos),
- company="_Test Company 1",
- do_not_submit=True,
- warehouse="Stores - _TC1",
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item.item_code,
+ "warehouse": "_Test Warehouse 2 - _TC1",
+ "company": "_Test Company 1",
+ "qty": 2,
+ "voucher_type": "Purchase Receipt",
+ "serial_nos": serial_nos,
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "do_not_save": True,
+ }
+ )
)
- self.assertRaises(SerialNoDuplicateError, pr_different_company.submit)
+ self.assertRaises(SerialNoDuplicateError, bundle_id.make_serial_and_batch_bundle)
# Then made delivery note to remove the serial nos from stock
- dn = create_delivery_note(item_code=item.name, qty=2, rate=1500, serial_no="\n".join(serial_nos))
+ dn = create_delivery_note(item_code=item.name, qty=2, rate=1500, serial_no=serial_nos)
dn.load_from_db()
- self.assertEquals(get_serial_nos(dn.items[0].serial_no), serial_nos)
+ self.assertEquals(get_serial_nos_from_bundle(dn.items[0].serial_and_batch_bundle), serial_nos)
posting_date = add_days(today(), -3)
# Try to receive same serial nos again in the same company with backdated.
- pr1 = make_purchase_receipt(
- item_code=item.name,
- qty=2,
- rate=500,
- posting_date=posting_date,
- serial_no="\n".join(serial_nos),
- do_not_submit=True,
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item.item_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "company": "_Test Company",
+ "qty": 2,
+ "rate": 500,
+ "voucher_type": "Purchase Receipt",
+ "serial_nos": serial_nos,
+ "posting_date": posting_date,
+ "posting_time": nowtime(),
+ "do_not_save": True,
+ }
+ )
)
- self.assertRaises(SerialNoExistsInFutureTransaction, pr1.submit)
+ self.assertRaises(SerialNoExistsInFutureTransactionError, bundle_id.make_serial_and_batch_bundle)
# Try to receive same serial nos with different company with backdated.
- pr2 = make_purchase_receipt(
- item_code=item.name,
- qty=2,
- rate=500,
- posting_date=posting_date,
- serial_no="\n".join(serial_nos),
- company="_Test Company 1",
- do_not_submit=True,
- warehouse="Stores - _TC1",
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item.item_code,
+ "warehouse": "_Test Warehouse 2 - _TC1",
+ "company": "_Test Company 1",
+ "qty": 2,
+ "rate": 500,
+ "voucher_type": "Purchase Receipt",
+ "serial_nos": serial_nos,
+ "posting_date": posting_date,
+ "posting_time": nowtime(),
+ "do_not_save": True,
+ }
+ )
)
- self.assertRaises(SerialNoExistsInFutureTransaction, pr2.submit)
+ self.assertRaises(SerialNoExistsInFutureTransactionError, bundle_id.make_serial_and_batch_bundle)
# Receive the same serial nos after the delivery note posting date and time
- make_purchase_receipt(item_code=item.name, qty=2, rate=500, serial_no="\n".join(serial_nos))
+ make_purchase_receipt(item_code=item.name, qty=2, rate=500, serial_no=serial_nos)
# Raise the error for backdated deliver note entry cancel
- self.assertRaises(SerialNoExistsInFutureTransaction, dn.cancel)
+ # self.assertRaises(SerialNoExistsInFutureTransactionError, dn.cancel)
def test_purchase_receipt_gl_entry(self):
pr = make_purchase_receipt(
@@ -307,15 +339,26 @@
pr.cancel()
self.assertTrue(get_gl_entries("Purchase Receipt", pr.name))
- def test_serial_no_supplier(self):
+ def test_serial_no_warehouse(self):
pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
- pr_row_1_serial_no = pr.get("items")[0].serial_no
+ pr_row_1_serial_no = get_serial_nos_from_bundle(pr.get("items")[0].serial_and_batch_bundle)[0]
- self.assertEqual(frappe.db.get_value("Serial No", pr_row_1_serial_no, "supplier"), pr.supplier)
+ self.assertEqual(
+ frappe.db.get_value("Serial No", pr_row_1_serial_no, "warehouse"), pr.get("items")[0].warehouse
+ )
pr.cancel()
self.assertFalse(frappe.db.get_value("Serial No", pr_row_1_serial_no, "warehouse"))
+ def test_rejected_warehouse_filter(self):
+ pr = frappe.copy_doc(test_records[0])
+ pr.get("items")[0].item_code = "_Test Serialized Item With Series"
+ pr.get("items")[0].qty = 3
+ pr.get("items")[0].rejected_qty = 2
+ pr.get("items")[0].received_qty = 5
+ pr.get("items")[0].rejected_warehouse = pr.get("items")[0].warehouse
+ self.assertRaises(frappe.ValidationError, pr.save)
+
def test_rejected_serial_no(self):
pr = frappe.copy_doc(test_records[0])
pr.get("items")[0].item_code = "_Test Serialized Item With Series"
@@ -325,15 +368,18 @@
pr.get("items")[0].rejected_warehouse = "_Test Rejected Warehouse - _TC"
pr.insert()
pr.submit()
+ pr.load_from_db()
- accepted_serial_nos = pr.get("items")[0].serial_no.split("\n")
+ accepted_serial_nos = get_serial_nos_from_bundle(pr.get("items")[0].serial_and_batch_bundle)
self.assertEqual(len(accepted_serial_nos), 3)
for serial_no in accepted_serial_nos:
self.assertEqual(
frappe.db.get_value("Serial No", serial_no, "warehouse"), pr.get("items")[0].warehouse
)
- rejected_serial_nos = pr.get("items")[0].rejected_serial_no.split("\n")
+ rejected_serial_nos = get_serial_nos_from_bundle(
+ pr.get("items")[0].rejected_serial_and_batch_bundle
+ )
self.assertEqual(len(rejected_serial_nos), 2)
for serial_no in rejected_serial_nos:
self.assertEqual(
@@ -556,23 +602,21 @@
pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
- serial_no = get_serial_nos(pr.get("items")[0].serial_no)[0]
+ serial_no = get_serial_nos_from_bundle(pr.get("items")[0].serial_and_batch_bundle)[0]
- _check_serial_no_values(
- serial_no, {"warehouse": "_Test Warehouse - _TC", "purchase_document_no": pr.name}
- )
+ _check_serial_no_values(serial_no, {"warehouse": "_Test Warehouse - _TC"})
return_pr = make_purchase_receipt(
item_code="_Test Serialized Item With Series",
qty=-1,
is_return=1,
return_against=pr.name,
- serial_no=serial_no,
+ serial_no=[serial_no],
)
_check_serial_no_values(
serial_no,
- {"warehouse": "", "purchase_document_no": pr.name, "delivery_document_no": return_pr.name},
+ {"warehouse": ""},
)
return_pr.cancel()
@@ -677,20 +721,23 @@
item_code = "Test Manual Created Serial No"
if not frappe.db.exists("Item", item_code):
- item = make_item(item_code, dict(has_serial_no=1))
+ make_item(item_code, dict(has_serial_no=1))
- serial_no = "12903812901"
+ serial_no = ["12903812901"]
+ if not frappe.db.exists("Serial No", serial_no[0]):
+ frappe.get_doc(
+ {"doctype": "Serial No", "item_code": item_code, "serial_no": serial_no[0]}
+ ).insert()
+
pr_doc = make_purchase_receipt(item_code=item_code, qty=1, serial_no=serial_no)
+ pr_doc.load_from_db()
- self.assertEqual(
- serial_no,
- frappe.db.get_value(
- "Serial No",
- {"purchase_document_type": "Purchase Receipt", "purchase_document_no": pr_doc.name},
- "name",
- ),
- )
+ bundle_id = pr_doc.items[0].serial_and_batch_bundle
+ self.assertEqual(serial_no[0], get_serial_nos_from_bundle(bundle_id)[0])
+ voucher_no = frappe.db.get_value("Serial and Batch Bundle", bundle_id, "voucher_no")
+
+ self.assertEqual(voucher_no, pr_doc.name)
pr_doc.cancel()
# check for the auto created serial nos
@@ -699,16 +746,15 @@
make_item(item_code, dict(has_serial_no=1, serial_no_series="KLJL.###"))
new_pr_doc = make_purchase_receipt(item_code=item_code, qty=1)
+ new_pr_doc.load_from_db()
- serial_no = get_serial_nos(new_pr_doc.items[0].serial_no)[0]
- self.assertEqual(
- serial_no,
- frappe.db.get_value(
- "Serial No",
- {"purchase_document_type": "Purchase Receipt", "purchase_document_no": new_pr_doc.name},
- "name",
- ),
- )
+ bundle_id = new_pr_doc.items[0].serial_and_batch_bundle
+ serial_no = get_serial_nos_from_bundle(bundle_id)[0]
+ self.assertTrue(serial_no)
+
+ voucher_no = frappe.db.get_value("Serial and Batch Bundle", bundle_id, "voucher_no")
+
+ self.assertEqual(voucher_no, new_pr_doc.name)
new_pr_doc.cancel()
@@ -1491,7 +1537,7 @@
)
pi.load_from_db()
- batch_no = pi.items[0].batch_no
+ batch_no = get_batch_from_bundle(pi.items[0].serial_and_batch_bundle)
self.assertTrue(batch_no)
frappe.db.set_value("Batch", batch_no, "expiry_date", add_days(today(), -1))
@@ -1610,6 +1656,367 @@
frappe.db.set_single_value("Stock Settings", "over_delivery_receipt_allowance", 0)
+ def test_internal_pr_gl_entries(self):
+ from erpnext.stock import get_warehouse_account_map
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+ from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
+ create_stock_reconciliation,
+ )
+
+ prepare_data_for_internal_transfer()
+ customer = "_Test Internal Customer 2"
+ company = "_Test Company with perpetual inventory"
+ from_warehouse = create_warehouse("_Test Internal From Warehouse New", company=company)
+ target_warehouse = create_warehouse("_Test Internal GIT Warehouse New", company=company)
+ to_warehouse = create_warehouse("_Test Internal To Warehouse New", company=company)
+
+ item = make_item(properties={"is_stock_item": 1, "valuation_rate": 100})
+ make_stock_entry(
+ purpose="Material Receipt",
+ item_code=item.name,
+ qty=10,
+ company=company,
+ to_warehouse=from_warehouse,
+ posting_date=add_days(today(), -3),
+ )
+
+ # Step - 1: Create Delivery Note with Internal Customer
+ dn = create_delivery_note(
+ item_code=item.name,
+ company=company,
+ customer=customer,
+ cost_center="Main - TCP1",
+ expense_account="Cost of Goods Sold - TCP1",
+ qty=10,
+ rate=100,
+ warehouse=from_warehouse,
+ target_warehouse=target_warehouse,
+ posting_date=add_days(today(), -2),
+ )
+
+ # Step - 2: Create Internal Purchase Receipt
+ pr = make_inter_company_purchase_receipt(dn.name)
+ pr.items[0].qty = 10
+ pr.items[0].from_warehouse = target_warehouse
+ pr.items[0].warehouse = to_warehouse
+ pr.items[0].rejected_warehouse = from_warehouse
+ pr.save()
+ pr.submit()
+
+ # Step - 3: Create back-date Stock Reconciliation [After DN and Before PR]
+ create_stock_reconciliation(
+ item_code=item,
+ warehouse=target_warehouse,
+ qty=10,
+ rate=50,
+ company=company,
+ posting_date=add_days(today(), -1),
+ )
+
+ warehouse_account = get_warehouse_account_map(company)
+ stock_account_value = frappe.db.get_value(
+ "GL Entry",
+ {
+ "account": warehouse_account[target_warehouse]["account"],
+ "voucher_type": "Purchase Receipt",
+ "voucher_no": pr.name,
+ "is_cancelled": 0,
+ },
+ fieldname=["credit"],
+ )
+ stock_diff = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "voucher_type": "Purchase Receipt",
+ "voucher_no": pr.name,
+ "is_cancelled": 0,
+ },
+ fieldname=["sum(stock_value_difference)"],
+ )
+
+ # Value of Stock Account should be equal to the sum of Stock Value Difference
+ self.assertEqual(stock_account_value, stock_diff)
+
+ def test_internal_pr_reference(self):
+ item = make_item(properties={"is_stock_item": 1, "valuation_rate": 100})
+ customer = "_Test Internal Customer 2"
+ company = "_Test Company with perpetual inventory"
+ from_warehouse = create_warehouse("_Test Internal From Warehouse New 1", company=company)
+ target_warehouse = create_warehouse("_Test Internal GIT Warehouse New 1", company=company)
+ to_warehouse = create_warehouse("_Test Internal To Warehouse New 1", company=company)
+
+ # Step 2: Create Stock Entry (Material Receipt)
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+
+ make_stock_entry(
+ purpose="Material Receipt",
+ item_code=item.name,
+ qty=15,
+ company=company,
+ to_warehouse=from_warehouse,
+ )
+
+ # Step 3: Create Delivery Note with Internal Customer
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+
+ dn = create_delivery_note(
+ item_code=item.name,
+ company=company,
+ customer=customer,
+ cost_center="Main - TCP1",
+ expense_account="Cost of Goods Sold - TCP1",
+ qty=10,
+ rate=100,
+ warehouse=from_warehouse,
+ target_warehouse=target_warehouse,
+ )
+
+ # Step 4: Create Internal Purchase Receipt
+ from erpnext.controllers.status_updater import OverAllowanceError
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
+
+ pr = make_inter_company_purchase_receipt(dn.name)
+ pr.inter_company_reference = ""
+ self.assertRaises(frappe.ValidationError, pr.save)
+
+ pr.inter_company_reference = dn.name
+ pr.items[0].qty = 10
+ pr.items[0].from_warehouse = target_warehouse
+ pr.items[0].warehouse = to_warehouse
+ pr.items[0].rejected_warehouse = from_warehouse
+ pr.save()
+
+ delivery_note_item = pr.items[0].delivery_note_item
+ pr.items[0].delivery_note_item = ""
+
+ self.assertRaises(frappe.ValidationError, pr.save)
+
+ pr.load_from_db()
+ pr.items[0].delivery_note_item = delivery_note_item
+ pr.save()
+
+ def test_purchase_return_valuation_with_rejected_qty(self):
+ item_code = "_Test Item Return Valuation"
+ create_item(item_code)
+
+ warehouse = create_warehouse("_Test Warehouse Return Valuation")
+ rejected_warehouse = create_warehouse("_Test Rejected Warehouse Return Valuation")
+
+ # Step 1: Create Purchase Receipt with valuation rate 100
+ make_purchase_receipt(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=10,
+ rate=100,
+ rejected_qty=2,
+ rejected_warehouse=rejected_warehouse,
+ )
+
+ # Step 2: Create One more Purchase Receipt with valuation rate 200
+ pr = make_purchase_receipt(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=10,
+ rate=200,
+ rejected_qty=2,
+ rejected_warehouse=rejected_warehouse,
+ )
+
+ # Step 3: Create Purchase Return for 2 qty
+ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_return
+
+ pr_return = make_purchase_return(pr.name)
+ pr_return.items[0].qty = 2 * -1
+ pr_return.items[0].received_qty = 2 * -1
+ pr_return.items[0].rejected_qty = 0
+ pr_return.items[0].rejected_warehouse = ""
+ pr_return.save()
+ pr_return.submit()
+
+ data = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": pr_return.name, "docstatus": 1},
+ fields=["SUM(stock_value_difference) as stock_value_difference"],
+ )[0]
+
+ self.assertEqual(abs(data["stock_value_difference"]), 400.00)
+
+ def test_return_from_rejected_warehouse(self):
+ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import (
+ make_purchase_return_against_rejected_warehouse,
+ )
+
+ item_code = "_Test Item Return from Rejected Warehouse"
+ create_item(item_code)
+
+ warehouse = create_warehouse("_Test Warehouse Return Qty Warehouse")
+ rejected_warehouse = create_warehouse("_Test Rejected Warehouse Return Qty Warehouse")
+
+ # Step 1: Create Purchase Receipt with valuation rate 100
+ pr = make_purchase_receipt(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=10,
+ rate=100,
+ rejected_qty=2,
+ rejected_warehouse=rejected_warehouse,
+ )
+
+ pr_return = make_purchase_return_against_rejected_warehouse(pr.name)
+ self.assertEqual(pr_return.items[0].warehouse, rejected_warehouse)
+ self.assertEqual(pr_return.items[0].qty, 2.0 * -1)
+ self.assertEqual(pr_return.items[0].rejected_qty, 0.0)
+ self.assertEqual(pr_return.items[0].rejected_warehouse, "")
+
+ def test_purchase_receipt_with_backdated_landed_cost_voucher(self):
+ from erpnext.controllers.sales_and_purchase_return import make_return_doc
+ from erpnext.stock.doctype.landed_cost_voucher.test_landed_cost_voucher import (
+ create_landed_cost_voucher,
+ )
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+
+ item_code = "_Test Purchase Item With Landed Cost"
+ create_item(item_code)
+
+ warehouse = create_warehouse("_Test Purchase Warehouse With Landed Cost")
+ warehouse1 = create_warehouse("_Test Purchase Warehouse With Landed Cost 1")
+ warehouse2 = create_warehouse("_Test Purchase Warehouse With Landed Cost 2")
+ warehouse3 = create_warehouse("_Test Purchase Warehouse With Landed Cost 3")
+
+ pr = make_purchase_receipt(
+ item_code=item_code,
+ warehouse=warehouse,
+ posting_date=add_days(today(), -10),
+ posting_time="10:59:59",
+ qty=100,
+ rate=275.00,
+ )
+
+ pr_return = make_return_doc("Purchase Receipt", pr.name)
+ pr_return.posting_date = add_days(today(), -9)
+ pr_return.items[0].qty = 2 * -1
+ pr_return.items[0].received_qty = 2 * -1
+ pr_return.submit()
+
+ ste1 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -8),
+ source=warehouse,
+ target=warehouse1,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste1.reload()
+ self.assertEqual(ste1.items[0].valuation_rate, 275.00)
+
+ ste2 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -7),
+ source=warehouse,
+ target=warehouse2,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste2.reload()
+ self.assertEqual(ste2.items[0].valuation_rate, 275.00)
+
+ ste3 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -6),
+ source=warehouse,
+ target=warehouse3,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste3.reload()
+ self.assertEqual(ste3.items[0].valuation_rate, 275.00)
+
+ ste4 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -5),
+ source=warehouse1,
+ target=warehouse,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste4.reload()
+ self.assertEqual(ste4.items[0].valuation_rate, 275.00)
+
+ ste5 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -4),
+ source=warehouse,
+ target=warehouse1,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste5.reload()
+ self.assertEqual(ste5.items[0].valuation_rate, 275.00)
+
+ ste6 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -3),
+ source=warehouse1,
+ target=warehouse,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste6.reload()
+ self.assertEqual(ste6.items[0].valuation_rate, 275.00)
+
+ ste7 = make_stock_entry(
+ purpose="Material Transfer",
+ posting_date=add_days(today(), -3),
+ source=warehouse,
+ target=warehouse1,
+ item_code=item_code,
+ qty=20,
+ company=pr.company,
+ )
+
+ ste7.reload()
+ self.assertEqual(ste7.items[0].valuation_rate, 275.00)
+
+ create_landed_cost_voucher("Purchase Receipt", pr.name, pr.company, charges=2500 * -1)
+
+ pr.reload()
+ valuation_rate = pr.items[0].valuation_rate
+
+ ste1.reload()
+ self.assertEqual(ste1.items[0].valuation_rate, valuation_rate)
+
+ ste2.reload()
+ self.assertEqual(ste2.items[0].valuation_rate, valuation_rate)
+
+ ste3.reload()
+ self.assertEqual(ste3.items[0].valuation_rate, valuation_rate)
+
+ ste4.reload()
+ self.assertEqual(ste4.items[0].valuation_rate, valuation_rate)
+
+ ste5.reload()
+ self.assertEqual(ste5.items[0].valuation_rate, valuation_rate)
+
+ ste6.reload()
+ self.assertEqual(ste6.items[0].valuation_rate, valuation_rate)
+
+ ste7.reload()
+ self.assertEqual(ste7.items[0].valuation_rate, valuation_rate)
+
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
@@ -1754,7 +2161,7 @@
if not frappe.db.exists("Location", "Test Location"):
frappe.get_doc({"doctype": "Location", "location_name": "Test Location"}).insert()
- frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+ frappe.db.set_single_value("Buying Settings", "allow_multiple_items", 1)
pr = frappe.new_doc("Purchase Receipt")
args = frappe._dict(args)
pr.posting_date = args.posting_date or today()
@@ -1776,6 +2183,30 @@
item_code = args.item or args.item_code or "_Test Item"
uom = args.uom or frappe.db.get_value("Item", item_code, "stock_uom") or "_Test UOM"
+
+ bundle_id = None
+ if args.get("batch_no") or args.get("serial_no"):
+ batches = {}
+ if args.get("batch_no"):
+ batches = frappe._dict({args.batch_no: qty})
+
+ serial_nos = args.get("serial_no") or []
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": qty,
+ "batches": batches,
+ "voucher_type": "Purchase Receipt",
+ "serial_nos": serial_nos,
+ "posting_date": args.posting_date or today(),
+ "posting_time": args.posting_time,
+ }
+ )
+ ).name
+
pr.append(
"items",
{
@@ -1790,8 +2221,7 @@
"rate": args.rate if args.rate != None else 50,
"conversion_factor": args.conversion_factor or 1.0,
"stock_qty": flt(qty) * (flt(args.conversion_factor) or 1.0),
- "serial_no": args.serial_no,
- "batch_no": args.batch_no,
+ "serial_and_batch_bundle": bundle_id,
"stock_uom": args.stock_uom or "_Test UOM",
"uom": uom,
"cost_center": args.cost_center
@@ -1817,6 +2247,9 @@
pr.insert()
if not args.do_not_submit:
pr.submit()
+
+ pr.load_from_db()
+
return pr
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index cd320fd..bc5e8a0 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -79,6 +79,7 @@
"purchase_order",
"purchase_invoice",
"column_break_40",
+ "allow_zero_valuation_rate",
"is_fixed_asset",
"asset_location",
"asset_category",
@@ -91,14 +92,19 @@
"delivery_note_item",
"putaway_rule",
"section_break_45",
- "allow_zero_valuation_rate",
- "bom",
- "serial_no",
+ "add_serial_batch_bundle",
+ "serial_and_batch_bundle",
"col_break5",
- "include_exploded_items",
- "batch_no",
+ "add_serial_batch_for_rejected_qty",
+ "rejected_serial_and_batch_bundle",
+ "section_break_3vxt",
+ "serial_no",
"rejected_serial_no",
- "item_tax_rate",
+ "column_break_tolu",
+ "batch_no",
+ "subcontract_bom_section",
+ "include_exploded_items",
+ "bom",
"item_weight_details",
"weight_per_unit",
"total_weight",
@@ -110,6 +116,7 @@
"manufacturer_part_no",
"accounting_details_section",
"expense_account",
+ "item_tax_rate",
"column_break_102",
"provisional_expense_account",
"accounting_dimensions_section",
@@ -206,6 +213,7 @@
"fieldname": "received_qty",
"fieldtype": "Float",
"label": "Received Quantity",
+ "no_copy": 1,
"oldfieldname": "received_qty",
"oldfieldtype": "Currency",
"print_hide": 1,
@@ -494,6 +502,7 @@
{
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"oldfieldname": "rejected_warehouse",
@@ -565,37 +574,8 @@
},
{
"fieldname": "section_break_45",
- "fieldtype": "Section Break"
- },
- {
- "depends_on": "eval:!doc.is_fixed_asset",
- "fieldname": "serial_no",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Serial No",
- "no_copy": 1,
- "oldfieldname": "serial_no",
- "oldfieldtype": "Text"
- },
- {
- "depends_on": "eval:!doc.is_fixed_asset",
- "fieldname": "batch_no",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Batch No",
- "no_copy": 1,
- "oldfieldname": "batch_no",
- "oldfieldtype": "Link",
- "options": "Batch",
- "print_hide": 1
- },
- {
- "depends_on": "eval:!doc.is_fixed_asset",
- "fieldname": "rejected_serial_no",
- "fieldtype": "Small Text",
- "label": "Rejected Serial No",
- "no_copy": 1,
- "print_hide": 1
+ "fieldtype": "Section Break",
+ "label": "Serial and Batch No"
},
{
"fieldname": "item_tax_template",
@@ -1016,12 +996,70 @@
"no_copy": 1,
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "depends_on": "eval:parent.is_old_subcontracting_flow",
+ "fieldname": "subcontract_bom_section",
+ "fieldtype": "Section Break",
+ "label": "Subcontract BOM"
+ },
+ {
+ "fieldname": "serial_no",
+ "fieldtype": "Text",
+ "label": "Serial No",
+ "read_only": 1
+ },
+ {
+ "fieldname": "rejected_serial_no",
+ "fieldtype": "Text",
+ "label": "Rejected Serial No",
+ "read_only": 1
+ },
+ {
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "label": "Batch No",
+ "options": "Batch",
+ "read_only": 1
+ },
+ {
+ "fieldname": "rejected_serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Rejected Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle"
+ },
+ {
+ "fieldname": "add_serial_batch_for_rejected_qty",
+ "fieldtype": "Button",
+ "label": "Add Serial / Batch No (Rejected Qty)"
+ },
+ {
+ "fieldname": "section_break_3vxt",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_tolu",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "add_serial_batch_bundle",
+ "fieldtype": "Button",
+ "label": "Add Serial / Batch No"
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-02-28 15:43:04.470104",
+ "modified": "2023-07-04 17:22:02.830029",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
diff --git a/erpnext/stock/doctype/putaway_rule/putaway_rule.py b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
index 623fbde..0a04210 100644
--- a/erpnext/stock/doctype/putaway_rule/putaway_rule.py
+++ b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
@@ -11,7 +11,6 @@
from frappe.model.document import Document
from frappe.utils import cint, cstr, floor, flt, nowdate
-from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.utils import get_stock_balance
@@ -99,7 +98,6 @@
item = frappe._dict(item)
source_warehouse = item.get("s_warehouse")
- serial_nos = get_serial_nos(item.get("serial_no"))
item.conversion_factor = flt(item.conversion_factor) or 1.0
pending_qty, item_code = flt(item.qty), item.item_code
pending_stock_qty = flt(item.transfer_qty) if doctype == "Stock Entry" else flt(item.stock_qty)
@@ -145,9 +143,7 @@
if not qty_to_allocate:
break
- updated_table = add_row(
- item, qty_to_allocate, rule.warehouse, updated_table, rule.name, serial_nos=serial_nos
- )
+ updated_table = add_row(item, qty_to_allocate, rule.warehouse, updated_table, rule.name)
pending_stock_qty -= stock_qty_to_allocate
pending_qty -= qty_to_allocate
@@ -245,7 +241,7 @@
return False, vacant_rules
-def add_row(item, to_allocate, warehouse, updated_table, rule=None, serial_nos=None):
+def add_row(item, to_allocate, warehouse, updated_table, rule=None):
new_updated_table_row = copy.deepcopy(item)
new_updated_table_row.idx = 1 if not updated_table else cint(updated_table[-1].idx) + 1
new_updated_table_row.name = None
@@ -264,8 +260,8 @@
if rule:
new_updated_table_row.putaway_rule = rule
- if serial_nos:
- new_updated_table_row.serial_no = get_serial_nos_to_allocate(serial_nos, to_allocate)
+
+ new_updated_table_row.serial_and_batch_bundle = ""
updated_table.append(new_updated_table_row)
return updated_table
@@ -297,12 +293,3 @@
)
frappe.msgprint(msg, title=_("Insufficient Capacity"), is_minimizable=True, wide=True)
-
-
-def get_serial_nos_to_allocate(serial_nos, to_allocate):
- if serial_nos:
- allocated_serial_nos = serial_nos[0 : cint(to_allocate)]
- serial_nos[:] = serial_nos[cint(to_allocate) :] # pop out allocated serial nos and modify list
- return "\n".join(allocated_serial_nos) if allocated_serial_nos else ""
- else:
- return ""
diff --git a/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py b/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py
index ab0ca10..f5bad51 100644
--- a/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py
+++ b/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py
@@ -7,6 +7,11 @@
from erpnext.stock.doctype.batch.test_batch import make_new_batch
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
from erpnext.stock.get_item_details import get_conversion_factor
@@ -382,42 +387,49 @@
make_new_batch(batch_id="BOTTL-BATCH-1", item_code="Water Bottle")
pr = make_purchase_receipt(item_code="Water Bottle", qty=5, do_not_submit=1)
- pr.items[0].batch_no = "BOTTL-BATCH-1"
pr.save()
pr.submit()
+ pr.load_from_db()
- serial_nos = frappe.get_list(
- "Serial No", filters={"purchase_document_no": pr.name, "status": "Active"}
- )
- serial_nos = [d.name for d in serial_nos]
+ batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
+ serial_nos = get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle)
stock_entry = make_stock_entry(
item_code="Water Bottle",
source="_Test Warehouse - _TC",
qty=5,
+ serial_no=serial_nos,
target="Finished Goods - _TC",
purpose="Material Transfer",
apply_putaway_rule=1,
do_not_save=1,
)
- stock_entry.items[0].batch_no = "BOTTL-BATCH-1"
- stock_entry.items[0].serial_no = "\n".join(serial_nos)
stock_entry.save()
+ stock_entry.load_from_db()
self.assertEqual(stock_entry.items[0].t_warehouse, self.warehouse_1)
self.assertEqual(stock_entry.items[0].qty, 3)
self.assertEqual(stock_entry.items[0].putaway_rule, rule_1.name)
- self.assertEqual(stock_entry.items[0].serial_no, "\n".join(serial_nos[:3]))
- self.assertEqual(stock_entry.items[0].batch_no, "BOTTL-BATCH-1")
+ self.assertEqual(
+ get_serial_nos_from_bundle(stock_entry.items[0].serial_and_batch_bundle), serial_nos[0:3]
+ )
+ self.assertEqual(get_batch_from_bundle(stock_entry.items[0].serial_and_batch_bundle), batch_no)
self.assertEqual(stock_entry.items[1].t_warehouse, self.warehouse_2)
self.assertEqual(stock_entry.items[1].qty, 2)
self.assertEqual(stock_entry.items[1].putaway_rule, rule_2.name)
- self.assertEqual(stock_entry.items[1].serial_no, "\n".join(serial_nos[3:]))
- self.assertEqual(stock_entry.items[1].batch_no, "BOTTL-BATCH-1")
+ self.assertEqual(
+ get_serial_nos_from_bundle(stock_entry.items[1].serial_and_batch_bundle), serial_nos[3:5]
+ )
+ self.assertEqual(get_batch_from_bundle(stock_entry.items[1].serial_and_batch_bundle), batch_no)
self.assertUnchangedItemsOnResave(stock_entry)
+ for row in stock_entry.items:
+ if row.serial_and_batch_bundle:
+ frappe.delete_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+
+ stock_entry.load_from_db()
stock_entry.delete()
pr.cancel()
rule_1.delete()
diff --git a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
index 9d2e139..f5f8c3a 100644
--- a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
@@ -167,13 +167,13 @@
reference_type="Stock Entry", reference_name=se.name, readings=readings, status="Rejected"
)
- frappe.db.set_value("Stock Settings", None, "action_if_quality_inspection_is_rejected", "Stop")
+ frappe.db.set_single_value("Stock Settings", "action_if_quality_inspection_is_rejected", "Stop")
se.reload()
self.assertRaises(
QualityInspectionRejectedError, se.submit
) # when blocked in Stock settings, block rejected QI
- frappe.db.set_value("Stock Settings", None, "action_if_quality_inspection_is_rejected", "Warn")
+ frappe.db.set_single_value("Stock Settings", "action_if_quality_inspection_is_rejected", "Warn")
se.reload()
se.submit() # when allowed in Stock settings, allow rejected QI
@@ -182,7 +182,7 @@
qa.cancel()
se.reload()
se.cancel()
- frappe.db.set_value("Stock Settings", None, "action_if_quality_inspection_is_rejected", "Stop")
+ frappe.db.set_single_value("Stock Settings", "action_if_quality_inspection_is_rejected", "Stop")
def test_qi_status(self):
make_stock_entry(
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js
index 8aec532..40748ce 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js
@@ -59,6 +59,7 @@
if (frm.doc.status == 'In Progress') {
frm.doc.current_index = data.current_index;
frm.doc.items_to_be_repost = data.items_to_be_repost;
+ frm.doc.total_reposting_count = data.total_reposting_count;
frm.dashboard.reset();
frm.trigger('show_reposting_progress');
@@ -95,6 +96,11 @@
var bars = [];
let total_count = frm.doc.items_to_be_repost ? JSON.parse(frm.doc.items_to_be_repost).length : 0;
+
+ if (frm.doc?.total_reposting_count) {
+ total_count = frm.doc.total_reposting_count;
+ }
+
let progress = flt(cint(frm.doc.current_index) / total_count * 100, 2) || 0.5;
var title = __('Reposting Completed {0}%', [progress]);
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
index 8a5309c..1c5b521 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -22,11 +22,15 @@
"amended_from",
"error_section",
"error_log",
+ "reposting_info_section",
+ "reposting_data_file",
"items_to_be_repost",
- "affected_transactions",
"distinct_item_and_warehouse",
+ "column_break_o1sj",
+ "total_reposting_count",
"current_index",
- "gl_reposting_index"
+ "gl_reposting_index",
+ "affected_transactions"
],
"fields": [
{
@@ -191,13 +195,36 @@
"fieldtype": "Int",
"hidden": 1,
"label": "GL reposting index",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "reposting_info_section",
+ "fieldtype": "Section Break",
+ "label": "Reposting Info"
+ },
+ {
+ "fieldname": "column_break_o1sj",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "total_reposting_count",
+ "fieldtype": "Int",
+ "label": "Total Reposting Count",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "reposting_data_file",
+ "fieldtype": "Attach",
+ "label": "Reposting Data File",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-11-28 16:00:05.637440",
+ "modified": "2023-05-31 12:48:57.138693",
"modified_by": "Administrator",
"module": "Stock",
"name": "Repost Item Valuation",
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
index bbed099..27066b8 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -3,15 +3,17 @@
import frappe
from frappe import _
+from frappe.desk.form.load import get_attachments
from frappe.exceptions import QueryDeadlockError, QueryTimeoutError
from frappe.model.document import Document
from frappe.query_builder import DocType, Interval
-from frappe.query_builder.functions import Now
+from frappe.query_builder.functions import Max, Now
from frappe.utils import cint, get_link_to_form, get_weekday, getdate, now, nowtime
from frappe.utils.user import get_users_with_role
from rq.timeouts import JobTimeoutException
import erpnext
+from erpnext.accounts.general_ledger import validate_accounting_period
from erpnext.accounts.utils import get_future_stock_vouchers, repost_gle_for_stock_vouchers
from erpnext.stock.stock_ledger import (
get_affected_transactions,
@@ -36,11 +38,76 @@
)
def validate(self):
+ self.validate_period_closing_voucher()
self.set_status(write=False)
self.reset_field_values()
self.set_company()
self.validate_accounts_freeze()
+ def validate_period_closing_voucher(self):
+ # Period Closing Voucher
+ year_end_date = self.get_max_year_end_date(self.company)
+ if year_end_date and getdate(self.posting_date) <= getdate(year_end_date):
+ date = frappe.format(year_end_date, "Date")
+ msg = f"Due to period closing, you cannot repost item valuation before {date}"
+ frappe.throw(_(msg))
+
+ # Accounting Period
+ if self.voucher_type:
+ validate_accounting_period(
+ [
+ frappe._dict(
+ {
+ "posting_date": self.posting_date,
+ "company": self.company,
+ "voucher_type": self.voucher_type,
+ }
+ )
+ ]
+ )
+
+ # Closing Stock Balance
+ closing_stock = self.get_closing_stock_balance()
+ if closing_stock and closing_stock[0].name:
+ name = get_link_to_form("Closing Stock Balance", closing_stock[0].name)
+ to_date = frappe.format(closing_stock[0].to_date, "Date")
+ msg = f"Due to closing stock balance {name}, you cannot repost item valuation before {to_date}"
+ frappe.throw(_(msg))
+
+ def get_closing_stock_balance(self):
+ filters = {
+ "company": self.company,
+ "status": "Completed",
+ "docstatus": 1,
+ "to_date": (">=", self.posting_date),
+ }
+
+ for field in ["warehouse", "item_code"]:
+ if self.get(field):
+ filters.update({field: ("in", ["", self.get(field)])})
+
+ return frappe.get_all("Closing Stock Balance", fields=["name", "to_date"], filters=filters)
+
+ @staticmethod
+ def get_max_year_end_date(company):
+ data = frappe.get_all(
+ "Period Closing Voucher", fields=["fiscal_year"], filters={"docstatus": 1, "company": company}
+ )
+
+ if not data:
+ return
+
+ fiscal_years = [d.fiscal_year for d in data]
+ table = frappe.qb.DocType("Fiscal Year")
+
+ query = (
+ frappe.qb.from_(table)
+ .select(Max(table.year_end_date))
+ .where((table.name.isin(fiscal_years)) & (table.disabled == 0))
+ ).run()
+
+ return query[0][0] if query else None
+
def validate_accounts_freeze(self):
acc_settings = frappe.db.get_value(
"Accounts Settings",
@@ -68,6 +135,12 @@
self.allow_negative_stock = 1
+ def on_cancel(self):
+ self.clear_attachment()
+
+ def on_trash(self):
+ self.clear_attachment()
+
def set_company(self):
if self.based_on == "Transaction":
self.company = frappe.get_cached_value(self.voucher_type, self.voucher_no, "company")
@@ -83,6 +156,14 @@
if write:
self.db_set("status", self.status)
+ def clear_attachment(self):
+ if attachments := get_attachments(self.doctype, self.name):
+ attachment = attachments[0]
+ frappe.delete_doc("File", attachment.name)
+
+ if self.reposting_data_file:
+ self.db_set("reposting_data_file", None)
+
def on_submit(self):
"""During tests reposts are executed immediately.
@@ -273,9 +354,7 @@
def notify_error_to_stock_managers(doc, traceback):
- recipients = get_users_with_role("Stock Manager")
- if not recipients:
- recipients = get_users_with_role("System Manager")
+ recipients = get_recipients()
subject = _("Error while reposting item valuation")
message = (
@@ -292,6 +371,17 @@
frappe.sendmail(recipients=recipients, subject=subject, message=message)
+def get_recipients():
+ role = (
+ frappe.db.get_single_value("Stock Reposting Settings", "notify_reposting_error_to_role")
+ or "Stock Manager"
+ )
+
+ recipients = get_users_with_role(role)
+
+ return recipients
+
+
def repost_entries():
"""
Reposts 'Repost Item Valuation' entries in queue.
@@ -317,7 +407,7 @@
return frappe.db.sql(
""" SELECT name from `tabRepost Item Valuation`
WHERE status in ('Queued', 'In Progress') and creation <= %s and docstatus = 1
- ORDER BY timestamp(posting_date, posting_time) asc, creation asc
+ ORDER BY timestamp(posting_date, posting_time) asc, creation asc, status asc
""",
now(),
as_dict=1,
diff --git a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
index 96ac435..1853f45 100644
--- a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
@@ -376,3 +376,49 @@
accounts_settings.acc_frozen_upto = ""
accounts_settings.save()
+
+ def test_create_repost_entry_for_cancelled_document(self):
+ pr = make_purchase_receipt(
+ company="_Test Company with perpetual inventory",
+ warehouse="Stores - TCP1",
+ get_multiple_items=True,
+ )
+
+ self.assertTrue(pr.docstatus == 1)
+ self.assertFalse(frappe.db.exists("Repost Item Valuation", {"voucher_no": pr.name}))
+
+ pr.load_from_db()
+
+ pr.cancel()
+ self.assertTrue(pr.docstatus == 2)
+ self.assertTrue(frappe.db.exists("Repost Item Valuation", {"voucher_no": pr.name}))
+
+ def test_repost_item_valuation_for_closing_stock_balance(self):
+ from erpnext.stock.doctype.closing_stock_balance.closing_stock_balance import (
+ prepare_closing_stock_balance,
+ )
+
+ doc = frappe.new_doc("Closing Stock Balance")
+ doc.company = "_Test Company"
+ doc.from_date = today()
+ doc.to_date = today()
+ doc.submit()
+
+ prepare_closing_stock_balance(doc.name)
+ doc.load_from_db()
+ self.assertEqual(doc.docstatus, 1)
+ self.assertEqual(doc.status, "Completed")
+
+ riv = frappe.new_doc("Repost Item Valuation")
+ riv.update(
+ {
+ "item_code": "_Test Item",
+ "warehouse": "_Test Warehouse - _TC",
+ "based_on": "Item and Warehouse",
+ "posting_date": today(),
+ "posting_time": "00:01:00",
+ }
+ )
+
+ self.assertRaises(frappe.ValidationError, riv.save)
+ doc.cancel()
diff --git a/erpnext/loan_management/dashboard_chart_source/__init__.py b/erpnext/stock/doctype/serial_and_batch_bundle/__init__.py
similarity index 100%
rename from erpnext/loan_management/dashboard_chart_source/__init__.py
rename to erpnext/stock/doctype/serial_and_batch_bundle/__init__.py
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js
new file mode 100644
index 0000000..cda4445
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js
@@ -0,0 +1,236 @@
+// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Serial and Batch Bundle', {
+ setup(frm) {
+ frm.trigger('set_queries');
+ },
+
+ refresh(frm) {
+ frm.trigger('toggle_fields');
+ frm.trigger('prepare_serial_batch_prompt');
+ },
+
+ item_code(frm) {
+ frm.clear_custom_buttons();
+ frm.trigger('prepare_serial_batch_prompt');
+ },
+
+ type_of_transaction(frm) {
+ frm.clear_custom_buttons();
+ frm.trigger('prepare_serial_batch_prompt');
+ },
+
+ warehouse(frm) {
+ if (frm.doc.warehouse) {
+ frm.call({
+ method: "set_warehouse",
+ doc: frm.doc,
+ callback(r) {
+ refresh_field("entries");
+ }
+ })
+ }
+ },
+
+ has_serial_no(frm) {
+ frm.trigger('toggle_fields');
+ },
+
+ has_batch_no(frm) {
+ frm.trigger('toggle_fields');
+ },
+
+ prepare_serial_batch_prompt(frm) {
+ if (frm.doc.docstatus === 0 && frm.doc.item_code
+ && frm.doc.type_of_transaction === "Inward") {
+ let label = frm.doc?.has_serial_no === 1
+ ? __('Serial Nos') : __('Batch Nos');
+
+ if (frm.doc?.has_serial_no === 1 && frm.doc?.has_batch_no === 1) {
+ label = __('Serial and Batch Nos');
+ }
+
+ let fields = frm.events.get_prompt_fields(frm);
+
+ frm.add_custom_button(__("Make " + label), () => {
+ frappe.prompt(fields, (data) => {
+ frm.events.add_serial_batch(frm, data);
+ }, "Add " + label, "Make " + label);
+ });
+ }
+ },
+
+ get_prompt_fields(frm) {
+ let attach_field = {
+ "label": __("Attach CSV File"),
+ "fieldname": "csv_file",
+ "fieldtype": "Attach"
+ }
+
+ if (!frm.doc.has_batch_no) {
+ attach_field.depends_on = "eval:doc.using_csv_file === 1"
+ }
+
+ let fields = [
+ {
+ "label": __("Using CSV File"),
+ "fieldname": "using_csv_file",
+ "default": 1,
+ "fieldtype": "Check",
+ },
+ attach_field,
+ {
+ "fieldtype": "Section Break",
+ }
+ ]
+
+ if (frm.doc.has_serial_no) {
+ fields.push({
+ "label": "Serial Nos",
+ "fieldname": "serial_nos",
+ "fieldtype": "Small Text",
+ "depends_on": "eval:doc.using_csv_file === 0"
+ })
+ }
+
+ if (frm.doc.has_batch_no) {
+ fields = attach_field
+ }
+
+ return fields;
+ },
+
+ add_serial_batch(frm, prompt_data) {
+ frm.events.validate_prompt_data(frm, prompt_data);
+
+ frm.call({
+ method: "add_serial_batch",
+ doc: frm.doc,
+ args: {
+ "data": prompt_data,
+ },
+ callback(r) {
+ refresh_field("entries");
+ }
+ });
+ },
+
+ validate_prompt_data(frm, prompt_data) {
+ if (prompt_data.using_csv_file && !prompt_data.csv_file) {
+ frappe.throw(__("Please attach CSV file"));
+ }
+
+ if (frm.doc.has_serial_no && !prompt_data.using_csv_file && !prompt_data.serial_nos) {
+ frappe.throw(__("Please enter serial nos"));
+ }
+ },
+
+ toggle_fields(frm) {
+ if (frm.doc.has_serial_no) {
+ frm.doc.entries.forEach(row => {
+ if (Math.abs(row.qty) !== 1) {
+ frappe.model.set_value(row.doctype, row.name, "qty", 1);
+ }
+ })
+ }
+
+ frm.fields_dict.entries.grid.update_docfield_property(
+ 'serial_no', 'read_only', !frm.doc.has_serial_no
+ );
+
+ frm.fields_dict.entries.grid.update_docfield_property(
+ 'batch_no', 'read_only', !frm.doc.has_batch_no
+ );
+
+ frm.fields_dict.entries.grid.update_docfield_property(
+ 'qty', 'read_only', frm.doc.has_serial_no
+ );
+ },
+
+ set_queries(frm) {
+ frm.set_query('item_code', () => {
+ return {
+ query: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.item_query',
+ };
+ });
+
+ frm.set_query('voucher_type', () => {
+ return {
+ filters: {
+ 'istable': 0,
+ 'issingle': 0,
+ 'is_submittable': 1,
+ 'name': ['in', [
+ "Asset Capitalization",
+ "Asset Repair",
+ "Delivery Note",
+ "Installation Note",
+ "Job Card",
+ "Maintenance Schedule",
+ "POS Invoice",
+ "Pick List",
+ "Purchase Invoice",
+ "Purchase Receipt",
+ "Quotation",
+ "Sales Invoice",
+ "Stock Entry",
+ "Stock Reconciliation",
+ "Subcontracting Receipt",
+ ]],
+ }
+ };
+ });
+
+ frm.set_query('voucher_no', () => {
+ return {
+ filters: {
+ 'docstatus': ["!=", 2],
+ }
+ };
+ });
+
+ frm.set_query('warehouse', () => {
+ return {
+ filters: {
+ 'is_group': 0,
+ 'company': frm.doc.company,
+ }
+ };
+ });
+
+ frm.set_query('serial_no', 'entries', () => {
+ return {
+ filters: {
+ item_code: frm.doc.item_code,
+ }
+ };
+ });
+
+ frm.set_query('batch_no', 'entries', () => {
+ return {
+ filters: {
+ item: frm.doc.item_code,
+ disabled: 0,
+ }
+ };
+ });
+
+ frm.set_query('warehouse', 'entries', () => {
+ return {
+ filters: {
+ company: frm.doc.company,
+ }
+ };
+ });
+ }
+});
+
+
+frappe.ui.form.on("Serial and Batch Entry", {
+ entries_add(frm, cdt, cdn) {
+ if (frm.doc.warehouse) {
+ frappe.model.set_value(cdt, cdn, 'warehouse', frm.doc.warehouse);
+ }
+ },
+})
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
new file mode 100644
index 0000000..6955c76
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -0,0 +1,273 @@
+{
+ "actions": [],
+ "autoname": "naming_series:",
+ "creation": "2022-09-29 14:56:38.338267",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "item_details_tab",
+ "naming_series",
+ "company",
+ "item_name",
+ "has_serial_no",
+ "has_batch_no",
+ "column_break_4",
+ "item_code",
+ "warehouse",
+ "type_of_transaction",
+ "serial_no_and_batch_no_tab",
+ "entries",
+ "quantity_and_rate_section",
+ "total_qty",
+ "item_group",
+ "column_break_13",
+ "avg_rate",
+ "total_amount",
+ "tab_break_12",
+ "voucher_type",
+ "voucher_no",
+ "voucher_detail_no",
+ "column_break_aouy",
+ "posting_date",
+ "posting_time",
+ "returned_against",
+ "section_break_wzou",
+ "is_cancelled",
+ "is_rejected",
+ "amended_from"
+ ],
+ "fields": [
+ {
+ "fieldname": "item_details_tab",
+ "fieldtype": "Tab Break",
+ "label": "Serial and Batch"
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company",
+ "reqd": 1
+ },
+ {
+ "fetch_from": "item_code.item_group",
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "label": "Item Group",
+ "options": "Item Group"
+ },
+ {
+ "default": "0",
+ "fetch_from": "item_code.has_serial_no",
+ "fieldname": "has_serial_no",
+ "fieldtype": "Check",
+ "label": "Has Serial No",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Item Code",
+ "options": "Item",
+ "reqd": 1
+ },
+ {
+ "fetch_from": "item_code.item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "label": "Item Name",
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fetch_from": "item_code.has_batch_no",
+ "fieldname": "has_batch_no",
+ "fieldtype": "Check",
+ "label": "Has Batch No",
+ "read_only": 1
+ },
+ {
+ "fieldname": "serial_no_and_batch_no_tab",
+ "fieldtype": "Section Break",
+ "label": "Serial / Batch No"
+ },
+ {
+ "fieldname": "voucher_type",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Voucher Type",
+ "options": "DocType",
+ "reqd": 1
+ },
+ {
+ "fieldname": "voucher_no",
+ "fieldtype": "Dynamic Link",
+ "label": "Voucher No",
+ "no_copy": 1,
+ "options": "voucher_type"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_cancelled",
+ "fieldtype": "Check",
+ "label": "Is Cancelled",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "tab_break_12",
+ "fieldtype": "Tab Break",
+ "label": "Reference"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "quantity_and_rate_section",
+ "fieldtype": "Tab Break",
+ "label": "Quantity and Rate"
+ },
+ {
+ "fieldname": "column_break_13",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "avg_rate",
+ "fieldtype": "Float",
+ "label": "Avg Rate",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_amount",
+ "fieldtype": "Float",
+ "label": "Total Amount",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "total_qty",
+ "fieldtype": "Float",
+ "label": "Total Qty",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_aouy",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "company",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Warehouse",
+ "mandatory_depends_on": "eval:doc.type_of_transaction != \"Maintenance\"",
+ "options": "Warehouse"
+ },
+ {
+ "fieldname": "type_of_transaction",
+ "fieldtype": "Select",
+ "label": "Type of Transaction",
+ "options": "\nInward\nOutward\nMaintenance\nAsset Repair",
+ "reqd": 1
+ },
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Naming Series",
+ "options": "SBB-.####"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:doc.voucher_type == \"Purchase Receipt\"",
+ "fieldname": "is_rejected",
+ "fieldtype": "Check",
+ "label": "Is Rejected",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_wzou",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "label": "Posting Date",
+ "no_copy": 1
+ },
+ {
+ "fieldname": "posting_time",
+ "fieldtype": "Time",
+ "label": "Posting Time",
+ "no_copy": 1
+ },
+ {
+ "fieldname": "voucher_detail_no",
+ "fieldtype": "Data",
+ "label": "Voucher Detail No",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "allow_bulk_edit": 1,
+ "fieldname": "entries",
+ "fieldtype": "Table",
+ "options": "Serial and Batch Entry",
+ "reqd": 1
+ },
+ {
+ "fieldname": "returned_against",
+ "fieldtype": "Data",
+ "label": "Returned Against",
+ "read_only": 1
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-04-10 20:02:42.964309",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Serial and Batch Bundle",
+ "naming_rule": "By \"Naming Series\" field",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "item_code"
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
new file mode 100644
index 0000000..0c6d33b
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -0,0 +1,1598 @@
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import collections
+import csv
+from collections import defaultdict
+from typing import Dict, List
+
+import frappe
+from frappe import _, _dict, bold
+from frappe.model.document import Document
+from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.utils import (
+ add_days,
+ cint,
+ cstr,
+ flt,
+ get_link_to_form,
+ now,
+ nowtime,
+ parse_json,
+ today,
+)
+from frappe.utils.csvutils import build_csv_response
+
+from erpnext.stock.serial_batch_bundle import BatchNoValuation, SerialNoValuation
+from erpnext.stock.serial_batch_bundle import get_serial_nos as get_serial_nos_from_bundle
+
+
+class SerialNoExistsInFutureTransactionError(frappe.ValidationError):
+ pass
+
+
+class BatchNegativeStockError(frappe.ValidationError):
+ pass
+
+
+class SerialNoDuplicateError(frappe.ValidationError):
+ pass
+
+
+class SerialNoWarehouseError(frappe.ValidationError):
+ pass
+
+
+class SerialandBatchBundle(Document):
+ def validate(self):
+ self.validate_serial_and_batch_no()
+ self.validate_duplicate_serial_and_batch_no()
+ self.validate_voucher_no()
+ if self.type_of_transaction == "Maintenance":
+ return
+
+ self.validate_serial_nos_duplicate()
+ self.check_future_entries_exists()
+ self.set_is_outward()
+ self.calculate_total_qty()
+ self.set_warehouse()
+ self.set_incoming_rate()
+ self.calculate_qty_and_amount()
+
+ def validate_serial_nos_inventory(self):
+ if not (self.has_serial_no and self.type_of_transaction == "Outward"):
+ return
+
+ serial_nos = [d.serial_no for d in self.entries if d.serial_no]
+ kwargs = {"item_code": self.item_code, "warehouse": self.warehouse}
+ if self.voucher_type == "POS Invoice":
+ kwargs["ignore_voucher_no"] = self.voucher_no
+
+ available_serial_nos = get_available_serial_nos(frappe._dict(kwargs))
+
+ serial_no_warehouse = {}
+ for data in available_serial_nos:
+ if data.serial_no not in serial_nos:
+ continue
+
+ serial_no_warehouse[data.serial_no] = data.warehouse
+
+ for serial_no in serial_nos:
+ if (
+ not serial_no_warehouse.get(serial_no) or serial_no_warehouse.get(serial_no) != self.warehouse
+ ):
+ self.throw_error_message(
+ f"Serial No {bold(serial_no)} is not present in the warehouse {bold(self.warehouse)}.",
+ SerialNoWarehouseError,
+ )
+
+ def validate_serial_nos_duplicate(self):
+ if self.voucher_type in ["Stock Reconciliation", "Stock Entry"] and self.docstatus != 1:
+ return
+
+ if not (self.has_serial_no and self.type_of_transaction == "Inward"):
+ return
+
+ serial_nos = [d.serial_no for d in self.entries if d.serial_no]
+ kwargs = frappe._dict(
+ {
+ "item_code": self.item_code,
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ "serial_nos": serial_nos,
+ }
+ )
+
+ if self.returned_against and self.docstatus == 1:
+ kwargs["ignore_voucher_detail_no"] = self.voucher_detail_no
+
+ if self.docstatus == 1:
+ kwargs["voucher_no"] = self.voucher_no
+
+ available_serial_nos = get_available_serial_nos(kwargs)
+
+ for data in available_serial_nos:
+ if data.serial_no in serial_nos:
+ self.throw_error_message(
+ f"Serial No {bold(data.serial_no)} is already present in the warehouse {bold(data.warehouse)}.",
+ SerialNoDuplicateError,
+ )
+
+ def throw_error_message(self, message, exception=frappe.ValidationError):
+ frappe.throw(_(message), exception, title=_("Error"))
+
+ def set_incoming_rate(self, row=None, save=False):
+ if self.type_of_transaction not in ["Inward", "Outward"] or self.voucher_type in [
+ "Installation Note",
+ "Job Card",
+ "Maintenance Schedule",
+ "Pick List",
+ ]:
+ return
+
+ if self.type_of_transaction == "Outward":
+ self.set_incoming_rate_for_outward_transaction(row, save)
+ else:
+ self.set_incoming_rate_for_inward_transaction(row, save)
+
+ def calculate_total_qty(self, save=True):
+ self.total_qty = 0.0
+ for d in self.entries:
+ d.qty = 1 if self.has_serial_no and abs(d.qty) > 1 else abs(d.qty) if d.qty else 0
+ d.stock_value_difference = abs(d.stock_value_difference) if d.stock_value_difference else 0
+ if self.type_of_transaction == "Outward":
+ d.qty *= -1
+ d.stock_value_difference *= -1
+
+ self.total_qty += flt(d.qty)
+
+ if save:
+ self.db_set("total_qty", self.total_qty)
+
+ def get_serial_nos(self):
+ return [d.serial_no for d in self.entries if d.serial_no]
+
+ def set_incoming_rate_for_outward_transaction(self, row=None, save=False):
+ sle = self.get_sle_for_outward_transaction()
+
+ if self.has_serial_no:
+ sn_obj = SerialNoValuation(
+ sle=sle,
+ item_code=self.item_code,
+ warehouse=self.warehouse,
+ )
+
+ else:
+ sn_obj = BatchNoValuation(
+ sle=sle,
+ item_code=self.item_code,
+ warehouse=self.warehouse,
+ )
+
+ for d in self.entries:
+ available_qty = 0
+ if self.has_serial_no:
+ d.incoming_rate = abs(sn_obj.serial_no_incoming_rate.get(d.serial_no, 0.0))
+ else:
+ if sn_obj.batch_avg_rate.get(d.batch_no):
+ d.incoming_rate = abs(sn_obj.batch_avg_rate.get(d.batch_no))
+
+ available_qty = flt(sn_obj.available_qty.get(d.batch_no))
+ if self.docstatus == 1:
+ available_qty += flt(d.qty)
+
+ self.validate_negative_batch(d.batch_no, available_qty)
+
+ d.stock_value_difference = flt(d.qty) * flt(d.incoming_rate)
+
+ if save:
+ d.db_set(
+ {"incoming_rate": d.incoming_rate, "stock_value_difference": d.stock_value_difference}
+ )
+
+ def validate_negative_batch(self, batch_no, available_qty):
+ if available_qty < 0:
+ msg = f"""Batch No {bold(batch_no)} has negative stock
+ of quantity {bold(available_qty)} in the
+ warehouse {self.warehouse}"""
+
+ frappe.throw(_(msg), BatchNegativeStockError)
+
+ def get_sle_for_outward_transaction(self):
+ sle = frappe._dict(
+ {
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ "item_code": self.item_code,
+ "warehouse": self.warehouse,
+ "serial_and_batch_bundle": self.name,
+ "actual_qty": self.total_qty,
+ "company": self.company,
+ "serial_nos": [row.serial_no for row in self.entries if row.serial_no],
+ "batch_nos": {row.batch_no: row for row in self.entries if row.batch_no},
+ "voucher_type": self.voucher_type,
+ }
+ )
+
+ if self.docstatus == 1:
+ sle["voucher_no"] = self.voucher_no
+
+ if not sle.actual_qty:
+ self.calculate_total_qty()
+ sle.actual_qty = self.total_qty
+
+ return sle
+
+ def set_incoming_rate_for_inward_transaction(self, row=None, save=False):
+ valuation_field = "valuation_rate"
+ if self.voucher_type in ["Sales Invoice", "Delivery Note", "Quotation"]:
+ valuation_field = "incoming_rate"
+
+ if self.voucher_type == "POS Invoice":
+ valuation_field = "rate"
+
+ rate = row.get(valuation_field) if row else 0.0
+ child_table = self.child_table
+
+ if self.voucher_type == "Subcontracting Receipt":
+ if not self.voucher_detail_no:
+ return
+ elif frappe.db.exists("Subcontracting Receipt Supplied Item", self.voucher_detail_no):
+ valuation_field = "rate"
+ child_table = "Subcontracting Receipt Supplied Item"
+ else:
+ valuation_field = "rm_supp_cost"
+ child_table = "Subcontracting Receipt Item"
+
+ precision = frappe.get_precision(child_table, valuation_field) or 2
+
+ if not rate and self.voucher_detail_no and self.voucher_no:
+ rate = frappe.db.get_value(child_table, self.voucher_detail_no, valuation_field)
+
+ for d in self.entries:
+ if not rate or (
+ flt(rate, precision) == flt(d.incoming_rate, precision) and d.stock_value_difference
+ ):
+ continue
+
+ d.incoming_rate = flt(rate, precision)
+ if self.has_batch_no:
+ d.stock_value_difference = flt(d.qty) * flt(d.incoming_rate)
+
+ if save:
+ d.db_set(
+ {"incoming_rate": d.incoming_rate, "stock_value_difference": d.stock_value_difference}
+ )
+
+ def set_serial_and_batch_values(self, parent, row, qty_field=None):
+ values_to_set = {}
+ if not self.voucher_no or self.voucher_no != row.parent:
+ values_to_set["voucher_no"] = row.parent
+
+ if self.voucher_type != parent.doctype:
+ values_to_set["voucher_type"] = parent.doctype
+
+ if not self.voucher_detail_no or self.voucher_detail_no != row.name:
+ values_to_set["voucher_detail_no"] = row.name
+
+ if parent.get("posting_date") and (
+ not self.posting_date or self.posting_date != parent.posting_date
+ ):
+ values_to_set["posting_date"] = parent.posting_date or today()
+
+ if parent.get("posting_time") and (
+ not self.posting_time or self.posting_time != parent.posting_time
+ ):
+ values_to_set["posting_time"] = parent.posting_time
+
+ if values_to_set:
+ self.db_set(values_to_set)
+
+ self.calculate_total_qty(save=True)
+
+ # If user has changed the rate in the child table
+ if self.docstatus == 0:
+ self.set_incoming_rate(save=True, row=row)
+
+ self.calculate_qty_and_amount(save=True)
+ self.validate_quantity(row, qty_field=qty_field)
+ self.set_warranty_expiry_date()
+
+ def set_warranty_expiry_date(self):
+ if self.type_of_transaction != "Outward":
+ return
+
+ if not (self.docstatus == 1 and self.voucher_type == "Delivery Note" and self.has_serial_no):
+ return
+
+ warranty_period = frappe.get_cached_value("Item", self.item_code, "warranty_period")
+
+ if not warranty_period:
+ return
+
+ warranty_expiry_date = add_days(self.posting_date, cint(warranty_period))
+
+ serial_nos = self.get_serial_nos()
+ if not serial_nos:
+ return
+
+ sn_table = frappe.qb.DocType("Serial No")
+ (
+ frappe.qb.update(sn_table)
+ .set(sn_table.warranty_expiry_date, warranty_expiry_date)
+ .where(sn_table.name.isin(serial_nos))
+ ).run()
+
+ def validate_voucher_no(self):
+ if not (self.voucher_type and self.voucher_no):
+ return
+
+ if self.voucher_no and not frappe.db.exists(self.voucher_type, self.voucher_no):
+ self.throw_error_message(f"The {self.voucher_type} # {self.voucher_no} does not exist")
+
+ if self.flags.ignore_voucher_validation:
+ return
+
+ if (
+ self.docstatus == 1
+ and frappe.get_cached_value(self.voucher_type, self.voucher_no, "docstatus") != 1
+ ):
+ self.throw_error_message(f"The {self.voucher_type} # {self.voucher_no} should be submit first.")
+
+ def check_future_entries_exists(self):
+ if not self.has_serial_no:
+ return
+
+ serial_nos = [d.serial_no for d in self.entries if d.serial_no]
+
+ if not serial_nos:
+ return
+
+ parent = frappe.qb.DocType("Serial and Batch Bundle")
+ child = frappe.qb.DocType("Serial and Batch Entry")
+
+ timestamp_condition = CombineDatetime(
+ parent.posting_date, parent.posting_time
+ ) > CombineDatetime(self.posting_date, self.posting_time)
+
+ future_entries = (
+ frappe.qb.from_(parent)
+ .inner_join(child)
+ .on(parent.name == child.parent)
+ .select(
+ child.serial_no,
+ parent.voucher_type,
+ parent.voucher_no,
+ )
+ .where(
+ (child.serial_no.isin(serial_nos))
+ & (child.parent != self.name)
+ & (parent.item_code == self.item_code)
+ & (parent.docstatus == 1)
+ & (parent.is_cancelled == 0)
+ & (parent.type_of_transaction.isin(["Inward", "Outward"]))
+ )
+ .where(timestamp_condition)
+ ).run(as_dict=True)
+
+ if future_entries:
+ msg = """The serial nos has been used in the future
+ transactions so you need to cancel them first.
+ The list of serial nos and their respective
+ transactions are as below."""
+
+ msg += "<br><br><ul>"
+
+ for d in future_entries:
+ msg += f"<li>{d.serial_no} in {get_link_to_form(d.voucher_type, d.voucher_no)}</li>"
+ msg += "</li></ul>"
+
+ title = "Serial No Exists In Future Transaction(s)"
+
+ frappe.throw(_(msg), title=_(title), exc=SerialNoExistsInFutureTransactionError)
+
+ def validate_quantity(self, row, qty_field=None):
+ if not qty_field:
+ qty_field = "qty"
+
+ precision = row.precision
+ if self.voucher_type in ["Subcontracting Receipt"]:
+ qty_field = "consumed_qty"
+
+ if abs(abs(flt(self.total_qty, precision)) - abs(flt(row.get(qty_field), precision))) > 0.01:
+ self.throw_error_message(
+ f"Total quantity {abs(self.total_qty)} in the Serial and Batch Bundle {bold(self.name)} does not match with the quantity {abs(row.get(qty_field))} for the Item {bold(self.item_code)} in the {self.voucher_type} # {self.voucher_no}"
+ )
+
+ def set_is_outward(self):
+ for row in self.entries:
+ if self.type_of_transaction == "Outward" and row.qty > 0:
+ row.qty *= -1
+ elif self.type_of_transaction == "Inward" and row.qty < 0:
+ row.qty *= -1
+
+ row.is_outward = 1 if self.type_of_transaction == "Outward" else 0
+
+ @frappe.whitelist()
+ def set_warehouse(self):
+ for row in self.entries:
+ if row.warehouse != self.warehouse:
+ row.warehouse = self.warehouse
+
+ def calculate_qty_and_amount(self, save=False):
+ self.total_amount = 0.0
+ self.total_qty = 0.0
+ self.avg_rate = 0.0
+
+ for row in self.entries:
+ rate = flt(row.incoming_rate)
+ row.stock_value_difference = flt(row.qty) * rate
+ self.total_amount += flt(row.qty) * rate
+ self.total_qty += flt(row.qty)
+
+ if self.total_qty:
+ self.avg_rate = flt(self.total_amount) / flt(self.total_qty)
+
+ if save:
+ self.db_set(
+ {
+ "total_qty": self.total_qty,
+ "avg_rate": self.avg_rate,
+ "total_amount": self.total_amount,
+ }
+ )
+
+ def calculate_outgoing_rate(self):
+ if not (self.has_serial_no and self.entries):
+ return
+
+ if not (self.voucher_type and self.voucher_no):
+ return False
+
+ if self.voucher_type in ["Purchase Receipt", "Purchase Invoice"]:
+ return frappe.get_cached_value(self.voucher_type, self.voucher_no, "is_return")
+ elif self.voucher_type in ["Sales Invoice", "Delivery Note"]:
+ return not frappe.get_cached_value(self.voucher_type, self.voucher_no, "is_return")
+ elif self.voucher_type == "Stock Entry":
+ return frappe.get_cached_value(self.voucher_type, self.voucher_no, "purpose") in [
+ "Material Receipt"
+ ]
+
+ def validate_serial_and_batch_no(self):
+ if self.item_code and not self.has_serial_no and not self.has_batch_no:
+ msg = f"The Item {self.item_code} does not have Serial No or Batch No"
+ frappe.throw(_(msg))
+
+ serial_nos = []
+ batch_nos = []
+
+ serial_batches = {}
+
+ for row in self.entries:
+ if row.serial_no:
+ serial_nos.append(row.serial_no)
+
+ if row.batch_no and not row.serial_no:
+ batch_nos.append(row.batch_no)
+
+ if row.serial_no and row.batch_no and self.type_of_transaction == "Outward":
+ serial_batches.setdefault(row.serial_no, row.batch_no)
+
+ if serial_nos:
+ self.validate_incorrect_serial_nos(serial_nos)
+
+ elif batch_nos:
+ self.validate_incorrect_batch_nos(batch_nos)
+
+ if serial_batches:
+ self.validate_serial_batch_no(serial_batches)
+
+ def validate_serial_batch_no(self, serial_batches):
+ correct_batches = frappe._dict(
+ frappe.get_all(
+ "Serial No",
+ filters={"name": ("in", list(serial_batches.keys()))},
+ fields=["name", "batch_no"],
+ as_list=True,
+ )
+ )
+
+ for serial_no, batch_no in serial_batches.items():
+ if correct_batches.get(serial_no) != batch_no:
+ self.throw_error_message(
+ f"Serial No {bold(serial_no)} does not belong to Batch No {bold(batch_no)}"
+ )
+
+ def validate_incorrect_serial_nos(self, serial_nos):
+
+ if self.voucher_type == "Stock Entry" and self.voucher_no:
+ if frappe.get_cached_value("Stock Entry", self.voucher_no, "purpose") == "Repack":
+ return
+
+ incorrect_serial_nos = frappe.get_all(
+ "Serial No",
+ filters={"name": ("in", serial_nos), "item_code": ("!=", self.item_code)},
+ fields=["name"],
+ )
+
+ if incorrect_serial_nos:
+ incorrect_serial_nos = ", ".join([d.name for d in incorrect_serial_nos])
+ self.throw_error_message(
+ f"Serial Nos {bold(incorrect_serial_nos)} does not belong to Item {bold(self.item_code)}"
+ )
+
+ def validate_incorrect_batch_nos(self, batch_nos):
+ incorrect_batch_nos = frappe.get_all(
+ "Batch", filters={"name": ("in", batch_nos), "item": ("!=", self.item_code)}, fields=["name"]
+ )
+
+ if incorrect_batch_nos:
+ incorrect_batch_nos = ", ".join([d.name for d in incorrect_batch_nos])
+ self.throw_error_message(
+ f"Batch Nos {bold(incorrect_batch_nos)} does not belong to Item {bold(self.item_code)}"
+ )
+
+ def validate_duplicate_serial_and_batch_no(self):
+ serial_nos = []
+ batch_nos = []
+
+ for row in self.entries:
+ if row.serial_no:
+ serial_nos.append(row.serial_no)
+
+ if row.batch_no and not row.serial_no:
+ batch_nos.append(row.batch_no)
+
+ if serial_nos:
+ for key, value in collections.Counter(serial_nos).items():
+ if value > 1:
+ self.throw_error_message(f"Duplicate Serial No {key} found")
+
+ if batch_nos:
+ for key, value in collections.Counter(batch_nos).items():
+ if value > 1:
+ self.throw_error_message(f"Duplicate Batch No {key} found")
+
+ def before_cancel(self):
+ self.delink_serial_and_batch_bundle()
+ self.clear_table()
+
+ def delink_serial_and_batch_bundle(self):
+ self.voucher_no = None
+
+ sles = frappe.get_all("Stock Ledger Entry", filters={"serial_and_batch_bundle": self.name})
+
+ for sle in sles:
+ frappe.db.set_value("Stock Ledger Entry", sle.name, "serial_and_batch_bundle", None)
+
+ def clear_table(self):
+ self.set("entries", [])
+
+ @property
+ def child_table(self):
+ if self.voucher_type == "Job Card":
+ return
+
+ parent_child_map = {
+ "Asset Capitalization": "Asset Capitalization Stock Item",
+ "Asset Repair": "Asset Repair Consumed Item",
+ "Quotation": "Packed Item",
+ "Stock Entry": "Stock Entry Detail",
+ }
+
+ return (
+ parent_child_map[self.voucher_type]
+ if self.voucher_type in parent_child_map
+ else f"{self.voucher_type} Item"
+ )
+
+ def delink_refernce_from_voucher(self):
+ or_filters = {"serial_and_batch_bundle": self.name}
+
+ fields = ["name", "serial_and_batch_bundle"]
+ if self.voucher_type == "Stock Reconciliation":
+ fields = ["name", "current_serial_and_batch_bundle", "serial_and_batch_bundle"]
+ or_filters["current_serial_and_batch_bundle"] = self.name
+
+ elif self.voucher_type == "Purchase Receipt":
+ fields = ["name", "rejected_serial_and_batch_bundle", "serial_and_batch_bundle"]
+ or_filters["rejected_serial_and_batch_bundle"] = self.name
+
+ if (
+ self.voucher_type == "Subcontracting Receipt"
+ and self.voucher_detail_no
+ and not frappe.db.exists("Subcontracting Receipt Item", self.voucher_detail_no)
+ ):
+ self.voucher_type = "Subcontracting Receipt Supplied"
+
+ vouchers = frappe.get_all(
+ self.child_table,
+ fields=fields,
+ filters={"docstatus": 0},
+ or_filters=or_filters,
+ )
+
+ for voucher in vouchers:
+ if voucher.get("current_serial_and_batch_bundle"):
+ frappe.db.set_value(self.child_table, voucher.name, "current_serial_and_batch_bundle", None)
+ elif voucher.get("rejected_serial_and_batch_bundle"):
+ frappe.db.set_value(self.child_table, voucher.name, "rejected_serial_and_batch_bundle", None)
+
+ frappe.db.set_value(self.child_table, voucher.name, "serial_and_batch_bundle", None)
+
+ def delink_reference_from_batch(self):
+ batches = frappe.get_all(
+ "Batch",
+ fields=["name"],
+ filters={"reference_name": self.name, "reference_doctype": "Serial and Batch Bundle"},
+ )
+
+ for batch in batches:
+ frappe.db.set_value("Batch", batch.name, {"reference_name": None, "reference_doctype": None})
+
+ def on_submit(self):
+ self.validate_serial_nos_inventory()
+
+ def validate_serial_and_batch_inventory(self):
+ self.check_future_entries_exists()
+ self.validate_batch_inventory()
+
+ def validate_batch_inventory(self):
+ if not self.has_batch_no:
+ return
+
+ batches = [d.batch_no for d in self.entries if d.batch_no]
+ if not batches:
+ return
+
+ available_batches = get_auto_batch_nos(
+ frappe._dict(
+ {
+ "item_code": self.item_code,
+ "warehouse": self.warehouse,
+ "batch_no": batches,
+ }
+ )
+ )
+
+ if not available_batches:
+ return
+
+ available_batches = get_availabel_batches_qty(available_batches)
+ for batch_no in batches:
+ if batch_no not in available_batches or available_batches[batch_no] < 0:
+ self.throw_error_message(
+ f"Batch {bold(batch_no)} is not available in the selected warehouse {self.warehouse}"
+ )
+
+ def on_cancel(self):
+ self.validate_voucher_no_docstatus()
+
+ def validate_voucher_no_docstatus(self):
+ if frappe.db.get_value(self.voucher_type, self.voucher_no, "docstatus") == 1:
+ msg = f"""The {self.voucher_type} {bold(self.voucher_no)}
+ is in submitted state, please cancel it first"""
+ frappe.throw(_(msg))
+
+ def on_trash(self):
+ self.validate_voucher_no_docstatus()
+ self.delink_refernce_from_voucher()
+ self.delink_reference_from_batch()
+ self.clear_table()
+
+ @frappe.whitelist()
+ def add_serial_batch(self, data):
+ serial_nos, batch_nos = [], []
+ if isinstance(data, str):
+ data = parse_json(data)
+
+ if data.get("csv_file"):
+ serial_nos, batch_nos = get_serial_batch_from_csv(self.item_code, data.get("csv_file"))
+ else:
+ serial_nos, batch_nos = get_serial_batch_from_data(self.item_code, data)
+
+ if not serial_nos and not batch_nos:
+ return
+
+ if serial_nos:
+ self.set("entries", serial_nos)
+ elif batch_nos:
+ self.set("entries", batch_nos)
+
+
+@frappe.whitelist()
+def download_blank_csv_template(content):
+ csv_data = []
+ if isinstance(content, str):
+ content = parse_json(content)
+
+ csv_data.append(content)
+ csv_data.append([])
+ csv_data.append([])
+
+ filename = "serial_and_batch_bundle"
+ build_csv_response(csv_data, filename)
+
+
+@frappe.whitelist()
+def upload_csv_file(item_code, file_path):
+ serial_nos, batch_nos = [], []
+ serial_nos, batch_nos = get_serial_batch_from_csv(item_code, file_path)
+
+ return {
+ "serial_nos": serial_nos,
+ "batch_nos": batch_nos,
+ }
+
+
+def get_serial_batch_from_csv(item_code, file_path):
+ file_path = frappe.get_site_path() + file_path
+ serial_nos = []
+ batch_nos = []
+
+ with open(file_path, "r") as f:
+ reader = csv.reader(f)
+ serial_nos, batch_nos = parse_csv_file_to_get_serial_batch(reader)
+
+ if serial_nos:
+ make_serial_nos(item_code, serial_nos)
+
+ if batch_nos:
+ make_batch_nos(item_code, batch_nos)
+
+ return serial_nos, batch_nos
+
+
+def parse_csv_file_to_get_serial_batch(reader):
+ has_serial_no, has_batch_no = False, False
+ serial_nos = []
+ batch_nos = []
+
+ for index, row in enumerate(reader):
+ if index == 0:
+ has_serial_no = row[0] == "Serial No"
+ has_batch_no = row[0] == "Batch No"
+ continue
+
+ if not row[0]:
+ continue
+
+ if has_serial_no or (has_serial_no and has_batch_no):
+ _dict = {"serial_no": row[0], "qty": 1}
+
+ if has_batch_no:
+ _dict.update(
+ {
+ "batch_no": row[1],
+ "qty": row[2],
+ }
+ )
+
+ serial_nos.append(_dict)
+ elif has_batch_no:
+ batch_nos.append(
+ {
+ "batch_no": row[0],
+ "qty": row[1],
+ }
+ )
+
+ return serial_nos, batch_nos
+
+
+def get_serial_batch_from_data(item_code, kwargs):
+ serial_nos = []
+ batch_nos = []
+ if kwargs.get("serial_nos"):
+ data = parse_serial_nos(kwargs.get("serial_nos"))
+ for serial_no in data:
+ if not serial_no:
+ continue
+ serial_nos.append({"serial_no": serial_no, "qty": 1})
+
+ make_serial_nos(item_code, serial_nos)
+
+ return serial_nos, batch_nos
+
+
+def make_serial_nos(item_code, serial_nos):
+ item = frappe.get_cached_value("Item", item_code, ["description", "item_code"], as_dict=1)
+
+ serial_nos = [d.get("serial_no") for d in serial_nos if d.get("serial_no")]
+
+ serial_nos_details = []
+ user = frappe.session.user
+ for serial_no in serial_nos:
+ serial_nos_details.append(
+ (
+ serial_no,
+ serial_no,
+ now(),
+ now(),
+ user,
+ user,
+ item.item_code,
+ item.item_name,
+ item.description,
+ "Inactive",
+ )
+ )
+
+ fields = [
+ "name",
+ "serial_no",
+ "creation",
+ "modified",
+ "owner",
+ "modified_by",
+ "item_code",
+ "item_name",
+ "description",
+ "status",
+ ]
+
+ frappe.db.bulk_insert("Serial No", fields=fields, values=set(serial_nos_details))
+
+ frappe.msgprint(_("Serial Nos are created successfully"))
+
+
+def make_batch_nos(item_code, batch_nos):
+ item = frappe.get_cached_value("Item", item_code, ["description", "item_code"], as_dict=1)
+
+ batch_nos = [d.get("batch_no") for d in batch_nos if d.get("batch_no")]
+
+ batch_nos_details = []
+ user = frappe.session.user
+ for batch_no in batch_nos:
+ batch_nos_details.append(
+ (batch_no, batch_no, now(), now(), user, user, item.item_code, item.item_name, item.description)
+ )
+
+ fields = [
+ "name",
+ "batch_id",
+ "creation",
+ "modified",
+ "owner",
+ "modified_by",
+ "item",
+ "item_name",
+ "description",
+ ]
+
+ frappe.db.bulk_insert("Batch", fields=fields, values=set(batch_nos_details))
+
+ frappe.msgprint(_("Batch Nos are created successfully"))
+
+
+def parse_serial_nos(data):
+ if isinstance(data, list):
+ return data
+
+ return [s.strip() for s in cstr(data).strip().upper().replace(",", "\n").split("\n") if s.strip()]
+
+
+@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
+def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=False):
+ item_filters = {"disabled": 0}
+ if txt:
+ item_filters["name"] = ("like", f"%{txt}%")
+
+ return frappe.get_all(
+ "Item",
+ filters=item_filters,
+ or_filters={"has_serial_no": 1, "has_batch_no": 1},
+ fields=["name", "item_name"],
+ as_list=1,
+ )
+
+
+@frappe.whitelist()
+def get_serial_batch_ledgers(item_code, docstatus=None, voucher_no=None, name=None):
+ filters = get_filters_for_bundle(item_code, docstatus=docstatus, voucher_no=voucher_no, name=name)
+
+ return frappe.get_all(
+ "Serial and Batch Bundle",
+ fields=[
+ "`tabSerial and Batch Bundle`.`name`",
+ "`tabSerial and Batch Entry`.`qty`",
+ "`tabSerial and Batch Entry`.`warehouse`",
+ "`tabSerial and Batch Entry`.`batch_no`",
+ "`tabSerial and Batch Entry`.`serial_no`",
+ ],
+ filters=filters,
+ order_by="`tabSerial and Batch Entry`.`idx`",
+ )
+
+
+def get_filters_for_bundle(item_code, docstatus=None, voucher_no=None, name=None):
+ filters = [
+ ["Serial and Batch Bundle", "item_code", "=", item_code],
+ ["Serial and Batch Bundle", "is_cancelled", "=", 0],
+ ]
+
+ if not docstatus:
+ docstatus = [0, 1]
+
+ if isinstance(docstatus, list):
+ filters.append(["Serial and Batch Bundle", "docstatus", "in", docstatus])
+ else:
+ filters.append(["Serial and Batch Bundle", "docstatus", "=", docstatus])
+
+ if voucher_no:
+ filters.append(["Serial and Batch Bundle", "voucher_no", "=", voucher_no])
+
+ if name:
+ if isinstance(name, list):
+ filters.append(["Serial and Batch Entry", "parent", "in", name])
+ else:
+ filters.append(["Serial and Batch Entry", "parent", "=", name])
+
+ return filters
+
+
+@frappe.whitelist()
+def add_serial_batch_ledgers(entries, child_row, doc, warehouse) -> object:
+ if isinstance(child_row, str):
+ child_row = frappe._dict(parse_json(child_row))
+
+ if isinstance(entries, str):
+ entries = parse_json(entries)
+
+ if doc and isinstance(doc, str):
+ parent_doc = parse_json(doc)
+
+ if frappe.db.exists("Serial and Batch Bundle", child_row.serial_and_batch_bundle):
+ doc = update_serial_batch_no_ledgers(entries, child_row, parent_doc, warehouse)
+ else:
+ doc = create_serial_batch_no_ledgers(entries, child_row, parent_doc, warehouse)
+
+ return doc
+
+
+def create_serial_batch_no_ledgers(entries, child_row, parent_doc, warehouse=None) -> object:
+
+ warehouse = warehouse or (
+ child_row.rejected_warehouse if child_row.is_rejected else child_row.warehouse
+ )
+
+ type_of_transaction = child_row.type_of_transaction
+ if parent_doc.get("doctype") == "Stock Entry":
+ type_of_transaction = "Outward" if child_row.s_warehouse else "Inward"
+ warehouse = warehouse or child_row.s_warehouse or child_row.t_warehouse
+
+ doc = frappe.get_doc(
+ {
+ "doctype": "Serial and Batch Bundle",
+ "voucher_type": child_row.parenttype,
+ "item_code": child_row.item_code,
+ "warehouse": warehouse,
+ "is_rejected": child_row.is_rejected,
+ "type_of_transaction": type_of_transaction,
+ "posting_date": parent_doc.get("posting_date"),
+ "posting_time": parent_doc.get("posting_time"),
+ }
+ )
+
+ for row in entries:
+ row = frappe._dict(row)
+ doc.append(
+ "entries",
+ {
+ "qty": (row.qty or 1.0) * (1 if type_of_transaction == "Inward" else -1),
+ "warehouse": warehouse,
+ "batch_no": row.batch_no,
+ "serial_no": row.serial_no,
+ },
+ )
+
+ doc.save()
+
+ frappe.db.set_value(child_row.doctype, child_row.name, "serial_and_batch_bundle", doc.name)
+
+ frappe.msgprint(_("Serial and Batch Bundle created"), alert=True)
+
+ return doc
+
+
+def update_serial_batch_no_ledgers(entries, child_row, parent_doc, warehouse=None) -> object:
+ doc = frappe.get_doc("Serial and Batch Bundle", child_row.serial_and_batch_bundle)
+ doc.voucher_detail_no = child_row.name
+ doc.posting_date = parent_doc.posting_date
+ doc.posting_time = parent_doc.posting_time
+ doc.warehouse = warehouse or doc.warehouse
+ doc.set("entries", [])
+
+ for d in entries:
+ doc.append(
+ "entries",
+ {
+ "qty": d.get("qty") * (1 if doc.type_of_transaction == "Inward" else -1),
+ "warehouse": warehouse or d.get("warehouse"),
+ "batch_no": d.get("batch_no"),
+ "serial_no": d.get("serial_no"),
+ },
+ )
+
+ doc.save(ignore_permissions=True)
+
+ frappe.msgprint(_("Serial and Batch Bundle updated"), alert=True)
+
+ return doc
+
+
+def get_serial_and_batch_ledger(**kwargs):
+ kwargs = frappe._dict(kwargs)
+
+ sle_table = frappe.qb.DocType("Stock Ledger Entry")
+ serial_batch_table = frappe.qb.DocType("Serial and Batch Entry")
+
+ query = (
+ frappe.qb.from_(sle_table)
+ .inner_join(serial_batch_table)
+ .on(sle_table.serial_and_batch_bundle == serial_batch_table.parent)
+ .select(
+ serial_batch_table.serial_no,
+ serial_batch_table.warehouse,
+ serial_batch_table.batch_no,
+ serial_batch_table.qty,
+ serial_batch_table.incoming_rate,
+ serial_batch_table.voucher_detail_no,
+ )
+ .where(
+ (sle_table.item_code == kwargs.item_code)
+ & (sle_table.warehouse == kwargs.warehouse)
+ & (serial_batch_table.is_outward == 0)
+ )
+ )
+
+ if kwargs.serial_nos:
+ query = query.where(serial_batch_table.serial_no.isin(kwargs.serial_nos))
+
+ if kwargs.batch_nos:
+ query = query.where(serial_batch_table.batch_no.isin(kwargs.batch_nos))
+
+ if kwargs.fetch_incoming_rate:
+ query = query.where(sle_table.actual_qty > 0)
+
+ return query.run(as_dict=True)
+
+
+@frappe.whitelist()
+def get_auto_data(**kwargs):
+ kwargs = frappe._dict(kwargs)
+ if cint(kwargs.has_serial_no):
+ return get_available_serial_nos(kwargs)
+
+ elif cint(kwargs.has_batch_no):
+ return get_auto_batch_nos(kwargs)
+
+
+def get_availabel_batches_qty(available_batches):
+ available_batches_qty = defaultdict(float)
+ for batch in available_batches:
+ available_batches_qty[batch.batch_no] += batch.qty
+
+ return available_batches_qty
+
+
+def get_available_serial_nos(kwargs):
+ fields = ["name as serial_no", "warehouse"]
+ if kwargs.has_batch_no:
+ fields.append("batch_no")
+
+ order_by = "creation"
+ if kwargs.based_on == "LIFO":
+ order_by = "creation desc"
+ elif kwargs.based_on == "Expiry":
+ order_by = "amc_expiry_date asc"
+
+ filters = {"item_code": kwargs.item_code, "warehouse": ("is", "set")}
+
+ if kwargs.warehouse:
+ filters["warehouse"] = kwargs.warehouse
+
+ # Since SLEs are not present against POS invoices, need to ignore serial nos present in the POS invoice
+ ignore_serial_nos = get_reserved_serial_nos_for_pos(kwargs)
+
+ # To ignore serial nos in the same record for the draft state
+ if kwargs.get("ignore_serial_nos"):
+ ignore_serial_nos.extend(kwargs.get("ignore_serial_nos"))
+
+ if kwargs.get("posting_date"):
+ if kwargs.get("posting_time") is None:
+ kwargs.posting_time = nowtime()
+
+ time_based_serial_nos = get_serial_nos_based_on_posting_date(kwargs, ignore_serial_nos)
+
+ if not time_based_serial_nos:
+ return []
+
+ filters["name"] = ("in", time_based_serial_nos)
+ elif ignore_serial_nos:
+ filters["name"] = ("not in", ignore_serial_nos)
+
+ if kwargs.get("batches"):
+ batches = get_non_expired_batches(kwargs.get("batches"))
+ if not batches:
+ return []
+
+ filters["batch_no"] = ("in", batches)
+
+ return frappe.get_all(
+ "Serial No",
+ fields=fields,
+ filters=filters,
+ limit=cint(kwargs.qty) or 10000000,
+ order_by=order_by,
+ )
+
+
+def get_non_expired_batches(batches):
+ filters = {}
+ if isinstance(batches, list):
+ filters["name"] = ("in", batches)
+ else:
+ filters["name"] = batches
+
+ data = frappe.get_all(
+ "Batch",
+ filters=filters,
+ or_filters=[["expiry_date", ">=", today()], ["expiry_date", "is", "not set"]],
+ fields=["name"],
+ )
+
+ return [d.name for d in data] if data else []
+
+
+def get_serial_nos_based_on_posting_date(kwargs, ignore_serial_nos):
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+ serial_nos = set()
+ data = get_stock_ledgers_for_serial_nos(kwargs)
+
+ for d in data:
+ if d.serial_and_batch_bundle:
+ sns = get_serial_nos_from_bundle(d.serial_and_batch_bundle, kwargs.get("serial_nos", []))
+ if d.actual_qty > 0:
+ serial_nos.update(sns)
+ else:
+ serial_nos.difference_update(sns)
+
+ elif d.serial_no:
+ sns = get_serial_nos(d.serial_no)
+ if d.actual_qty > 0:
+ serial_nos.update(sns)
+ else:
+ serial_nos.difference_update(sns)
+
+ serial_nos = list(serial_nos)
+ for serial_no in ignore_serial_nos:
+ if serial_no in serial_nos:
+ serial_nos.remove(serial_no)
+
+ return serial_nos
+
+
+def get_reserved_serial_nos_for_pos(kwargs):
+ from erpnext.controllers.sales_and_purchase_return import get_returned_serial_nos
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+ ignore_serial_nos = []
+ pos_invoices = frappe.get_all(
+ "POS Invoice",
+ fields=[
+ "`tabPOS Invoice Item`.serial_no",
+ "`tabPOS Invoice`.is_return",
+ "`tabPOS Invoice Item`.name as child_docname",
+ "`tabPOS Invoice`.name as parent_docname",
+ "`tabPOS Invoice Item`.serial_and_batch_bundle",
+ ],
+ filters=[
+ ["POS Invoice", "consolidated_invoice", "is", "not set"],
+ ["POS Invoice", "docstatus", "=", 1],
+ ["POS Invoice Item", "item_code", "=", kwargs.item_code],
+ ["POS Invoice", "name", "!=", kwargs.ignore_voucher_no],
+ ],
+ )
+
+ ids = [
+ pos_invoice.serial_and_batch_bundle
+ for pos_invoice in pos_invoices
+ if pos_invoice.serial_and_batch_bundle
+ ]
+
+ if not ids:
+ return []
+
+ for d in get_serial_batch_ledgers(kwargs.item_code, docstatus=1, name=ids):
+ ignore_serial_nos.append(d.serial_no)
+
+ # Will be deprecated in v16
+ returned_serial_nos = []
+ for pos_invoice in pos_invoices:
+ if pos_invoice.serial_no:
+ ignore_serial_nos.extend(get_serial_nos(pos_invoice.serial_no))
+
+ if pos_invoice.is_return:
+ continue
+
+ child_doc = _dict(
+ {
+ "doctype": "POS Invoice Item",
+ "name": pos_invoice.child_docname,
+ }
+ )
+
+ parent_doc = _dict(
+ {
+ "doctype": "POS Invoice",
+ "name": pos_invoice.parent_docname,
+ }
+ )
+
+ returned_serial_nos.extend(
+ get_returned_serial_nos(
+ child_doc, parent_doc, ignore_voucher_detail_no=kwargs.get("ignore_voucher_detail_no")
+ )
+ )
+
+ return list(set(ignore_serial_nos) - set(returned_serial_nos))
+
+
+def get_reserved_batches_for_pos(kwargs):
+ pos_batches = frappe._dict()
+ pos_invoices = frappe.get_all(
+ "POS Invoice",
+ fields=[
+ "`tabPOS Invoice Item`.batch_no",
+ "`tabPOS Invoice`.is_return",
+ "`tabPOS Invoice Item`.warehouse",
+ "`tabPOS Invoice Item`.name as child_docname",
+ "`tabPOS Invoice`.name as parent_docname",
+ "`tabPOS Invoice Item`.serial_and_batch_bundle",
+ ],
+ filters=[
+ ["POS Invoice", "consolidated_invoice", "is", "not set"],
+ ["POS Invoice", "docstatus", "=", 1],
+ ["POS Invoice Item", "item_code", "=", kwargs.item_code],
+ ["POS Invoice", "name", "!=", kwargs.ignore_voucher_no],
+ ],
+ )
+
+ ids = [
+ pos_invoice.serial_and_batch_bundle
+ for pos_invoice in pos_invoices
+ if pos_invoice.serial_and_batch_bundle
+ ]
+
+ if not ids:
+ return []
+
+ if ids:
+ for d in get_serial_batch_ledgers(kwargs.item_code, docstatus=1, name=ids):
+ key = (d.batch_no, d.warehouse)
+ if key not in pos_batches:
+ pos_batches[key] = frappe._dict(
+ {
+ "qty": d.qty,
+ "warehouse": d.warehouse,
+ }
+ )
+ else:
+ pos_batches[key].qty += d.qty
+
+ for row in pos_invoices:
+ if not row.batch_no:
+ continue
+
+ if kwargs.get("batch_no") and row.batch_no != kwargs.get("batch_no"):
+ continue
+
+ key = (row.batch_no, row.warehouse)
+ if key in pos_batches:
+ pos_batches[key] -= row.qty * -1 if row.is_return else row.qty
+ else:
+ pos_batches[key] = frappe._dict(
+ {
+ "qty": (row.qty * -1 if row.is_return else row.qty),
+ "warehouse": row.warehouse,
+ }
+ )
+
+ return pos_batches
+
+
+def get_auto_batch_nos(kwargs):
+ available_batches = get_available_batches(kwargs)
+ qty = flt(kwargs.qty)
+
+ pos_invoice_batches = get_reserved_batches_for_pos(kwargs)
+ stock_ledgers_batches = get_stock_ledgers_batches(kwargs)
+ if stock_ledgers_batches or pos_invoice_batches:
+ update_available_batches(available_batches, stock_ledgers_batches, pos_invoice_batches)
+
+ available_batches = list(filter(lambda x: x.qty > 0, available_batches))
+
+ if not qty:
+ return available_batches
+
+ return get_qty_based_available_batches(available_batches, qty)
+
+
+def get_qty_based_available_batches(available_batches, qty):
+ batches = []
+ for batch in available_batches:
+ if qty <= 0:
+ break
+
+ batch_qty = flt(batch.qty)
+ if qty > batch_qty:
+ batches.append(
+ frappe._dict(
+ {
+ "batch_no": batch.batch_no,
+ "qty": batch_qty,
+ "warehouse": batch.warehouse,
+ }
+ )
+ )
+ qty -= batch_qty
+ else:
+ batches.append(
+ frappe._dict(
+ {
+ "batch_no": batch.batch_no,
+ "qty": qty,
+ "warehouse": batch.warehouse,
+ }
+ )
+ )
+ qty = 0
+
+ return batches
+
+
+def update_available_batches(available_batches, reserved_batches=None, pos_invoice_batches=None):
+ for batches in [reserved_batches, pos_invoice_batches]:
+ if batches:
+ for key, data in batches.items():
+ batch_no, warehouse = key
+ batch_not_exists = True
+ for batch in available_batches:
+ if batch.batch_no == batch_no and batch.warehouse == warehouse:
+ batch.qty += data.qty
+ batch_not_exists = False
+
+ if batch_not_exists:
+ available_batches.append(data)
+
+
+def get_available_batches(kwargs):
+ stock_ledger_entry = frappe.qb.DocType("Stock Ledger Entry")
+ batch_ledger = frappe.qb.DocType("Serial and Batch Entry")
+ batch_table = frappe.qb.DocType("Batch")
+
+ query = (
+ frappe.qb.from_(stock_ledger_entry)
+ .inner_join(batch_ledger)
+ .on(stock_ledger_entry.serial_and_batch_bundle == batch_ledger.parent)
+ .inner_join(batch_table)
+ .on(batch_ledger.batch_no == batch_table.name)
+ .select(
+ batch_ledger.batch_no,
+ batch_ledger.warehouse,
+ Sum(batch_ledger.qty).as_("qty"),
+ )
+ .where(
+ (batch_table.disabled == 0)
+ & ((batch_table.expiry_date >= today()) | (batch_table.expiry_date.isnull()))
+ )
+ .where(stock_ledger_entry.is_cancelled == 0)
+ .groupby(batch_ledger.batch_no, batch_ledger.warehouse)
+ )
+
+ if kwargs.get("posting_date"):
+ if kwargs.get("posting_time") is None:
+ kwargs.posting_time = nowtime()
+
+ timestamp_condition = CombineDatetime(
+ stock_ledger_entry.posting_date, stock_ledger_entry.posting_time
+ ) <= CombineDatetime(kwargs.posting_date, kwargs.posting_time)
+
+ query = query.where(timestamp_condition)
+
+ for field in ["warehouse", "item_code"]:
+ if not kwargs.get(field):
+ continue
+
+ if isinstance(kwargs.get(field), list):
+ query = query.where(stock_ledger_entry[field].isin(kwargs.get(field)))
+ else:
+ query = query.where(stock_ledger_entry[field] == kwargs.get(field))
+
+ if kwargs.get("batch_no"):
+ if isinstance(kwargs.batch_no, list):
+ query = query.where(batch_ledger.batch_no.isin(kwargs.batch_no))
+ else:
+ query = query.where(batch_ledger.batch_no == kwargs.batch_no)
+
+ if kwargs.based_on == "LIFO":
+ query = query.orderby(batch_table.creation, order=frappe.qb.desc)
+ elif kwargs.based_on == "Expiry":
+ query = query.orderby(batch_table.expiry_date)
+ else:
+ query = query.orderby(batch_table.creation)
+
+ if kwargs.get("ignore_voucher_nos"):
+ query = query.where(stock_ledger_entry.voucher_no.notin(kwargs.get("ignore_voucher_nos")))
+
+ data = query.run(as_dict=True)
+
+ return data
+
+
+# For work order and subcontracting
+def get_voucher_wise_serial_batch_from_bundle(**kwargs) -> Dict[str, Dict]:
+ data = get_ledgers_from_serial_batch_bundle(**kwargs)
+ if not data:
+ return {}
+
+ group_by_voucher = {}
+
+ for row in data:
+ key = (row.item_code, row.warehouse, row.voucher_no)
+ if kwargs.get("get_subcontracted_item"):
+ # get_subcontracted_item = ("doctype", "field_name")
+ doctype, field_name = kwargs.get("get_subcontracted_item")
+
+ subcontracted_item_code = frappe.get_cached_value(doctype, row.voucher_detail_no, field_name)
+ key = (row.item_code, subcontracted_item_code, row.warehouse, row.voucher_no)
+
+ if key not in group_by_voucher:
+ group_by_voucher.setdefault(
+ key,
+ frappe._dict({"serial_nos": [], "batch_nos": defaultdict(float), "item_row": row}),
+ )
+
+ child_row = group_by_voucher[key]
+ if row.serial_no:
+ child_row["serial_nos"].append(row.serial_no)
+
+ if row.batch_no:
+ child_row["batch_nos"][row.batch_no] += row.qty
+
+ return group_by_voucher
+
+
+def get_ledgers_from_serial_batch_bundle(**kwargs) -> List[frappe._dict]:
+ bundle_table = frappe.qb.DocType("Serial and Batch Bundle")
+ serial_batch_table = frappe.qb.DocType("Serial and Batch Entry")
+
+ query = (
+ frappe.qb.from_(bundle_table)
+ .inner_join(serial_batch_table)
+ .on(bundle_table.name == serial_batch_table.parent)
+ .select(
+ serial_batch_table.serial_no,
+ bundle_table.warehouse,
+ bundle_table.item_code,
+ serial_batch_table.batch_no,
+ serial_batch_table.qty,
+ serial_batch_table.incoming_rate,
+ bundle_table.voucher_detail_no,
+ bundle_table.voucher_no,
+ bundle_table.posting_date,
+ bundle_table.posting_time,
+ )
+ .where(
+ (bundle_table.docstatus == 1)
+ & (bundle_table.is_cancelled == 0)
+ & (bundle_table.type_of_transaction.isin(["Inward", "Outward"]))
+ )
+ .orderby(bundle_table.posting_date, bundle_table.posting_time)
+ )
+
+ for key, val in kwargs.items():
+ if key in ["get_subcontracted_item"]:
+ continue
+
+ if key in ["name", "item_code", "warehouse", "voucher_no", "company", "voucher_detail_no"]:
+ if isinstance(val, list):
+ query = query.where(bundle_table[key].isin(val))
+ else:
+ query = query.where(bundle_table[key] == val)
+ elif key in ["posting_date", "posting_time"]:
+ query = query.where(bundle_table[key] >= val)
+ else:
+ if isinstance(val, list):
+ query = query.where(serial_batch_table[key].isin(val))
+ else:
+ query = query.where(serial_batch_table[key] == val)
+
+ return query.run(as_dict=True)
+
+
+def get_stock_ledgers_for_serial_nos(kwargs):
+ stock_ledger_entry = frappe.qb.DocType("Stock Ledger Entry")
+
+ query = (
+ frappe.qb.from_(stock_ledger_entry)
+ .select(
+ stock_ledger_entry.actual_qty,
+ stock_ledger_entry.serial_no,
+ stock_ledger_entry.serial_and_batch_bundle,
+ )
+ .where((stock_ledger_entry.is_cancelled == 0))
+ )
+
+ if kwargs.get("posting_date"):
+ if kwargs.get("posting_time") is None:
+ kwargs.posting_time = nowtime()
+
+ timestamp_condition = CombineDatetime(
+ stock_ledger_entry.posting_date, stock_ledger_entry.posting_time
+ ) <= CombineDatetime(kwargs.posting_date, kwargs.posting_time)
+
+ query = query.where(timestamp_condition)
+
+ for field in ["warehouse", "item_code", "serial_no"]:
+ if not kwargs.get(field):
+ continue
+
+ if isinstance(kwargs.get(field), list):
+ query = query.where(stock_ledger_entry[field].isin(kwargs.get(field)))
+ else:
+ query = query.where(stock_ledger_entry[field] == kwargs.get(field))
+
+ if kwargs.voucher_no:
+ query = query.where(stock_ledger_entry.voucher_no != kwargs.voucher_no)
+
+ return query.run(as_dict=True)
+
+
+def get_stock_ledgers_batches(kwargs):
+ stock_ledger_entry = frappe.qb.DocType("Stock Ledger Entry")
+ batch_table = frappe.qb.DocType("Batch")
+
+ query = (
+ frappe.qb.from_(stock_ledger_entry)
+ .inner_join(batch_table)
+ .on(stock_ledger_entry.batch_no == batch_table.name)
+ .select(
+ stock_ledger_entry.warehouse,
+ stock_ledger_entry.item_code,
+ Sum(stock_ledger_entry.actual_qty).as_("qty"),
+ stock_ledger_entry.batch_no,
+ )
+ .where((stock_ledger_entry.is_cancelled == 0) & (stock_ledger_entry.batch_no.isnotnull()))
+ .groupby(stock_ledger_entry.batch_no, stock_ledger_entry.warehouse)
+ )
+
+ for field in ["warehouse", "item_code", "batch_no"]:
+ if not kwargs.get(field):
+ continue
+
+ if isinstance(kwargs.get(field), list):
+ query = query.where(stock_ledger_entry[field].isin(kwargs.get(field)))
+ else:
+ query = query.where(stock_ledger_entry[field] == kwargs.get(field))
+
+ if kwargs.based_on == "LIFO":
+ query = query.orderby(batch_table.creation, order=frappe.qb.desc)
+ elif kwargs.based_on == "Expiry":
+ query = query.orderby(batch_table.expiry_date)
+ else:
+ query = query.orderby(batch_table.creation)
+
+ data = query.run(as_dict=True)
+ batches = {}
+ for d in data:
+ key = (d.batch_no, d.warehouse)
+ if key not in batches:
+ batches[key] = d
+ else:
+ batches[key].qty += d.qty
+
+ return batches
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js
new file mode 100644
index 0000000..355fcd0
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js
@@ -0,0 +1,11 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.listview_settings["Serial and Batch Bundle"] = {
+ add_fields: ["is_cancelled"],
+ get_indicator: function (doc) {
+ if (doc.is_cancelled) {
+ return [__("Cancelled"), "red", "is_cancelled,=,1"];
+ }
+ },
+};
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
new file mode 100644
index 0000000..0e01b20
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
@@ -0,0 +1,418 @@
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import json
+
+import frappe
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import add_days, add_to_date, flt, nowdate, nowtime, today
+
+from erpnext.stock.doctype.item.test_item import make_item
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+
+
+class TestSerialandBatchBundle(FrappeTestCase):
+ def test_inward_outward_serial_valuation(self):
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+
+ serial_item_code = "New Serial No Valuation 1"
+ make_item(
+ serial_item_code,
+ {
+ "has_serial_no": 1,
+ "serial_no_series": "TEST-SER-VAL-.#####",
+ "is_stock_item": 1,
+ },
+ )
+
+ pr = make_purchase_receipt(
+ item_code=serial_item_code, warehouse="_Test Warehouse - _TC", qty=1, rate=500
+ )
+
+ serial_no1 = get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle)[0]
+
+ pr = make_purchase_receipt(
+ item_code=serial_item_code, warehouse="_Test Warehouse - _TC", qty=1, rate=300
+ )
+
+ serial_no2 = get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle)[0]
+
+ dn = create_delivery_note(
+ item_code=serial_item_code,
+ warehouse="_Test Warehouse - _TC",
+ qty=1,
+ rate=1500,
+ serial_no=[serial_no2],
+ )
+
+ stock_value_difference = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {"voucher_no": dn.name, "is_cancelled": 0, "voucher_type": "Delivery Note"},
+ "stock_value_difference",
+ )
+
+ self.assertEqual(flt(stock_value_difference, 2), -300)
+
+ dn = create_delivery_note(
+ item_code=serial_item_code,
+ warehouse="_Test Warehouse - _TC",
+ qty=1,
+ rate=1500,
+ serial_no=[serial_no1],
+ )
+
+ stock_value_difference = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {"voucher_no": dn.name, "is_cancelled": 0, "voucher_type": "Delivery Note"},
+ "stock_value_difference",
+ )
+
+ self.assertEqual(flt(stock_value_difference, 2), -500)
+
+ def test_inward_outward_batch_valuation(self):
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+
+ batch_item_code = "New Batch No Valuation 1"
+ make_item(
+ batch_item_code,
+ {
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "TEST-BATTCCH-VAL-.#####",
+ "is_stock_item": 1,
+ },
+ )
+
+ pr = make_purchase_receipt(
+ item_code=batch_item_code, warehouse="_Test Warehouse - _TC", qty=10, rate=500
+ )
+
+ batch_no1 = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
+
+ pr = make_purchase_receipt(
+ item_code=batch_item_code, warehouse="_Test Warehouse - _TC", qty=10, rate=300
+ )
+
+ batch_no2 = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
+
+ dn = create_delivery_note(
+ item_code=batch_item_code,
+ warehouse="_Test Warehouse - _TC",
+ qty=10,
+ rate=1500,
+ batch_no=batch_no2,
+ )
+
+ stock_value_difference = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {"voucher_no": dn.name, "is_cancelled": 0, "voucher_type": "Delivery Note"},
+ "stock_value_difference",
+ )
+
+ self.assertEqual(flt(stock_value_difference, 2), -3000)
+
+ dn = create_delivery_note(
+ item_code=batch_item_code,
+ warehouse="_Test Warehouse - _TC",
+ qty=10,
+ rate=1500,
+ batch_no=batch_no1,
+ )
+
+ stock_value_difference = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {"voucher_no": dn.name, "is_cancelled": 0, "voucher_type": "Delivery Note"},
+ "stock_value_difference",
+ )
+
+ self.assertEqual(flt(stock_value_difference, 2), -5000)
+
+ def test_old_batch_valuation(self):
+ frappe.flags.ignore_serial_batch_bundle_validation = True
+ batch_item_code = "Old Batch Item Valuation 1"
+ make_item(
+ batch_item_code,
+ {
+ "has_batch_no": 1,
+ "is_stock_item": 1,
+ },
+ )
+
+ batch_id = "Old Batch 1"
+ if not frappe.db.exists("Batch", batch_id):
+ batch_doc = frappe.get_doc(
+ {
+ "doctype": "Batch",
+ "batch_id": batch_id,
+ "item": batch_item_code,
+ "use_batchwise_valuation": 0,
+ }
+ ).insert(ignore_permissions=True)
+
+ self.assertTrue(batch_doc.use_batchwise_valuation)
+ batch_doc.db_set("use_batchwise_valuation", 0)
+
+ stock_queue = []
+ qty_after_transaction = 0
+ balance_value = 0
+ for qty, valuation in {10: 100, 20: 200}.items():
+ stock_queue.append([qty, valuation])
+ qty_after_transaction += qty
+ balance_value += qty_after_transaction * valuation
+
+ doc = frappe.get_doc(
+ {
+ "doctype": "Stock Ledger Entry",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "batch_no": batch_id,
+ "incoming_rate": valuation,
+ "qty_after_transaction": qty_after_transaction,
+ "stock_value_difference": valuation * qty,
+ "balance_value": balance_value,
+ "valuation_rate": balance_value / qty_after_transaction,
+ "actual_qty": qty,
+ "item_code": batch_item_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "stock_queue": json.dumps(stock_queue),
+ }
+ )
+
+ doc.flags.ignore_permissions = True
+ doc.flags.ignore_mandatory = True
+ doc.flags.ignore_links = True
+ doc.flags.ignore_validate = True
+ doc.submit()
+
+ bundle_doc = make_serial_batch_bundle(
+ {
+ "item_code": batch_item_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "voucher_type": "Stock Entry",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "qty": -10,
+ "batches": frappe._dict({batch_id: 10}),
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+
+ bundle_doc.reload()
+ for row in bundle_doc.entries:
+ self.assertEqual(flt(row.stock_value_difference, 2), -1666.67)
+
+ bundle_doc.flags.ignore_permissions = True
+ bundle_doc.flags.ignore_mandatory = True
+ bundle_doc.flags.ignore_links = True
+ bundle_doc.flags.ignore_validate = True
+ bundle_doc.submit()
+
+ bundle_doc = make_serial_batch_bundle(
+ {
+ "item_code": batch_item_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "voucher_type": "Stock Entry",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "qty": -20,
+ "batches": frappe._dict({batch_id: 20}),
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+
+ bundle_doc.reload()
+ for row in bundle_doc.entries:
+ self.assertEqual(flt(row.stock_value_difference, 2), -3333.33)
+
+ bundle_doc.flags.ignore_permissions = True
+ bundle_doc.flags.ignore_mandatory = True
+ bundle_doc.flags.ignore_links = True
+ bundle_doc.flags.ignore_validate = True
+ bundle_doc.submit()
+
+ frappe.flags.ignore_serial_batch_bundle_validation = False
+
+ def test_old_serial_no_valuation(self):
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+
+ serial_no_item_code = "Old Serial No Item Valuation 1"
+ make_item(
+ serial_no_item_code,
+ {
+ "has_serial_no": 1,
+ "serial_no_series": "TEST-SER-VALL-.#####",
+ "is_stock_item": 1,
+ },
+ )
+
+ make_purchase_receipt(
+ item_code=serial_no_item_code, warehouse="_Test Warehouse - _TC", qty=1, rate=500
+ )
+
+ frappe.flags.ignore_serial_batch_bundle_validation = True
+
+ serial_no_id = "Old Serial No 1"
+ if not frappe.db.exists("Serial No", serial_no_id):
+ sn_doc = frappe.get_doc(
+ {
+ "doctype": "Serial No",
+ "serial_no": serial_no_id,
+ "item_code": serial_no_item_code,
+ "company": "_Test Company",
+ }
+ ).insert(ignore_permissions=True)
+
+ sn_doc.db_set(
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "purchase_rate": 100,
+ }
+ )
+
+ doc = frappe.get_doc(
+ {
+ "doctype": "Stock Ledger Entry",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "serial_no": serial_no_id,
+ "incoming_rate": 100,
+ "qty_after_transaction": 1,
+ "stock_value_difference": 100,
+ "balance_value": 100,
+ "valuation_rate": 100,
+ "actual_qty": 1,
+ "item_code": serial_no_item_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "company": "_Test Company",
+ }
+ )
+
+ doc.flags.ignore_permissions = True
+ doc.flags.ignore_mandatory = True
+ doc.flags.ignore_links = True
+ doc.flags.ignore_validate = True
+ doc.submit()
+
+ bundle_doc = make_serial_batch_bundle(
+ {
+ "item_code": serial_no_item_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "voucher_type": "Stock Entry",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "qty": -1,
+ "serial_nos": [serial_no_id],
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+
+ bundle_doc.reload()
+ for row in bundle_doc.entries:
+ self.assertEqual(flt(row.stock_value_difference, 2), -100.00)
+
+ def test_batch_not_belong_to_serial_no(self):
+ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+
+ serial_and_batch_code = "New Serial No Valuation 1"
+ make_item(
+ serial_and_batch_code,
+ {
+ "has_serial_no": 1,
+ "serial_no_series": "TEST-SER-VALL-.#####",
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "TEST-SNBAT-VAL-.#####",
+ },
+ )
+
+ pr = make_purchase_receipt(
+ item_code=serial_and_batch_code, warehouse="_Test Warehouse - _TC", qty=1, rate=500
+ )
+
+ serial_no = get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle)[0]
+
+ pr = make_purchase_receipt(
+ item_code=serial_and_batch_code, warehouse="_Test Warehouse - _TC", qty=1, rate=300
+ )
+
+ batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
+
+ doc = frappe.get_doc(
+ {
+ "doctype": "Serial and Batch Bundle",
+ "item_code": serial_and_batch_code,
+ "warehouse": "_Test Warehouse - _TC",
+ "voucher_type": "Stock Entry",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "qty": -1,
+ "type_of_transaction": "Outward",
+ }
+ )
+
+ doc.append(
+ "entries",
+ {
+ "batch_no": batch_no,
+ "serial_no": serial_no,
+ "qty": -1,
+ },
+ )
+
+ # Batch does not belong to serial no
+ self.assertRaises(frappe.exceptions.ValidationError, doc.save)
+
+
+def get_batch_from_bundle(bundle):
+ from erpnext.stock.serial_batch_bundle import get_batch_nos
+
+ batches = get_batch_nos(bundle)
+
+ return list(batches.keys())[0]
+
+
+def get_serial_nos_from_bundle(bundle):
+ from erpnext.stock.serial_batch_bundle import get_serial_nos
+
+ serial_nos = get_serial_nos(bundle)
+ return sorted(serial_nos) if serial_nos else []
+
+
+def make_serial_batch_bundle(kwargs):
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
+
+ if isinstance(kwargs, dict):
+ kwargs = frappe._dict(kwargs)
+
+ type_of_transaction = "Inward" if kwargs.qty > 0 else "Outward"
+ if kwargs.get("type_of_transaction"):
+ type_of_transaction = kwargs.get("type_of_transaction")
+
+ sb = SerialBatchCreation(
+ {
+ "item_code": kwargs.item_code,
+ "warehouse": kwargs.warehouse,
+ "voucher_type": kwargs.voucher_type,
+ "voucher_no": kwargs.voucher_no,
+ "posting_date": kwargs.posting_date,
+ "posting_time": kwargs.posting_time,
+ "qty": kwargs.qty,
+ "avg_rate": kwargs.rate,
+ "batches": kwargs.batches,
+ "serial_nos": kwargs.serial_nos,
+ "type_of_transaction": type_of_transaction,
+ "company": kwargs.company or "_Test Company",
+ "do_not_submit": kwargs.do_not_submit,
+ }
+ )
+
+ if not kwargs.get("do_not_save"):
+ return sb.make_serial_and_batch_bundle()
+
+ return sb
diff --git a/erpnext/loan_management/doctype/loan_security/__init__.py b/erpnext/stock/doctype/serial_and_batch_entry/__init__.py
similarity index 100%
rename from erpnext/loan_management/doctype/loan_security/__init__.py
rename to erpnext/stock/doctype/serial_and_batch_entry/__init__.py
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
new file mode 100644
index 0000000..6ec2129
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
@@ -0,0 +1,121 @@
+{
+ "actions": [],
+ "creation": "2022-09-29 14:55:15.909881",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "serial_no",
+ "batch_no",
+ "column_break_2",
+ "qty",
+ "warehouse",
+ "section_break_6",
+ "incoming_rate",
+ "column_break_8",
+ "outgoing_rate",
+ "stock_value_difference",
+ "is_outward",
+ "stock_queue"
+ ],
+ "fields": [
+ {
+ "depends_on": "eval:parent.has_serial_no == 1",
+ "fieldname": "serial_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Serial No",
+ "mandatory_depends_on": "eval:parent.has_serial_no == 1",
+ "options": "Serial No",
+ "search_index": 1
+ },
+ {
+ "depends_on": "eval:parent.has_batch_no == 1",
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Batch No",
+ "mandatory_depends_on": "eval:parent.has_batch_no == 1",
+ "options": "Batch",
+ "search_index": 1
+ },
+ {
+ "default": "1",
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Qty"
+ },
+ {
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Warehouse",
+ "options": "Warehouse",
+ "search_index": 1
+ },
+ {
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break",
+ "label": "Rate Section"
+ },
+ {
+ "fieldname": "incoming_rate",
+ "fieldtype": "Float",
+ "label": "Incoming Rate",
+ "no_copy": 1,
+ "read_only": 1,
+ "read_only_depends_on": "eval:parent.type_of_transaction == \"Outward\""
+ },
+ {
+ "fieldname": "outgoing_rate",
+ "fieldtype": "Float",
+ "label": "Outgoing Rate",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_8",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "stock_value_difference",
+ "fieldtype": "Float",
+ "label": "Change in Stock Value",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "is_outward",
+ "fieldtype": "Check",
+ "label": "Is Outward",
+ "read_only": 1
+ },
+ {
+ "fieldname": "stock_queue",
+ "fieldtype": "Small Text",
+ "label": "FIFO Stock Queue (qty, rate)",
+ "read_only": 1
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2023-03-31 11:18:59.809486",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Serial and Batch Entry",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
new file mode 100644
index 0000000..337403e
--- /dev/null
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SerialandBatchEntry(Document):
+ pass
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 6e1e0d4..ed1b0af 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -12,24 +12,15 @@
"column_break0",
"serial_no",
"item_code",
- "warehouse",
"batch_no",
+ "warehouse",
+ "purchase_rate",
"column_break1",
+ "status",
"item_name",
"description",
"item_group",
"brand",
- "sales_order",
- "purchase_details",
- "column_break2",
- "purchase_document_type",
- "purchase_document_no",
- "purchase_date",
- "purchase_time",
- "purchase_rate",
- "column_break3",
- "supplier",
- "supplier_name",
"asset_details",
"asset",
"asset_status",
@@ -38,14 +29,6 @@
"employee",
"delivery_details",
"delivery_document_type",
- "delivery_document_no",
- "delivery_date",
- "delivery_time",
- "column_break5",
- "customer",
- "customer_name",
- "invoice_details",
- "sales_invoice",
"warranty_amc_details",
"column_break6",
"warranty_expiry_date",
@@ -54,9 +37,8 @@
"maintenance_status",
"warranty_period",
"more_info",
- "serial_no_details",
"company",
- "status",
+ "column_break_2cmm",
"work_order"
],
"fields": [
@@ -91,39 +73,19 @@
"reqd": 1
},
{
- "description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt",
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Warehouse",
- "no_copy": 1,
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "read_only": 1,
- "search_index": 1
- },
- {
- "fieldname": "batch_no",
- "fieldtype": "Link",
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Batch No",
- "options": "Batch",
- "read_only": 1
- },
- {
"fieldname": "column_break1",
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.item_name",
+ "fetch_if_empty": 1,
"fieldname": "item_name",
"fieldtype": "Data",
"label": "Item Name",
"read_only": 1
},
{
+ "fetch_from": "item_code.description",
"fieldname": "description",
"fieldtype": "Text",
"label": "Description",
@@ -151,84 +113,6 @@
"read_only": 1
},
{
- "fieldname": "sales_order",
- "fieldtype": "Link",
- "label": "Sales Order",
- "options": "Sales Order"
- },
- {
- "fieldname": "purchase_details",
- "fieldtype": "Section Break",
- "label": "Purchase / Manufacture Details"
- },
- {
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "fieldname": "purchase_document_type",
- "fieldtype": "Link",
- "label": "Creation Document Type",
- "no_copy": 1,
- "options": "DocType",
- "read_only": 1
- },
- {
- "fieldname": "purchase_document_no",
- "fieldtype": "Dynamic Link",
- "label": "Creation Document No",
- "no_copy": 1,
- "options": "purchase_document_type",
- "read_only": 1
- },
- {
- "fieldname": "purchase_date",
- "fieldtype": "Date",
- "label": "Creation Date",
- "no_copy": 1,
- "oldfieldname": "purchase_date",
- "oldfieldtype": "Date",
- "read_only": 1
- },
- {
- "fieldname": "purchase_time",
- "fieldtype": "Time",
- "label": "Creation Time",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "purchase_rate",
- "fieldtype": "Currency",
- "label": "Incoming Rate",
- "no_copy": 1,
- "oldfieldname": "purchase_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "read_only": 1
- },
- {
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "fieldname": "supplier",
- "fieldtype": "Link",
- "label": "Supplier",
- "no_copy": 1,
- "options": "Supplier"
- },
- {
- "bold": 1,
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "label": "Supplier Name",
- "no_copy": 1,
- "read_only": 1
- },
- {
"fieldname": "asset_details",
"fieldtype": "Section Break",
"label": "Asset Details"
@@ -284,67 +168,6 @@
"read_only": 1
},
{
- "fieldname": "delivery_document_no",
- "fieldtype": "Dynamic Link",
- "label": "Delivery Document No",
- "no_copy": 1,
- "options": "delivery_document_type",
- "read_only": 1
- },
- {
- "fieldname": "delivery_date",
- "fieldtype": "Date",
- "label": "Delivery Date",
- "no_copy": 1,
- "oldfieldname": "delivery_date",
- "oldfieldtype": "Date",
- "read_only": 1
- },
- {
- "fieldname": "delivery_time",
- "fieldtype": "Time",
- "label": "Delivery Time",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break5",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "fieldname": "customer",
- "fieldtype": "Link",
- "label": "Customer",
- "no_copy": 1,
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "print_hide": 1
- },
- {
- "bold": 1,
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "label": "Customer Name",
- "no_copy": 1,
- "oldfieldname": "customer_name",
- "oldfieldtype": "Data",
- "read_only": 1
- },
- {
- "fieldname": "invoice_details",
- "fieldtype": "Section Break",
- "label": "Invoice Details"
- },
- {
- "fieldname": "sales_invoice",
- "fieldtype": "Link",
- "label": "Sales Invoice",
- "options": "Sales Invoice",
- "read_only": 1
- },
- {
"fieldname": "warranty_amc_details",
"fieldtype": "Section Break",
"label": "Warranty / AMC Details"
@@ -366,6 +189,7 @@
"width": "150px"
},
{
+ "fetch_from": "item_code.warranty_period",
"fieldname": "warranty_period",
"fieldtype": "Int",
"label": "Warranty Period (Days)",
@@ -401,39 +225,62 @@
"label": "More Information"
},
{
- "fieldname": "serial_no_details",
- "fieldtype": "Text Editor",
- "label": "Serial No Details"
- },
- {
"fieldname": "company",
"fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"options": "Company",
- "read_only": 1,
"remember_last_selected_value": 1,
"reqd": 1,
- "search_index": 1
- },
- {
- "fieldname": "status",
- "fieldtype": "Select",
- "in_standard_filter": 1,
- "label": "Status",
- "options": "\nActive\nInactive\nDelivered\nExpired",
- "read_only": 1
+ "search_index": 1,
+ "set_only_once": 1
},
{
"fieldname": "work_order",
"fieldtype": "Link",
"label": "Work Order",
"options": "Work Order"
+ },
+ {
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Warehouse",
+ "options": "Warehouse",
+ "read_only": 1
+ },
+ {
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "label": "Batch No",
+ "options": "Batch",
+ "read_only": 1
+ },
+ {
+ "fieldname": "purchase_rate",
+ "fieldtype": "Float",
+ "label": "Incoming Rate",
+ "read_only": 1
+ },
+ {
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Status",
+ "options": "\nActive\nInactive\nExpired",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_2cmm",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-barcode",
"idx": 1,
"links": [],
- "modified": "2021-12-23 10:44:30.299450",
+ "modified": "2023-04-16 15:58:46.139887",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
@@ -461,7 +308,6 @@
"read": 1,
"report": 1,
"role": "Stock Manager",
- "set_user_permissions": 1,
"write": 1
},
{
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 541d4d1..ba9482a 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -9,19 +9,9 @@
from frappe import ValidationError, _
from frappe.model.naming import make_autoname
from frappe.query_builder.functions import Coalesce
-from frappe.utils import (
- add_days,
- cint,
- cstr,
- flt,
- get_link_to_form,
- getdate,
- nowdate,
- safe_json_loads,
-)
+from frappe.utils import cint, cstr, getdate, nowdate, safe_json_loads
from erpnext.controllers.stock_controller import StockController
-from erpnext.stock.get_item_details import get_reserved_qty_for_so
class SerialNoCannotCreateDirectError(ValidationError):
@@ -32,38 +22,10 @@
pass
-class SerialNoNotRequiredError(ValidationError):
- pass
-
-
-class SerialNoRequiredError(ValidationError):
- pass
-
-
-class SerialNoQtyError(ValidationError):
- pass
-
-
-class SerialNoItemError(ValidationError):
- pass
-
-
class SerialNoWarehouseError(ValidationError):
pass
-class SerialNoBatchError(ValidationError):
- pass
-
-
-class SerialNoNotExistsError(ValidationError):
- pass
-
-
-class SerialNoDuplicateError(ValidationError):
- pass
-
-
class SerialNo(StockController):
def __init__(self, *args, **kwargs):
super(SerialNo, self).__init__(*args, **kwargs)
@@ -80,18 +42,14 @@
self.set_maintenance_status()
self.validate_warehouse()
- self.validate_item()
- self.set_status()
- def set_status(self):
- if self.delivery_document_type:
- self.status = "Delivered"
- elif self.warranty_expiry_date and getdate(self.warranty_expiry_date) <= getdate(nowdate()):
- self.status = "Expired"
- elif not self.warehouse:
- self.status = "Inactive"
- else:
- self.status = "Active"
+ def validate_warehouse(self):
+ if not self.get("__islocal"):
+ item_code, warehouse = frappe.db.get_value("Serial No", self.name, ["item_code", "warehouse"])
+ if not self.via_stock_ledger and item_code != self.item_code:
+ frappe.throw(_("Item Code cannot be changed for Serial No."), SerialNoCannotCannotChangeError)
+ if not self.via_stock_ledger and warehouse != self.warehouse:
+ frappe.throw(_("Warehouse cannot be changed for Serial No."), SerialNoCannotCannotChangeError)
def set_maintenance_status(self):
if not self.warranty_expiry_date and not self.amc_expiry_date:
@@ -109,137 +67,6 @@
if self.warranty_expiry_date and getdate(self.warranty_expiry_date) >= getdate(nowdate()):
self.maintenance_status = "Under Warranty"
- def validate_warehouse(self):
- if not self.get("__islocal"):
- item_code, warehouse = frappe.db.get_value("Serial No", self.name, ["item_code", "warehouse"])
- if not self.via_stock_ledger and item_code != self.item_code:
- frappe.throw(_("Item Code cannot be changed for Serial No."), SerialNoCannotCannotChangeError)
- if not self.via_stock_ledger and warehouse != self.warehouse:
- frappe.throw(_("Warehouse cannot be changed for Serial No."), SerialNoCannotCannotChangeError)
-
- def validate_item(self):
- """
- Validate whether serial no is required for this item
- """
- item = frappe.get_cached_doc("Item", self.item_code)
- if item.has_serial_no != 1:
- frappe.throw(
- _("Item {0} is not setup for Serial Nos. Check Item master").format(self.item_code)
- )
-
- self.item_group = item.item_group
- self.description = item.description
- self.item_name = item.item_name
- self.brand = item.brand
- self.warranty_period = item.warranty_period
-
- def set_purchase_details(self, purchase_sle):
- if purchase_sle:
- self.purchase_document_type = purchase_sle.voucher_type
- self.purchase_document_no = purchase_sle.voucher_no
- self.purchase_date = purchase_sle.posting_date
- self.purchase_time = purchase_sle.posting_time
- self.purchase_rate = purchase_sle.incoming_rate
- if purchase_sle.voucher_type in ("Purchase Receipt", "Purchase Invoice"):
- self.supplier, self.supplier_name = frappe.db.get_value(
- purchase_sle.voucher_type, purchase_sle.voucher_no, ["supplier", "supplier_name"]
- )
-
- # If sales return entry
- if self.purchase_document_type == "Delivery Note":
- self.sales_invoice = None
- else:
- for fieldname in (
- "purchase_document_type",
- "purchase_document_no",
- "purchase_date",
- "purchase_time",
- "purchase_rate",
- "supplier",
- "supplier_name",
- ):
- self.set(fieldname, None)
-
- def set_sales_details(self, delivery_sle):
- if delivery_sle:
- self.delivery_document_type = delivery_sle.voucher_type
- self.delivery_document_no = delivery_sle.voucher_no
- self.delivery_date = delivery_sle.posting_date
- self.delivery_time = delivery_sle.posting_time
- if delivery_sle.voucher_type in ("Delivery Note", "Sales Invoice"):
- self.customer, self.customer_name = frappe.db.get_value(
- delivery_sle.voucher_type, delivery_sle.voucher_no, ["customer", "customer_name"]
- )
- if self.warranty_period:
- self.warranty_expiry_date = add_days(
- cstr(delivery_sle.posting_date), cint(self.warranty_period)
- )
- else:
- for fieldname in (
- "delivery_document_type",
- "delivery_document_no",
- "delivery_date",
- "delivery_time",
- "customer",
- "customer_name",
- "warranty_expiry_date",
- ):
- self.set(fieldname, None)
-
- def get_last_sle(self, serial_no=None):
- entries = {}
- sle_dict = self.get_stock_ledger_entries(serial_no)
- if sle_dict:
- if sle_dict.get("incoming", []):
- entries["purchase_sle"] = sle_dict["incoming"][0]
-
- if len(sle_dict.get("incoming", [])) - len(sle_dict.get("outgoing", [])) > 0:
- entries["last_sle"] = sle_dict["incoming"][0]
- else:
- entries["last_sle"] = sle_dict["outgoing"][0]
- entries["delivery_sle"] = sle_dict["outgoing"][0]
-
- return entries
-
- def get_stock_ledger_entries(self, serial_no=None):
- sle_dict = {}
- if not serial_no:
- serial_no = self.name
-
- for sle in frappe.db.sql(
- """
- SELECT voucher_type, voucher_no,
- posting_date, posting_time, incoming_rate, actual_qty, serial_no
- FROM
- `tabStock Ledger Entry`
- WHERE
- item_code=%s AND company = %s
- AND is_cancelled = 0
- AND (serial_no = %s
- OR serial_no like %s
- OR serial_no like %s
- OR serial_no like %s
- )
- ORDER BY
- posting_date desc, posting_time desc, creation desc""",
- (
- self.item_code,
- self.company,
- serial_no,
- serial_no + "\n%",
- "%\n" + serial_no,
- "%\n" + serial_no + "\n%",
- ),
- as_dict=1,
- ):
- if serial_no.upper() in get_serial_nos(sle.serial_no):
- if cint(sle.actual_qty) > 0:
- sle_dict.setdefault("incoming", []).append(sle)
- else:
- sle_dict.setdefault("outgoing", []).append(sle)
-
- return sle_dict
-
def on_trash(self):
sl_entries = frappe.db.sql(
"""select serial_no from `tabStock Ledger Entry`
@@ -260,305 +87,13 @@
_("Cannot delete Serial No {0}, as it is used in stock transactions").format(self.name)
)
- def update_serial_no_reference(self, serial_no=None):
- last_sle = self.get_last_sle(serial_no)
- self.set_purchase_details(last_sle.get("purchase_sle"))
- self.set_sales_details(last_sle.get("delivery_sle"))
- self.set_maintenance_status()
- self.set_status()
-
-def process_serial_no(sle):
- item_det = get_item_details(sle.item_code)
- validate_serial_no(sle, item_det)
- update_serial_nos(sle, item_det)
-
-
-def validate_serial_no(sle, item_det):
- serial_nos = get_serial_nos(sle.serial_no) if sle.serial_no else []
- validate_material_transfer_entry(sle)
-
- if item_det.has_serial_no == 0:
- if serial_nos:
- frappe.throw(
- _("Item {0} is not setup for Serial Nos. Column must be blank").format(sle.item_code),
- SerialNoNotRequiredError,
- )
- elif not sle.is_cancelled:
- if serial_nos:
- if cint(sle.actual_qty) != flt(sle.actual_qty):
- frappe.throw(
- _("Serial No {0} quantity {1} cannot be a fraction").format(sle.item_code, sle.actual_qty)
- )
-
- if len(serial_nos) and len(serial_nos) != abs(cint(sle.actual_qty)):
- frappe.throw(
- _("{0} Serial Numbers required for Item {1}. You have provided {2}.").format(
- abs(sle.actual_qty), sle.item_code, len(serial_nos)
- ),
- SerialNoQtyError,
- )
-
- if len(serial_nos) != len(set(serial_nos)):
- frappe.throw(
- _("Duplicate Serial No entered for Item {0}").format(sle.item_code), SerialNoDuplicateError
- )
-
- for serial_no in serial_nos:
- if frappe.db.exists("Serial No", serial_no):
- sr = frappe.db.get_value(
- "Serial No",
- serial_no,
- [
- "name",
- "item_code",
- "batch_no",
- "sales_order",
- "delivery_document_no",
- "delivery_document_type",
- "warehouse",
- "purchase_document_type",
- "purchase_document_no",
- "company",
- "status",
- ],
- as_dict=1,
- )
-
- if sr.item_code != sle.item_code:
- if not allow_serial_nos_with_different_item(serial_no, sle):
- frappe.throw(
- _("Serial No {0} does not belong to Item {1}").format(serial_no, sle.item_code),
- SerialNoItemError,
- )
-
- if cint(sle.actual_qty) > 0 and has_serial_no_exists(sr, sle):
- doc_name = frappe.bold(get_link_to_form(sr.purchase_document_type, sr.purchase_document_no))
- frappe.throw(
- _("Serial No {0} has already been received in the {1} #{2}").format(
- frappe.bold(serial_no), sr.purchase_document_type, doc_name
- ),
- SerialNoDuplicateError,
- )
-
- if (
- sr.delivery_document_no
- and sle.voucher_type not in ["Stock Entry", "Stock Reconciliation"]
- and sle.voucher_type == sr.delivery_document_type
- ):
- return_against = frappe.db.get_value(sle.voucher_type, sle.voucher_no, "return_against")
- if return_against and return_against != sr.delivery_document_no:
- frappe.throw(_("Serial no {0} has been already returned").format(sr.name))
-
- if cint(sle.actual_qty) < 0:
- if sr.warehouse != sle.warehouse:
- frappe.throw(
- _("Serial No {0} does not belong to Warehouse {1}").format(serial_no, sle.warehouse),
- SerialNoWarehouseError,
- )
-
- if not sr.purchase_document_no:
- frappe.throw(_("Serial No {0} not in stock").format(serial_no), SerialNoNotExistsError)
-
- if sle.voucher_type in ("Delivery Note", "Sales Invoice"):
-
- if sr.batch_no and sr.batch_no != sle.batch_no:
- frappe.throw(
- _("Serial No {0} does not belong to Batch {1}").format(serial_no, sle.batch_no),
- SerialNoBatchError,
- )
-
- if not sle.is_cancelled and not sr.warehouse:
- frappe.throw(
- _("Serial No {0} does not belong to any Warehouse").format(serial_no),
- SerialNoWarehouseError,
- )
-
- # if Sales Order reference in Serial No validate the Delivery Note or Invoice is against the same
- if sr.sales_order:
- if sle.voucher_type == "Sales Invoice":
- if not frappe.db.exists(
- "Sales Invoice Item",
- {"parent": sle.voucher_no, "item_code": sle.item_code, "sales_order": sr.sales_order},
- ):
- frappe.throw(
- _(
- "Cannot deliver Serial No {0} of item {1} as it is reserved to fullfill Sales Order {2}"
- ).format(sr.name, sle.item_code, sr.sales_order)
- )
- elif sle.voucher_type == "Delivery Note":
- if not frappe.db.exists(
- "Delivery Note Item",
- {
- "parent": sle.voucher_no,
- "item_code": sle.item_code,
- "against_sales_order": sr.sales_order,
- },
- ):
- invoice = frappe.db.get_value(
- "Delivery Note Item",
- {"parent": sle.voucher_no, "item_code": sle.item_code},
- "against_sales_invoice",
- )
- if not invoice or frappe.db.exists(
- "Sales Invoice Item",
- {"parent": invoice, "item_code": sle.item_code, "sales_order": sr.sales_order},
- ):
- frappe.throw(
- _(
- "Cannot deliver Serial No {0} of item {1} as it is reserved to fullfill Sales Order {2}"
- ).format(sr.name, sle.item_code, sr.sales_order)
- )
- # if Sales Order reference in Delivery Note or Invoice validate SO reservations for item
- if sle.voucher_type == "Sales Invoice":
- sales_order = frappe.db.get_value(
- "Sales Invoice Item",
- {"parent": sle.voucher_no, "item_code": sle.item_code},
- "sales_order",
- )
- if sales_order and get_reserved_qty_for_so(sales_order, sle.item_code):
- validate_so_serial_no(sr, sales_order)
- elif sle.voucher_type == "Delivery Note":
- sales_order = frappe.get_value(
- "Delivery Note Item",
- {"parent": sle.voucher_no, "item_code": sle.item_code},
- "against_sales_order",
- )
- if sales_order and get_reserved_qty_for_so(sales_order, sle.item_code):
- validate_so_serial_no(sr, sales_order)
- else:
- sales_invoice = frappe.get_value(
- "Delivery Note Item",
- {"parent": sle.voucher_no, "item_code": sle.item_code},
- "against_sales_invoice",
- )
- if sales_invoice:
- sales_order = frappe.db.get_value(
- "Sales Invoice Item",
- {"parent": sales_invoice, "item_code": sle.item_code},
- "sales_order",
- )
- if sales_order and get_reserved_qty_for_so(sales_order, sle.item_code):
- validate_so_serial_no(sr, sales_order)
- elif cint(sle.actual_qty) < 0:
- # transfer out
- frappe.throw(_("Serial No {0} not in stock").format(serial_no), SerialNoNotExistsError)
- elif cint(sle.actual_qty) < 0 or not item_det.serial_no_series:
- frappe.throw(
- _("Serial Nos Required for Serialized Item {0}").format(sle.item_code), SerialNoRequiredError
- )
- elif serial_nos:
- # SLE is being cancelled and has serial nos
- for serial_no in serial_nos:
- check_serial_no_validity_on_cancel(serial_no, sle)
-
-
-def check_serial_no_validity_on_cancel(serial_no, sle):
- sr = frappe.db.get_value(
- "Serial No", serial_no, ["name", "warehouse", "company", "status"], as_dict=1
- )
- sr_link = frappe.utils.get_link_to_form("Serial No", serial_no)
- doc_link = frappe.utils.get_link_to_form(sle.voucher_type, sle.voucher_no)
- actual_qty = cint(sle.actual_qty)
- is_stock_reco = sle.voucher_type == "Stock Reconciliation"
- msg = None
-
- if sr and (actual_qty < 0 or is_stock_reco) and (sr.warehouse and sr.warehouse != sle.warehouse):
- # receipt(inward) is being cancelled
- msg = _("Cannot cancel {0} {1} as Serial No {2} does not belong to the warehouse {3}").format(
- sle.voucher_type, doc_link, sr_link, frappe.bold(sle.warehouse)
- )
- elif sr and actual_qty > 0 and not is_stock_reco:
- # delivery is being cancelled, check for warehouse.
- if sr.warehouse:
- # serial no is active in another warehouse/company.
- msg = _("Cannot cancel {0} {1} as Serial No {2} is active in warehouse {3}").format(
- sle.voucher_type, doc_link, sr_link, frappe.bold(sr.warehouse)
- )
- elif sr.company != sle.company and sr.status == "Delivered":
- # serial no is inactive (allowed) or delivered from another company (block).
- msg = _("Cannot cancel {0} {1} as Serial No {2} does not belong to the company {3}").format(
- sle.voucher_type, doc_link, sr_link, frappe.bold(sle.company)
- )
-
- if msg:
- frappe.throw(msg, title=_("Cannot cancel"))
-
-
-def validate_material_transfer_entry(sle_doc):
- sle_doc.update({"skip_update_serial_no": False, "skip_serial_no_validaiton": False})
-
- if (
- sle_doc.voucher_type == "Stock Entry"
- and not sle_doc.is_cancelled
- and frappe.get_cached_value("Stock Entry", sle_doc.voucher_no, "purpose") == "Material Transfer"
- ):
- if sle_doc.actual_qty < 0:
- sle_doc.skip_update_serial_no = True
- else:
- sle_doc.skip_serial_no_validaiton = True
-
-
-def validate_so_serial_no(sr, sales_order):
- if not sr.sales_order or sr.sales_order != sales_order:
- msg = _(
- "Sales Order {0} has reservation for the item {1}, you can only deliver reserved {1} against {0}."
- ).format(sales_order, sr.item_code)
-
- frappe.throw(_("""{0} Serial No {1} cannot be delivered""").format(msg, sr.name))
-
-
-def has_serial_no_exists(sn, sle):
- if (
- sn.warehouse and not sle.skip_serial_no_validaiton and sle.voucher_type != "Stock Reconciliation"
- ):
- return True
-
- if sn.company != sle.company:
- return False
-
-
-def allow_serial_nos_with_different_item(sle_serial_no, sle):
- """
- Allows same serial nos for raw materials and finished goods
- in Manufacture / Repack type Stock Entry
- """
- allow_serial_nos = False
- if sle.voucher_type == "Stock Entry" and cint(sle.actual_qty) > 0:
- stock_entry = frappe.get_cached_doc("Stock Entry", sle.voucher_no)
- if stock_entry.purpose in ("Repack", "Manufacture"):
- for d in stock_entry.get("items"):
- if d.serial_no and (d.s_warehouse if not sle.is_cancelled else d.t_warehouse):
- serial_nos = get_serial_nos(d.serial_no)
- if sle_serial_no in serial_nos:
- allow_serial_nos = True
-
- return allow_serial_nos
-
-
-def update_serial_nos(sle, item_det):
- if sle.skip_update_serial_no:
- return
- if (
- not sle.is_cancelled
- and not sle.serial_no
- and cint(sle.actual_qty) > 0
- and item_det.has_serial_no == 1
- and item_det.serial_no_series
- ):
- serial_nos = get_auto_serial_nos(item_det.serial_no_series, sle.actual_qty)
- sle.db_set("serial_no", serial_nos)
- validate_serial_no(sle, item_det)
- if sle.serial_no:
- auto_make_serial_nos(sle)
-
-
-def get_auto_serial_nos(serial_no_series, qty):
+def get_available_serial_nos(serial_no_series, qty) -> List[str]:
serial_nos = []
for i in range(cint(qty)):
serial_nos.append(get_new_serial_number(serial_no_series))
- return "\n".join(serial_nos)
+ return serial_nos
def get_new_serial_number(series):
@@ -568,41 +103,6 @@
return sr_no
-def auto_make_serial_nos(args):
- serial_nos = get_serial_nos(args.get("serial_no"))
- created_numbers = []
- voucher_type = args.get("voucher_type")
- item_code = args.get("item_code")
- for serial_no in serial_nos:
- is_new = False
- if frappe.db.exists("Serial No", serial_no):
- sr = frappe.get_cached_doc("Serial No", serial_no)
- elif args.get("actual_qty", 0) > 0:
- sr = frappe.new_doc("Serial No")
- is_new = True
-
- sr = update_args_for_serial_no(sr, serial_no, args, is_new=is_new)
- if is_new:
- created_numbers.append(sr.name)
-
- form_links = list(map(lambda d: get_link_to_form("Serial No", d), created_numbers))
-
- # Setting up tranlated title field for all cases
- singular_title = _("Serial Number Created")
- multiple_title = _("Serial Numbers Created")
-
- if voucher_type:
- multiple_title = singular_title = _("{0} Created").format(voucher_type)
-
- if len(form_links) == 1:
- frappe.msgprint(_("Serial No {0} Created").format(form_links[0]), singular_title)
- elif len(form_links) > 0:
- message = _("The following serial numbers were created: <br><br> {0}").format(
- get_items_html(form_links, item_code)
- )
- frappe.msgprint(message, multiple_title)
-
-
def get_items_html(serial_nos, item_code):
body = ", ".join(serial_nos)
return """<details><summary>
@@ -614,16 +114,6 @@
)
-def get_item_details(item_code):
- return frappe.db.sql(
- """select name, has_batch_no, docstatus,
- is_stock_item, has_serial_no, serial_no_series
- from tabItem where name=%s""",
- item_code,
- as_dict=True,
- )[0]
-
-
def get_serial_nos(serial_no):
if isinstance(serial_no, list):
return serial_no
@@ -641,100 +131,6 @@
return "\n".join(serial_no_list)
-def update_args_for_serial_no(serial_no_doc, serial_no, args, is_new=False):
- for field in ["item_code", "work_order", "company", "batch_no", "supplier", "location"]:
- if args.get(field):
- serial_no_doc.set(field, args.get(field))
-
- serial_no_doc.via_stock_ledger = args.get("via_stock_ledger") or True
- serial_no_doc.warehouse = args.get("warehouse") if args.get("actual_qty", 0) > 0 else None
-
- if is_new:
- serial_no_doc.serial_no = serial_no
-
- if (
- serial_no_doc.sales_order
- and args.get("voucher_type") == "Stock Entry"
- and not args.get("actual_qty", 0) > 0
- ):
- serial_no_doc.sales_order = None
-
- serial_no_doc.validate_item()
- serial_no_doc.update_serial_no_reference(serial_no)
-
- if is_new:
- serial_no_doc.db_insert()
- else:
- serial_no_doc.db_update()
-
- return serial_no_doc
-
-
-def update_serial_nos_after_submit(controller, parentfield):
- stock_ledger_entries = frappe.db.sql(
- """select voucher_detail_no, serial_no, actual_qty, warehouse
- from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s""",
- (controller.doctype, controller.name),
- as_dict=True,
- )
-
- if not stock_ledger_entries:
- return
-
- for d in controller.get(parentfield):
- if d.serial_no:
- continue
-
- update_rejected_serial_nos = (
- True
- if (
- controller.doctype in ("Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt")
- and d.rejected_qty
- )
- else False
- )
- accepted_serial_nos_updated = False
-
- if controller.doctype == "Stock Entry":
- warehouse = d.t_warehouse
- qty = d.transfer_qty
- elif controller.doctype in ("Sales Invoice", "Delivery Note"):
- warehouse = d.warehouse
- qty = d.stock_qty
- else:
- warehouse = d.warehouse
- qty = (
- d.qty
- if controller.doctype in ["Stock Reconciliation", "Subcontracting Receipt"]
- else d.stock_qty
- )
- for sle in stock_ledger_entries:
- if sle.voucher_detail_no == d.name:
- if (
- not accepted_serial_nos_updated
- and qty
- and abs(sle.actual_qty) == abs(qty)
- and sle.warehouse == warehouse
- and sle.serial_no != d.serial_no
- ):
- d.serial_no = sle.serial_no
- frappe.db.set_value(d.doctype, d.name, "serial_no", sle.serial_no)
- accepted_serial_nos_updated = True
- if not update_rejected_serial_nos:
- break
- elif (
- update_rejected_serial_nos
- and abs(sle.actual_qty) == d.rejected_qty
- and sle.warehouse == d.rejected_warehouse
- and sle.serial_no != d.rejected_serial_no
- ):
- d.rejected_serial_no = sle.serial_no
- frappe.db.set_value(d.doctype, d.name, "rejected_serial_no", sle.serial_no)
- update_rejected_serial_nos = False
- if accepted_serial_nos_updated:
- break
-
-
def update_maintenance_status():
serial_nos = frappe.db.sql(
"""select name from `tabSerial No` where (amc_expiry_date<%s or
@@ -896,3 +292,16 @@
serial_numbers = query.run(as_dict=True)
return serial_numbers
+
+
+def get_serial_nos_for_outward(kwargs):
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_available_serial_nos,
+ )
+
+ serial_nos = get_available_serial_nos(kwargs)
+
+ if not serial_nos:
+ return []
+
+ return [d.serial_no for d in serial_nos]
diff --git a/erpnext/stock/doctype/serial_no/serial_no_list.js b/erpnext/stock/doctype/serial_no/serial_no_list.js
deleted file mode 100644
index 7526d1d..0000000
--- a/erpnext/stock/doctype/serial_no/serial_no_list.js
+++ /dev/null
@@ -1,14 +0,0 @@
-frappe.listview_settings['Serial No'] = {
- add_fields: ["item_code", "warehouse", "warranty_expiry_date", "delivery_document_type"],
- get_indicator: (doc) => {
- if (doc.delivery_document_type) {
- return [__("Delivered"), "green", "delivery_document_type,is,set"];
- } else if (doc.warranty_expiry_date && frappe.datetime.get_diff(doc.warranty_expiry_date, frappe.datetime.nowdate()) <= 0) {
- return [__("Expired"), "red", "warranty_expiry_date,not in,|warranty_expiry_date,<=,Today|delivery_document_type,is,not set"];
- } else if (!doc.warehouse) {
- return [__("Inactive"), "grey", "warehouse,is,not set"];
- } else {
- return [__("Active"), "green", "delivery_document_type,is,not set"];
- }
- }
-};
diff --git a/erpnext/stock/doctype/serial_no/test_serial_no.py b/erpnext/stock/doctype/serial_no/test_serial_no.py
index 68623fb..5a5c403 100644
--- a/erpnext/stock/doctype/serial_no/test_serial_no.py
+++ b/erpnext/stock/doctype/serial_no/test_serial_no.py
@@ -6,11 +6,18 @@
import frappe
+from frappe import _, _dict
from frappe.tests.utils import FrappeTestCase
+from frappe.utils import today
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.serial_no.serial_no import *
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -44,26 +51,22 @@
def test_inter_company_transfer(self):
se = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
dn = create_delivery_note(
- item_code="_Test Serialized Item With Series", qty=1, serial_no=serial_nos[0]
+ item_code="_Test Serialized Item With Series", qty=1, serial_no=[serial_nos[0]]
)
serial_no = frappe.get_doc("Serial No", serial_nos[0])
# check Serial No details after delivery
- self.assertEqual(serial_no.status, "Delivered")
self.assertEqual(serial_no.warehouse, None)
- self.assertEqual(serial_no.company, "_Test Company")
- self.assertEqual(serial_no.delivery_document_type, "Delivery Note")
- self.assertEqual(serial_no.delivery_document_no, dn.name)
wh = create_warehouse("_Test Warehouse", company="_Test Company 1")
pr = make_purchase_receipt(
item_code="_Test Serialized Item With Series",
qty=1,
- serial_no=serial_nos[0],
+ serial_no=[serial_nos[0]],
company="_Test Company 1",
warehouse=wh,
)
@@ -71,11 +74,7 @@
serial_no.reload()
# check Serial No details after purchase in second company
- self.assertEqual(serial_no.status, "Active")
self.assertEqual(serial_no.warehouse, wh)
- self.assertEqual(serial_no.company, "_Test Company 1")
- self.assertEqual(serial_no.purchase_document_type, "Purchase Receipt")
- self.assertEqual(serial_no.purchase_document_no, pr.name)
def test_inter_company_transfer_intermediate_cancellation(self):
"""
@@ -84,25 +83,19 @@
Try to cancel intermediate receipts/deliveries to test if it is blocked.
"""
se = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
sn_doc = frappe.get_doc("Serial No", serial_nos[0])
# check Serial No details after purchase in first company
- self.assertEqual(sn_doc.status, "Active")
- self.assertEqual(sn_doc.company, "_Test Company")
self.assertEqual(sn_doc.warehouse, "_Test Warehouse - _TC")
- self.assertEqual(sn_doc.purchase_document_no, se.name)
dn = create_delivery_note(
- item_code="_Test Serialized Item With Series", qty=1, serial_no=serial_nos[0]
+ item_code="_Test Serialized Item With Series", qty=1, serial_no=[serial_nos[0]]
)
sn_doc.reload()
# check Serial No details after delivery from **first** company
- self.assertEqual(sn_doc.status, "Delivered")
- self.assertEqual(sn_doc.company, "_Test Company")
self.assertEqual(sn_doc.warehouse, None)
- self.assertEqual(sn_doc.delivery_document_no, dn.name)
# try cancelling the first Serial No Receipt, even though it is delivered
# block cancellation is Serial No is out of the warehouse
@@ -113,7 +106,7 @@
pr = make_purchase_receipt(
item_code="_Test Serialized Item With Series",
qty=1,
- serial_no=serial_nos[0],
+ serial_no=[serial_nos[0]],
company="_Test Company 1",
warehouse=wh,
)
@@ -128,17 +121,14 @@
dn_2 = create_delivery_note(
item_code="_Test Serialized Item With Series",
qty=1,
- serial_no=serial_nos[0],
+ serial_no=[serial_nos[0]],
company="_Test Company 1",
warehouse=wh,
)
sn_doc.reload()
# check Serial No details after delivery from **second** company
- self.assertEqual(sn_doc.status, "Delivered")
- self.assertEqual(sn_doc.company, "_Test Company 1")
self.assertEqual(sn_doc.warehouse, None)
- self.assertEqual(sn_doc.delivery_document_no, dn_2.name)
# cannot cancel any intermediate document before last Delivery Note
self.assertRaises(frappe.ValidationError, se.cancel)
@@ -153,12 +143,12 @@
"""
# Receipt in **first** company
se = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
sn_doc = frappe.get_doc("Serial No", serial_nos[0])
# Delivery from first company
dn = create_delivery_note(
- item_code="_Test Serialized Item With Series", qty=1, serial_no=serial_nos[0]
+ item_code="_Test Serialized Item With Series", qty=1, serial_no=[serial_nos[0]]
)
# Receipt in **second** company
@@ -166,7 +156,7 @@
pr = make_purchase_receipt(
item_code="_Test Serialized Item With Series",
qty=1,
- serial_no=serial_nos[0],
+ serial_no=[serial_nos[0]],
company="_Test Company 1",
warehouse=wh,
)
@@ -175,72 +165,29 @@
dn_2 = create_delivery_note(
item_code="_Test Serialized Item With Series",
qty=1,
- serial_no=serial_nos[0],
+ serial_no=[serial_nos[0]],
company="_Test Company 1",
warehouse=wh,
)
sn_doc.reload()
- self.assertEqual(sn_doc.status, "Delivered")
- self.assertEqual(sn_doc.company, "_Test Company 1")
- self.assertEqual(sn_doc.delivery_document_no, dn_2.name)
+ self.assertEqual(sn_doc.warehouse, None)
dn_2.cancel()
sn_doc.reload()
# Fallback on Purchase Receipt if Delivery is cancelled
- self.assertEqual(sn_doc.status, "Active")
- self.assertEqual(sn_doc.company, "_Test Company 1")
self.assertEqual(sn_doc.warehouse, wh)
- self.assertEqual(sn_doc.purchase_document_no, pr.name)
pr.cancel()
sn_doc.reload()
# Inactive in same company if Receipt cancelled
- self.assertEqual(sn_doc.status, "Inactive")
- self.assertEqual(sn_doc.company, "_Test Company 1")
self.assertEqual(sn_doc.warehouse, None)
dn.cancel()
sn_doc.reload()
# Fallback on Purchase Receipt in FIRST company if
# Delivery from FIRST company is cancelled
- self.assertEqual(sn_doc.status, "Active")
- self.assertEqual(sn_doc.company, "_Test Company")
self.assertEqual(sn_doc.warehouse, "_Test Warehouse - _TC")
- self.assertEqual(sn_doc.purchase_document_no, se.name)
-
- def test_auto_creation_of_serial_no(self):
- """
- Test if auto created Serial No excludes existing serial numbers
- """
- item_code = make_item(
- "_Test Auto Serial Item ", {"has_serial_no": 1, "serial_no_series": "XYZ.###"}
- ).item_code
-
- # Reserve XYZ005
- pr_1 = make_purchase_receipt(item_code=item_code, qty=1, serial_no="XYZ005")
- # XYZ005 is already used and will throw an error if used again
- pr_2 = make_purchase_receipt(item_code=item_code, qty=10)
-
- self.assertEqual(get_serial_nos(pr_1.get("items")[0].serial_no)[0], "XYZ005")
- for serial_no in get_serial_nos(pr_2.get("items")[0].serial_no):
- self.assertNotEqual(serial_no, "XYZ005")
-
- def test_serial_no_sanitation(self):
- "Test if Serial No input is sanitised before entering the DB."
- item_code = "_Test Serialized Item"
- test_records = frappe.get_test_records("Stock Entry")
-
- se = frappe.copy_doc(test_records[0])
- se.get("items")[0].item_code = item_code
- se.get("items")[0].qty = 4
- se.get("items")[0].serial_no = " _TS1, _TS2 , _TS3 , _TS4 - 2021"
- se.get("items")[0].transfer_qty = 4
- se.set_stock_entry_type()
- se.insert()
- se.submit()
-
- self.assertEqual(se.get("items")[0].serial_no, "_TS1\n_TS2\n_TS3\n_TS4 - 2021")
def test_correct_serial_no_incoming_rate(self):
"""Check correct consumption rate based on serial no record."""
@@ -248,19 +195,28 @@
warehouse = "_Test Warehouse - _TC"
serial_nos = ["LOWVALUATION", "HIGHVALUATION"]
+ for serial_no in serial_nos:
+ if not frappe.db.exists("Serial No", serial_no):
+ frappe.get_doc(
+ {"doctype": "Serial No", "item_code": item_code, "serial_no": serial_no}
+ ).insert()
+
in1 = make_stock_entry(
- item_code=item_code, to_warehouse=warehouse, qty=1, rate=42, serial_no=serial_nos[0]
+ item_code=item_code, to_warehouse=warehouse, qty=1, rate=42, serial_no=[serial_nos[0]]
)
in2 = make_stock_entry(
- item_code=item_code, to_warehouse=warehouse, qty=1, rate=113, serial_no=serial_nos[1]
+ item_code=item_code, to_warehouse=warehouse, qty=1, rate=113, serial_no=[serial_nos[1]]
)
out = create_delivery_note(
- item_code=item_code, qty=1, serial_no=serial_nos[0], do_not_submit=True
+ item_code=item_code, qty=1, serial_no=[serial_nos[0]], do_not_submit=True
)
- # change serial no
- out.items[0].serial_no = serial_nos[1]
+ bundle = out.items[0].serial_and_batch_bundle
+ doc = frappe.get_doc("Serial and Batch Bundle", bundle)
+ doc.entries[0].serial_no = serial_nos[1]
+ doc.save()
+
out.save()
out.submit()
@@ -288,49 +244,99 @@
in1.reload()
in2.reload()
- batch1 = in1.items[0].batch_no
- batch2 = in2.items[0].batch_no
+ batch1 = get_batch_from_bundle(in1.items[0].serial_and_batch_bundle)
+ batch2 = get_batch_from_bundle(in2.items[0].serial_and_batch_bundle)
batch_wise_serials = {
- batch1: get_serial_nos(in1.items[0].serial_no),
- batch2: get_serial_nos(in2.items[0].serial_no),
+ batch1: get_serial_nos_from_bundle(in1.items[0].serial_and_batch_bundle),
+ batch2: get_serial_nos_from_bundle(in2.items[0].serial_and_batch_bundle),
}
# Test FIFO
- first_fetch = auto_fetch_serial_number(5, item_code, warehouse)
+ first_fetch = get_auto_serial_nos(
+ _dict(
+ {
+ "qty": 5,
+ "item_code": item_code,
+ "warehouse": warehouse,
+ }
+ )
+ )
+
self.assertEqual(first_fetch, batch_wise_serials[batch1])
# partial FIFO
- partial_fetch = auto_fetch_serial_number(2, item_code, warehouse)
+ partial_fetch = get_auto_serial_nos(
+ _dict(
+ {
+ "qty": 2,
+ "item_code": item_code,
+ "warehouse": warehouse,
+ }
+ )
+ )
+
self.assertTrue(
set(partial_fetch).issubset(set(first_fetch)),
msg=f"{partial_fetch} should be subset of {first_fetch}",
)
# exclusion
- remaining = auto_fetch_serial_number(
- 3, item_code, warehouse, exclude_sr_nos=json.dumps(partial_fetch)
+ remaining = get_auto_serial_nos(
+ _dict(
+ {
+ "qty": 3,
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "ignore_serial_nos": partial_fetch,
+ }
+ )
)
+
self.assertEqual(sorted(remaining + partial_fetch), first_fetch)
# batchwise
for batch, expected_serials in batch_wise_serials.items():
- fetched_sr = auto_fetch_serial_number(5, item_code, warehouse, batch_nos=batch)
+ fetched_sr = get_auto_serial_nos(
+ _dict({"qty": 5, "item_code": item_code, "warehouse": warehouse, "batches": [batch]})
+ )
+
self.assertEqual(fetched_sr, sorted(expected_serials))
# non existing warehouse
- self.assertEqual(auto_fetch_serial_number(10, item_code, warehouse="Nonexisting"), [])
+ self.assertFalse(
+ get_auto_serial_nos(
+ _dict({"qty": 10, "item_code": item_code, "warehouse": "Non Existing Warehouse"})
+ )
+ )
# multi batch
all_serials = [sr for sr_list in batch_wise_serials.values() for sr in sr_list]
- fetched_serials = auto_fetch_serial_number(
- 10, item_code, warehouse, batch_nos=list(batch_wise_serials.keys())
+ fetched_serials = get_auto_serial_nos(
+ _dict(
+ {
+ "qty": 10,
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "batches": list(batch_wise_serials.keys()),
+ }
+ )
)
self.assertEqual(sorted(all_serials), fetched_serials)
# expiry date
frappe.db.set_value("Batch", batch1, "expiry_date", "1980-01-01")
- non_expired_serials = auto_fetch_serial_number(
- 5, item_code, warehouse, posting_date="2021-01-01", batch_nos=batch1
+ non_expired_serials = get_auto_serial_nos(
+ _dict({"qty": 5, "item_code": item_code, "warehouse": warehouse, "batches": [batch1]})
)
+
self.assertEqual(non_expired_serials, [])
+
+
+def get_auto_serial_nos(kwargs):
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_available_serial_nos,
+ )
+
+ serial_nos = get_available_serial_nos(kwargs)
+ return sorted([d.serial_no for d in serial_nos])
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index fb1f77a..403e04a 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -7,6 +7,8 @@
frappe.ui.form.on('Stock Entry', {
setup: function(frm) {
+ frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle'];
+
frm.set_indicator_formatter('item_code', function(doc) {
if (!doc.s_warehouse) {
return 'blue';
@@ -101,6 +103,27 @@
}
});
+ frm.set_query("serial_and_batch_bundle", "items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
frm.add_fetch("bom_no", "inspection_required", "inspection_required");
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
@@ -403,28 +426,6 @@
}
},
- set_serial_no: function(frm, cdt, cdn, callback) {
- var d = frappe.model.get_doc(cdt, cdn);
- if(!d.item_code && !d.s_warehouse && !d.qty) return;
- var args = {
- 'item_code' : d.item_code,
- 'warehouse' : cstr(d.s_warehouse),
- 'stock_qty' : d.transfer_qty
- };
- frappe.call({
- method: "erpnext.stock.get_item_details.get_serial_no",
- args: {"args": args},
- callback: function(r) {
- if (!r.exe && r.message){
- frappe.model.set_value(cdt, cdn, "serial_no", r.message);
- }
- if (callback) {
- callback();
- }
- }
- });
- },
-
make_retention_stock_entry: function(frm) {
frappe.call({
method: "erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse",
@@ -491,8 +492,7 @@
'item_code': child.item_code,
'warehouse': cstr(child.s_warehouse) || cstr(child.t_warehouse),
'transfer_qty': child.transfer_qty,
- 'serial_no': child.serial_no,
- 'batch_no': child.batch_no,
+ 'serial_and_batch_bundle': child.serial_and_batch_bundle,
'qty': child.s_warehouse ? -1* child.transfer_qty : child.transfer_qty,
'posting_date': frm.doc.posting_date,
'posting_time': frm.doc.posting_time,
@@ -677,23 +677,34 @@
});
}
},
+
+ process_loss_qty(frm) {
+ if (frm.doc.process_loss_qty) {
+ frm.doc.process_loss_percentage = flt(frm.doc.process_loss_qty / frm.doc.fg_completed_qty * 100, precision("process_loss_qty", frm.doc));
+ refresh_field("process_loss_percentage");
+ }
+ },
+
+ process_loss_percentage(frm) {
+ debugger
+ if (frm.doc.process_loss_percentage) {
+ frm.doc.process_loss_qty = flt((frm.doc.fg_completed_qty * frm.doc.process_loss_percentage) / 100 , precision("process_loss_qty", frm.doc));
+ refresh_field("process_loss_qty");
+ }
+ }
});
frappe.ui.form.on('Stock Entry Detail', {
- qty: function(frm, cdt, cdn) {
- frm.events.set_serial_no(frm, cdt, cdn, () => {
- frm.events.set_basic_rate(frm, cdt, cdn);
- });
- },
-
- conversion_factor: function(frm, cdt, cdn) {
+ qty(frm, cdt, cdn) {
frm.events.set_basic_rate(frm, cdt, cdn);
},
- s_warehouse: function(frm, cdt, cdn) {
- frm.events.set_serial_no(frm, cdt, cdn, () => {
- frm.events.get_warehouse_details(frm, cdt, cdn);
- });
+ conversion_factor(frm, cdt, cdn) {
+ frm.events.set_basic_rate(frm, cdt, cdn);
+ },
+
+ s_warehouse(frm, cdt, cdn) {
+ frm.events.get_warehouse_details(frm, cdt, cdn);
// set allow_zero_valuation_rate to 0 if s_warehouse is selected.
let item = frappe.get_doc(cdt, cdn);
@@ -702,16 +713,16 @@
}
},
- t_warehouse: function(frm, cdt, cdn) {
+ t_warehouse(frm, cdt, cdn) {
frm.events.get_warehouse_details(frm, cdt, cdn);
},
- basic_rate: function(frm, cdt, cdn) {
+ basic_rate(frm, cdt, cdn) {
var item = locals[cdt][cdn];
frm.events.calculate_basic_amount(frm, item);
},
- uom: function(doc, cdt, cdn) {
+ uom(doc, cdt, cdn) {
var d = locals[cdt][cdn];
if(d.uom && d.item_code){
return frappe.call({
@@ -730,7 +741,7 @@
}
},
- item_code: function(frm, cdt, cdn) {
+ item_code(frm, cdt, cdn) {
var d = locals[cdt][cdn];
if(d.item_code) {
var args = {
@@ -769,26 +780,38 @@
no_batch_serial_number_value = !d.batch_no;
}
- if (no_batch_serial_number_value && !frappe.flags.hide_serial_batch_dialog) {
+ if (no_batch_serial_number_value && !frappe.flags.hide_serial_batch_dialog && !frappe.flags.dialog_set) {
+ frappe.flags.dialog_set = true;
erpnext.stock.select_batch_and_serial_no(frm, d);
+ } else {
+ frappe.flags.dialog_set = false;
}
}
}
});
}
},
- expense_account: function(frm, cdt, cdn) {
+
+ expense_account(frm, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "items", "expense_account");
},
- cost_center: function(frm, cdt, cdn) {
+
+ cost_center(frm, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "items", "cost_center");
},
- sample_quantity: function(frm, cdt, cdn) {
+
+ sample_quantity(frm, cdt, cdn) {
validate_sample_quantity(frm, cdt, cdn);
},
- batch_no: function(frm, cdt, cdn) {
+
+ batch_no(frm, cdt, cdn) {
validate_sample_quantity(frm, cdt, cdn);
},
+
+ add_serial_batch_bundle(frm, cdt, cdn) {
+ var child = locals[cdt][cdn];
+ erpnext.stock.select_batch_and_serial_no(frm, child);
+ }
});
var validate_sample_quantity = function(frm, cdt, cdn) {
@@ -1093,35 +1116,29 @@
};
erpnext.stock.select_batch_and_serial_no = (frm, item) => {
- let get_warehouse_type_and_name = (item) => {
- let value = '';
- if(frm.fields_dict.from_warehouse.disp_status === "Write") {
- value = cstr(item.s_warehouse) || '';
- return {
- type: 'Source Warehouse',
- name: value
- };
- } else {
- value = cstr(item.t_warehouse) || '';
- return {
- type: 'Target Warehouse',
- name: value
- };
- }
- }
+ let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
- if(item && !item.has_serial_no && !item.has_batch_no) return;
- if (frm.doc.purpose === 'Material Receipt') return;
+ frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
+ .then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ item.has_serial_no = r.message.has_serial_no;
+ item.has_batch_no = r.message.has_batch_no;
+ item.type_of_transaction = item.s_warehouse ? "Outward" : "Inward";
- frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
- if (frm.batch_selector?.dialog?.display) return;
- frm.batch_selector = new erpnext.SerialNoBatchSelector({
- frm: frm,
- item: item,
- warehouse_details: get_warehouse_type_and_name(item),
+ frappe.require(path, function() {
+ new erpnext.SerialBatchPackageSelector(
+ frm, item, (r) => {
+ if (r) {
+ frappe.model.set_value(item.doctype, item.name, {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ });
+ }
+ }
+ );
+ });
+ }
});
- });
-
}
function attach_bom_items(bom_no) {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index bc5533f..564c380 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -24,6 +24,7 @@
"company",
"posting_date",
"posting_time",
+ "column_break_eaoa",
"set_posting_time",
"inspection_required",
"apply_putaway_rule",
@@ -124,7 +125,8 @@
"oldfieldname": "purpose",
"oldfieldtype": "Select",
"options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "company",
@@ -576,7 +578,8 @@
"fieldtype": "Link",
"label": "Pick List",
"options": "Pick List",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "print_settings_col_break",
@@ -640,16 +643,16 @@
},
{
"collapsible": 1,
+ "depends_on": "eval: doc.fg_completed_qty > 0 && in_list([\"Manufacture\", \"Repack\"], doc.purpose)",
"fieldname": "section_break_7qsm",
"fieldtype": "Section Break",
"label": "Process Loss"
},
{
- "depends_on": "process_loss_percentage",
+ "depends_on": "eval: doc.fg_completed_qty > 0 && in_list([\"Manufacture\", \"Repack\"], doc.purpose)",
"fieldname": "process_loss_qty",
"fieldtype": "Float",
- "label": "Process Loss Qty",
- "read_only": 1
+ "label": "Process Loss Qty"
},
{
"fieldname": "column_break_e92r",
@@ -657,8 +660,6 @@
},
{
"depends_on": "eval:doc.from_bom && doc.fg_completed_qty",
- "fetch_from": "bom_no.process_loss_percentage",
- "fetch_if_empty": 1,
"fieldname": "process_loss_percentage",
"fieldtype": "Percent",
"label": "% Process Loss"
@@ -667,6 +668,10 @@
"fieldname": "items_section",
"fieldtype": "Section Break",
"label": "Items"
+ },
+ {
+ "fieldname": "column_break_eaoa",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-file-text",
@@ -674,7 +679,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-04-06 12:42:56.673180",
+ "modified": "2023-06-19 18:23:40.748114",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
@@ -735,7 +740,6 @@
"read": 1,
"report": 1,
"role": "Stock Manager",
- "set_user_permissions": 1,
"share": 1,
"submit": 1,
"write": 1
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 36c875f..d9b5503 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -4,12 +4,23 @@
import json
from collections import defaultdict
+from typing import List
import frappe
from frappe import _
from frappe.model.mapper import get_mapped_doc
from frappe.query_builder.functions import Sum
-from frappe.utils import cint, comma_or, cstr, flt, format_time, formatdate, getdate, nowdate
+from frappe.utils import (
+ cint,
+ comma_or,
+ cstr,
+ flt,
+ format_time,
+ formatdate,
+ getdate,
+ month_diff,
+ nowdate,
+)
import erpnext
from erpnext.accounts.general_ledger import process_gl_map
@@ -17,12 +28,9 @@
from erpnext.manufacturing.doctype.bom.bom import add_additional_cost, validate_bom_no
from erpnext.setup.doctype.brand.brand import get_brand_defaults
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
-from erpnext.stock.doctype.batch.batch import get_batch_no, get_batch_qty, set_batch_nos
+from erpnext.stock.doctype.batch.batch import get_batch_qty
from erpnext.stock.doctype.item.item import get_item_defaults
-from erpnext.stock.doctype.serial_no.serial_no import (
- get_serial_nos,
- update_serial_nos_after_submit,
-)
+from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import (
OpeningEntryAccountError,
)
@@ -30,7 +38,11 @@
get_bin_details,
get_conversion_factor,
get_default_cost_center,
- get_reserved_qty_for_so,
+)
+from erpnext.stock.serial_batch_bundle import (
+ SerialBatchCreation,
+ get_empty_batches_based_work_order,
+ get_serial_or_batch_items,
)
from erpnext.stock.stock_ledger import NegativeStockError, get_previous_sle, get_valuation_rate
from erpnext.stock.utils import get_bin, get_incoming_rate
@@ -127,18 +139,13 @@
self.validate_fg_completed_qty()
self.validate_difference_account()
self.set_job_card_data()
+ self.validate_job_card_item()
self.set_purpose_for_stock_entry()
self.clean_serial_nos()
- self.validate_duplicate_serial_no()
if not self.from_bom:
self.fg_completed_qty = 0.0
- if self._action == "submit":
- self.make_batches("t_warehouse")
- else:
- set_batch_nos(self, "s_warehouse")
-
self.validate_serialized_batch()
self.set_actual_qty()
self.calculate_rate_and_amount()
@@ -150,10 +157,43 @@
self.reset_default_field_value("from_warehouse", "items", "s_warehouse")
self.reset_default_field_value("to_warehouse", "items", "t_warehouse")
+ def submit(self):
+ if self.is_enqueue_action():
+ frappe.msgprint(
+ _(
+ "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage"
+ )
+ )
+ self.queue_action("submit", timeout=2000)
+ else:
+ self._submit()
+
+ def cancel(self):
+ if self.is_enqueue_action():
+ frappe.msgprint(
+ _(
+ "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage"
+ )
+ )
+ self.queue_action("cancel", timeout=2000)
+ else:
+ self._cancel()
+
+ def is_enqueue_action(self, force=False) -> bool:
+ if force:
+ return True
+
+ if frappe.flags.in_test:
+ return False
+
+ # If line items are more than 100 or record is older than 6 months
+ if len(self.items) > 100 or month_diff(nowdate(), self.posting_date) > 6:
+ return True
+
+ return False
+
def on_submit(self):
self.update_stock_ledger()
-
- update_serial_nos_after_submit(self, "items")
self.update_work_order()
self.validate_subcontract_order()
self.update_subcontract_order_supplied_items()
@@ -164,13 +204,9 @@
self.repost_future_sle_and_gle()
self.update_cost_in_project()
- self.validate_reserved_serial_no_consumption()
self.update_transferred_qty()
self.update_quality_inspection()
- if self.work_order and self.purpose == "Manufacture":
- self.update_so_in_serial_number()
-
if self.purpose == "Material Transfer" and self.add_to_transit:
self.set_material_request_transfer_status("In Transit")
if self.purpose == "Material Transfer" and self.outgoing_stock_entry:
@@ -186,7 +222,12 @@
self.update_work_order()
self.update_stock_ledger()
- self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
+ self.ignore_linked_doctypes = (
+ "GL Entry",
+ "Stock Ledger Entry",
+ "Repost Item Valuation",
+ "Serial and Batch Bundle",
+ )
self.make_gl_entries_on_cancel()
self.repost_future_sle_and_gle()
@@ -201,6 +242,12 @@
if self.purpose == "Material Transfer" and self.outgoing_stock_entry:
self.set_material_request_transfer_status("In Transit")
+ def before_save(self):
+ self.make_serial_and_batch_bundle_for_outward()
+
+ def on_update(self):
+ self.set_serial_and_batch_bundle()
+
def set_job_card_data(self):
if self.job_card and not self.work_order:
data = frappe.db.get_value(
@@ -211,6 +258,24 @@
self.from_bom = 1
self.bom_no = data.bom_no
+ def validate_job_card_item(self):
+ if not self.job_card:
+ return
+
+ if cint(frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")):
+ return
+
+ for row in self.items:
+ if row.job_card_item or not row.s_warehouse:
+ continue
+
+ msg = f"""Row #{row.idx}: The job card item reference
+ is missing. Kindly create the stock entry
+ from the job card. If you have added the row manually
+ then you won't be able to add job card item reference."""
+
+ frappe.throw(_(msg))
+
def validate_work_order_status(self):
pro_doc = frappe.get_doc("Work Order", self.work_order)
if pro_doc.status == "Completed":
@@ -297,7 +362,6 @@
def validate_item(self):
stock_items = self.get_stock_items()
- serialized_items = self.get_serialized_items()
for item in self.get("items"):
if flt(item.qty) and flt(item.qty) < 0:
frappe.throw(
@@ -339,16 +403,6 @@
flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item)
)
- if (
- self.purpose in ("Material Transfer", "Material Transfer for Manufacture")
- and not item.serial_no
- and item.item_code in serialized_items
- ):
- frappe.throw(
- _("Row #{0}: Please specify Serial No for Item {1}").format(item.idx, item.item_code),
- frappe.MandatoryError,
- )
-
def validate_qty(self):
manufacture_purpose = ["Manufacture", "Material Consumption for Manufacture"]
@@ -388,13 +442,16 @@
if self.purpose == "Manufacture" and self.work_order:
for d in self.items:
if d.is_finished_item:
+ if self.process_loss_qty:
+ d.qty = self.fg_completed_qty - self.process_loss_qty
+
item_wise_qty.setdefault(d.item_code, []).append(d.qty)
precision = frappe.get_precision("Stock Entry Detail", "qty")
for item_code, qty_list in item_wise_qty.items():
total = flt(sum(qty_list), precision)
- if (self.fg_completed_qty - total) > 0:
+ if (self.fg_completed_qty - total) > 0 and not self.process_loss_qty:
self.process_loss_qty = flt(self.fg_completed_qty - total, precision)
self.process_loss_percentage = flt(self.process_loss_qty * 100 / self.fg_completed_qty)
@@ -524,7 +581,9 @@
for d in prod_order.get("operations"):
total_completed_qty = flt(self.fg_completed_qty) + flt(prod_order.produced_qty)
- completed_qty = d.completed_qty + (allowance_percentage / 100 * d.completed_qty)
+ completed_qty = (
+ d.completed_qty + d.process_loss_qty + (allowance_percentage / 100 * d.completed_qty)
+ )
if total_completed_qty > flt(completed_qty):
job_card = frappe.db.get_value("Job Card", {"operation_id": d.name}, "name")
if not job_card:
@@ -648,6 +707,9 @@
self.set_total_incoming_outgoing_value()
self.set_total_amount()
+ if not reset_outgoing_rate:
+ self.set_serial_and_batch_bundle()
+
def set_basic_rate(self, reset_outgoing_rate=True, raise_error_if_no_rate=True):
"""
Set rate for outgoing, scrapped and finished items
@@ -677,6 +739,9 @@
d.basic_rate = self.get_basic_rate_for_repacked_items(d.transfer_qty, outgoing_items_cost)
if not d.basic_rate and not d.allow_zero_valuation_rate:
+ if self.is_new():
+ raise_error_if_no_rate = False
+
d.basic_rate = get_valuation_rate(
d.item_code,
d.t_warehouse,
@@ -686,7 +751,7 @@
currency=erpnext.get_company_currency(self.company),
company=self.company,
raise_error_if_no_rate=raise_error_if_no_rate,
- batch_no=d.batch_no,
+ serial_and_batch_bundle=d.serial_and_batch_bundle,
)
# do not round off basic rate to avoid precision loss
@@ -731,12 +796,11 @@
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"qty": item.s_warehouse and -1 * flt(item.transfer_qty) or flt(item.transfer_qty),
- "serial_no": item.serial_no,
- "batch_no": item.batch_no,
"voucher_type": self.doctype,
"voucher_no": self.name,
"company": self.company,
"allow_zero_valuation": item.allow_zero_valuation_rate,
+ "serial_and_batch_bundle": item.serial_and_batch_bundle,
}
)
@@ -818,25 +882,65 @@
if self.stock_entry_type and not self.purpose:
self.purpose = frappe.get_cached_value("Stock Entry Type", self.stock_entry_type, "purpose")
- def validate_duplicate_serial_no(self):
- warehouse_wise_serial_nos = {}
+ def make_serial_and_batch_bundle_for_outward(self):
+ if self.docstatus == 1:
+ return
- # In case of repack the source and target serial nos could be same
- for warehouse in ["s_warehouse", "t_warehouse"]:
- serial_nos = []
- for row in self.items:
- if not (row.serial_no and row.get(warehouse)):
- continue
+ serial_or_batch_items = get_serial_or_batch_items(self.items)
+ if not serial_or_batch_items:
+ return
- for sn in get_serial_nos(row.serial_no):
- if sn in serial_nos:
- frappe.throw(
- _("The serial no {0} has added multiple times in the stock entry {1}").format(
- frappe.bold(sn), self.name
- )
- )
+ already_picked_serial_nos = []
- serial_nos.append(sn)
+ for row in self.items:
+ if not row.s_warehouse:
+ continue
+
+ if row.item_code not in serial_or_batch_items:
+ continue
+
+ bundle_doc = None
+ if row.serial_and_batch_bundle and abs(row.qty) != abs(
+ frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty")
+ ):
+ bundle_doc = SerialBatchCreation(
+ {
+ "item_code": row.item_code,
+ "warehouse": row.s_warehouse,
+ "serial_and_batch_bundle": row.serial_and_batch_bundle,
+ "type_of_transaction": "Outward",
+ "ignore_serial_nos": already_picked_serial_nos,
+ "qty": row.qty * -1,
+ }
+ ).update_serial_and_batch_entries()
+ elif not row.serial_and_batch_bundle:
+ bundle_doc = SerialBatchCreation(
+ {
+ "item_code": row.item_code,
+ "warehouse": row.s_warehouse,
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ "voucher_type": self.doctype,
+ "voucher_detail_no": row.name,
+ "qty": row.qty * -1,
+ "ignore_serial_nos": already_picked_serial_nos,
+ "type_of_transaction": "Outward",
+ "company": self.company,
+ "do_not_submit": True,
+ }
+ ).make_serial_and_batch_bundle()
+
+ if not bundle_doc:
+ continue
+
+ if self.docstatus == 0:
+ for entry in bundle_doc.entries:
+ if not entry.serial_no:
+ continue
+
+ already_picked_serial_nos.append(entry.serial_no)
+
+ row.serial_and_batch_bundle = bundle_doc.name
def validate_subcontract_order(self):
"""Throw exception if more raw material is transferred against Subcontract Order than in
@@ -1141,6 +1245,28 @@
sl_entries.append(sle)
+ def make_serial_and_batch_bundle_for_transfer(self):
+ ids = frappe._dict(
+ frappe.get_all(
+ "Stock Entry Detail",
+ fields=["name", "serial_and_batch_bundle"],
+ filters={"parent": self.outgoing_stock_entry, "serial_and_batch_bundle": ("is", "set")},
+ as_list=1,
+ )
+ )
+
+ if not ids:
+ return
+
+ for d in self.get("items"):
+ serial_and_batch_bundle = ids.get(d.ste_detail)
+ if not serial_and_batch_bundle:
+ continue
+
+ d.serial_and_batch_bundle = self.make_package_for_transfer(
+ serial_and_batch_bundle, d.s_warehouse, "Outward", do_not_submit=True
+ )
+
def get_sle_for_target_warehouse(self, sl_entries, finished_item_row):
for d in self.get("items"):
if cstr(d.t_warehouse):
@@ -1152,9 +1278,36 @@
"incoming_rate": flt(d.valuation_rate),
},
)
+
if cstr(d.s_warehouse) or (finished_item_row and d.name == finished_item_row.name):
sle.recalculate_rate = 1
+ allowed_types = [
+ "Material Transfer",
+ "Send to Subcontractor",
+ "Material Transfer for Manufacture",
+ ]
+
+ if self.purpose in allowed_types and d.serial_and_batch_bundle and self.docstatus == 1:
+ sle.serial_and_batch_bundle = self.make_package_for_transfer(
+ d.serial_and_batch_bundle, d.t_warehouse
+ )
+
+ if sle.serial_and_batch_bundle and self.docstatus == 2:
+ bundle_id = frappe.get_cached_value(
+ "Serial and Batch Bundle",
+ {
+ "voucher_detail_no": d.name,
+ "voucher_no": self.name,
+ "is_cancelled": 0,
+ "type_of_transaction": "Inward",
+ },
+ "name",
+ )
+
+ if sle.serial_and_batch_bundle != bundle_id:
+ sle.serial_and_batch_bundle = bundle_id
+
sl_entries.append(sle)
def get_gl_entries(self, warehouse_account):
@@ -1262,7 +1415,6 @@
pro_doc.run_method("update_work_order_qty")
if self.purpose == "Manufacture":
pro_doc.run_method("update_planned_qty")
- pro_doc.update_batch_produced_qty(self)
pro_doc.run_method("update_status")
if not pro_doc.operations:
@@ -1304,10 +1456,8 @@
"qty": args.get("qty"),
"transfer_qty": args.get("qty"),
"conversion_factor": 1,
- "batch_no": "",
"actual_qty": 0,
"basic_rate": 0,
- "serial_no": "",
"has_serial_no": item.has_serial_no,
"has_batch_no": item.has_batch_no,
"sample_quantity": item.sample_quantity,
@@ -1342,15 +1492,6 @@
stock_and_rate = get_warehouse_details(args) if args.get("warehouse") else {}
ret.update(stock_and_rate)
- # automatically select batch for outgoing item
- if (
- args.get("s_warehouse", None)
- and args.get("qty")
- and ret.get("has_batch_no")
- and not args.get("batch_no")
- ):
- args.batch_no = get_batch_no(args["item_code"], args["s_warehouse"], args["qty"])
-
if (
self.purpose == "Send to Subcontractor"
and self.get(self.subcontract_data.order_field)
@@ -1389,8 +1530,6 @@
"ste_detail": d.name,
"stock_uom": d.stock_uom,
"conversion_factor": d.conversion_factor,
- "serial_no": d.serial_no,
- "batch_no": d.batch_no,
},
)
@@ -1506,16 +1645,36 @@
if self.purpose not in ("Manufacture", "Repack"):
return
- self.process_loss_qty = 0.0
- if not self.process_loss_percentage:
+ precision = self.precision("process_loss_qty")
+ if self.work_order:
+ data = frappe.get_all(
+ "Work Order Operation",
+ filters={"parent": self.work_order},
+ fields=["max(process_loss_qty) as process_loss_qty"],
+ )
+
+ if data and data[0].process_loss_qty is not None:
+ process_loss_qty = data[0].process_loss_qty
+ if flt(self.process_loss_qty, precision) != flt(process_loss_qty, precision):
+ self.process_loss_qty = flt(process_loss_qty, precision)
+
+ frappe.msgprint(
+ _("The Process Loss Qty has reset as per job cards Process Loss Qty"), alert=True
+ )
+
+ if not self.process_loss_percentage and not self.process_loss_qty:
self.process_loss_percentage = frappe.get_cached_value(
"BOM", self.bom_no, "process_loss_percentage"
)
- if self.process_loss_percentage:
+ if self.process_loss_percentage and not self.process_loss_qty:
self.process_loss_qty = flt(
(flt(self.fg_completed_qty) * flt(self.process_loss_percentage)) / 100
)
+ elif self.process_loss_qty and not self.process_loss_percentage:
+ self.process_loss_percentage = flt(
+ (flt(self.process_loss_qty) / flt(self.fg_completed_qty)) * 100
+ )
def set_work_order_details(self):
if not getattr(self, "pro_doc", None):
@@ -1561,6 +1720,7 @@
if (
self.work_order
and self.pro_doc.has_batch_no
+ and not self.pro_doc.has_serial_no
and cint(
frappe.db.get_single_value(
"Manufacturing Settings", "make_serial_no_batch_from_work_order", cache=True
@@ -1572,42 +1732,34 @@
self.add_finished_goods(args, item)
def set_batchwise_finished_goods(self, args, item):
- filters = {
- "reference_name": self.pro_doc.name,
- "reference_doctype": self.pro_doc.doctype,
- "qty_to_produce": (">", 0),
- "batch_qty": ("=", 0),
- }
+ batches = get_empty_batches_based_work_order(self.work_order, self.pro_doc.production_item)
- fields = ["qty_to_produce as qty", "produced_qty", "name"]
-
- data = frappe.get_all("Batch", filters=filters, fields=fields, order_by="creation asc")
-
- if not data:
+ if not batches:
self.add_finished_goods(args, item)
else:
- self.add_batchwise_finished_good(data, args, item)
+ self.add_batchwise_finished_good(batches, args, item)
- def add_batchwise_finished_good(self, data, args, item):
+ def add_batchwise_finished_good(self, batches, args, item):
qty = flt(self.fg_completed_qty)
+ row = frappe._dict({"batches_to_be_consume": defaultdict(float)})
- for row in data:
- batch_qty = flt(row.qty) - flt(row.produced_qty)
- if not batch_qty:
- continue
+ self.update_batches_to_be_consume(batches, row, qty)
- if qty <= 0:
- break
+ if not row.batches_to_be_consume:
+ return
- fg_qty = batch_qty
- if batch_qty >= qty:
- fg_qty = qty
+ id = create_serial_and_batch_bundle(
+ row,
+ frappe._dict(
+ {
+ "item_code": self.pro_doc.production_item,
+ "warehouse": args.get("to_warehouse"),
+ }
+ ),
+ )
- qty -= batch_qty
- args["qty"] = fg_qty
- args["batch_no"] = row.name
-
- self.add_finished_goods(args, item)
+ args["serial_and_batch_bundle"] = id
+ self.add_finished_goods(args, item)
def add_finished_goods(self, args, item):
self.add_to_stock_entry_detail({item.name: args}, bom_no=self.bom_no)
@@ -1811,21 +1963,41 @@
qty = frappe.utils.ceil(qty)
if row.batch_details:
- batches = sorted(row.batch_details.items(), key=lambda x: x[0])
- for batch_no, batch_qty in batches:
- if qty <= 0 or batch_qty <= 0:
- continue
+ row.batches_to_be_consume = defaultdict(float)
+ batches = row.batch_details
+ self.update_batches_to_be_consume(batches, row, qty)
- if batch_qty > qty:
- batch_qty = qty
+ elif row.serial_nos:
+ serial_nos = row.serial_nos[0 : cint(qty)]
+ row.serial_nos = serial_nos
- item.batch_no = batch_no
- self.update_item_in_stock_entry_detail(row, item, batch_qty)
+ self.update_item_in_stock_entry_detail(row, item, qty)
- row.batch_details[batch_no] -= batch_qty
- qty -= batch_qty
- else:
- self.update_item_in_stock_entry_detail(row, item, qty)
+ def update_batches_to_be_consume(self, batches, row, qty):
+ qty_to_be_consumed = qty
+ batches = sorted(batches.items(), key=lambda x: x[0])
+
+ for batch_no, batch_qty in batches:
+ if qty_to_be_consumed <= 0 or batch_qty <= 0:
+ continue
+
+ if batch_qty > qty_to_be_consumed:
+ batch_qty = qty_to_be_consumed
+
+ row.batches_to_be_consume[batch_no] += batch_qty
+
+ if batch_no and row.serial_nos:
+ serial_nos = self.get_serial_nos_based_on_transferred_batch(batch_no, row.serial_nos)
+ serial_nos = serial_nos[0 : cint(batch_qty)]
+
+ # remove consumed serial nos from list
+ for sn in serial_nos:
+ row.serial_nos.remove(sn)
+
+ if "batch_details" in row:
+ row.batch_details[batch_no] -= batch_qty
+
+ qty_to_be_consumed -= batch_qty
def update_item_in_stock_entry_detail(self, row, item, qty) -> None:
if not qty:
@@ -1836,7 +2008,7 @@
"to_warehouse": "",
"qty": qty,
"item_name": item.item_name,
- "batch_no": item.batch_no,
+ "serial_and_batch_bundle": create_serial_and_batch_bundle(row, item, "Outward"),
"description": item.description,
"stock_uom": item.stock_uom,
"expense_account": item.expense_account,
@@ -1847,24 +2019,14 @@
if self.is_return:
ste_item_details["to_warehouse"] = item.s_warehouse
- if row.serial_nos:
- serial_nos = row.serial_nos
- if item.batch_no:
- serial_nos = self.get_serial_nos_based_on_transferred_batch(item.batch_no, row.serial_nos)
-
- serial_nos = serial_nos[0 : cint(qty)]
- ste_item_details["serial_no"] = "\n".join(serial_nos)
-
- # remove consumed serial nos from list
- for sn in serial_nos:
- row.serial_nos.remove(sn)
-
self.add_to_stock_entry_detail({item.item_code: ste_item_details})
@staticmethod
def get_serial_nos_based_on_transferred_batch(batch_no, serial_nos) -> list:
serial_nos = frappe.get_all(
- "Serial No", filters={"batch_no": batch_no, "name": ("in", serial_nos)}, order_by="creation"
+ "Serial No",
+ filters={"batch_no": batch_no, "name": ("in", serial_nos), "warehouse": ("is", "not set")},
+ order_by="creation",
)
return [d.name for d in serial_nos]
@@ -2006,8 +2168,7 @@
"expense_account",
"description",
"item_name",
- "serial_no",
- "batch_no",
+ "serial_and_batch_bundle",
"allow_zero_valuation_rate",
]:
if item_row.get(field):
@@ -2116,42 +2277,6 @@
stock_bin = get_bin(item_code, reserve_warehouse)
stock_bin.update_reserved_qty_for_sub_contracting()
- def update_so_in_serial_number(self):
- so_name, item_code = frappe.db.get_value(
- "Work Order", self.work_order, ["sales_order", "production_item"]
- )
- if so_name and item_code:
- qty_to_reserve = get_reserved_qty_for_so(so_name, item_code)
- if qty_to_reserve:
- reserved_qty = frappe.db.sql(
- """select count(name) from `tabSerial No` where item_code=%s and
- sales_order=%s""",
- (item_code, so_name),
- )
- if reserved_qty and reserved_qty[0][0]:
- qty_to_reserve -= reserved_qty[0][0]
- if qty_to_reserve > 0:
- for item in self.items:
- has_serial_no = frappe.get_cached_value("Item", item.item_code, "has_serial_no")
- if item.item_code == item_code and has_serial_no:
- serial_nos = (item.serial_no).split("\n")
- for serial_no in serial_nos:
- if qty_to_reserve > 0:
- frappe.db.set_value("Serial No", serial_no, "sales_order", so_name)
- qty_to_reserve -= 1
-
- def validate_reserved_serial_no_consumption(self):
- for item in self.items:
- if item.s_warehouse and not item.t_warehouse and item.serial_no:
- for sr in get_serial_nos(item.serial_no):
- sales_order = frappe.db.get_value("Serial No", sr, "sales_order")
- if sales_order:
- msg = _(
- "(Serial No: {0}) cannot be consumed as it's reserverd to fullfill Sales Order {1}."
- ).format(sr, sales_order)
-
- frappe.throw(_("Item {0} {1}").format(item.item_code, msg))
-
def update_transferred_qty(self):
if self.purpose == "Material Transfer" and self.outgoing_stock_entry:
stock_entries = {}
@@ -2244,40 +2369,52 @@
frappe.db.set_value("Material Request", material_request, "transfer_status", status)
def set_serial_no_batch_for_finished_good(self):
- serial_nos = []
- if self.pro_doc.serial_no:
- serial_nos = self.get_serial_nos_for_fg() or []
+ if not (
+ (self.pro_doc.has_serial_no or self.pro_doc.has_batch_no)
+ and frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")
+ ):
+ return
- for row in self.items:
- if row.is_finished_item and row.item_code == self.pro_doc.production_item:
+ for d in self.items:
+ if (
+ d.is_finished_item
+ and d.item_code == self.pro_doc.production_item
+ and not d.serial_and_batch_bundle
+ ):
+ serial_nos = self.get_available_serial_nos()
if serial_nos:
- row.serial_no = "\n".join(serial_nos[0 : cint(row.qty)])
+ row = frappe._dict({"serial_nos": serial_nos[0 : cint(d.qty)]})
- def get_serial_nos_for_fg(self):
- fields = [
- "`tabStock Entry`.`name`",
- "`tabStock Entry Detail`.`qty`",
- "`tabStock Entry Detail`.`serial_no`",
- "`tabStock Entry Detail`.`batch_no`",
- ]
+ id = create_serial_and_batch_bundle(
+ row,
+ frappe._dict(
+ {
+ "item_code": d.item_code,
+ "warehouse": d.t_warehouse,
+ }
+ ),
+ )
- filters = [
- ["Stock Entry", "work_order", "=", self.work_order],
- ["Stock Entry", "purpose", "=", "Manufacture"],
- ["Stock Entry", "docstatus", "<", 2],
- ["Stock Entry Detail", "item_code", "=", self.pro_doc.production_item],
- ]
+ d.serial_and_batch_bundle = id
- stock_entries = frappe.get_all("Stock Entry", fields=fields, filters=filters)
- return self.get_available_serial_nos(stock_entries)
+ def get_available_serial_nos(self) -> List[str]:
+ serial_nos = []
+ data = frappe.get_all(
+ "Serial No",
+ filters={
+ "item_code": self.pro_doc.production_item,
+ "warehouse": ("is", "not set"),
+ "status": "Inactive",
+ "work_order": self.pro_doc.name,
+ },
+ fields=["name"],
+ order_by="creation asc",
+ )
- def get_available_serial_nos(self, stock_entries):
- used_serial_nos = []
- for row in stock_entries:
- if row.serial_no:
- used_serial_nos.extend(get_serial_nos(row.serial_no))
+ for row in data:
+ serial_nos.append(row.name)
- return sorted(list(set(get_serial_nos(self.pro_doc.serial_no)) - set(used_serial_nos)))
+ return serial_nos
def update_subcontracting_order_status(self):
if self.subcontracting_order and self.purpose in ["Send to Subcontractor", "Material Transfer"]:
@@ -2301,6 +2438,11 @@
@frappe.whitelist()
def move_sample_to_retention_warehouse(company, items):
+ from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ )
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
+
if isinstance(items, str):
items = json.loads(items)
retention_warehouse = frappe.db.get_single_value("Stock Settings", "sample_retention_warehouse")
@@ -2309,20 +2451,25 @@
stock_entry.purpose = "Material Transfer"
stock_entry.set_stock_entry_type()
for item in items:
- if item.get("sample_quantity") and item.get("batch_no"):
+ if item.get("sample_quantity") and item.get("serial_and_batch_bundle"):
+ batch_no = get_batch_from_bundle(item.get("serial_and_batch_bundle"))
sample_quantity = validate_sample_quantity(
item.get("item_code"),
item.get("sample_quantity"),
item.get("transfer_qty") or item.get("qty"),
- item.get("batch_no"),
+ batch_no,
)
+
if sample_quantity:
- sample_serial_nos = ""
- if item.get("serial_no"):
- serial_nos = (item.get("serial_no")).split()
- if serial_nos and len(serial_nos) > item.get("sample_quantity"):
- serial_no_list = serial_nos[: -(len(serial_nos) - item.get("sample_quantity"))]
- sample_serial_nos = "\n".join(serial_no_list)
+ cls_obj = SerialBatchCreation(
+ {
+ "type_of_transaction": "Outward",
+ "serial_and_batch_bundle": item.get("serial_and_batch_bundle"),
+ "item_code": item.get("item_code"),
+ }
+ )
+
+ cls_obj.duplicate_package()
stock_entry.append(
"items",
@@ -2334,9 +2481,8 @@
"basic_rate": item.get("valuation_rate"),
"uom": item.get("uom"),
"stock_uom": item.get("stock_uom"),
- "conversion_factor": 1.0,
- "serial_no": sample_serial_nos,
- "batch_no": item.get("batch_no"),
+ "conversion_factor": item.get("conversion_factor") or 1.0,
+ "serial_and_batch_bundle": cls_obj.serial_and_batch_bundle,
},
)
if stock_entry.get("items"):
@@ -2346,8 +2492,9 @@
@frappe.whitelist()
def make_stock_in_entry(source_name, target_doc=None):
def set_missing_values(source, target):
- target.set_stock_entry_type()
+ target.stock_entry_type = "Material Transfer"
target.set_missing_values()
+ target.make_serial_and_batch_bundle_for_transfer()
def update_item(source_doc, target_doc, source_parent):
target_doc.t_warehouse = ""
@@ -2661,9 +2808,17 @@
if row.batch_no:
item_data.batch_details[row.batch_no] += row.qty
+ if row.batch_nos:
+ for batch_no, qty in row.batch_nos.items():
+ item_data.batch_details[batch_no] += qty
+
if row.serial_no:
item_data.serial_nos.extend(get_serial_nos(row.serial_no))
item_data.serial_nos.sort()
+
+ if row.serial_nos:
+ item_data.serial_nos.extend(get_serial_nos(row.serial_nos))
+ item_data.serial_nos.sort()
else:
# Consume raw material qty in case of 'Manufacture' or 'Material Consumption for Manufacture'
@@ -2671,18 +2826,30 @@
if row.batch_no:
item_data.batch_details[row.batch_no] -= row.qty
+ if row.batch_nos:
+ for batch_no, qty in row.batch_nos.items():
+ item_data.batch_details[batch_no] += qty
+
if row.serial_no:
for serial_no in get_serial_nos(row.serial_no):
item_data.serial_nos.remove(serial_no)
+ if row.serial_nos:
+ for serial_no in get_serial_nos(row.serial_nos):
+ item_data.serial_nos.remove(serial_no)
+
return available_materials
def get_stock_entry_data(work_order):
+ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_voucher_wise_serial_batch_from_bundle,
+ )
+
stock_entry = frappe.qb.DocType("Stock Entry")
stock_entry_detail = frappe.qb.DocType("Stock Entry Detail")
- return (
+ data = (
frappe.qb.from_(stock_entry)
.from_(stock_entry_detail)
.select(
@@ -2696,9 +2863,11 @@
stock_entry_detail.stock_uom,
stock_entry_detail.expense_account,
stock_entry_detail.cost_center,
+ stock_entry_detail.serial_and_batch_bundle,
stock_entry_detail.batch_no,
stock_entry_detail.serial_no,
stock_entry.purpose,
+ stock_entry.name,
)
.where(
(stock_entry.name == stock_entry_detail.parent)
@@ -2713,3 +2882,86 @@
)
.orderby(stock_entry.creation, stock_entry_detail.item_code, stock_entry_detail.idx)
).run(as_dict=1)
+
+ if not data:
+ return []
+
+ voucher_nos = [row.get("name") for row in data if row.get("name")]
+ if voucher_nos:
+ bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=voucher_nos)
+ for row in data:
+ key = (row.item_code, row.warehouse, row.name)
+ if row.purpose != "Material Transfer for Manufacture":
+ key = (row.item_code, row.s_warehouse, row.name)
+
+ if bundle_data.get(key):
+ row.update(bundle_data.get(key))
+
+ return data
+
+
+def create_serial_and_batch_bundle(row, child, type_of_transaction=None):
+ item_details = frappe.get_cached_value(
+ "Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1
+ )
+
+ if not (item_details.has_serial_no or item_details.has_batch_no):
+ return
+
+ if not type_of_transaction:
+ type_of_transaction = "Inward"
+
+ doc = frappe.get_doc(
+ {
+ "doctype": "Serial and Batch Bundle",
+ "voucher_type": "Stock Entry",
+ "item_code": child.item_code,
+ "warehouse": child.warehouse,
+ "type_of_transaction": type_of_transaction,
+ }
+ )
+
+ if row.serial_nos and row.batches_to_be_consume:
+ doc.has_serial_no = 1
+ doc.has_batch_no = 1
+ batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row)
+ for batch_no, qty in row.batches_to_be_consume.items():
+
+ while qty > 0:
+ qty -= 1
+ doc.append(
+ "entries",
+ {
+ "batch_no": batch_no,
+ "serial_no": batchwise_serial_nos.get(batch_no).pop(0),
+ "warehouse": row.warehouse,
+ "qty": -1,
+ },
+ )
+
+ elif row.serial_nos:
+ doc.has_serial_no = 1
+ for serial_no in row.serial_nos:
+ doc.append("entries", {"serial_no": serial_no, "warehouse": row.warehouse, "qty": -1})
+
+ elif row.batches_to_be_consume:
+ doc.has_batch_no = 1
+ for batch_no, qty in row.batches_to_be_consume.items():
+ doc.append("entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": qty * -1})
+
+ return doc.insert(ignore_permissions=True).name
+
+
+def get_batchwise_serial_nos(item_code, row):
+ batchwise_serial_nos = {}
+
+ for batch_no in row.batches_to_be_consume:
+ serial_nos = frappe.get_all(
+ "Serial No",
+ filters={"item_code": item_code, "batch_no": batch_no, "name": ("in", row.serial_nos)},
+ )
+
+ if serial_nos:
+ batchwise_serial_nos[batch_no] = sorted([serial_no.name for serial_no in serial_nos])
+
+ return batchwise_serial_nos
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index 0f90013..83bfaa0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -52,6 +52,7 @@
:do_not_save: Optional flag
:do_not_submit: Optional flag
"""
+ from erpnext.stock.serial_batch_bundle import SerialBatchCreation
def process_serial_numbers(serial_nos_list):
serial_nos_list = [
@@ -131,16 +132,36 @@
# We can find out the serial number using the batch source document
serial_number = args.serial_no
- if not args.serial_no and args.qty and args.batch_no:
- serial_number_list = frappe.get_list(
- doctype="Stock Ledger Entry",
- fields=["serial_no"],
- filters={"batch_no": args.batch_no, "warehouse": args.from_warehouse},
+ bundle_id = None
+ if args.serial_no or args.batch_no or args.batches:
+ batches = frappe._dict({})
+ if args.batch_no:
+ batches = frappe._dict({args.batch_no: args.qty})
+ elif args.batches:
+ batches = args.batches
+
+ bundle_id = (
+ SerialBatchCreation(
+ {
+ "item_code": args.item,
+ "warehouse": args.source or args.target,
+ "voucher_type": "Stock Entry",
+ "total_qty": args.qty * (-1 if args.source else 1),
+ "batches": batches,
+ "serial_nos": args.serial_no,
+ "type_of_transaction": "Outward" if args.source else "Inward",
+ "company": s.company,
+ "posting_date": s.posting_date,
+ "posting_time": s.posting_time,
+ "rate": args.rate or args.basic_rate,
+ "do_not_submit": True,
+ }
+ )
+ .make_serial_and_batch_bundle()
+ .name
)
- serial_number = process_serial_numbers(serial_number_list)
args.serial_no = serial_number
-
s.append(
"items",
{
@@ -148,6 +169,7 @@
"s_warehouse": args.source,
"t_warehouse": args.target,
"qty": args.qty,
+ "serial_and_batch_bundle": bundle_id,
"basic_rate": args.rate or args.basic_rate,
"conversion_factor": args.conversion_factor or 1.0,
"transfer_qty": flt(args.qty) * (flt(args.conversion_factor) or 1.0),
@@ -164,4 +186,7 @@
s.insert()
if not args.do_not_submit:
s.submit()
+
+ s.load_from_db()
+
return s
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index cc06bd7..cc8a108 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -5,7 +5,7 @@
import frappe
from frappe.permissions import add_user_permission, remove_user_permission
from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, nowdate, nowtime, today
+from frappe.utils import add_days, add_to_date, flt, nowdate, nowtime, today
from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.stock.doctype.item.test_item import (
@@ -14,12 +14,13 @@
make_item_variant,
set_item_variant_settings,
)
-from erpnext.stock.doctype.serial_no.serial_no import * # noqa
-from erpnext.stock.doctype.stock_entry.stock_entry import (
- FinishedGoodError,
- make_stock_in_entry,
- move_sample_to_retention_warehouse,
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
)
+from erpnext.stock.doctype.serial_no.serial_no import * # noqa
+from erpnext.stock.doctype.stock_entry.stock_entry import FinishedGoodError, make_stock_in_entry
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry import StockFreezeError
from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import (
@@ -28,6 +29,7 @@
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
create_stock_reconciliation,
)
+from erpnext.stock.serial_batch_bundle import SerialBatchCreation
from erpnext.stock.stock_ledger import NegativeStockError, get_previous_sle
@@ -53,7 +55,7 @@
frappe.set_user("Administrator")
def test_fifo(self):
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
item_code = "_Test Item 2"
warehouse = "_Test Warehouse - _TC"
@@ -140,7 +142,7 @@
or 0
)
- frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
+ frappe.db.set_single_value("Stock Settings", "auto_indent", 1)
# update re-level qty so that it is more than projected_qty
if projected_qty >= variant.reorder_levels[0].warehouse_reorder_level:
@@ -152,7 +154,7 @@
mr_list = reorder_item()
- frappe.db.set_value("Stock Settings", None, "auto_indent", 0)
+ frappe.db.set_single_value("Stock Settings", "auto_indent", 0)
items = []
for mr in mr_list:
@@ -202,6 +204,9 @@
)
end_transit_entry = make_stock_in_entry(transit_entry.name)
+
+ self.assertEqual(end_transit_entry.stock_entry_type, "Material Transfer")
+ self.assertEqual(end_transit_entry.purpose, "Material Transfer")
self.assertEqual(transit_entry.name, end_transit_entry.outgoing_stock_entry)
self.assertEqual(transit_entry.name, end_transit_entry.items[0].against_stock_entry)
self.assertEqual(transit_entry.items[0].name, end_transit_entry.items[0].ste_detail)
@@ -546,28 +551,47 @@
def test_serial_no_not_reqd(self):
se = frappe.copy_doc(test_records[0])
se.get("items")[0].serial_no = "ABCD"
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoNotRequiredError, se.submit)
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": se.get("items")[0].item_code,
+ "warehouse": se.get("items")[0].t_warehouse,
+ "company": se.company,
+ "qty": 2,
+ "voucher_type": "Stock Entry",
+ "serial_nos": ["ABCD"],
+ "posting_date": se.posting_date,
+ "posting_time": se.posting_time,
+ "do_not_save": True,
+ }
+ )
+ )
+
+ self.assertRaises(frappe.ValidationError, bundle_id.make_serial_and_batch_bundle)
def test_serial_no_reqd(self):
se = frappe.copy_doc(test_records[0])
se.get("items")[0].item_code = "_Test Serialized Item"
se.get("items")[0].qty = 2
se.get("items")[0].transfer_qty = 2
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoRequiredError, se.submit)
- def test_serial_no_qty_more(self):
- se = frappe.copy_doc(test_records[0])
- se.get("items")[0].item_code = "_Test Serialized Item"
- se.get("items")[0].qty = 2
- se.get("items")[0].serial_no = "ABCD\nEFGH\nXYZ"
- se.get("items")[0].transfer_qty = 2
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoQtyError, se.submit)
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": se.get("items")[0].item_code,
+ "warehouse": se.get("items")[0].t_warehouse,
+ "company": se.company,
+ "qty": 2,
+ "voucher_type": "Stock Entry",
+ "posting_date": se.posting_date,
+ "posting_time": se.posting_time,
+ "do_not_save": True,
+ }
+ )
+ )
+
+ self.assertRaises(frappe.ValidationError, bundle_id.make_serial_and_batch_bundle)
def test_serial_no_qty_less(self):
se = frappe.copy_doc(test_records[0])
@@ -575,91 +599,85 @@
se.get("items")[0].qty = 2
se.get("items")[0].serial_no = "ABCD"
se.get("items")[0].transfer_qty = 2
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoQtyError, se.submit)
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": se.get("items")[0].item_code,
+ "warehouse": se.get("items")[0].t_warehouse,
+ "company": se.company,
+ "qty": 2,
+ "serial_nos": ["ABCD"],
+ "voucher_type": "Stock Entry",
+ "posting_date": se.posting_date,
+ "posting_time": se.posting_time,
+ "do_not_save": True,
+ }
+ )
+ )
+
+ self.assertRaises(frappe.ValidationError, bundle_id.make_serial_and_batch_bundle)
def test_serial_no_transfer_in(self):
+ serial_nos = ["ABCD1", "EFGH1"]
+ for serial_no in serial_nos:
+ if not frappe.db.exists("Serial No", serial_no):
+ doc = frappe.new_doc("Serial No")
+ doc.serial_no = serial_no
+ doc.item_code = "_Test Serialized Item"
+ doc.insert(ignore_permissions=True)
+
se = frappe.copy_doc(test_records[0])
se.get("items")[0].item_code = "_Test Serialized Item"
se.get("items")[0].qty = 2
- se.get("items")[0].serial_no = "ABCD\nEFGH"
se.get("items")[0].transfer_qty = 2
se.set_stock_entry_type()
+
+ se.get("items")[0].serial_and_batch_bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": se.get("items")[0].item_code,
+ "warehouse": se.get("items")[0].t_warehouse,
+ "company": se.company,
+ "qty": 2,
+ "voucher_type": "Stock Entry",
+ "serial_nos": serial_nos,
+ "posting_date": se.posting_date,
+ "posting_time": se.posting_time,
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
se.insert()
se.submit()
- self.assertTrue(frappe.db.exists("Serial No", "ABCD"))
- self.assertTrue(frappe.db.exists("Serial No", "EFGH"))
+ self.assertTrue(frappe.db.get_value("Serial No", "ABCD1", "warehouse"))
+ self.assertTrue(frappe.db.get_value("Serial No", "EFGH1", "warehouse"))
se.cancel()
- self.assertFalse(frappe.db.get_value("Serial No", "ABCD", "warehouse"))
-
- def test_serial_no_not_exists(self):
- frappe.db.sql("delete from `tabSerial No` where name in ('ABCD', 'EFGH')")
- make_serialized_item(target_warehouse="_Test Warehouse 1 - _TC")
- se = frappe.copy_doc(test_records[0])
- se.purpose = "Material Issue"
- se.get("items")[0].item_code = "_Test Serialized Item With Series"
- se.get("items")[0].qty = 2
- se.get("items")[0].s_warehouse = "_Test Warehouse 1 - _TC"
- se.get("items")[0].t_warehouse = None
- se.get("items")[0].serial_no = "ABCD\nEFGH"
- se.get("items")[0].transfer_qty = 2
- se.set_stock_entry_type()
- se.insert()
-
- self.assertRaises(SerialNoNotExistsError, se.submit)
-
- def test_serial_duplicate(self):
- se, serial_nos = self.test_serial_by_series()
-
- se = frappe.copy_doc(test_records[0])
- se.get("items")[0].item_code = "_Test Serialized Item With Series"
- se.get("items")[0].qty = 1
- se.get("items")[0].serial_no = serial_nos[0]
- se.get("items")[0].transfer_qty = 1
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoDuplicateError, se.submit)
+ self.assertFalse(frappe.db.get_value("Serial No", "ABCD1", "warehouse"))
def test_serial_by_series(self):
se = make_serialized_item()
- serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
self.assertTrue(frappe.db.exists("Serial No", serial_nos[0]))
self.assertTrue(frappe.db.exists("Serial No", serial_nos[1]))
return se, serial_nos
- def test_serial_item_error(self):
- se, serial_nos = self.test_serial_by_series()
- if not frappe.db.exists("Serial No", "ABCD"):
- make_serialized_item(item_code="_Test Serialized Item", serial_no="ABCD\nEFGH")
-
- se = frappe.copy_doc(test_records[0])
- se.purpose = "Material Transfer"
- se.get("items")[0].item_code = "_Test Serialized Item"
- se.get("items")[0].qty = 1
- se.get("items")[0].transfer_qty = 1
- se.get("items")[0].serial_no = serial_nos[0]
- se.get("items")[0].s_warehouse = "_Test Warehouse - _TC"
- se.get("items")[0].t_warehouse = "_Test Warehouse 1 - _TC"
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoItemError, se.submit)
-
def test_serial_move(self):
se = make_serialized_item()
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
+ serial_no = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
se = frappe.copy_doc(test_records[0])
se.purpose = "Material Transfer"
se.get("items")[0].item_code = "_Test Serialized Item With Series"
se.get("items")[0].qty = 1
se.get("items")[0].transfer_qty = 1
- se.get("items")[0].serial_no = serial_no
+ se.get("items")[0].serial_no = [serial_no]
se.get("items")[0].s_warehouse = "_Test Warehouse - _TC"
se.get("items")[0].t_warehouse = "_Test Warehouse 1 - _TC"
se.set_stock_entry_type()
@@ -674,29 +692,12 @@
frappe.db.get_value("Serial No", serial_no, "warehouse"), "_Test Warehouse - _TC"
)
- def test_serial_warehouse_error(self):
- make_serialized_item(target_warehouse="_Test Warehouse 1 - _TC")
-
- t = make_serialized_item()
- serial_nos = get_serial_nos(t.get("items")[0].serial_no)
-
- se = frappe.copy_doc(test_records[0])
- se.purpose = "Material Transfer"
- se.get("items")[0].item_code = "_Test Serialized Item With Series"
- se.get("items")[0].qty = 1
- se.get("items")[0].transfer_qty = 1
- se.get("items")[0].serial_no = serial_nos[0]
- se.get("items")[0].s_warehouse = "_Test Warehouse 1 - _TC"
- se.get("items")[0].t_warehouse = "_Test Warehouse - _TC"
- se.set_stock_entry_type()
- se.insert()
- self.assertRaises(SerialNoWarehouseError, se.submit)
-
def test_serial_cancel(self):
se, serial_nos = self.test_serial_by_series()
- se.cancel()
+ se.load_from_db()
+ serial_no = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)[0]
- serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
+ se.cancel()
self.assertFalse(frappe.db.get_value("Serial No", serial_no, "warehouse"))
def test_serial_batch_item_stock_entry(self):
@@ -723,8 +724,8 @@
se = make_stock_entry(
item_code=item.item_code, target="_Test Warehouse - _TC", qty=1, basic_rate=100
)
- batch_no = se.items[0].batch_no
- serial_no = get_serial_nos(se.items[0].serial_no)[0]
+ batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
+ serial_no = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)[0]
batch_qty = get_batch_qty(batch_no, "_Test Warehouse - _TC", item.item_code)
batch_in_serial_no = frappe.db.get_value("Serial No", serial_no, "batch_no")
@@ -735,67 +736,7 @@
se.cancel()
batch_in_serial_no = frappe.db.get_value("Serial No", serial_no, "batch_no")
- self.assertEqual(batch_in_serial_no, None)
-
- self.assertEqual(frappe.db.get_value("Serial No", serial_no, "status"), "Inactive")
- self.assertEqual(frappe.db.exists("Batch", batch_no), None)
-
- def test_serial_batch_item_qty_deduction(self):
- """
- Behaviour: Create 2 Stock Entries, both adding Serial Nos to same batch
- Expected: 1) Cancelling first Stock Entry (origin transaction of created batch)
- should throw a LinkExistsError
- 2) Cancelling second Stock Entry should make Serial Nos that are, linked to mentioned batch
- and in that transaction only, Inactive.
- """
- from erpnext.stock.doctype.batch.batch import get_batch_qty
-
- item = frappe.db.exists("Item", {"item_name": "Batched and Serialised Item"})
- if not item:
- item = create_item("Batched and Serialised Item")
- item.has_batch_no = 1
- item.create_new_batch = 1
- item.has_serial_no = 1
- item.batch_number_series = "B-BATCH-.##"
- item.serial_no_series = "S-.####"
- item.save()
- else:
- item = frappe.get_doc("Item", {"item_name": "Batched and Serialised Item"})
-
- se1 = make_stock_entry(
- item_code=item.item_code, target="_Test Warehouse - _TC", qty=1, basic_rate=100
- )
- batch_no = se1.items[0].batch_no
- serial_no1 = get_serial_nos(se1.items[0].serial_no)[0]
-
- # Check Source (Origin) Document of Batch
- self.assertEqual(frappe.db.get_value("Batch", batch_no, "reference_name"), se1.name)
-
- se2 = make_stock_entry(
- item_code=item.item_code,
- target="_Test Warehouse - _TC",
- qty=1,
- basic_rate=100,
- batch_no=batch_no,
- )
- serial_no2 = get_serial_nos(se2.items[0].serial_no)[0]
-
- batch_qty = get_batch_qty(batch_no, "_Test Warehouse - _TC", item.item_code)
- self.assertEqual(batch_qty, 2)
-
- se2.cancel()
-
- # Check decrease in Batch Qty
- batch_qty = get_batch_qty(batch_no, "_Test Warehouse - _TC", item.item_code)
- self.assertEqual(batch_qty, 1)
-
- # Check if Serial No from Stock Entry 1 is intact
- self.assertEqual(frappe.db.get_value("Serial No", serial_no1, "batch_no"), batch_no)
- self.assertEqual(frappe.db.get_value("Serial No", serial_no1, "status"), "Active")
-
- # Check if Serial No from Stock Entry 2 is Unlinked and Inactive
- self.assertEqual(frappe.db.get_value("Serial No", serial_no2, "batch_no"), None)
- self.assertEqual(frappe.db.get_value("Serial No", serial_no2, "status"), "Inactive")
+ self.assertEqual(frappe.db.get_value("Serial No", serial_no, "warehouse"), None)
def test_warehouse_company_validation(self):
company = frappe.db.get_value("Warehouse", "_Test Warehouse 2 - _TC1", "company")
@@ -851,24 +792,24 @@
remove_user_permission("Company", "_Test Company 1", "test2@example.com")
def test_freeze_stocks(self):
- frappe.db.set_value("Stock Settings", None, "stock_auth_role", "")
+ frappe.db.set_single_value("Stock Settings", "stock_auth_role", "")
# test freeze_stocks_upto
- frappe.db.set_value("Stock Settings", None, "stock_frozen_upto", add_days(nowdate(), 5))
+ frappe.db.set_single_value("Stock Settings", "stock_frozen_upto", add_days(nowdate(), 5))
se = frappe.copy_doc(test_records[0]).insert()
self.assertRaises(StockFreezeError, se.submit)
- frappe.db.set_value("Stock Settings", None, "stock_frozen_upto", "")
+ frappe.db.set_single_value("Stock Settings", "stock_frozen_upto", "")
# test freeze_stocks_upto_days
- frappe.db.set_value("Stock Settings", None, "stock_frozen_upto_days", -1)
+ frappe.db.set_single_value("Stock Settings", "stock_frozen_upto_days", -1)
se = frappe.copy_doc(test_records[0])
se.set_posting_time = 1
se.posting_date = nowdate()
se.set_stock_entry_type()
se.insert()
self.assertRaises(StockFreezeError, se.submit)
- frappe.db.set_value("Stock Settings", None, "stock_frozen_upto_days", 0)
+ frappe.db.set_single_value("Stock Settings", "stock_frozen_upto_days", 0)
def test_work_order(self):
from erpnext.manufacturing.doctype.work_order.work_order import (
@@ -1001,7 +942,7 @@
def test_same_serial_nos_in_repack_or_manufacture_entries(self):
s1 = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
- serial_nos = s1.get("items")[0].serial_no
+ serial_nos = get_serial_nos_from_bundle(s1.get("items")[0].serial_and_batch_bundle)
s2 = make_stock_entry(
item_code="_Test Serialized Item With Series",
@@ -1013,6 +954,26 @@
do_not_save=True,
)
+ cls_obj = SerialBatchCreation(
+ {
+ "type_of_transaction": "Inward",
+ "serial_and_batch_bundle": s2.items[0].serial_and_batch_bundle,
+ "item_code": "_Test Serialized Item",
+ }
+ )
+
+ cls_obj.duplicate_package()
+ bundle_id = cls_obj.serial_and_batch_bundle
+ doc = frappe.get_doc("Serial and Batch Bundle", bundle_id)
+ doc.db_set(
+ {
+ "item_code": "_Test Serialized Item",
+ "warehouse": "_Test Warehouse - _TC",
+ }
+ )
+
+ doc.load_from_db()
+
s2.append(
"items",
{
@@ -1023,90 +984,90 @@
"expense_account": "Stock Adjustment - _TC",
"conversion_factor": 1.0,
"cost_center": "_Test Cost Center - _TC",
- "serial_no": serial_nos,
+ "serial_and_batch_bundle": bundle_id,
},
)
s2.submit()
s2.cancel()
- def test_retain_sample(self):
- from erpnext.stock.doctype.batch.batch import get_batch_qty
- from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+ # def test_retain_sample(self):
+ # from erpnext.stock.doctype.batch.batch import get_batch_qty
+ # from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
- create_warehouse("Test Warehouse for Sample Retention")
- frappe.db.set_value(
- "Stock Settings",
- None,
- "sample_retention_warehouse",
- "Test Warehouse for Sample Retention - _TC",
- )
+ # create_warehouse("Test Warehouse for Sample Retention")
+ # frappe.db.set_value(
+ # "Stock Settings",
+ # None,
+ # "sample_retention_warehouse",
+ # "Test Warehouse for Sample Retention - _TC",
+ # )
- test_item_code = "Retain Sample Item"
- if not frappe.db.exists("Item", test_item_code):
- item = frappe.new_doc("Item")
- item.item_code = test_item_code
- item.item_name = "Retain Sample Item"
- item.description = "Retain Sample Item"
- item.item_group = "All Item Groups"
- item.is_stock_item = 1
- item.has_batch_no = 1
- item.create_new_batch = 1
- item.retain_sample = 1
- item.sample_quantity = 4
- item.save()
+ # test_item_code = "Retain Sample Item"
+ # if not frappe.db.exists("Item", test_item_code):
+ # item = frappe.new_doc("Item")
+ # item.item_code = test_item_code
+ # item.item_name = "Retain Sample Item"
+ # item.description = "Retain Sample Item"
+ # item.item_group = "All Item Groups"
+ # item.is_stock_item = 1
+ # item.has_batch_no = 1
+ # item.create_new_batch = 1
+ # item.retain_sample = 1
+ # item.sample_quantity = 4
+ # item.save()
- receipt_entry = frappe.new_doc("Stock Entry")
- receipt_entry.company = "_Test Company"
- receipt_entry.purpose = "Material Receipt"
- receipt_entry.append(
- "items",
- {
- "item_code": test_item_code,
- "t_warehouse": "_Test Warehouse - _TC",
- "qty": 40,
- "basic_rate": 12,
- "cost_center": "_Test Cost Center - _TC",
- "sample_quantity": 4,
- },
- )
- receipt_entry.set_stock_entry_type()
- receipt_entry.insert()
- receipt_entry.submit()
+ # receipt_entry = frappe.new_doc("Stock Entry")
+ # receipt_entry.company = "_Test Company"
+ # receipt_entry.purpose = "Material Receipt"
+ # receipt_entry.append(
+ # "items",
+ # {
+ # "item_code": test_item_code,
+ # "t_warehouse": "_Test Warehouse - _TC",
+ # "qty": 40,
+ # "basic_rate": 12,
+ # "cost_center": "_Test Cost Center - _TC",
+ # "sample_quantity": 4,
+ # },
+ # )
+ # receipt_entry.set_stock_entry_type()
+ # receipt_entry.insert()
+ # receipt_entry.submit()
- retention_data = move_sample_to_retention_warehouse(
- receipt_entry.company, receipt_entry.get("items")
- )
- retention_entry = frappe.new_doc("Stock Entry")
- retention_entry.company = retention_data.company
- retention_entry.purpose = retention_data.purpose
- retention_entry.append(
- "items",
- {
- "item_code": test_item_code,
- "t_warehouse": "Test Warehouse for Sample Retention - _TC",
- "s_warehouse": "_Test Warehouse - _TC",
- "qty": 4,
- "basic_rate": 12,
- "cost_center": "_Test Cost Center - _TC",
- "batch_no": receipt_entry.get("items")[0].batch_no,
- },
- )
- retention_entry.set_stock_entry_type()
- retention_entry.insert()
- retention_entry.submit()
+ # retention_data = move_sample_to_retention_warehouse(
+ # receipt_entry.company, receipt_entry.get("items")
+ # )
+ # retention_entry = frappe.new_doc("Stock Entry")
+ # retention_entry.company = retention_data.company
+ # retention_entry.purpose = retention_data.purpose
+ # retention_entry.append(
+ # "items",
+ # {
+ # "item_code": test_item_code,
+ # "t_warehouse": "Test Warehouse for Sample Retention - _TC",
+ # "s_warehouse": "_Test Warehouse - _TC",
+ # "qty": 4,
+ # "basic_rate": 12,
+ # "cost_center": "_Test Cost Center - _TC",
+ # "batch_no": get_batch_from_bundle(receipt_entry.get("items")[0].serial_and_batch_bundle),
+ # },
+ # )
+ # retention_entry.set_stock_entry_type()
+ # retention_entry.insert()
+ # retention_entry.submit()
- qty_in_usable_warehouse = get_batch_qty(
- receipt_entry.get("items")[0].batch_no, "_Test Warehouse - _TC", "_Test Item"
- )
- qty_in_retention_warehouse = get_batch_qty(
- receipt_entry.get("items")[0].batch_no,
- "Test Warehouse for Sample Retention - _TC",
- "_Test Item",
- )
+ # qty_in_usable_warehouse = get_batch_qty(
+ # get_batch_from_bundle(receipt_entry.get("items")[0].serial_and_batch_bundle), "_Test Warehouse - _TC", "_Test Item"
+ # )
+ # qty_in_retention_warehouse = get_batch_qty(
+ # get_batch_from_bundle(receipt_entry.get("items")[0].serial_and_batch_bundle),
+ # "Test Warehouse for Sample Retention - _TC",
+ # "_Test Item",
+ # )
- self.assertEqual(qty_in_usable_warehouse, 36)
- self.assertEqual(qty_in_retention_warehouse, 4)
+ # self.assertEqual(qty_in_usable_warehouse, 36)
+ # self.assertEqual(qty_in_retention_warehouse, 4)
def test_quality_check(self):
item_code = "_Test Item For QC"
@@ -1250,7 +1211,7 @@
)
def test_conversion_factor_change(self):
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
repack_entry = frappe.copy_doc(test_records[3])
repack_entry.posting_date = nowdate()
repack_entry.posting_time = nowtime()
@@ -1400,7 +1361,7 @@
posting_date="2021-09-01",
purpose="Material Receipt",
)
- batch_nos.append(se1.items[0].batch_no)
+ batch_nos.append(get_batch_from_bundle(se1.items[0].serial_and_batch_bundle))
se2 = make_stock_entry(
item_code=item_code,
qty=2,
@@ -1408,9 +1369,9 @@
posting_date="2021-09-03",
purpose="Material Receipt",
)
- batch_nos.append(se2.items[0].batch_no)
+ batch_nos.append(get_batch_from_bundle(se2.items[0].serial_and_batch_bundle))
- with self.assertRaises(NegativeStockError) as nse:
+ with self.assertRaises(frappe.ValidationError) as nse:
make_stock_entry(
item_code=item_code,
qty=1,
@@ -1431,8 +1392,6 @@
"""
from erpnext.stock.doctype.batch.test_batch import TestBatch
- batch_nos = []
-
item_code = "_TestMultibatchFifo"
TestBatch.make_batch_item(item_code)
warehouse = "_Test Warehouse - _TC"
@@ -1449,18 +1408,25 @@
)
receipt.save()
receipt.submit()
- batch_nos.extend(row.batch_no for row in receipt.items)
+ receipt.load_from_db()
+
+ batches = frappe._dict(
+ {get_batch_from_bundle(row.serial_and_batch_bundle): row.qty for row in receipt.items}
+ )
+
self.assertEqual(receipt.value_difference, 30)
issue = make_stock_entry(
- item_code=item_code, qty=1, from_warehouse=warehouse, purpose="Material Issue", do_not_save=True
+ item_code=item_code,
+ qty=2,
+ from_warehouse=warehouse,
+ purpose="Material Issue",
+ do_not_save=True,
+ batches=batches,
)
- issue.append("items", frappe.copy_doc(issue.items[0], ignore_no_copy=False))
- for row, batch_no in zip(issue.items, batch_nos):
- row.batch_no = batch_no
+
issue.save()
issue.submit()
-
issue.reload() # reload because reposting current voucher updates rate
self.assertEqual(issue.value_difference, -30)
@@ -1704,6 +1670,36 @@
self.assertRaises(frappe.ValidationError, sr_doc.submit)
+ def test_enqueue_action(self):
+ frappe.flags.in_test = False
+ item_code = "Test Enqueue Item - 001"
+ create_item(item_code=item_code, is_stock_item=1, valuation_rate=10)
+
+ doc = make_stock_entry(
+ item_code=item_code,
+ posting_date=add_to_date(today(), months=-7),
+ posting_time="00:00:00",
+ purpose="Material Receipt",
+ qty=10,
+ to_warehouse="_Test Warehouse - _TC",
+ do_not_submit=True,
+ )
+
+ self.assertTrue(doc.is_enqueue_action())
+
+ doc = make_stock_entry(
+ item_code=item_code,
+ posting_date=today(),
+ posting_time="00:00:00",
+ purpose="Material Receipt",
+ qty=10,
+ to_warehouse="_Test Warehouse - _TC",
+ do_not_submit=True,
+ )
+
+ self.assertFalse(doc.is_enqueue_action())
+ frappe.flags.in_test = True
+
def make_serialized_item(**args):
args = frappe._dict(args)
@@ -1712,10 +1708,31 @@
if args.company:
se.company = args.company
+ if args.target_warehouse:
+ se.get("items")[0].t_warehouse = args.target_warehouse
+
se.get("items")[0].item_code = args.item_code or "_Test Serialized Item With Series"
if args.serial_no:
- se.get("items")[0].serial_no = args.serial_no
+ serial_nos = args.serial_no
+ if isinstance(serial_nos, str):
+ serial_nos = [serial_nos]
+
+ se.get("items")[0].serial_and_batch_bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": se.get("items")[0].item_code,
+ "warehouse": se.get("items")[0].t_warehouse,
+ "company": se.company,
+ "qty": 2,
+ "voucher_type": "Stock Entry",
+ "serial_nos": serial_nos,
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "do_not_submit": True,
+ }
+ )
+ ).name
if args.cost_center:
se.get("items")[0].cost_center = args.cost_center
@@ -1726,12 +1743,11 @@
se.get("items")[0].qty = 2
se.get("items")[0].transfer_qty = 2
- if args.target_warehouse:
- se.get("items")[0].t_warehouse = args.target_warehouse
-
se.set_stock_entry_type()
se.insert()
se.submit()
+
+ se.load_from_db()
return se
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index fe81a87..0c08fb2 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -46,8 +46,10 @@
"basic_amount",
"amount",
"serial_no_batch",
- "serial_no",
+ "add_serial_batch_bundle",
+ "serial_and_batch_bundle",
"col_break4",
+ "serial_no",
"batch_no",
"accounting",
"expense_account",
@@ -292,7 +294,8 @@
"label": "Serial No",
"no_copy": 1,
"oldfieldname": "serial_no",
- "oldfieldtype": "Text"
+ "oldfieldtype": "Text",
+ "read_only": 1
},
{
"fieldname": "col_break4",
@@ -305,7 +308,8 @@
"no_copy": 1,
"oldfieldname": "batch_no",
"oldfieldtype": "Link",
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"depends_on": "eval:parent.inspection_required && doc.t_warehouse",
@@ -395,7 +399,8 @@
"no_copy": 1,
"options": "Material Request",
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "material_request_item",
@@ -565,13 +570,26 @@
"fieldtype": "Check",
"label": "Has Item Scanned",
"read_only": 1
+ },
+ {
+ "fieldname": "add_serial_batch_bundle",
+ "fieldtype": "Button",
+ "label": "Add Serial / Batch No"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-01-03 14:51:16.575515",
+ "modified": "2023-05-09 12:41:18.210864",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index 46ce9de..569f58a 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -15,9 +15,10 @@
"voucher_type",
"voucher_no",
"voucher_detail_no",
+ "serial_and_batch_bundle",
"dependant_sle_voucher_detail_no",
- "recalculate_rate",
"section_break_11",
+ "recalculate_rate",
"actual_qty",
"qty_after_transaction",
"incoming_rate",
@@ -31,12 +32,14 @@
"company",
"stock_uom",
"project",
- "batch_no",
"column_break_26",
"fiscal_year",
- "serial_no",
+ "has_batch_no",
+ "has_serial_no",
"is_cancelled",
- "to_rename"
+ "to_rename",
+ "serial_no",
+ "batch_no"
],
"fields": [
{
@@ -309,6 +312,27 @@
"label": "Recalculate Incoming/Outgoing Rate",
"no_copy": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "options": "Serial and Batch Bundle",
+ "search_index": 1
+ },
+ {
+ "default": "0",
+ "fetch_from": "item_code.has_batch_no",
+ "fieldname": "has_batch_no",
+ "fieldtype": "Check",
+ "label": "Has Batch No"
+ },
+ {
+ "default": "0",
+ "fetch_from": "item_code.has_serial_no",
+ "fieldname": "has_serial_no",
+ "fieldtype": "Check",
+ "label": "Has Serial No"
}
],
"hide_toolbar": 1,
@@ -317,7 +341,7 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2021-12-21 06:25:30.040801",
+ "modified": "2023-04-03 16:33:16.270722",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 052f778..3ca4bad 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -12,6 +12,7 @@
from erpnext.accounts.utils import get_fiscal_year
from erpnext.controllers.item_variant import ItemTemplateCannotHaveStock
+from erpnext.stock.serial_batch_bundle import SerialBatchBundle
class StockFreezeError(frappe.ValidationError):
@@ -40,7 +41,6 @@
from erpnext.stock.utils import validate_disabled_warehouse, validate_warehouse_company
self.validate_mandatory()
- self.validate_item()
self.validate_batch()
validate_disabled_warehouse(self.warehouse)
validate_warehouse_company(self.warehouse, self.company)
@@ -51,24 +51,20 @@
def on_submit(self):
self.check_stock_frozen_date()
- self.calculate_batch_qty()
+
+ # Added to handle few test cases where serial_and_batch_bundles are not required
+ if frappe.flags.in_test and frappe.flags.ignore_serial_batch_bundle_validation:
+ return
if not self.get("via_landed_cost_voucher"):
- from erpnext.stock.doctype.serial_no.serial_no import process_serial_no
-
- process_serial_no(self)
-
- def calculate_batch_qty(self):
- if self.batch_no:
- batch_qty = (
- frappe.db.get_value(
- "Stock Ledger Entry",
- {"docstatus": 1, "batch_no": self.batch_no, "is_cancelled": 0},
- "sum(actual_qty)",
- )
- or 0
+ SerialBatchBundle(
+ sle=self,
+ item_code=self.item_code,
+ warehouse=self.warehouse,
+ company=self.company,
)
- frappe.db.set_value("Batch", self.batch_no, "batch_qty", batch_qty)
+
+ self.validate_serial_batch_no_bundle()
def validate_mandatory(self):
mandatory = ["warehouse", "posting_date", "voucher_type", "voucher_no", "company"]
@@ -79,47 +75,45 @@
if self.voucher_type != "Stock Reconciliation" and not self.actual_qty:
frappe.throw(_("Actual Qty is mandatory"))
- def validate_item(self):
- item_det = frappe.db.sql(
- """select name, item_name, has_batch_no, docstatus,
- is_stock_item, has_variants, stock_uom, create_new_batch
- from tabItem where name=%s""",
+ def validate_serial_batch_no_bundle(self):
+ item_detail = frappe.get_cached_value(
+ "Item",
self.item_code,
- as_dict=True,
+ ["has_serial_no", "has_batch_no", "is_stock_item", "has_variants", "stock_uom"],
+ as_dict=1,
)
- if not item_det:
- frappe.throw(_("Item {0} not found").format(self.item_code))
+ values_to_be_change = {}
+ if self.has_batch_no != item_detail.has_batch_no:
+ values_to_be_change["has_batch_no"] = item_detail.has_batch_no
- item_det = item_det[0]
+ if self.has_serial_no != item_detail.has_serial_no:
+ values_to_be_change["has_serial_no"] = item_detail.has_serial_no
- if item_det.is_stock_item != 1:
- frappe.throw(_("Item {0} must be a stock Item").format(self.item_code))
+ if values_to_be_change:
+ self.db_set(values_to_be_change)
- # check if batch number is valid
- if item_det.has_batch_no == 1:
- batch_item = (
- self.item_code
- if self.item_code == item_det.item_name
- else self.item_code + ":" + item_det.item_name
- )
- if not self.batch_no:
- frappe.throw(_("Batch number is mandatory for Item {0}").format(batch_item))
- elif not frappe.db.get_value("Batch", {"item": self.item_code, "name": self.batch_no}):
- frappe.throw(
- _("{0} is not a valid Batch Number for Item {1}").format(self.batch_no, batch_item)
- )
+ if not item_detail:
+ self.throw_error_message(f"Item {self.item_code} not found")
- elif item_det.has_batch_no == 0 and self.batch_no and self.is_cancelled == 0:
- frappe.throw(_("The Item {0} cannot have Batch").format(self.item_code))
-
- if item_det.has_variants:
- frappe.throw(
- _("Stock cannot exist for Item {0} since has variants").format(self.item_code),
+ if item_detail.has_variants:
+ self.throw_error_message(
+ f"Stock cannot exist for Item {self.item_code} since has variants",
ItemTemplateCannotHaveStock,
)
- self.stock_uom = item_det.stock_uom
+ if item_detail.is_stock_item != 1:
+ self.throw_error_message("Item {0} must be a stock Item").format(self.item_code)
+
+ if item_detail.has_serial_no or item_detail.has_batch_no:
+ if not self.serial_and_batch_bundle:
+ self.throw_error_message(f"Serial No / Batch No are mandatory for Item {self.item_code}")
+
+ if self.serial_and_batch_bundle and not (item_detail.has_serial_no or item_detail.has_batch_no):
+ self.throw_error_message(f"Serial No and Batch No are not allowed for Item {self.item_code}")
+
+ def throw_error_message(self, message, exception=frappe.ValidationError):
+ frappe.throw(_(message), exception)
def check_stock_frozen_date(self):
stock_settings = frappe.get_cached_doc("Stock Settings")
diff --git a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
index 6c341d9..f7c6ffe 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
@@ -18,6 +18,11 @@
create_landed_cost_voucher,
)
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry import BackDatedStockTransaction
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
@@ -411,8 +416,8 @@
def test_back_dated_entry_not_allowed(self):
# Back dated stock transactions are only allowed to stock managers
- frappe.db.set_value(
- "Stock Settings", None, "role_allowed_to_create_edit_back_dated_transactions", "Stock Manager"
+ frappe.db.set_single_value(
+ "Stock Settings", "role_allowed_to_create_edit_back_dated_transactions", "Stock Manager"
)
# Set User with Stock User role but not Stock Manager
@@ -448,8 +453,8 @@
stock_entry_on_today.cancel()
finally:
- frappe.db.set_value(
- "Stock Settings", None, "role_allowed_to_create_edit_back_dated_transactions", None
+ frappe.db.set_single_value(
+ "Stock Settings", "role_allowed_to_create_edit_back_dated_transactions", None
)
frappe.set_user("Administrator")
user.remove_roles("Stock Manager")
@@ -480,13 +485,12 @@
dns = create_delivery_note_entries_for_batchwise_item_valuation_test(dn_entry_list)
sle_details = fetch_sle_details_for_doc_list(dns, ["stock_value_difference"])
svd_list = [-1 * d["stock_value_difference"] for d in sle_details]
- expected_incoming_rates = expected_abs_svd = [75, 125, 75, 125]
+ expected_incoming_rates = expected_abs_svd = sorted([75.0, 125.0, 75.0, 125.0])
- self.assertEqual(expected_abs_svd, svd_list, "Incorrect 'Stock Value Difference' values")
+ self.assertEqual(expected_abs_svd, sorted(svd_list), "Incorrect 'Stock Value Difference' values")
for dn, incoming_rate in zip(dns, expected_incoming_rates):
- self.assertEqual(
- dn.items[0].incoming_rate,
- incoming_rate,
+ self.assertTrue(
+ dn.items[0].incoming_rate in expected_abs_svd,
"Incorrect 'Incoming Rate' values fetched for DN items",
)
@@ -513,9 +517,12 @@
osr2 = create_stock_reconciliation(
warehouse=warehouses[0], item_code=item, qty=13, rate=200, batch_no=batches[0]
)
+
expected_sles = [
+ {"actual_qty": -10, "stock_value_difference": -10 * 100},
{"actual_qty": 13, "stock_value_difference": 200 * 13},
]
+
update_invariants(expected_sles)
self.assertSLEs(osr2, expected_sles)
@@ -524,7 +531,7 @@
)
expected_sles = [
- {"actual_qty": -10, "stock_value_difference": -10 * 100},
+ {"actual_qty": -13, "stock_value_difference": -13 * 200},
{"actual_qty": 5, "stock_value_difference": 250},
]
update_invariants(expected_sles)
@@ -534,7 +541,7 @@
warehouse=warehouses[0], item_code=item, qty=20, rate=75, batch_no=batches[0]
)
expected_sles = [
- {"actual_qty": -13, "stock_value_difference": -13 * 200},
+ {"actual_qty": -5, "stock_value_difference": -5 * 50},
{"actual_qty": 20, "stock_value_difference": 20 * 75},
]
update_invariants(expected_sles)
@@ -711,7 +718,7 @@
"qty_after_transaction",
"stock_queue",
]
- item, warehouses, batches = setup_item_valuation_test(use_batchwise_valuation=0)
+ item, warehouses, batches = setup_item_valuation_test()
def check_sle_details_against_expected(sle_details, expected_sle_details, detail, columns):
for i, (sle_vals, ex_sle_vals) in enumerate(zip(sle_details, expected_sle_details)):
@@ -736,8 +743,8 @@
)
sle_details = fetch_sle_details_for_doc_list(ses, columns=columns, as_dict=0)
expected_sle_details = [
- (50.0, 50.0, 1.0, 1.0, "[[1.0, 50.0]]"),
- (100.0, 150.0, 1.0, 2.0, "[[1.0, 50.0], [1.0, 100.0]]"),
+ (50.0, 50.0, 1.0, 1.0, "[]"),
+ (100.0, 150.0, 1.0, 2.0, "[]"),
]
details_list.append((sle_details, expected_sle_details, "Material Receipt Entries", columns))
@@ -749,152 +756,152 @@
se_entry_list_mi, "Material Issue"
)
sle_details = fetch_sle_details_for_doc_list(ses, columns=columns, as_dict=0)
- expected_sle_details = [(-50.0, 100.0, -1.0, 1.0, "[[1, 100.0]]")]
+ expected_sle_details = [(-100.0, 50.0, -1.0, 1.0, "[]")]
details_list.append((sle_details, expected_sle_details, "Material Issue Entries", columns))
# Run assertions
for details in details_list:
check_sle_details_against_expected(*details)
- def test_mixed_valuation_batches_fifo(self):
- item_code, warehouses, batches = setup_item_valuation_test(use_batchwise_valuation=0)
- warehouse = warehouses[0]
+ # def test_mixed_valuation_batches_fifo(self):
+ # item_code, warehouses, batches = setup_item_valuation_test(use_batchwise_valuation=0)
+ # warehouse = warehouses[0]
- state = {"qty": 0.0, "stock_value": 0.0}
+ # state = {"qty": 0.0, "stock_value": 0.0}
- def update_invariants(exp_sles):
- for sle in exp_sles:
- state["stock_value"] += sle["stock_value_difference"]
- state["qty"] += sle["actual_qty"]
- sle["stock_value"] = state["stock_value"]
- sle["qty_after_transaction"] = state["qty"]
- return exp_sles
+ # def update_invariants(exp_sles):
+ # for sle in exp_sles:
+ # state["stock_value"] += sle["stock_value_difference"]
+ # state["qty"] += sle["actual_qty"]
+ # sle["stock_value"] = state["stock_value"]
+ # sle["qty_after_transaction"] = state["qty"]
+ # return exp_sles
- old1 = make_stock_entry(
- item_code=item_code, target=warehouse, batch_no=batches[0], qty=10, rate=10
- )
- self.assertSLEs(
- old1,
- update_invariants(
- [
- {"actual_qty": 10, "stock_value_difference": 10 * 10, "stock_queue": [[10, 10]]},
- ]
- ),
- )
- old2 = make_stock_entry(
- item_code=item_code, target=warehouse, batch_no=batches[1], qty=10, rate=20
- )
- self.assertSLEs(
- old2,
- update_invariants(
- [
- {"actual_qty": 10, "stock_value_difference": 10 * 20, "stock_queue": [[10, 10], [10, 20]]},
- ]
- ),
- )
- old3 = make_stock_entry(
- item_code=item_code, target=warehouse, batch_no=batches[0], qty=5, rate=15
- )
+ # old1 = make_stock_entry(
+ # item_code=item_code, target=warehouse, batch_no=batches[0], qty=10, rate=10
+ # )
+ # self.assertSLEs(
+ # old1,
+ # update_invariants(
+ # [
+ # {"actual_qty": 10, "stock_value_difference": 10 * 10, "stock_queue": [[10, 10]]},
+ # ]
+ # ),
+ # )
+ # old2 = make_stock_entry(
+ # item_code=item_code, target=warehouse, batch_no=batches[1], qty=10, rate=20
+ # )
+ # self.assertSLEs(
+ # old2,
+ # update_invariants(
+ # [
+ # {"actual_qty": 10, "stock_value_difference": 10 * 20, "stock_queue": [[10, 10], [10, 20]]},
+ # ]
+ # ),
+ # )
+ # old3 = make_stock_entry(
+ # item_code=item_code, target=warehouse, batch_no=batches[0], qty=5, rate=15
+ # )
- self.assertSLEs(
- old3,
- update_invariants(
- [
- {
- "actual_qty": 5,
- "stock_value_difference": 5 * 15,
- "stock_queue": [[10, 10], [10, 20], [5, 15]],
- },
- ]
- ),
- )
+ # self.assertSLEs(
+ # old3,
+ # update_invariants(
+ # [
+ # {
+ # "actual_qty": 5,
+ # "stock_value_difference": 5 * 15,
+ # "stock_queue": [[10, 10], [10, 20], [5, 15]],
+ # },
+ # ]
+ # ),
+ # )
- new1 = make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=40)
- batches.append(new1.items[0].batch_no)
- # assert old queue remains
- self.assertSLEs(
- new1,
- update_invariants(
- [
- {
- "actual_qty": 10,
- "stock_value_difference": 10 * 40,
- "stock_queue": [[10, 10], [10, 20], [5, 15]],
- },
- ]
- ),
- )
+ # new1 = make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=40)
+ # batches.append(new1.items[0].batch_no)
+ # # assert old queue remains
+ # self.assertSLEs(
+ # new1,
+ # update_invariants(
+ # [
+ # {
+ # "actual_qty": 10,
+ # "stock_value_difference": 10 * 40,
+ # "stock_queue": [[10, 10], [10, 20], [5, 15]],
+ # },
+ # ]
+ # ),
+ # )
- new2 = make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=42)
- batches.append(new2.items[0].batch_no)
- self.assertSLEs(
- new2,
- update_invariants(
- [
- {
- "actual_qty": 10,
- "stock_value_difference": 10 * 42,
- "stock_queue": [[10, 10], [10, 20], [5, 15]],
- },
- ]
- ),
- )
+ # new2 = make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=42)
+ # batches.append(new2.items[0].batch_no)
+ # self.assertSLEs(
+ # new2,
+ # update_invariants(
+ # [
+ # {
+ # "actual_qty": 10,
+ # "stock_value_difference": 10 * 42,
+ # "stock_queue": [[10, 10], [10, 20], [5, 15]],
+ # },
+ # ]
+ # ),
+ # )
- # consume old batch as per FIFO
- consume_old1 = make_stock_entry(
- item_code=item_code, source=warehouse, qty=15, batch_no=batches[0]
- )
- self.assertSLEs(
- consume_old1,
- update_invariants(
- [
- {
- "actual_qty": -15,
- "stock_value_difference": -10 * 10 - 5 * 20,
- "stock_queue": [[5, 20], [5, 15]],
- },
- ]
- ),
- )
+ # # consume old batch as per FIFO
+ # consume_old1 = make_stock_entry(
+ # item_code=item_code, source=warehouse, qty=15, batch_no=batches[0]
+ # )
+ # self.assertSLEs(
+ # consume_old1,
+ # update_invariants(
+ # [
+ # {
+ # "actual_qty": -15,
+ # "stock_value_difference": -10 * 10 - 5 * 20,
+ # "stock_queue": [[5, 20], [5, 15]],
+ # },
+ # ]
+ # ),
+ # )
- # consume new batch as per batch
- consume_new2 = make_stock_entry(
- item_code=item_code, source=warehouse, qty=10, batch_no=batches[-1]
- )
- self.assertSLEs(
- consume_new2,
- update_invariants(
- [
- {"actual_qty": -10, "stock_value_difference": -10 * 42, "stock_queue": [[5, 20], [5, 15]]},
- ]
- ),
- )
+ # # consume new batch as per batch
+ # consume_new2 = make_stock_entry(
+ # item_code=item_code, source=warehouse, qty=10, batch_no=batches[-1]
+ # )
+ # self.assertSLEs(
+ # consume_new2,
+ # update_invariants(
+ # [
+ # {"actual_qty": -10, "stock_value_difference": -10 * 42, "stock_queue": [[5, 20], [5, 15]]},
+ # ]
+ # ),
+ # )
- # finish all old batches
- consume_old2 = make_stock_entry(
- item_code=item_code, source=warehouse, qty=10, batch_no=batches[1]
- )
- self.assertSLEs(
- consume_old2,
- update_invariants(
- [
- {"actual_qty": -10, "stock_value_difference": -5 * 20 - 5 * 15, "stock_queue": []},
- ]
- ),
- )
+ # # finish all old batches
+ # consume_old2 = make_stock_entry(
+ # item_code=item_code, source=warehouse, qty=10, batch_no=batches[1]
+ # )
+ # self.assertSLEs(
+ # consume_old2,
+ # update_invariants(
+ # [
+ # {"actual_qty": -10, "stock_value_difference": -5 * 20 - 5 * 15, "stock_queue": []},
+ # ]
+ # ),
+ # )
- # finish all new batches
- consume_new1 = make_stock_entry(
- item_code=item_code, source=warehouse, qty=10, batch_no=batches[-2]
- )
- self.assertSLEs(
- consume_new1,
- update_invariants(
- [
- {"actual_qty": -10, "stock_value_difference": -10 * 40, "stock_queue": []},
- ]
- ),
- )
+ # # finish all new batches
+ # consume_new1 = make_stock_entry(
+ # item_code=item_code, source=warehouse, qty=10, batch_no=batches[-2]
+ # )
+ # self.assertSLEs(
+ # consume_new1,
+ # update_invariants(
+ # [
+ # {"actual_qty": -10, "stock_value_difference": -10 * 40, "stock_queue": []},
+ # ]
+ # ),
+ # )
def test_fifo_dependent_consumption(self):
item = make_item("_TestFifoTransferRates")
@@ -1400,6 +1407,23 @@
)
dn = make_delivery_note(so.name)
+
+ dn.items[0].serial_and_batch_bundle = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": dn.items[0].item_code,
+ "qty": dn.items[0].qty * (-1 if not dn.is_return else 1),
+ "batches": frappe._dict({batch_no: qty}),
+ "type_of_transaction": "Outward",
+ "warehouse": dn.items[0].warehouse,
+ "posting_date": dn.posting_date,
+ "posting_time": dn.posting_time,
+ "voucher_type": "Delivery Note",
+ "do_not_submit": dn.name,
+ }
+ )
+ ).name
+
dn.items[0].batch_no = batch_no
dn.insert()
dn.submit()
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 05dd105..0664c29 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -5,6 +5,10 @@
frappe.provide("erpnext.accounts.dimensions");
frappe.ui.form.on("Stock Reconciliation", {
+ setup(frm) {
+ frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle'];
+ },
+
onload: function(frm) {
frm.add_fetch("item_code", "item_name", "item_name");
@@ -26,6 +30,29 @@
};
});
+ frm.set_query("serial_and_batch_bundle", "items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
+ return {
+ 'item_code': row.doc.item_code,
+ 'warehouse': row.doc.warehouse,
+ 'voucher_type': frm.doc.doctype,
+ }
+ };
+ }
+
if (frm.doc.company) {
erpnext.queries.setup_queries(frm, "Warehouse", function() {
return erpnext.queries.warehouse(frm.doc);
@@ -270,6 +297,10 @@
}
},
+ add_serial_batch_bundle(frm, cdt, cdn) {
+ erpnext.utils.pick_serial_and_batch_bundle(frm, cdt, cdn, "Inward");
+ }
+
});
erpnext.stock.StockReconciliation = class StockReconciliation extends erpnext.stock.StockController {
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index e304bd1..6ea27ed 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -11,7 +11,10 @@
import erpnext
from erpnext.accounts.utils import get_company_default
from erpnext.controllers.stock_controller import StockController
-from erpnext.stock.doctype.batch.batch import get_batch_qty
+from erpnext.stock.doctype.batch.batch import get_available_batches, get_batch_qty
+from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
+ get_available_serial_nos,
+)
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.utils import get_stock_balance
@@ -37,6 +40,8 @@
if not self.cost_center:
self.cost_center = frappe.get_cached_value("Company", self.company, "cost_center")
self.validate_posting_time()
+ self.set_current_serial_and_batch_bundle()
+ self.set_new_serial_and_batch_bundle()
self.remove_items_with_no_change()
self.validate_data()
self.validate_expense_account()
@@ -47,37 +52,162 @@
self.validate_putaway_capacity()
if self._action == "submit":
- self.make_batches("warehouse")
+ self.validate_reserved_stock()
+
+ def on_update(self):
+ self.set_serial_and_batch_bundle(ignore_validate=True)
def on_submit(self):
self.update_stock_ledger()
self.make_gl_entries()
self.repost_future_sle_and_gle()
- from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
-
- update_serial_nos_after_submit(self, "items")
-
def on_cancel(self):
- self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
+ self.validate_reserved_stock()
+ self.ignore_linked_doctypes = (
+ "GL Entry",
+ "Stock Ledger Entry",
+ "Repost Item Valuation",
+ "Serial and Batch Bundle",
+ )
self.make_sle_on_cancel()
self.make_gl_entries_on_cancel()
self.repost_future_sle_and_gle()
self.delete_auto_created_batches()
+ def set_current_serial_and_batch_bundle(self):
+ """Set Serial and Batch Bundle for each item"""
+ for item in self.items:
+ item_details = frappe.get_cached_value(
+ "Item", item.item_code, ["has_serial_no", "has_batch_no"], as_dict=1
+ )
+
+ if not (item_details.has_serial_no or item_details.has_batch_no):
+ continue
+
+ if not item.current_serial_and_batch_bundle:
+ serial_and_batch_bundle = frappe.get_doc(
+ {
+ "doctype": "Serial and Batch Bundle",
+ "item_code": item.item_code,
+ "warehouse": item.warehouse,
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ "voucher_type": self.doctype,
+ "type_of_transaction": "Outward",
+ }
+ )
+ else:
+ serial_and_batch_bundle = frappe.get_doc(
+ "Serial and Batch Bundle", item.current_serial_and_batch_bundle
+ )
+
+ serial_and_batch_bundle.set("entries", [])
+
+ if item_details.has_serial_no:
+ serial_nos_details = get_available_serial_nos(
+ frappe._dict(
+ {
+ "item_code": item.item_code,
+ "warehouse": item.warehouse,
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ }
+ )
+ )
+
+ for serial_no_row in serial_nos_details:
+ serial_and_batch_bundle.append(
+ "entries",
+ {
+ "serial_no": serial_no_row.serial_no,
+ "qty": -1,
+ "warehouse": serial_no_row.warehouse,
+ "batch_no": serial_no_row.batch_no,
+ },
+ )
+
+ if item_details.has_batch_no:
+ batch_nos_details = get_available_batches(
+ frappe._dict(
+ {
+ "item_code": item.item_code,
+ "warehouse": item.warehouse,
+ "posting_date": self.posting_date,
+ "posting_time": self.posting_time,
+ }
+ )
+ )
+
+ for batch_no, qty in batch_nos_details.items():
+ serial_and_batch_bundle.append(
+ "entries",
+ {
+ "batch_no": batch_no,
+ "qty": qty * -1,
+ "warehouse": item.warehouse,
+ },
+ )
+
+ if not serial_and_batch_bundle.entries:
+ continue
+
+ item.current_serial_and_batch_bundle = serial_and_batch_bundle.save().name
+ item.current_qty = abs(serial_and_batch_bundle.total_qty)
+ item.current_valuation_rate = abs(serial_and_batch_bundle.avg_rate)
+
+ def set_new_serial_and_batch_bundle(self):
+ for item in self.items:
+ if item.current_serial_and_batch_bundle and not item.serial_and_batch_bundle:
+ current_doc = frappe.get_doc("Serial and Batch Bundle", item.current_serial_and_batch_bundle)
+
+ item.qty = abs(current_doc.total_qty)
+ item.valuation_rate = abs(current_doc.avg_rate)
+
+ bundle_doc = frappe.copy_doc(current_doc)
+ bundle_doc.warehouse = item.warehouse
+ bundle_doc.type_of_transaction = "Inward"
+
+ for row in bundle_doc.entries:
+ if row.qty < 0:
+ row.qty = abs(row.qty)
+
+ if row.stock_value_difference < 0:
+ row.stock_value_difference = abs(row.stock_value_difference)
+
+ row.is_outward = 0
+
+ bundle_doc.calculate_qty_and_amount()
+ bundle_doc.flags.ignore_permissions = True
+ bundle_doc.save()
+ item.serial_and_batch_bundle = bundle_doc.name
+ elif item.serial_and_batch_bundle and not item.qty and not item.valuation_rate:
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", item.serial_and_batch_bundle)
+
+ item.qty = bundle_doc.total_qty
+ item.valuation_rate = bundle_doc.avg_rate
+
def remove_items_with_no_change(self):
"""Remove items if qty or rate is not changed"""
self.difference_amount = 0.0
def _changed(item):
+ if item.current_serial_and_batch_bundle:
+ bundle_data = frappe.get_all(
+ "Serial and Batch Bundle",
+ filters={"name": item.current_serial_and_batch_bundle},
+ fields=["total_qty as qty", "avg_rate as rate"],
+ )[0]
+
+ self.calculate_difference_amount(item, bundle_data)
+ return True
+
item_dict = get_stock_balance_for(
item.item_code, item.warehouse, self.posting_date, self.posting_time, batch_no=item.batch_no
)
- if (
- (item.qty is None or item.qty == item_dict.get("qty"))
- and (item.valuation_rate is None or item.valuation_rate == item_dict.get("rate"))
- and (not item.serial_no or (item.serial_no == item_dict.get("serial_nos")))
+ if (item.qty is None or item.qty == item_dict.get("qty")) and (
+ item.valuation_rate is None or item.valuation_rate == item_dict.get("rate")
):
return False
else:
@@ -88,18 +218,9 @@
if item.valuation_rate is None:
item.valuation_rate = item_dict.get("rate")
- if item_dict.get("serial_nos"):
- item.current_serial_no = item_dict.get("serial_nos")
- if self.purpose == "Stock Reconciliation" and not item.serial_no and item.qty:
- item.serial_no = item.current_serial_no
-
item.current_qty = item_dict.get("qty")
item.current_valuation_rate = item_dict.get("rate")
- self.difference_amount += flt(item.qty, item.precision("qty")) * flt(
- item.valuation_rate or item_dict.get("rate"), item.precision("valuation_rate")
- ) - flt(item_dict.get("qty"), item.precision("qty")) * flt(
- item_dict.get("rate"), item.precision("valuation_rate")
- )
+ self.calculate_difference_amount(item, item_dict)
return True
items = list(filter(lambda d: _changed(d), self.items))
@@ -116,6 +237,13 @@
item.idx = i + 1
frappe.msgprint(_("Removed items with no change in quantity or value."))
+ def calculate_difference_amount(self, item, item_dict):
+ self.difference_amount += flt(item.qty, item.precision("qty")) * flt(
+ item.valuation_rate or item_dict.get("rate"), item.precision("valuation_rate")
+ ) - flt(item_dict.get("qty"), item.precision("qty")) * flt(
+ item_dict.get("rate"), item.precision("valuation_rate")
+ )
+
def validate_data(self):
def _get_msg(row_num, msg):
return _("Row # {0}:").format(row_num + 1) + " " + msg
@@ -208,40 +336,67 @@
validate_end_of_life(item_code, item.end_of_life, item.disabled)
validate_is_stock_item(item_code, item.is_stock_item)
- # item should not be serialized
- if item.has_serial_no and not row.serial_no and not item.serial_no_series:
- raise frappe.ValidationError(
- _("Serial no(s) required for serialized item {0}").format(item_code)
- )
-
- # item managed batch-wise not allowed
- if item.has_batch_no and not row.batch_no and not item.create_new_batch:
- raise frappe.ValidationError(_("Batch no is required for batched item {0}").format(item_code))
-
# docstatus should be < 2
validate_cancelled_item(item_code, item.docstatus)
except Exception as e:
self.validation_messages.append(_("Row #") + " " + ("%d: " % (row.idx)) + cstr(e))
+ def validate_reserved_stock(self) -> None:
+ """Raises an exception if there is any reserved stock for the items in the Stock Reconciliation."""
+
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ get_sre_reserved_qty_details_for_item_and_warehouse as get_sre_reserved_qty_details,
+ )
+
+ item_code_list, warehouse_list = [], []
+ for item in self.items:
+ item_code_list.append(item.item_code)
+ warehouse_list.append(item.warehouse)
+
+ sre_reserved_qty_details = get_sre_reserved_qty_details(item_code_list, warehouse_list)
+
+ if sre_reserved_qty_details:
+ data = []
+ for (item_code, warehouse), reserved_qty in sre_reserved_qty_details.items():
+ data.append([item_code, warehouse, reserved_qty])
+
+ msg = ""
+ if len(data) == 1:
+ msg = _(
+ "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation."
+ ).format(bold(data[0][2]), bold(data[0][0]), bold(data[0][1]), self._action)
+ else:
+ items_html = ""
+ for d in data:
+ items_html += "<li>{0} units of Item {1} in Warehouse {2}</li>".format(
+ bold(d[2]), bold(d[0]), bold(d[1])
+ )
+
+ msg = _(
+ "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation: <br /><br /> {1}"
+ ).format(self._action, items_html)
+
+ frappe.throw(
+ msg,
+ title=_("Stock Reservation"),
+ )
+
def update_stock_ledger(self):
"""find difference between current and expected entries
and create stock ledger entries based on the difference"""
from erpnext.stock.stock_ledger import get_previous_sle
sl_entries = []
- has_serial_no = False
- has_batch_no = False
for row in self.items:
- item = frappe.get_doc("Item", row.item_code)
- if item.has_batch_no:
- has_batch_no = True
+ item = frappe.get_cached_value(
+ "Item", row.item_code, ["has_serial_no", "has_batch_no"], as_dict=1
+ )
if item.has_serial_no or item.has_batch_no:
- has_serial_no = True
- self.get_sle_for_serialized_items(row, sl_entries, item)
+ self.get_sle_for_serialized_items(row, sl_entries)
else:
- if row.serial_no or row.batch_no:
+ if row.serial_and_batch_bundle:
frappe.throw(
_(
"Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
@@ -279,101 +434,36 @@
sl_entries.append(self.get_sle_for_items(row))
if sl_entries:
- if has_serial_no:
- sl_entries = self.merge_similar_item_serial_nos(sl_entries)
-
- allow_negative_stock = False
- if has_batch_no:
- allow_negative_stock = True
-
+ allow_negative_stock = cint(
+ frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
+ )
self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock)
- if has_serial_no and sl_entries:
- self.update_valuation_rate_for_serial_no()
-
- def get_sle_for_serialized_items(self, row, sl_entries, item):
- from erpnext.stock.stock_ledger import get_previous_sle
-
- serial_nos = get_serial_nos(row.serial_no)
-
- # To issue existing serial nos
- if row.current_qty and (row.current_serial_no or row.batch_no):
+ def get_sle_for_serialized_items(self, row, sl_entries):
+ if row.current_serial_and_batch_bundle:
args = self.get_sle_for_items(row)
args.update(
{
"actual_qty": -1 * row.current_qty,
- "serial_no": row.current_serial_no,
- "batch_no": row.batch_no,
+ "serial_and_batch_bundle": row.current_serial_and_batch_bundle,
"valuation_rate": row.current_valuation_rate,
}
)
- if row.current_serial_no:
- args.update(
- {
- "qty_after_transaction": 0,
- }
- )
-
sl_entries.append(args)
- qty_after_transaction = 0
- for serial_no in serial_nos:
- args = self.get_sle_for_items(row, [serial_no])
-
- previous_sle = get_previous_sle(
- {
- "item_code": row.item_code,
- "posting_date": self.posting_date,
- "posting_time": self.posting_time,
- "serial_no": serial_no,
- }
- )
-
- if previous_sle and row.warehouse != previous_sle.get("warehouse"):
- # If serial no exists in different warehouse
-
- warehouse = previous_sle.get("warehouse", "") or row.warehouse
-
- if not qty_after_transaction:
- qty_after_transaction = get_stock_balance(
- row.item_code, warehouse, self.posting_date, self.posting_time
- )
-
- qty_after_transaction -= 1
-
- new_args = args.copy()
- new_args.update(
- {
- "actual_qty": -1,
- "qty_after_transaction": qty_after_transaction,
- "warehouse": warehouse,
- "valuation_rate": previous_sle.get("valuation_rate"),
- }
- )
-
- sl_entries.append(new_args)
-
- if row.qty:
+ if row.qty != 0:
args = self.get_sle_for_items(row)
-
- if item.has_serial_no and item.has_batch_no:
- args["qty_after_transaction"] = row.qty
-
args.update(
{
"actual_qty": row.qty,
"incoming_rate": row.valuation_rate,
- "valuation_rate": row.valuation_rate,
+ "serial_and_batch_bundle": row.serial_and_batch_bundle,
}
)
sl_entries.append(args)
- if serial_nos == get_serial_nos(row.current_serial_no):
- # update valuation rate
- self.update_valuation_rate_for_serial_nos(row, serial_nos)
-
def update_valuation_rate_for_serial_no(self):
for d in self.items:
if not d.serial_no:
@@ -410,8 +500,6 @@
"company": self.company,
"stock_uom": frappe.db.get_value("Item", row.item_code, "stock_uom"),
"is_cancelled": 1 if self.docstatus == 2 else 0,
- "serial_no": "\n".join(serial_nos) if serial_nos else "",
- "batch_no": row.batch_no,
"valuation_rate": flt(row.valuation_rate, row.precision("valuation_rate")),
}
)
@@ -419,17 +507,19 @@
if not row.batch_no:
data.qty_after_transaction = flt(row.qty, row.precision("qty"))
- if self.docstatus == 2 and not row.batch_no:
+ if self.docstatus == 2:
if row.current_qty:
data.actual_qty = -1 * row.current_qty
data.qty_after_transaction = flt(row.current_qty)
data.previous_qty_after_transaction = flt(row.qty)
data.valuation_rate = flt(row.current_valuation_rate)
+ data.serial_and_batch_bundle = row.current_serial_and_batch_bundle
data.stock_value = data.qty_after_transaction * data.valuation_rate
data.stock_value_difference = -1 * flt(row.amount_difference)
else:
data.actual_qty = row.qty
data.qty_after_transaction = 0.0
+ data.serial_and_batch_bundle = row.serial_and_batch_bundle
data.valuation_rate = flt(row.valuation_rate)
data.stock_value_difference = -1 * flt(row.amount_difference)
@@ -442,15 +532,7 @@
has_serial_no = False
for row in self.items:
- if row.serial_no or row.batch_no or row.current_serial_no:
- has_serial_no = True
- serial_nos = ""
- if row.current_serial_no:
- serial_nos = get_serial_nos(row.current_serial_no)
-
- sl_entries.append(self.get_sle_for_items(row, serial_nos))
- else:
- sl_entries.append(self.get_sle_for_items(row))
+ sl_entries.append(self.get_sle_for_items(row))
if sl_entries:
if has_serial_no:
@@ -571,24 +653,40 @@
self._cancel()
def recalculate_current_qty(self, item_code, batch_no):
+ from erpnext.stock.stock_ledger import get_valuation_rate
+
+ sl_entries = []
for row in self.items:
- if not (row.item_code == item_code and row.batch_no == batch_no):
+ if (
+ not (row.item_code == item_code and row.batch_no == batch_no)
+ and not row.serial_and_batch_bundle
+ ):
continue
- row.current_qty = get_batch_qty_for_stock_reco(
+ if row.current_serial_and_batch_bundle:
+ self.recalculate_qty_for_serial_and_batch_bundle(row)
+ continue
+
+ current_qty = get_batch_qty_for_stock_reco(
item_code, row.warehouse, batch_no, self.posting_date, self.posting_time, self.name
)
- qty, val_rate = get_stock_balance(
- item_code,
- row.warehouse,
- self.posting_date,
- self.posting_time,
- with_valuation_rate=True,
+ precesion = row.precision("current_qty")
+ if flt(current_qty, precesion) == flt(row.current_qty, precesion):
+ continue
+
+ val_rate = get_valuation_rate(
+ item_code, row.warehouse, self.doctype, self.name, company=self.company, batch_no=batch_no
)
row.current_valuation_rate = val_rate
+ if not row.current_qty and current_qty:
+ sle = self.get_sle_for_items(row)
+ sle.actual_qty = current_qty * -1
+ sle.valuation_rate = val_rate
+ sl_entries.append(sle)
+ row.current_qty = current_qty
row.db_set(
{
"current_qty": row.current_qty,
@@ -597,6 +695,30 @@
}
)
+ if sl_entries:
+ self.make_sl_entries(sl_entries)
+
+ def recalculate_qty_for_serial_and_batch_bundle(self, row):
+ doc = frappe.get_doc("Serial and Batch Bundle", row.current_serial_and_batch_bundle)
+ precision = doc.entries[0].precision("qty")
+
+ for d in doc.entries:
+ qty = (
+ get_batch_qty(
+ d.batch_no,
+ doc.warehouse,
+ posting_date=doc.posting_date,
+ posting_time=doc.posting_time,
+ ignore_voucher_nos=[doc.voucher_no],
+ )
+ or 0
+ ) * -1
+
+ if flt(d.qty, precision) == flt(qty, precision):
+ continue
+
+ d.db_set("qty", qty)
+
def get_batch_qty_for_stock_reco(
item_code, warehouse, batch_no, posting_date, posting_time, voucher_no
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 7d59441..4817c8d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -12,6 +12,11 @@
from erpnext.accounts.utils import get_stock_and_account_balance
from erpnext.stock.doctype.item.test_item import create_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ get_serial_nos_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import (
EmptyStockReconciliationItemsError,
@@ -28,7 +33,7 @@
def setUpClass(cls):
create_batch_or_serial_no_items()
super().setUpClass()
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
def tearDown(self):
frappe.local.future_sle = {}
@@ -157,15 +162,18 @@
item_code=serial_item_code, warehouse=serial_warehouse, qty=5, rate=200
)
- serial_nos = get_serial_nos(sr.items[0].serial_no)
+ serial_nos = frappe.get_doc(
+ "Serial and Batch Bundle", sr.items[0].serial_and_batch_bundle
+ ).get_serial_nos()
self.assertEqual(len(serial_nos), 5)
args = {
"item_code": serial_item_code,
"warehouse": serial_warehouse,
- "posting_date": nowdate(),
+ "qty": -5,
+ "posting_date": add_days(sr.posting_date, 1),
"posting_time": nowtime(),
- "serial_no": sr.items[0].serial_no,
+ "serial_and_batch_bundle": sr.items[0].serial_and_batch_bundle,
}
valuation_rate = get_incoming_rate(args)
@@ -174,18 +182,20 @@
to_delete_records.append(sr.name)
sr = create_stock_reconciliation(
- item_code=serial_item_code, warehouse=serial_warehouse, qty=5, rate=300
+ item_code=serial_item_code, warehouse=serial_warehouse, qty=5, rate=300, serial_no=serial_nos
)
- serial_nos1 = get_serial_nos(sr.items[0].serial_no)
- self.assertEqual(len(serial_nos1), 5)
+ sn_doc = frappe.get_doc("Serial and Batch Bundle", sr.items[0].serial_and_batch_bundle)
+
+ self.assertEqual(len(sn_doc.get_serial_nos()), 5)
args = {
"item_code": serial_item_code,
"warehouse": serial_warehouse,
- "posting_date": nowdate(),
+ "qty": -5,
+ "posting_date": add_days(sr.posting_date, 1),
"posting_time": nowtime(),
- "serial_no": sr.items[0].serial_no,
+ "serial_and_batch_bundle": sr.items[0].serial_and_batch_bundle,
}
valuation_rate = get_incoming_rate(args)
@@ -198,66 +208,32 @@
stock_doc = frappe.get_doc("Stock Reconciliation", d)
stock_doc.cancel()
- def test_stock_reco_for_merge_serialized_item(self):
- to_delete_records = []
-
- # Add new serial nos
- serial_item_code = "Stock-Reco-Serial-Item-2"
- serial_warehouse = "_Test Warehouse for Stock Reco1 - _TC"
-
- sr = create_stock_reconciliation(
- item_code=serial_item_code,
- serial_no=random_string(6),
- warehouse=serial_warehouse,
- qty=1,
- rate=100,
- do_not_submit=True,
- purpose="Opening Stock",
- )
-
- for i in range(3):
- sr.append(
- "items",
- {
- "item_code": serial_item_code,
- "warehouse": serial_warehouse,
- "qty": 1,
- "valuation_rate": 100,
- "serial_no": random_string(6),
- },
- )
-
- sr.save()
- sr.submit()
-
- sle_entries = frappe.get_all(
- "Stock Ledger Entry", filters={"voucher_no": sr.name}, fields=["name", "incoming_rate"]
- )
-
- self.assertEqual(len(sle_entries), 1)
- self.assertEqual(sle_entries[0].incoming_rate, 100)
-
- to_delete_records.append(sr.name)
- to_delete_records.reverse()
-
- for d in to_delete_records:
- stock_doc = frappe.get_doc("Stock Reconciliation", d)
- stock_doc.cancel()
-
def test_stock_reco_for_batch_item(self):
to_delete_records = []
# Add new serial nos
- item_code = "Stock-Reco-batch-Item-1"
+ item_code = "Stock-Reco-batch-Item-123"
warehouse = "_Test Warehouse for Stock Reco2 - _TC"
+ self.make_item(
+ item_code,
+ frappe._dict(
+ {
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "SRBI123-.#####",
+ }
+ ),
+ )
sr = create_stock_reconciliation(
item_code=item_code, warehouse=warehouse, qty=5, rate=200, do_not_save=1
)
sr.save()
sr.submit()
+ sr.load_from_db()
- batch_no = sr.items[0].batch_no
+ batch_no = get_batch_from_bundle(sr.items[0].serial_and_batch_bundle)
self.assertTrue(batch_no)
to_delete_records.append(sr.name)
@@ -270,7 +246,7 @@
"warehouse": warehouse,
"posting_date": nowdate(),
"posting_time": nowtime(),
- "batch_no": batch_no,
+ "serial_and_batch_bundle": sr1.items[0].serial_and_batch_bundle,
}
valuation_rate = get_incoming_rate(args)
@@ -303,16 +279,15 @@
sr = create_stock_reconciliation(item_code=item.item_code, warehouse=warehouse, qty=1, rate=100)
- batch_no = sr.items[0].batch_no
+ batch_no = get_batch_from_bundle(sr.items[0].serial_and_batch_bundle)
- serial_nos = get_serial_nos(sr.items[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(sr.items[0].serial_and_batch_bundle)
self.assertEqual(len(serial_nos), 1)
self.assertEqual(frappe.db.get_value("Serial No", serial_nos[0], "batch_no"), batch_no)
sr.cancel()
- self.assertEqual(frappe.db.get_value("Serial No", serial_nos[0], "status"), "Inactive")
- self.assertEqual(frappe.db.exists("Batch", batch_no), None)
+ self.assertEqual(frappe.db.get_value("Serial No", serial_nos[0], "warehouse"), None)
def test_stock_reco_for_serial_and_batch_item_with_future_dependent_entry(self):
"""
@@ -339,13 +314,13 @@
stock_reco = create_stock_reconciliation(
item_code=item.item_code, warehouse=warehouse, qty=1, rate=100
)
- batch_no = stock_reco.items[0].batch_no
- reco_serial_no = get_serial_nos(stock_reco.items[0].serial_no)[0]
+ batch_no = get_batch_from_bundle(stock_reco.items[0].serial_and_batch_bundle)
+ reco_serial_no = get_serial_nos_from_bundle(stock_reco.items[0].serial_and_batch_bundle)[0]
stock_entry = make_stock_entry(
item_code=item.item_code, target=warehouse, qty=1, basic_rate=100, batch_no=batch_no
)
- serial_no_2 = get_serial_nos(stock_entry.items[0].serial_no)[0]
+ serial_no_2 = get_serial_nos_from_bundle(stock_entry.items[0].serial_and_batch_bundle)[0]
# Check Batch qty after 2 transactions
batch_qty = get_batch_qty(batch_no, warehouse, item.item_code)
@@ -360,11 +335,10 @@
# Check if Serial No from Stock Reconcilation is intact
self.assertEqual(frappe.db.get_value("Serial No", reco_serial_no, "batch_no"), batch_no)
- self.assertEqual(frappe.db.get_value("Serial No", reco_serial_no, "status"), "Active")
+ self.assertTrue(frappe.db.get_value("Serial No", reco_serial_no, "warehouse"))
# Check if Serial No from Stock Entry is Unlinked and Inactive
- self.assertEqual(frappe.db.get_value("Serial No", serial_no_2, "batch_no"), None)
- self.assertEqual(frappe.db.get_value("Serial No", serial_no_2, "status"), "Inactive")
+ self.assertFalse(frappe.db.get_value("Serial No", serial_no_2, "warehouse"))
stock_reco.cancel()
@@ -530,7 +504,9 @@
# check if cancellation of stock reco is blocked
self.assertRaises(NegativeStockError, sr.cancel)
- repost_exists = bool(frappe.db.exists("Repost Item Valuation", {"voucher_no": sr.name}))
+ repost_exists = bool(
+ frappe.db.exists("Repost Item Valuation", {"voucher_no": sr.name, "status": "Queued"})
+ )
self.assertFalse(repost_exists, msg="Negative stock validation not working on reco cancellation")
def test_intermediate_sr_bin_update(self):
@@ -577,10 +553,24 @@
def test_valid_batch(self):
create_batch_item_with_batch("Testing Batch Item 1", "001")
create_batch_item_with_batch("Testing Batch Item 2", "002")
- sr = create_stock_reconciliation(
- item_code="Testing Batch Item 1", qty=1, rate=100, batch_no="002", do_not_submit=True
+
+ doc = frappe.get_doc(
+ {
+ "doctype": "Serial and Batch Bundle",
+ "item_code": "Testing Batch Item 1",
+ "warehouse": "_Test Warehouse - _TC",
+ "voucher_type": "Stock Reconciliation",
+ "entries": [
+ {
+ "batch_no": "002",
+ "qty": 1,
+ "incoming_rate": 100,
+ }
+ ],
+ }
)
- self.assertRaises(frappe.ValidationError, sr.submit)
+
+ self.assertRaises(frappe.ValidationError, doc.save)
def test_serial_no_cancellation(self):
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
@@ -588,18 +578,17 @@
item = create_item("Stock-Reco-Serial-Item-9", is_stock_item=1)
if not item.has_serial_no:
item.has_serial_no = 1
- item.serial_no_series = "SRS9.####"
+ item.serial_no_series = "PSRS9.####"
item.save()
item_code = item.name
warehouse = "_Test Warehouse - _TC"
se1 = make_stock_entry(item_code=item_code, target=warehouse, qty=10, basic_rate=700)
-
- serial_nos = get_serial_nos(se1.items[0].serial_no)
+ serial_nos = get_serial_nos_from_bundle(se1.items[0].serial_and_batch_bundle)
# reduce 1 item
serial_nos.pop()
- new_serial_nos = "\n".join(serial_nos)
+ new_serial_nos = serial_nos
sr = create_stock_reconciliation(
item_code=item.name, warehouse=warehouse, serial_no=new_serial_nos, qty=9
@@ -621,10 +610,19 @@
item_code = item.name
warehouse = "_Test Warehouse - _TC"
+ if not frappe.db.exists("Serial No", "SR-CREATED-SR-NO"):
+ frappe.get_doc(
+ {
+ "doctype": "Serial No",
+ "item_code": item_code,
+ "serial_no": "SR-CREATED-SR-NO",
+ }
+ ).insert()
+
sr = create_stock_reconciliation(
item_code=item.name,
warehouse=warehouse,
- serial_no="SR-CREATED-SR-NO",
+ serial_no=["SR-CREATED-SR-NO"],
qty=1,
do_not_submit=True,
rate=100,
@@ -696,10 +694,12 @@
item_code=item_code, posting_time="09:00:00", target=warehouse, qty=100, basic_rate=700
)
+ batch_no = get_batch_from_bundle(se1.items[0].serial_and_batch_bundle)
+
# Removed 50 Qty, Balace Qty 50
se2 = make_stock_entry(
item_code=item_code,
- batch_no=se1.items[0].batch_no,
+ batch_no=batch_no,
posting_time="10:00:00",
source=warehouse,
qty=50,
@@ -711,15 +711,23 @@
item_code=item_code,
posting_time="11:00:00",
warehouse=warehouse,
- batch_no=se1.items[0].batch_no,
+ batch_no=batch_no,
qty=100,
rate=100,
)
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"is_cancelled": 0, "voucher_no": stock_reco.name, "actual_qty": ("<", 0)},
+ fields=["actual_qty"],
+ )
+
+ self.assertEqual(flt(sle[0].actual_qty), flt(-50.0))
+
# Removed 50 Qty, Balace Qty 50
make_stock_entry(
item_code=item_code,
- batch_no=se1.items[0].batch_no,
+ batch_no=batch_no,
posting_time="12:00:00",
source=warehouse,
qty=50,
@@ -743,12 +751,64 @@
sle = frappe.get_all(
"Stock Ledger Entry",
filters={"item_code": item_code, "warehouse": warehouse, "is_cancelled": 0},
- fields=["qty_after_transaction"],
+ fields=["qty_after_transaction", "actual_qty", "voucher_type", "voucher_no"],
order_by="posting_time desc, creation desc",
)
self.assertEqual(flt(sle[0].qty_after_transaction), flt(50.0))
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"is_cancelled": 0, "voucher_no": stock_reco.name, "actual_qty": ("<", 0)},
+ fields=["actual_qty"],
+ )
+
+ self.assertEqual(flt(sle[0].actual_qty), flt(-100.0))
+
+ def test_update_stock_reconciliation_while_reposting(self):
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+
+ item_code = self.make_item().name
+ warehouse = "_Test Warehouse - _TC"
+
+ # Stock Value => 100 * 100 = 10000
+ se = make_stock_entry(
+ item_code=item_code,
+ target=warehouse,
+ qty=100,
+ basic_rate=100,
+ posting_time="10:00:00",
+ )
+
+ # Stock Value => 100 * 200 = 20000
+ # Value Change => 20000 - 10000 = 10000
+ sr1 = create_stock_reconciliation(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=100,
+ rate=200,
+ posting_time="12:00:00",
+ )
+ self.assertEqual(sr1.difference_amount, 10000)
+
+ # Stock Value => 50 * 50 = 2500
+ # Value Change => 2500 - 10000 = -7500
+ sr2 = create_stock_reconciliation(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=50,
+ rate=50,
+ posting_time="11:00:00",
+ )
+ self.assertEqual(sr2.difference_amount, -7500)
+
+ sr1.load_from_db()
+ self.assertEqual(sr1.difference_amount, 17500)
+
+ sr2.cancel()
+ sr1.load_from_db()
+ self.assertEqual(sr1.difference_amount, 10000)
+
def create_batch_item_with_batch(item_name, batch_id):
batch_item_doc = create_item(item_name, is_stock_item=1)
@@ -849,6 +909,31 @@
or frappe.get_cached_value("Cost Center", filters={"is_group": 0, "company": sr.company})
)
+ bundle_id = None
+ if args.batch_no or args.serial_no:
+ batches = frappe._dict({})
+ if args.batch_no:
+ batches[args.batch_no] = args.qty
+
+ bundle_id = make_serial_batch_bundle(
+ frappe._dict(
+ {
+ "item_code": args.item_code or "_Test Item",
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
+ "qty": args.qty,
+ "voucher_type": "Stock Reconciliation",
+ "batches": batches,
+ "rate": args.rate,
+ "serial_nos": args.serial_no,
+ "posting_date": sr.posting_date,
+ "posting_time": sr.posting_time,
+ "type_of_transaction": "Inward" if args.qty > 0 else "Outward",
+ "company": args.company or "_Test Company",
+ "do_not_submit": True,
+ }
+ )
+ ).name
+
sr.append(
"items",
{
@@ -856,8 +941,7 @@
"warehouse": args.warehouse or "_Test Warehouse - _TC",
"qty": args.qty,
"valuation_rate": args.rate,
- "serial_no": args.serial_no,
- "batch_no": args.batch_no,
+ "serial_and_batch_bundle": bundle_id,
},
)
@@ -868,6 +952,9 @@
sr.submit()
except EmptyStockReconciliationItemsError:
pass
+
+ sr.load_from_db()
+
return sr
diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 7c3e151..62d6e4c 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -17,8 +17,11 @@
"amount",
"allow_zero_valuation_rate",
"serial_no_and_batch_section",
+ "add_serial_batch_bundle",
+ "serial_and_batch_bundle",
"batch_no",
"column_break_11",
+ "current_serial_and_batch_bundle",
"serial_no",
"section_break_3",
"current_qty",
@@ -99,8 +102,9 @@
},
{
"fieldname": "serial_no",
- "fieldtype": "Small Text",
- "label": "Serial No"
+ "fieldtype": "Long Text",
+ "label": "Serial No",
+ "read_only": 1
},
{
"fieldname": "column_break_11",
@@ -120,7 +124,7 @@
},
{
"fieldname": "current_serial_no",
- "fieldtype": "Small Text",
+ "fieldtype": "Long Text",
"label": "Current Serial No",
"no_copy": 1,
"print_hide": 1,
@@ -168,7 +172,8 @@
"fieldname": "batch_no",
"fieldtype": "Link",
"label": "Batch No",
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"default": "0",
@@ -185,11 +190,31 @@
"fieldtype": "Data",
"label": "Has Item Scanned",
"read_only": 1
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial / Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "current_serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Current Serial / Batch Bundle",
+ "options": "Serial and Batch Bundle",
+ "read_only": 1
+ },
+ {
+ "fieldname": "add_serial_batch_bundle",
+ "fieldtype": "Button",
+ "label": "Add Serial / Batch No"
}
],
"istable": 1,
"links": [],
- "modified": "2022-11-02 13:01:23.580937",
+ "modified": "2023-06-15 11:45:55.808942",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation Item",
diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
index 0facae8..7c712ce 100644
--- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
+++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
@@ -12,7 +12,9 @@
"start_time",
"end_time",
"limits_dont_apply_on",
- "item_based_reposting"
+ "item_based_reposting",
+ "errors_notification_section",
+ "notify_reposting_error_to_role"
],
"fields": [
{
@@ -52,12 +54,23 @@
"fieldname": "item_based_reposting",
"fieldtype": "Check",
"label": "Use Item based reposting"
+ },
+ {
+ "fieldname": "notify_reposting_error_to_role",
+ "fieldtype": "Link",
+ "label": "Notify Reposting Error to Role",
+ "options": "Role"
+ },
+ {
+ "fieldname": "errors_notification_section",
+ "fieldtype": "Section Break",
+ "label": "Errors Notification"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2021-11-02 01:22:45.155841",
+ "modified": "2023-05-04 16:14:29.080697",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reposting Settings",
@@ -76,5 +89,6 @@
],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reposting_settings/test_stock_reposting_settings.py b/erpnext/stock/doctype/stock_reposting_settings/test_stock_reposting_settings.py
index fad74d3..a6dc72d 100644
--- a/erpnext/stock/doctype/stock_reposting_settings/test_stock_reposting_settings.py
+++ b/erpnext/stock/doctype/stock_reposting_settings/test_stock_reposting_settings.py
@@ -1,9 +1,40 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
-# import frappe
import unittest
+import frappe
+
+from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import get_recipients
+
class TestStockRepostingSettings(unittest.TestCase):
- pass
+ def test_notify_reposting_error_to_role(self):
+ role = "Notify Reposting Role"
+
+ if not frappe.db.exists("Role", role):
+ frappe.get_doc({"doctype": "Role", "role_name": role}).insert(ignore_permissions=True)
+
+ user = "notify_reposting_error@test.com"
+ if not frappe.db.exists("User", user):
+ frappe.get_doc(
+ {
+ "doctype": "User",
+ "email": user,
+ "first_name": "Test",
+ "language": "en",
+ "time_zone": "Asia/Kolkata",
+ "send_welcome_email": 0,
+ "roles": [{"role": role}],
+ }
+ ).insert(ignore_permissions=True)
+
+ frappe.db.set_single_value("Stock Reposting Settings", "notify_reposting_error_to_role", "")
+
+ users = get_recipients()
+ self.assertFalse(user in users)
+
+ frappe.db.set_single_value("Stock Reposting Settings", "notify_reposting_error_to_role", role)
+
+ users = get_recipients()
+ self.assertTrue(user in users)
diff --git a/erpnext/loan_management/doctype/loan_security/__init__.py b/erpnext/stock/doctype/stock_reservation_entry/__init__.py
similarity index 100%
copy from erpnext/loan_management/doctype/loan_security/__init__.py
copy to erpnext/stock/doctype/stock_reservation_entry/__init__.py
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.js b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.js
new file mode 100644
index 0000000..666fd24
--- /dev/null
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Stock Reservation Entry", {
+ refresh(frm) {
+ frm.page.btn_primary.hide()
+ },
+});
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
new file mode 100644
index 0000000..7c7abac
--- /dev/null
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
@@ -0,0 +1,234 @@
+{
+ "actions": [],
+ "allow_copy": 1,
+ "autoname": "MAT-SRE-.YYYY.-.#####",
+ "creation": "2023-03-20 10:45:59.258959",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "item_code",
+ "warehouse",
+ "column_break_elik",
+ "voucher_type",
+ "voucher_no",
+ "voucher_detail_no",
+ "section_break_xt4m",
+ "available_qty",
+ "voucher_qty",
+ "stock_uom",
+ "column_break_o6ex",
+ "reserved_qty",
+ "delivered_qty",
+ "section_break_3vb3",
+ "company",
+ "column_break_jbyr",
+ "project",
+ "status",
+ "amended_from"
+ ],
+ "fields": [
+ {
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "print_width": "100px",
+ "read_only": 1,
+ "search_index": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_width": "100px",
+ "read_only": 1,
+ "search_index": 1,
+ "width": "100px"
+ },
+ {
+ "fieldname": "voucher_type",
+ "fieldtype": "Select",
+ "in_filter": 1,
+ "label": "Voucher Type",
+ "oldfieldname": "voucher_type",
+ "oldfieldtype": "Data",
+ "options": "\nSales Order",
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "voucher_no",
+ "fieldtype": "Dynamic Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Voucher No",
+ "oldfieldname": "voucher_no",
+ "oldfieldtype": "Data",
+ "options": "voucher_type",
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "voucher_detail_no",
+ "fieldtype": "Data",
+ "label": "Voucher Detail No",
+ "oldfieldname": "voucher_detail_no",
+ "oldfieldtype": "Data",
+ "print_width": "150px",
+ "read_only": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "label": "Stock UOM",
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Data",
+ "options": "UOM",
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "label": "Project",
+ "options": "Project",
+ "read_only": 1
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "label": "Company",
+ "oldfieldname": "company",
+ "oldfieldtype": "Data",
+ "options": "Company",
+ "print_width": "150px",
+ "read_only": 1,
+ "search_index": 1,
+ "width": "150px"
+ },
+ {
+ "fieldname": "reserved_qty",
+ "fieldtype": "Float",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Reserved Qty",
+ "oldfieldname": "actual_qty",
+ "oldfieldtype": "Currency",
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
+ },
+ {
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 1,
+ "label": "Status",
+ "options": "Draft\nPartially Reserved\nReserved\nPartially Delivered\nDelivered\nCancelled",
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "delivered_qty",
+ "fieldtype": "Float",
+ "label": "Delivered Qty",
+ "read_only": 1
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Stock Reservation Entry",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "available_qty",
+ "fieldtype": "Float",
+ "label": "Available Qty to Reserve",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "voucher_qty",
+ "fieldtype": "Float",
+ "label": "Voucher Qty",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_elik",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_xt4m",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_o6ex",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_3vb3",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_jbyr",
+ "fieldtype": "Column Break"
+ }
+ ],
+ "hide_toolbar": 1,
+ "in_create": 1,
+ "index_web_pages_for_search": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-03-29 18:36:26.752872",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Stock Reservation Entry",
+ "naming_rule": "Expression (old style)",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
new file mode 100644
index 0000000..5819dd7
--- /dev/null
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
@@ -0,0 +1,312 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.query_builder.functions import Sum
+
+
+class StockReservationEntry(Document):
+ def validate(self) -> None:
+ from erpnext.stock.utils import validate_disabled_warehouse, validate_warehouse_company
+
+ self.validate_mandatory()
+ self.validate_for_group_warehouse()
+ validate_disabled_warehouse(self.warehouse)
+ validate_warehouse_company(self.warehouse, self.company)
+
+ def on_submit(self) -> None:
+ self.update_reserved_qty_in_voucher()
+ self.update_status()
+
+ def on_cancel(self) -> None:
+ self.update_reserved_qty_in_voucher()
+ self.update_status()
+
+ def validate_mandatory(self) -> None:
+ """Raises exception if mandatory fields are not set."""
+
+ mandatory = [
+ "item_code",
+ "warehouse",
+ "voucher_type",
+ "voucher_no",
+ "voucher_detail_no",
+ "available_qty",
+ "voucher_qty",
+ "stock_uom",
+ "reserved_qty",
+ "company",
+ ]
+ for d in mandatory:
+ if not self.get(d):
+ frappe.throw(_("{0} is required").format(self.meta.get_label(d)))
+
+ def validate_for_group_warehouse(self) -> None:
+ """Raises exception if `Warehouse` is a Group Warehouse."""
+
+ if frappe.get_cached_value("Warehouse", self.warehouse, "is_group"):
+ frappe.throw(
+ _("Stock cannot be reserved in group warehouse {0}.").format(frappe.bold(self.warehouse)),
+ title=_("Invalid Warehouse"),
+ )
+
+ def update_status(self, status: str = None, update_modified: bool = True) -> None:
+ """Updates status based on Voucher Qty, Reserved Qty and Delivered Qty."""
+
+ if not status:
+ if self.docstatus == 2:
+ status = "Cancelled"
+ elif self.docstatus == 1:
+ if self.reserved_qty == self.delivered_qty:
+ status = "Delivered"
+ elif self.delivered_qty and self.delivered_qty < self.reserved_qty:
+ status = "Partially Delivered"
+ elif self.reserved_qty == self.voucher_qty:
+ status = "Reserved"
+ else:
+ status = "Partially Reserved"
+ else:
+ status = "Draft"
+
+ frappe.db.set_value(self.doctype, self.name, "status", status, update_modified=update_modified)
+
+ def update_reserved_qty_in_voucher(
+ self, reserved_qty_field: str = "stock_reserved_qty", update_modified: bool = True
+ ) -> None:
+ """Updates total reserved qty in the voucher."""
+
+ item_doctype = "Sales Order Item" if self.voucher_type == "Sales Order" else None
+
+ if item_doctype:
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ reserved_qty = (
+ frappe.qb.from_(sre)
+ .select(Sum(sre.reserved_qty))
+ .where(
+ (sre.docstatus == 1)
+ & (sre.voucher_type == self.voucher_type)
+ & (sre.voucher_no == self.voucher_no)
+ & (sre.voucher_detail_no == self.voucher_detail_no)
+ )
+ ).run(as_list=True)[0][0] or 0
+
+ frappe.db.set_value(
+ item_doctype,
+ self.voucher_detail_no,
+ reserved_qty_field,
+ reserved_qty,
+ update_modified=update_modified,
+ )
+
+
+def validate_stock_reservation_settings(voucher: object) -> None:
+ """Raises an exception if `Stock Reservation` is not enabled or `Voucher Type` is not allowed."""
+
+ if not frappe.db.get_single_value("Stock Settings", "enable_stock_reservation"):
+ frappe.throw(
+ _("Please enable {0} in the {1}.").format(
+ frappe.bold("Stock Reservation"), frappe.bold("Stock Settings")
+ )
+ )
+
+ # Voucher types allowed for stock reservation
+ allowed_voucher_types = ["Sales Order"]
+
+ if voucher.doctype not in allowed_voucher_types:
+ frappe.throw(
+ _("Stock Reservation can only be created against {0}.").format(", ".join(allowed_voucher_types))
+ )
+
+
+def get_available_qty_to_reserve(item_code: str, warehouse: str) -> float:
+ """Returns `Available Qty to Reserve (Actual Qty - Reserved Qty)` for Item and Warehouse combination."""
+
+ from erpnext.stock.utils import get_stock_balance
+
+ available_qty = get_stock_balance(item_code, warehouse)
+
+ if available_qty:
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ reserved_qty = (
+ frappe.qb.from_(sre)
+ .select(Sum(sre.reserved_qty - sre.delivered_qty))
+ .where(
+ (sre.docstatus == 1)
+ & (sre.item_code == item_code)
+ & (sre.warehouse == warehouse)
+ & (sre.status.notin(["Delivered", "Cancelled"]))
+ )
+ ).run()[0][0] or 0.0
+
+ if reserved_qty:
+ return available_qty - reserved_qty
+
+ return available_qty
+
+
+def get_stock_reservation_entries_for_voucher(
+ voucher_type: str, voucher_no: str, voucher_detail_no: str = None, fields: list[str] = None
+) -> list[dict]:
+ """Returns list of Stock Reservation Entries against a Voucher."""
+
+ if not fields or not isinstance(fields, list):
+ fields = [
+ "name",
+ "item_code",
+ "warehouse",
+ "voucher_detail_no",
+ "reserved_qty",
+ "delivered_qty",
+ "stock_uom",
+ ]
+
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ query = (
+ frappe.qb.from_(sre)
+ .where(
+ (sre.docstatus == 1)
+ & (sre.voucher_type == voucher_type)
+ & (sre.voucher_no == voucher_no)
+ & (sre.status.notin(["Delivered", "Cancelled"]))
+ )
+ .orderby(sre.creation)
+ )
+
+ for field in fields:
+ query = query.select(sre[field])
+
+ if voucher_detail_no:
+ query = query.where(sre.voucher_detail_no == voucher_detail_no)
+
+ return query.run(as_dict=True)
+
+
+def get_sre_reserved_qty_details_for_item_and_warehouse(
+ item_code_list: list, warehouse_list: list
+) -> dict:
+ """Returns a dict like {("item_code", "warehouse"): "reserved_qty", ... }."""
+
+ sre_details = {}
+
+ if item_code_list and warehouse_list:
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ sre_data = (
+ frappe.qb.from_(sre)
+ .select(
+ sre.item_code,
+ sre.warehouse,
+ Sum(sre.reserved_qty - sre.delivered_qty).as_("reserved_qty"),
+ )
+ .where(
+ (sre.docstatus == 1)
+ & (sre.item_code.isin(item_code_list))
+ & (sre.warehouse.isin(warehouse_list))
+ & (sre.status.notin(["Delivered", "Cancelled"]))
+ )
+ .groupby(sre.item_code, sre.warehouse)
+ ).run(as_dict=True)
+
+ if sre_data:
+ sre_details = {(d["item_code"], d["warehouse"]): d["reserved_qty"] for d in sre_data}
+
+ return sre_details
+
+
+def get_sre_reserved_qty_for_item_and_warehouse(item_code: str, warehouse: str) -> float:
+ """Returns `Reserved Qty` for Item and Warehouse combination."""
+
+ reserved_qty = 0.0
+
+ if item_code and warehouse:
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ return (
+ frappe.qb.from_(sre)
+ .select(Sum(sre.reserved_qty - sre.delivered_qty))
+ .where(
+ (sre.docstatus == 1)
+ & (sre.item_code == item_code)
+ & (sre.warehouse == warehouse)
+ & (sre.status.notin(["Delivered", "Cancelled"]))
+ )
+ ).run(as_list=True)[0][0] or 0.0
+
+ return reserved_qty
+
+
+def get_sre_reserved_qty_details_for_voucher(voucher_type: str, voucher_no: str) -> dict:
+ """Returns a dict like {"voucher_detail_no": "reserved_qty", ... }."""
+
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ data = (
+ frappe.qb.from_(sre)
+ .select(
+ sre.voucher_detail_no,
+ (Sum(sre.reserved_qty) - Sum(sre.delivered_qty)).as_("reserved_qty"),
+ )
+ .where(
+ (sre.docstatus == 1)
+ & (sre.voucher_type == voucher_type)
+ & (sre.voucher_no == voucher_no)
+ & (sre.status.notin(["Delivered", "Cancelled"]))
+ )
+ .groupby(sre.voucher_detail_no)
+ ).run(as_list=True)
+
+ return frappe._dict(data)
+
+
+def get_sre_reserved_qty_details_for_voucher_detail_no(
+ voucher_type: str, voucher_no: str, voucher_detail_no: str
+) -> list:
+ """Returns a list like ["warehouse", "reserved_qty"]."""
+
+ sre = frappe.qb.DocType("Stock Reservation Entry")
+ reserved_qty_details = (
+ frappe.qb.from_(sre)
+ .select(sre.warehouse, (Sum(sre.reserved_qty) - Sum(sre.delivered_qty)))
+ .where(
+ (sre.docstatus == 1)
+ & (sre.voucher_type == voucher_type)
+ & (sre.voucher_no == voucher_no)
+ & (sre.voucher_detail_no == voucher_detail_no)
+ & (sre.status.notin(["Delivered", "Cancelled"]))
+ )
+ .orderby(sre.creation)
+ .groupby(sre.warehouse)
+ ).run(as_list=True)
+
+ if reserved_qty_details:
+ return reserved_qty_details[0]
+
+ return reserved_qty_details
+
+
+def has_reserved_stock(voucher_type: str, voucher_no: str, voucher_detail_no: str = None) -> bool:
+ """Returns True if there is any Stock Reservation Entry for the given voucher."""
+
+ if get_stock_reservation_entries_for_voucher(
+ voucher_type, voucher_no, voucher_detail_no, fields=["name"]
+ ):
+ return True
+
+ return False
+
+
+@frappe.whitelist()
+def cancel_stock_reservation_entries(
+ voucher_type: str, voucher_no: str, voucher_detail_no: str = None, notify: bool = True
+) -> None:
+ """Cancel Stock Reservation Entries for the given voucher."""
+
+ sre_list = get_stock_reservation_entries_for_voucher(
+ voucher_type, voucher_no, voucher_detail_no, fields=["name"]
+ )
+
+ if sre_list:
+ for sre in sre_list:
+ frappe.get_doc("Stock Reservation Entry", sre.name).cancel()
+
+ if notify:
+ frappe.msgprint(_("Stock Reservation Entries Cancelled"), alert=True, indicator="red")
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js
new file mode 100644
index 0000000..442ac39
--- /dev/null
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry_list.js
@@ -0,0 +1,16 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.listview_settings['Stock Reservation Entry'] = {
+ get_indicator: function (doc) {
+ const status_colors = {
+ 'Draft': 'red',
+ 'Partially Reserved': 'orange',
+ 'Reserved': 'blue',
+ 'Partially Delivered': 'purple',
+ 'Delivered': 'green',
+ 'Cancelled': 'red',
+ };
+ return [__(doc.status), status_colors[doc.status], 'status,=,' + doc.status];
+ },
+};
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py
new file mode 100644
index 0000000..dff407f
--- /dev/null
+++ b/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py
@@ -0,0 +1,336 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import frappe
+from frappe.tests.utils import FrappeTestCase, change_settings
+
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+from erpnext.stock.doctype.stock_entry.stock_entry import StockEntry
+from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+from erpnext.stock.utils import get_stock_balance
+
+
+class TestStockReservationEntry(FrappeTestCase):
+ def setUp(self) -> None:
+ self.items = create_items()
+ create_material_receipt(self.items)
+
+ def tearDown(self) -> None:
+ return super().tearDown()
+
+ def test_validate_stock_reservation_settings(self) -> None:
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ validate_stock_reservation_settings,
+ )
+
+ voucher = frappe._dict(
+ {
+ "doctype": "Sales Order",
+ }
+ )
+
+ # Case - 1: When `Stock Reservation` is disabled in `Stock Settings`, throw `ValidationError`
+ with change_settings("Stock Settings", {"enable_stock_reservation": 0}):
+ self.assertRaises(frappe.ValidationError, validate_stock_reservation_settings, voucher)
+
+ with change_settings("Stock Settings", {"enable_stock_reservation": 1}):
+ # Case - 2: When `Voucher Type` is not allowed for `Stock Reservation`, throw `ValidationError`
+ voucher.doctype = "NOT ALLOWED"
+ self.assertRaises(frappe.ValidationError, validate_stock_reservation_settings, voucher)
+
+ # Case - 3: When `Voucher Type` is allowed for `Stock Reservation`
+ voucher.doctype = "Sales Order"
+ self.assertIsNone(validate_stock_reservation_settings(voucher), None)
+
+ def test_get_available_qty_to_reserve(self) -> None:
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ get_available_qty_to_reserve,
+ )
+
+ item_code, warehouse = "SR Item 1", "_Test Warehouse - _TC"
+
+ # Case - 1: When `Reserved Qty` is `0`, Available Qty to Reserve = Actual Qty
+ cancel_all_stock_reservation_entries()
+ available_qty_to_reserve = get_available_qty_to_reserve(item_code, warehouse)
+ expected_available_qty_to_reserve = get_stock_balance(item_code, warehouse)
+
+ self.assertEqual(available_qty_to_reserve, expected_available_qty_to_reserve)
+
+ # Case - 2: When `Reserved Qty` is `> 0`, Available Qty to Reserve = Actual Qty - Reserved Qty
+ sre = make_stock_reservation_entry(
+ item_code=item_code,
+ warehouse=warehouse,
+ ignore_validate=True,
+ )
+ available_qty_to_reserve = get_available_qty_to_reserve(item_code, warehouse)
+ expected_available_qty_to_reserve = get_stock_balance(item_code, warehouse) - sre.reserved_qty
+
+ self.assertEqual(available_qty_to_reserve, expected_available_qty_to_reserve)
+
+ def test_update_status(self) -> None:
+ sre = make_stock_reservation_entry(
+ reserved_qty=30,
+ ignore_validate=True,
+ do_not_submit=True,
+ )
+
+ # Draft: When DocStatus is `0`
+ sre.load_from_db()
+ self.assertEqual(sre.status, "Draft")
+
+ # Partially Reserved: When DocStatus is `1` and `Reserved Qty` < `Voucher Qty`
+ sre.submit()
+ sre.load_from_db()
+ self.assertEqual(sre.status, "Partially Reserved")
+
+ # Reserved: When DocStatus is `1` and `Reserved Qty` = `Voucher Qty`
+ sre.reserved_qty = sre.voucher_qty
+ sre.db_update()
+ sre.update_status()
+ sre.load_from_db()
+ self.assertEqual(sre.status, "Reserved")
+
+ # Partially Delivered: When DocStatus is `1` and (0 < `Delivered Qty` < `Voucher Qty`)
+ sre.delivered_qty = 10
+ sre.db_update()
+ sre.update_status()
+ sre.load_from_db()
+ self.assertEqual(sre.status, "Partially Delivered")
+
+ # Delivered: When DocStatus is `1` and `Delivered Qty` = `Voucher Qty`
+ sre.delivered_qty = sre.voucher_qty
+ sre.db_update()
+ sre.update_status()
+ sre.load_from_db()
+ self.assertEqual(sre.status, "Delivered")
+
+ # Cancelled: When DocStatus is `2`
+ sre.cancel()
+ sre.load_from_db()
+ self.assertEqual(sre.status, "Cancelled")
+
+ @change_settings("Stock Settings", {"enable_stock_reservation": 1})
+ def test_update_reserved_qty_in_voucher(self) -> None:
+ item_code, warehouse = "SR Item 1", "_Test Warehouse - _TC"
+
+ # Step - 1: Create a `Sales Order`
+ so = make_sales_order(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=50,
+ rate=100,
+ do_not_submit=True,
+ )
+ so.reserve_stock = 0 # Stock Reservation Entries won't be created on submit
+ so.items[0].reserve_stock = 1
+ so.save()
+ so.submit()
+
+ # Step - 2: Create a `Stock Reservation Entry[1]` for the `Sales Order Item`
+ sre1 = make_stock_reservation_entry(
+ item_code=item_code,
+ warehouse=warehouse,
+ voucher_type="Sales Order",
+ voucher_no=so.name,
+ voucher_detail_no=so.items[0].name,
+ reserved_qty=30,
+ )
+
+ so.load_from_db()
+ sre1.load_from_db()
+ self.assertEqual(sre1.status, "Partially Reserved")
+ self.assertEqual(so.items[0].stock_reserved_qty, sre1.reserved_qty)
+
+ # Step - 3: Create a `Stock Reservation Entry[2]` for the `Sales Order Item`
+ sre2 = make_stock_reservation_entry(
+ item_code=item_code,
+ warehouse=warehouse,
+ voucher_type="Sales Order",
+ voucher_no=so.name,
+ voucher_detail_no=so.items[0].name,
+ reserved_qty=20,
+ )
+
+ so.load_from_db()
+ sre2.load_from_db()
+ self.assertEqual(sre1.status, "Partially Reserved")
+ self.assertEqual(so.items[0].stock_reserved_qty, sre1.reserved_qty + sre2.reserved_qty)
+
+ # Step - 4: Cancel `Stock Reservation Entry[1]`
+ sre1.cancel()
+ so.load_from_db()
+ sre1.load_from_db()
+ self.assertEqual(sre1.status, "Cancelled")
+ self.assertEqual(so.items[0].stock_reserved_qty, sre2.reserved_qty)
+
+ # Step - 5: Cancel `Stock Reservation Entry[2]`
+ sre2.cancel()
+ so.load_from_db()
+ sre2.load_from_db()
+ self.assertEqual(sre1.status, "Cancelled")
+ self.assertEqual(so.items[0].stock_reserved_qty, 0)
+
+ @change_settings("Stock Settings", {"enable_stock_reservation": 1})
+ def test_cant_consume_reserved_stock(self) -> None:
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ cancel_stock_reservation_entries,
+ )
+ from erpnext.stock.stock_ledger import NegativeStockError
+
+ item_code, warehouse = "SR Item 1", "_Test Warehouse - _TC"
+
+ # Step - 1: Create a `Sales Order`
+ so = make_sales_order(
+ item_code=item_code,
+ warehouse=warehouse,
+ qty=50,
+ rate=100,
+ do_not_submit=True,
+ )
+ so.reserve_stock = 1 # Stock Reservation Entries will be created on submit
+ so.items[0].reserve_stock = 1
+ so.save()
+ so.submit()
+
+ actual_qty = get_stock_balance(item_code, warehouse)
+
+ # Step - 2: Try to consume (Transfer/Issue/Deliver) the Available Qty via Stock Entry or Delivery Note, should throw `NegativeStockError`.
+ se = make_stock_entry(
+ item_code=item_code,
+ qty=actual_qty,
+ from_warehouse=warehouse,
+ rate=100,
+ purpose="Material Issue",
+ do_not_submit=True,
+ )
+ self.assertRaises(NegativeStockError, se.submit)
+ se.cancel()
+
+ # Step - 3: Unreserve the stock and consume the Available Qty via Stock Entry.
+ cancel_stock_reservation_entries(so.doctype, so.name)
+
+ se = make_stock_entry(
+ item_code=item_code,
+ qty=actual_qty,
+ from_warehouse=warehouse,
+ rate=100,
+ purpose="Material Issue",
+ do_not_submit=True,
+ )
+ se.submit()
+ se.cancel()
+
+
+def create_items() -> dict:
+ from erpnext.stock.doctype.item.test_item import make_item
+
+ items_details = {
+ # Stock Items
+ "SR Item 1": {"is_stock_item": 1, "valuation_rate": 100},
+ "SR Item 2": {"is_stock_item": 1, "valuation_rate": 200, "stock_uom": "Kg"},
+ # Batch Items
+ "SR Batch Item 1": {
+ "is_stock_item": 1,
+ "valuation_rate": 100,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "SRBI-1-.#####.",
+ },
+ "SR Batch Item 2": {
+ "is_stock_item": 1,
+ "valuation_rate": 200,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "SRBI-2-.#####.",
+ "stock_uom": "Kg",
+ },
+ # Serial Item
+ "SR Serial Item 1": {
+ "is_stock_item": 1,
+ "valuation_rate": 100,
+ "has_serial_no": 1,
+ "serial_no_series": "SRSI-1-.#####",
+ },
+ # Batch and Serial Item
+ "SR Batch and Serial Item 1": {
+ "is_stock_item": 1,
+ "valuation_rate": 100,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "SRBSI-1-.#####.",
+ "has_serial_no": 1,
+ "serial_no_series": "SRBSI-1-.#####",
+ },
+ }
+
+ items = {}
+ for item_code, properties in items_details.items():
+ items[item_code] = make_item(item_code, properties)
+
+ return items
+
+
+def create_material_receipt(
+ items: dict, warehouse: str = "_Test Warehouse - _TC", qty: float = 100
+) -> StockEntry:
+ se = frappe.new_doc("Stock Entry")
+ se.purpose = "Material Receipt"
+ se.company = "_Test Company"
+ cost_center = frappe.get_value("Company", se.company, "cost_center")
+ expense_account = frappe.get_value("Company", se.company, "stock_adjustment_account")
+
+ for item in items.values():
+ se.append(
+ "items",
+ {
+ "item_code": item.item_code,
+ "t_warehouse": warehouse,
+ "qty": qty,
+ "basic_rate": item.valuation_rate or 100,
+ "conversion_factor": 1.0,
+ "transfer_qty": qty,
+ "cost_center": cost_center,
+ "expense_account": expense_account,
+ },
+ )
+
+ se.set_stock_entry_type()
+ se.insert()
+ se.submit()
+ se.reload()
+
+ return se
+
+
+def cancel_all_stock_reservation_entries() -> None:
+ sre_list = frappe.db.get_all("Stock Reservation Entry", filters={"docstatus": 1}, pluck="name")
+
+ for sre in sre_list:
+ frappe.get_doc("Stock Reservation Entry", sre).cancel()
+
+
+def make_stock_reservation_entry(**args):
+ doc = frappe.new_doc("Stock Reservation Entry")
+ args = frappe._dict(args)
+
+ doc.item_code = args.item_code or "SR Item 1"
+ doc.warehouse = args.warehouse or "_Test Warehouse - _TC"
+ doc.voucher_type = args.voucher_type
+ doc.voucher_no = args.voucher_no
+ doc.voucher_detail_no = args.voucher_detail_no
+ doc.available_qty = args.available_qty or 100
+ doc.voucher_qty = args.voucher_qty or 50
+ doc.stock_uom = args.stock_uom or "Nos"
+ doc.reserved_qty = args.reserved_qty or 50
+ doc.delivered_qty = args.delivered_qty or 0
+ doc.company = args.company or "_Test Company"
+
+ if args.ignore_validate:
+ doc.flags.ignore_validate = True
+
+ if not args.do_not_save:
+ doc.save()
+ if not args.do_not_submit:
+ doc.submit()
+
+ return doc
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index ec7fb0f..9d67cf9 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -8,12 +8,12 @@
"defaults_tab",
"item_defaults_section",
"item_naming_by",
+ "valuation_method",
"item_group",
- "stock_uom",
"column_break_4",
"default_warehouse",
"sample_retention_warehouse",
- "valuation_method",
+ "stock_uom",
"price_list_defaults_section",
"auto_insert_price_list_rate_if_missing",
"column_break_12",
@@ -31,11 +31,16 @@
"action_if_quality_inspection_is_not_submitted",
"column_break_23",
"action_if_quality_inspection_is_rejected",
+ "stock_reservation_tab",
+ "enable_stock_reservation",
+ "column_break_rx3e",
+ "reserve_stock_on_sales_order_submission",
+ "allow_partial_reservation",
"serial_and_batch_item_settings_tab",
"section_break_7",
- "automatically_set_serial_nos_based_on_fifo",
- "set_qty_in_transactions_based_on_serial_no_input",
- "column_break_10",
+ "auto_create_serial_and_batch_bundle_for_outward",
+ "pick_serial_and_batch_based_on",
+ "column_break_mhzc",
"disable_serial_no_and_batch_selector",
"use_naming_series",
"naming_series_prefix",
@@ -96,6 +101,7 @@
"fieldtype": "Column Break"
},
{
+ "documentation_url": "https://docs.erpnext.com/docs/v14/user/manual/en/stock/articles/calculation-of-valuation-rate-in-fifo-and-moving-average",
"fieldname": "valuation_method",
"fieldtype": "Select",
"label": "Default Valuation Method",
@@ -144,22 +150,6 @@
"label": "Allow Negative Stock"
},
{
- "fieldname": "column_break_10",
- "fieldtype": "Column Break"
- },
- {
- "default": "1",
- "fieldname": "automatically_set_serial_nos_based_on_fifo",
- "fieldtype": "Check",
- "label": "Automatically Set Serial Nos Based on FIFO"
- },
- {
- "default": "1",
- "fieldname": "set_qty_in_transactions_based_on_serial_no_input",
- "fieldtype": "Check",
- "label": "Set Qty in Transactions Based on Serial No Input"
- },
- {
"fieldname": "auto_material_request",
"fieldtype": "Section Break",
"label": "Auto Material Request"
@@ -339,6 +329,60 @@
{
"fieldname": "column_break_121",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "stock_reservation_tab",
+ "fieldtype": "Tab Break",
+ "label": "Stock Reservation"
+ },
+ {
+ "default": "0",
+ "fieldname": "enable_stock_reservation",
+ "fieldtype": "Check",
+ "label": "Enable Stock Reservation"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval: doc.enable_stock_reservation",
+ "description": "If enabled, <b>Stock Reservation Entries</b> will be created on submission of <b>Sales Order</b>",
+ "fieldname": "reserve_stock_on_sales_order_submission",
+ "fieldtype": "Check",
+ "label": "Reserve Stock on Sales Order Submission"
+ },
+ {
+ "fieldname": "column_break_rx3e",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "1",
+ "depends_on": "eval: doc.enable_stock_reservation",
+ "description": "If enabled, <b>Partial Stock Reservation Entries</b> can be created. For example, If you have a <b>Sales Order</b> of 100 units and the Available Stock is 90 units then a Stock Reservation Entry will be created for 90 units. ",
+ "fieldname": "allow_partial_reservation",
+ "fieldtype": "Check",
+ "label": "Allow Partial Reservation"
+ },
+ {
+ "fieldname": "section_break_plhx",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_mhzc",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "FIFO",
+ "depends_on": "auto_create_serial_and_batch_bundle_for_outward",
+ "fieldname": "pick_serial_and_batch_based_on",
+ "fieldtype": "Select",
+ "label": "Pick Serial / Batch Based On",
+ "mandatory_depends_on": "auto_create_serial_and_batch_bundle_for_outward",
+ "options": "FIFO\nLIFO\nExpiry"
+ },
+ {
+ "default": "1",
+ "fieldname": "auto_create_serial_and_batch_bundle_for_outward",
+ "fieldtype": "Check",
+ "label": "Auto Create Serial and Batch Bundle For Outward"
}
],
"icon": "icon-cog",
@@ -346,7 +390,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2022-02-05 15:33:43.692736",
+ "modified": "2023-05-29 15:10:54.959411",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index 50807a9..3b6db64 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -55,6 +55,7 @@
self.cant_change_valuation_method()
self.validate_clean_description_html()
self.validate_pending_reposts()
+ self.validate_stock_reservation()
def validate_warehouses(self):
warehouse_fields = ["default_warehouse", "sample_retention_warehouse"]
@@ -93,12 +94,81 @@
frappe.enqueue(
"erpnext.stock.doctype.stock_settings.stock_settings.clean_all_descriptions",
now=frappe.flags.in_test,
+ enqueue_after_commit=True,
)
def validate_pending_reposts(self):
if self.stock_frozen_upto:
check_pending_reposting(self.stock_frozen_upto)
+ def validate_stock_reservation(self):
+ """Raises an exception if the user tries to enable/disable `Stock Reservation` with `Negative Stock` or `Open Stock Reservation Entries`."""
+
+ # Skip validation for tests
+ if frappe.flags.in_test:
+ return
+
+ db_allow_negative_stock = frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
+ db_enable_stock_reservation = frappe.db.get_single_value(
+ "Stock Settings", "enable_stock_reservation"
+ )
+
+ # Change in value of `Allow Negative Stock`
+ if db_allow_negative_stock != self.allow_negative_stock:
+
+ # Disable -> Enable: Don't allow if `Stock Reservation` is enabled
+ if self.allow_negative_stock and self.enable_stock_reservation:
+ frappe.throw(
+ _("As {0} is enabled, you can not enable {1}.").format(
+ frappe.bold("Stock Reservation"), frappe.bold("Allow Negative Stock")
+ )
+ )
+
+ # Change in value of `Enable Stock Reservation`
+ if db_enable_stock_reservation != self.enable_stock_reservation:
+
+ # Disable -> Enable
+ if self.enable_stock_reservation:
+
+ # Don't allow if `Allow Negative Stock` is enabled
+ if self.allow_negative_stock:
+ frappe.throw(
+ _("As {0} is enabled, you can not enable {1}.").format(
+ frappe.bold("Allow Negative Stock"), frappe.bold("Stock Reservation")
+ )
+ )
+
+ else:
+ # Don't allow if there are negative stock
+ from frappe.query_builder.functions import Round
+
+ precision = frappe.db.get_single_value("System Settings", "float_precision") or 3
+ bin = frappe.qb.DocType("Bin")
+ bin_with_negative_stock = (
+ frappe.qb.from_(bin).select(bin.name).where(Round(bin.actual_qty, precision) < 0).limit(1)
+ ).run()
+
+ if bin_with_negative_stock:
+ frappe.throw(
+ _("As there are negative stock, you can not enable {0}.").format(
+ frappe.bold("Stock Reservation")
+ )
+ )
+
+ # Enable -> Disable
+ else:
+ # Don't allow if there are open Stock Reservation Entries
+ has_reserved_stock = frappe.db.exists(
+ "Stock Reservation Entry", {"docstatus": 1, "status": ["!=", "Delivered"]}
+ )
+
+ if has_reserved_stock:
+ frappe.throw(
+ _("As there are reserved stock, you cannot disable {0}.").format(
+ frappe.bold("Stock Reservation")
+ )
+ )
+
def on_update(self):
self.toggle_warehouse_field_for_inter_warehouse_transfer()
diff --git a/erpnext/stock/doctype/stock_settings/test_stock_settings.py b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
index 974e163..cda739e 100644
--- a/erpnext/stock/doctype/stock_settings/test_stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
@@ -10,7 +10,7 @@
class TestStockSettings(FrappeTestCase):
def setUp(self):
super().setUp()
- frappe.db.set_value("Stock Settings", None, "clean_description_html", 0)
+ frappe.db.set_single_value("Stock Settings", "clean_description_html", 0)
def test_settings(self):
item = frappe.get_doc(
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index d69c624..3819c0b2 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -13,10 +13,11 @@
};
});
- frm.set_query("parent_warehouse", function () {
+ frm.set_query("parent_warehouse", function (doc) {
return {
filters: {
is_group: 1,
+ company: doc.company,
},
};
});
@@ -39,26 +40,34 @@
!frm.doc.__islocal
);
- if (!frm.doc.__islocal) {
+ if (!frm.is_new()) {
frappe.contacts.render_address_and_contact(frm);
+
+ let enable_toggle = frm.doc.disabled ? "Enable" : "Disable";
+ frm.add_custom_button(__(enable_toggle), () => {
+ frm.set_value('disabled', 1 - frm.doc.disabled);
+ frm.save()
+ });
+
+ frm.add_custom_button(__("Stock Balance"), function () {
+ frappe.set_route("query-report", "Stock Balance", {
+ warehouse: frm.doc.name,
+ });
+ });
+
+ frm.add_custom_button(
+ frm.doc.is_group
+ ? __("Convert to Ledger", null, "Warehouse")
+ : __("Convert to Group", null, "Warehouse"),
+ function () {
+ convert_to_group_or_ledger(frm);
+ },
+ );
+
} else {
frappe.contacts.clear_address_and_contact(frm);
}
- frm.add_custom_button(__("Stock Balance"), function () {
- frappe.set_route("query-report", "Stock Balance", {
- warehouse: frm.doc.name,
- });
- });
-
- frm.add_custom_button(
- frm.doc.is_group
- ? __("Convert to Ledger", null, "Warehouse")
- : __("Convert to Group", null, "Warehouse"),
- function () {
- convert_to_group_or_ledger(frm);
- },
- );
if (!frm.doc.is_group && frm.doc.__onload && frm.doc.__onload.account) {
frm.add_custom_button(
@@ -74,12 +83,6 @@
}
frm.toggle_enable(["is_group", "company"], false);
-
- frappe.dynamic_link = {
- doc: frm.doc,
- fieldname: "name",
- doctype: "Warehouse",
- };
},
});
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index c695d54..43b2ad2 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -1,23 +1,21 @@
{
"actions": [],
"allow_import": 1,
- "creation": "2013-03-07 18:50:32",
+ "creation": "2023-05-29 13:02:17.121296",
"description": "A logical Warehouse against which stock entries are made.",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
"warehouse_detail",
+ "disabled",
"warehouse_name",
"column_break_3",
- "warehouse_type",
- "parent_warehouse",
- "default_in_transit_warehouse",
"is_group",
+ "parent_warehouse",
"column_break_4",
"account",
"company",
- "disabled",
"address_and_contact",
"address_html",
"column_break_10",
@@ -32,6 +30,10 @@
"city",
"state",
"pin",
+ "transit_section",
+ "warehouse_type",
+ "column_break_qajx",
+ "default_in_transit_warehouse",
"tree_details",
"lft",
"rgt",
@@ -58,7 +60,7 @@
"fieldname": "is_group",
"fieldtype": "Check",
"in_list_view": 1,
- "label": "Is Group"
+ "label": "Is Group Warehouse"
},
{
"fieldname": "company",
@@ -78,7 +80,7 @@
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
- "in_list_view": 1,
+ "hidden": 1,
"label": "Disabled"
},
{
@@ -164,7 +166,6 @@
{
"fieldname": "city",
"fieldtype": "Data",
- "in_list_view": 1,
"label": "City",
"oldfieldname": "city",
"oldfieldtype": "Data"
@@ -238,13 +239,23 @@
"fieldtype": "Link",
"label": "Default In-Transit Warehouse",
"options": "Warehouse"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "transit_section",
+ "fieldtype": "Section Break",
+ "label": "Transit"
+ },
+ {
+ "fieldname": "column_break_qajx",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-building",
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2022-03-01 02:37:48.034944",
+ "modified": "2023-05-29 13:10:43.333160",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
@@ -261,7 +272,6 @@
"read": 1,
"report": 1,
"role": "Item Manager",
- "set_user_permissions": 1,
"share": 1,
"write": 1
},
diff --git a/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json
index 5b7fd72..07a5110 100644
--- a/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/form_tour/stock_reconciliation/stock_reconciliation.json
@@ -2,54 +2,75 @@
"creation": "2021-08-24 14:44:46.770952",
"docstatus": 0,
"doctype": "Form Tour",
+ "first_document": 0,
"idx": 0,
+ "include_name_field": 0,
"is_standard": 1,
- "modified": "2021-08-25 16:26:11.718664",
+ "list_name": "List",
+ "modified": "2023-05-29 13:38:27.192177",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation",
+ "new_document_form": 0,
"owner": "Administrator",
"reference_doctype": "Stock Reconciliation",
"save_on_complete": 1,
"steps": [
{
"description": "Set Purpose to Opening Stock to set the stock opening balance.",
- "field": "",
"fieldname": "purpose",
"fieldtype": "Select",
"has_next_condition": 1,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Purpose",
+ "modal_trigger": 0,
+ "next_on_click": 0,
"next_step_condition": "eval: doc.purpose === \"Opening Stock\"",
- "parent_field": "",
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Top",
- "title": "Purpose"
- },
- {
- "description": "Select the items for which the opening stock has to be set.",
- "field": "",
- "fieldname": "items",
- "fieldtype": "Table",
- "has_next_condition": 1,
- "is_table_field": 0,
- "label": "Items",
- "next_step_condition": "eval: doc.items[0]?.item_code",
- "parent_field": "",
- "position": "Top",
- "title": "Items"
+ "title": "Purpose",
+ "ui_tour": 0
},
{
"description": "Edit the Posting Date by clicking on the Edit Posting Date and Time checkbox below.",
- "field": "",
"fieldname": "posting_date",
"fieldtype": "Date",
"has_next_condition": 0,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Posting Date",
- "parent_field": "",
+ "modal_trigger": 0,
+ "next_on_click": 0,
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Bottom",
- "title": "Posting Date"
+ "title": "Posting Date",
+ "ui_tour": 0
+ },
+ {
+ "description": "Select the items for which the opening stock has to be set.",
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "has_next_condition": 1,
+ "hide_buttons": 0,
+ "is_table_field": 0,
+ "label": "Items",
+ "modal_trigger": 0,
+ "next_on_click": 0,
+ "next_step_condition": "eval: doc.items[0]?.item_code",
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
+ "position": "Top",
+ "title": "Items",
+ "ui_tour": 0
}
],
- "title": "Stock Reconciliation"
+ "title": "Stock Reconciliation",
+ "track_steps": 0,
+ "ui_tour": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/form_tour/stock_settings/stock_settings.json b/erpnext/stock/form_tour/stock_settings/stock_settings.json
index 3d164e3..adbd159 100644
--- a/erpnext/stock/form_tour/stock_settings/stock_settings.json
+++ b/erpnext/stock/form_tour/stock_settings/stock_settings.json
@@ -2,88 +2,73 @@
"creation": "2021-08-20 15:20:59.336585",
"docstatus": 0,
"doctype": "Form Tour",
+ "first_document": 0,
"idx": 0,
+ "include_name_field": 0,
"is_standard": 1,
- "modified": "2021-08-25 16:19:37.699528",
+ "list_name": "List",
+ "modified": "2023-05-29 12:33:19.142202",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",
+ "new_document_form": 0,
"owner": "Administrator",
"reference_doctype": "Stock Settings",
"save_on_complete": 1,
"steps": [
{
"description": "By default, the Item Name is set as per the Item Code entered. If you want Items to be named by a Naming Series choose the 'Naming Series' option.",
- "field": "",
"fieldname": "item_naming_by",
"fieldtype": "Select",
"has_next_condition": 0,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Item Naming By",
- "parent_field": "",
+ "modal_trigger": 0,
+ "next_on_click": 0,
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Bottom",
- "title": "Item Naming By"
+ "title": "Item Naming By",
+ "ui_tour": 0
},
{
"description": "Set a Default Warehouse for Inventory Transactions. This will be fetched into the Default Warehouse in the Item master.",
- "field": "",
"fieldname": "default_warehouse",
"fieldtype": "Link",
"has_next_condition": 0,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Default Warehouse",
- "parent_field": "",
+ "modal_trigger": 0,
+ "next_on_click": 0,
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Bottom",
- "title": "Default Warehouse"
- },
- {
- "description": "Quality inspection is performed on the inward and outward movement of goods. Receipt and delivery transactions will be stopped or the user will be warned if the quality inspection is not performed.",
- "field": "",
- "fieldname": "action_if_quality_inspection_is_not_submitted",
- "fieldtype": "Select",
- "has_next_condition": 0,
- "is_table_field": 0,
- "label": "Action If Quality Inspection Is Not Submitted",
- "parent_field": "",
- "position": "Bottom",
- "title": "Action if Quality Inspection Is Not Submitted"
- },
- {
- "description": "Serial numbers for stock will be set automatically based on the Items entered based on first in first out in transactions like Purchase/Sales Invoices, Delivery Notes, etc.",
- "field": "",
- "fieldname": "automatically_set_serial_nos_based_on_fifo",
- "fieldtype": "Check",
- "has_next_condition": 0,
- "is_table_field": 0,
- "label": "Automatically Set Serial Nos Based on FIFO",
- "parent_field": "",
- "position": "Bottom",
- "title": "Automatically Set Serial Nos based on FIFO"
- },
- {
- "description": "Show 'Scan Barcode' field above every child table to insert Items with ease.",
- "field": "",
- "fieldname": "show_barcode_field",
- "fieldtype": "Check",
- "has_next_condition": 0,
- "is_table_field": 0,
- "label": "Show Barcode Field in Stock Transactions",
- "parent_field": "",
- "position": "Bottom",
- "title": "Show Barcode Field"
+ "title": "Default Warehouse",
+ "ui_tour": 0
},
{
"description": "Choose between FIFO and Moving Average Valuation Methods. Click <a href=\"https://docs.erpnext.com/docs/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average\" target=\"_blank\">here</a> to know more about them.",
- "field": "",
"fieldname": "valuation_method",
"fieldtype": "Select",
"has_next_condition": 0,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Default Valuation Method",
- "parent_field": "",
+ "modal_trigger": 0,
+ "next_on_click": 0,
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Bottom",
- "title": "Default Valuation Method"
+ "title": "Default Valuation Method",
+ "ui_tour": 0
}
],
- "title": "Stock Settings"
+ "title": "Stock Settings",
+ "track_steps": 0,
+ "ui_tour": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/form_tour/warehouse/warehouse.json b/erpnext/stock/form_tour/warehouse/warehouse.json
index 23ff2ae..5897357 100644
--- a/erpnext/stock/form_tour/warehouse/warehouse.json
+++ b/erpnext/stock/form_tour/warehouse/warehouse.json
@@ -2,53 +2,57 @@
"creation": "2021-08-24 14:43:44.465237",
"docstatus": 0,
"doctype": "Form Tour",
+ "first_document": 0,
"idx": 0,
+ "include_name_field": 0,
"is_standard": 1,
- "modified": "2021-08-24 14:50:31.988256",
+ "list_name": "List",
+ "modified": "2023-05-29 13:09:49.920796",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
+ "new_document_form": 0,
"owner": "Administrator",
"reference_doctype": "Warehouse",
"save_on_complete": 1,
"steps": [
{
"description": "Select a name for the warehouse. This should reflect its location or purpose.",
- "field": "",
"fieldname": "warehouse_name",
"fieldtype": "Data",
"has_next_condition": 1,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Warehouse Name",
+ "modal_trigger": 0,
+ "next_on_click": 0,
"next_step_condition": "eval: doc.warehouse_name",
- "parent_field": "",
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Bottom",
- "title": "Warehouse Name"
- },
- {
- "description": "Select a warehouse type to categorize the warehouse into a sub-group.",
- "field": "",
- "fieldname": "warehouse_type",
- "fieldtype": "Link",
- "has_next_condition": 0,
- "is_table_field": 0,
- "label": "Warehouse Type",
- "parent_field": "",
- "position": "Top",
- "title": "Warehouse Type"
+ "title": "Warehouse Name",
+ "ui_tour": 0
},
{
"description": "Select an account to set a default account for all transactions with this warehouse.",
- "field": "",
"fieldname": "account",
"fieldtype": "Link",
"has_next_condition": 0,
+ "hide_buttons": 0,
"is_table_field": 0,
"label": "Account",
- "parent_field": "",
+ "modal_trigger": 0,
+ "next_on_click": 0,
+ "offset_x": 0,
+ "offset_y": 0,
+ "popover_element": 0,
"position": "Top",
- "title": "Account"
+ "title": "Account",
+ "ui_tour": 0
}
],
- "title": "Warehouse"
+ "title": "Warehouse",
+ "track_steps": 0,
+ "ui_tour": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index ce85702..4f85ac0 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -8,7 +8,7 @@
from frappe import _, throw
from frappe.model import child_table_fields, default_fields
from frappe.model.meta import get_field_precision
-from frappe.query_builder.functions import CombineDatetime, IfNull, Sum
+from frappe.query_builder.functions import IfNull, Sum
from frappe.utils import add_days, add_months, cint, cstr, flt, getdate
from erpnext import get_company_currency
@@ -19,7 +19,6 @@
from erpnext.setup.doctype.brand.brand import get_brand_defaults
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
from erpnext.setup.utils import get_exchange_rate
-from erpnext.stock.doctype.batch.batch import get_batch_no
from erpnext.stock.doctype.item.item import get_item_defaults, get_uom_conv_factor
from erpnext.stock.doctype.item_manufacturer.item_manufacturer import get_item_manufacturer_part_no
from erpnext.stock.doctype.price_list.price_list import get_price_list_details
@@ -128,8 +127,6 @@
out.update(data)
- update_stock(args, out)
-
if args.transaction_date and item.lead_time_days:
out.schedule_date = out.lead_time_date = add_days(args.transaction_date, item.lead_time_days)
@@ -151,35 +148,6 @@
return details
-def update_stock(args, out):
- if (
- (
- args.get("doctype") == "Delivery Note"
- or (args.get("doctype") == "Sales Invoice" and args.get("update_stock"))
- )
- and out.warehouse
- and out.stock_qty > 0
- ):
-
- if out.has_batch_no and not args.get("batch_no"):
- out.batch_no = get_batch_no(out.item_code, out.warehouse, out.qty)
- actual_batch_qty = get_batch_qty(out.batch_no, out.warehouse, out.item_code)
- if actual_batch_qty:
- out.update(actual_batch_qty)
-
- if out.has_serial_no and args.get("batch_no"):
- reserved_so = get_so_reservation_for_item(args)
- out.batch_no = args.get("batch_no")
- out.serial_no = get_serial_no(out, args.serial_no, sales_order=reserved_so)
-
- elif out.has_serial_no:
- reserved_so = get_so_reservation_for_item(args)
- out.serial_no = get_serial_no(out, args.serial_no, sales_order=reserved_so)
-
- if not out.serial_no:
- out.pop("serial_no", None)
-
-
def set_valuation_rate(out, args):
if frappe.db.exists("Product Bundle", args.item_code, cache=True):
valuation_rate = 0.0
@@ -223,7 +191,6 @@
return args
-@frappe.whitelist()
def get_item_code(barcode=None, serial_no=None):
if barcode:
item_code = frappe.db.get_value("Item Barcode", {"barcode": barcode}, fieldname=["parent"])
@@ -1121,28 +1088,6 @@
return pos_profile and pos_profile[0] or None
-def get_serial_nos_by_fifo(args, sales_order=None):
- if frappe.db.get_single_value("Stock Settings", "automatically_set_serial_nos_based_on_fifo"):
- sn = frappe.qb.DocType("Serial No")
- query = (
- frappe.qb.from_(sn)
- .select(sn.name)
- .where((sn.item_code == args.item_code) & (sn.warehouse == args.warehouse))
- .orderby(CombineDatetime(sn.purchase_date, sn.purchase_time))
- .limit(abs(cint(args.stock_qty)))
- )
-
- if sales_order:
- query = query.where(sn.sales_order == sales_order)
- if args.batch_no:
- query = query.where(sn.batch_no == args.batch_no)
-
- serial_nos = query.run(as_list=True)
- serial_nos = [s[0] for s in serial_nos]
-
- return "\n".join(serial_nos)
-
-
@frappe.whitelist()
def get_conversion_factor(item_code, uom):
variant_of = frappe.db.get_value("Item", item_code, "variant_of", cache=True)
@@ -1209,51 +1154,6 @@
@frappe.whitelist()
-def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):
- args = frappe._dict(
- {"item_code": item_code, "warehouse": warehouse, "stock_qty": stock_qty, "serial_no": serial_no}
- )
- serial_no = get_serial_no(args)
-
- return {"serial_no": serial_no}
-
-
-@frappe.whitelist()
-def get_bin_details_and_serial_nos(
- item_code, warehouse, has_batch_no=None, stock_qty=None, serial_no=None
-):
- bin_details_and_serial_nos = {}
- bin_details_and_serial_nos.update(get_bin_details(item_code, warehouse))
- if flt(stock_qty) > 0:
- if has_batch_no:
- args = frappe._dict({"item_code": item_code, "warehouse": warehouse, "stock_qty": stock_qty})
- serial_no = get_serial_no(args)
- bin_details_and_serial_nos.update({"serial_no": serial_no})
- return bin_details_and_serial_nos
-
- bin_details_and_serial_nos.update(
- get_serial_no_details(item_code, warehouse, stock_qty, serial_no)
- )
-
- return bin_details_and_serial_nos
-
-
-@frappe.whitelist()
-def get_batch_qty_and_serial_no(batch_no, stock_qty, warehouse, item_code, has_serial_no):
- batch_qty_and_serial_no = {}
- batch_qty_and_serial_no.update(get_batch_qty(batch_no, warehouse, item_code))
-
- if (flt(batch_qty_and_serial_no.get("actual_batch_qty")) >= flt(stock_qty)) and has_serial_no:
- args = frappe._dict(
- {"item_code": item_code, "warehouse": warehouse, "stock_qty": stock_qty, "batch_no": batch_no}
- )
- serial_no = get_serial_no(args)
- batch_qty_and_serial_no.update({"serial_no": serial_no})
-
- return batch_qty_and_serial_no
-
-
-@frappe.whitelist()
def get_batch_qty(batch_no, warehouse, item_code):
from erpnext.stock.doctype.batch import batch
@@ -1427,32 +1327,8 @@
@frappe.whitelist()
def get_serial_no(args, serial_nos=None, sales_order=None):
- serial_no = None
- if isinstance(args, str):
- args = json.loads(args)
- args = frappe._dict(args)
- if args.get("doctype") == "Sales Invoice" and not args.get("update_stock"):
- return ""
- if args.get("warehouse") and args.get("stock_qty") and args.get("item_code"):
- has_serial_no = frappe.get_value("Item", {"item_code": args.item_code}, "has_serial_no")
- if args.get("batch_no") and has_serial_no == 1:
- return get_serial_nos_by_fifo(args, sales_order)
- elif has_serial_no == 1:
- args = json.dumps(
- {
- "item_code": args.get("item_code"),
- "warehouse": args.get("warehouse"),
- "stock_qty": args.get("stock_qty"),
- }
- )
- args = process_args(args)
- serial_no = get_serial_nos_by_fifo(args, sales_order)
-
- if not serial_no and serial_nos:
- # For POS
- serial_no = serial_nos
-
- return serial_no
+ serial_nos = serial_nos or []
+ return serial_nos
def update_party_blanket_order(args, out):
@@ -1498,37 +1374,3 @@
blanket_order_details = blanket_order_details[0] if blanket_order_details else ""
return blanket_order_details
-
-
-def get_so_reservation_for_item(args):
- reserved_so = None
- if args.get("against_sales_order"):
- if get_reserved_qty_for_so(args.get("against_sales_order"), args.get("item_code")):
- reserved_so = args.get("against_sales_order")
- elif args.get("against_sales_invoice"):
- sales_order = frappe.db.get_all(
- "Sales Invoice Item",
- filters={"parent": args.get("against_sales_invoice"), "item_code": args.get("item_code")},
- fields="sales_order",
- )
- if sales_order and sales_order[0]:
- if get_reserved_qty_for_so(sales_order[0][0], args.get("item_code")):
- reserved_so = sales_order[0]
- elif args.get("sales_order"):
- if get_reserved_qty_for_so(args.get("sales_order"), args.get("item_code")):
- reserved_so = args.get("sales_order")
- return reserved_so
-
-
-def get_reserved_qty_for_so(sales_order, item_code):
- reserved_qty = frappe.db.get_value(
- "Sales Order Item",
- filters={
- "parent": sales_order,
- "item_code": item_code,
- "ensure_delivery_based_on_produced_serial_no": 1,
- },
- fieldname="sum(qty)",
- )
-
- return reserved_qty or 0
diff --git a/erpnext/stock/module_onboarding/stock/stock.json b/erpnext/stock/module_onboarding/stock/stock.json
index c246747..864ac4b 100644
--- a/erpnext/stock/module_onboarding/stock/stock.json
+++ b/erpnext/stock/module_onboarding/stock/stock.json
@@ -19,7 +19,7 @@
"documentation_url": "https://docs.erpnext.com/docs/user/manual/en/stock",
"idx": 0,
"is_complete": 0,
- "modified": "2021-08-20 14:38:55.570067",
+ "modified": "2023-05-29 14:43:36.223302",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock",
@@ -35,10 +35,10 @@
"step": "Create a Stock Entry"
},
{
- "step": "Stock Opening Balance"
+ "step": "Check Stock Ledger Report"
},
{
- "step": "View Stock Projected Qty"
+ "step": "Stock Opening Balance"
}
],
"subtitle": "Inventory, Warehouses, Analysis, and more.",
diff --git a/erpnext/stock/onboarding_step/check_stock_ledger_report/check_stock_ledger_report.json b/erpnext/stock/onboarding_step/check_stock_ledger_report/check_stock_ledger_report.json
new file mode 100644
index 0000000..cdbc0b7
--- /dev/null
+++ b/erpnext/stock/onboarding_step/check_stock_ledger_report/check_stock_ledger_report.json
@@ -0,0 +1,24 @@
+{
+ "action": "View Report",
+ "action_label": "Check Stock Ledger",
+ "creation": "2023-05-29 13:46:04.174565",
+ "description": "# Check Stock Reports\nBased on the various stock transactions, you can get a host of one-click Stock Reports in ERPNext like Stock Ledger, Stock Balance, Projected Quantity, and Ageing analysis.",
+ "docstatus": 0,
+ "doctype": "Onboarding Step",
+ "idx": 0,
+ "is_complete": 0,
+ "is_single": 0,
+ "is_skipped": 0,
+ "modified": "2023-05-29 14:39:03.943244",
+ "modified_by": "Administrator",
+ "name": "Check Stock Ledger Report",
+ "owner": "Administrator",
+ "reference_report": "Stock Ledger",
+ "report_description": "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries.",
+ "report_reference_doctype": "Stock Ledger Entry",
+ "report_type": "Script Report",
+ "show_form_tour": 0,
+ "show_full_form": 0,
+ "title": "Check Stock Ledger",
+ "validate_action": 1
+}
\ No newline at end of file
diff --git a/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json b/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json
index 3cb522c..dea2aae 100644
--- a/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json
+++ b/erpnext/stock/onboarding_step/create_a_stock_entry/create_a_stock_entry.json
@@ -9,7 +9,7 @@
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-06-18 13:57:11.434063",
+ "modified": "2023-05-29 14:39:04.066547",
"modified_by": "Administrator",
"name": "Create a Stock Entry",
"owner": "Administrator",
diff --git a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json
index 22c88bf..2592612 100644
--- a/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json
+++ b/erpnext/stock/onboarding_step/create_a_warehouse/create_a_warehouse.json
@@ -9,7 +9,7 @@
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-08-18 12:23:36.675572",
+ "modified": "2023-05-29 14:39:04.074907",
"modified_by": "Administrator",
"name": "Create a Warehouse",
"owner": "Administrator",
diff --git a/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json b/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json
index 48fd1fd..18c9550 100644
--- a/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json
+++ b/erpnext/stock/onboarding_step/stock_opening_balance/stock_opening_balance.json
@@ -9,7 +9,7 @@
"is_complete": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2021-06-18 13:59:36.021097",
+ "modified": "2023-05-29 14:39:08.825699",
"modified_by": "Administrator",
"name": "Stock Opening Balance",
"owner": "Administrator",
diff --git a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json
index 2cf90e8..b48ac80 100644
--- a/erpnext/stock/onboarding_step/stock_settings/stock_settings.json
+++ b/erpnext/stock/onboarding_step/stock_settings/stock_settings.json
@@ -9,7 +9,7 @@
"is_complete": 0,
"is_single": 1,
"is_skipped": 0,
- "modified": "2021-08-18 12:06:51.139387",
+ "modified": "2023-05-29 14:39:04.083360",
"modified_by": "Administrator",
"name": "Stock Settings",
"owner": "Administrator",
diff --git a/erpnext/loan_management/__init__.py b/erpnext/stock/print_format/purchase_receipt_serial_and_batch_bundle_print/__init__.py
similarity index 100%
rename from erpnext/loan_management/__init__.py
rename to erpnext/stock/print_format/purchase_receipt_serial_and_batch_bundle_print/__init__.py
diff --git a/erpnext/stock/print_format/purchase_receipt_serial_and_batch_bundle_print/purchase_receipt_serial_and_batch_bundle_print.json b/erpnext/stock/print_format/purchase_receipt_serial_and_batch_bundle_print/purchase_receipt_serial_and_batch_bundle_print.json
new file mode 100644
index 0000000..a8ab8f6
--- /dev/null
+++ b/erpnext/stock/print_format/purchase_receipt_serial_and_batch_bundle_print/purchase_receipt_serial_and_batch_bundle_print.json
@@ -0,0 +1,30 @@
+{
+ "absolute_value": 0,
+ "align_labels_right": 0,
+ "creation": "2023-06-01 23:07:25.776606",
+ "custom_format": 0,
+ "disabled": 0,
+ "doc_type": "Purchase Receipt",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font_size": 14,
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"<div class=\\\"print-heading\\\">\\t\\t\\t\\t<h2><div>Purchase Receipt</div><br><small class=\\\"sub-heading\\\">{{ doc.name }}</small>\\t\\t\\t\\t</h2></div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"supplier_name\", \"print_hide\": 0, \"label\": \"Supplier Name\"}, {\"fieldname\": \"supplier_delivery_note\", \"print_hide\": 0, \"label\": \"Supplier Delivery Note\"}, {\"fieldname\": \"rack\", \"print_hide\": 0, \"label\": \"Rack\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"posting_date\", \"print_hide\": 0, \"label\": \"Date\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"apply_putaway_rule\", \"print_hide\": 0, \"label\": \"Apply Putaway Rule\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Accounting Dimensions\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"region\", \"print_hide\": 0, \"label\": \"Region\"}, {\"fieldname\": \"function\", \"print_hide\": 0, \"label\": \"Function\"}, {\"fieldname\": \"depot\", \"print_hide\": 0, \"label\": \"Depot\"}, {\"fieldname\": \"cost_center\", \"print_hide\": 0, \"label\": \"Cost Center\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"location\", \"print_hide\": 0, \"label\": \"Location\"}, {\"fieldname\": \"country\", \"print_hide\": 0, \"label\": \"Country\"}, {\"fieldname\": \"project\", \"print_hide\": 0, \"label\": \"Project\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Items\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"scan_barcode\", \"print_hide\": 0, \"label\": \"Scan Barcode\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"set_from_warehouse\", \"print_hide\": 0, \"label\": \"Set From Warehouse\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table class=\\\"table table-bordered\\\">\\n\\t<tbody>\\n\\t\\t<tr>\\n\\t\\t\\t<th>Sr</th>\\n\\t\\t\\t<th>Item Name</th>\\n\\t\\t\\t<th>Description</th>\\n\\t\\t\\t<th class=\\\"text-right\\\">Qty</th>\\n\\t\\t\\t<th class=\\\"text-right\\\">Rate</th>\\n\\t\\t\\t<th class=\\\"text-right\\\">Amount</th>\\n\\t\\t</tr>\\n\\t\\t{%- for row in doc.items -%}\\n\\t\\t<tr>\\n\\t\\t {% set bundle_data = get_serial_or_batch_nos(row.serial_and_batch_bundle) %}\\n\\t\\t {% set serial_nos = [] %}\\n {% set batches = {} %}\\n\\n\\t\\t\\t<td style=\\\"width: 4%;\\\">{{ row.idx }}</td>\\n\\t\\t\\t<td style=\\\"width: 20%;\\\">\\n\\t\\t\\t\\t{{ row.item_name }}\\n\\t\\t\\t\\t{% if row.item_code != row.item_name -%}\\n\\t\\t\\t\\t<br>Item Code: {{ row.item_code}}\\n\\t\\t\\t\\t{%- endif %}\\n\\t\\t\\t</td>\\n\\t\\t\\t<td style=\\\"width: 30%;\\\">\\n\\t\\t\\t\\t<div style=\\\"border: 0px;\\\">{{ row.description }}</div></td>\\n\\t\\t\\t<td style=\\\"width: 10%; text-align: right;\\\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\\n\\t\\t\\t<td style=\\\"width: 18%; text-align: right;\\\">{{\\n\\t\\t\\t\\trow.get_formatted(\\\"rate\\\", doc) }}</td>\\n\\t\\t\\t<td style=\\\"width: 18%; text-align: right;\\\">{{\\n\\t\\t\\t\\trow.get_formatted(\\\"amount\\\", doc) }}</td>\\n\\t\\t\\t\\n\\t\\t</tr>\\n\\t\\t{%- endfor -%}\\n\\t</tbody>\\n</table>\\n\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"total_qty\", \"print_hide\": 0, \"label\": \"Total Quantity\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"total\", \"print_hide\": 0, \"label\": \"Total\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"taxes\", \"print_hide\": 0, \"label\": \"Purchase Taxes and Charges\", \"visible_columns\": [{\"fieldname\": \"category\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"add_deduct_tax\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"charge_type\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"row_id\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"included_in_print_rate\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"included_in_paid_amount\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"account_head\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"description\", \"print_width\": \"300px\", \"print_hide\": 0}, {\"fieldname\": \"rate\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"region\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"function\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"location\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"cost_center\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"depot\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"country\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"account_currency\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"tax_amount\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"total\", \"print_width\": \"\", \"print_hide\": 0}]}, {\"fieldtype\": \"Section Break\", \"label\": \"Totals\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"grand_total\", \"print_hide\": 0, \"label\": \"Grand Total\"}, {\"fieldname\": \"rounded_total\", \"print_hide\": 0, \"label\": \"Rounded Total\"}, {\"fieldname\": \"in_words\", \"print_hide\": 0, \"label\": \"In Words\"}, {\"fieldname\": \"disable_rounded_total\", \"print_hide\": 0, \"label\": \"Disable Rounded Total\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Supplier Address\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"address_display\", \"print_hide\": 0, \"label\": \"Address\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"contact_display\", \"print_hide\": 0, \"label\": \"Contact\"}, {\"fieldname\": \"contact_mobile\", \"print_hide\": 0, \"label\": \"Mobile No\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Company Billing Address\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"billing_address\", \"print_hide\": 0, \"label\": \"Billing Address\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"billing_address_display\", \"print_hide\": 0, \"label\": \"Billing Address\"}, {\"fieldname\": \"terms\", \"print_hide\": 0, \"label\": \"Terms and Conditions\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table class=\\\"table table-bordered\\\">\\n\\t<tbody>\\n\\t\\t<tr>\\n\\t\\t\\t<th>Sr</th>\\n\\t\\t\\t<th>Item Name</th>\\n\\t\\t\\t<th>Qty</th>\\n\\t\\t\\t<th class=\\\"text-left\\\">Serial Nos</th>\\n\\t\\t\\t<th class=\\\"text-left\\\">Batch Nos (Qty)</th>\\n\\t\\t</tr>\\n\\t\\t{%- for row in doc.items -%}\\n\\t\\t<tr>\\n\\t\\t {% set bundle_data = frappe.get_all(\\\"Serial and Batch Entry\\\", \\n\\t\\t fields=[\\\"serial_no\\\", \\\"batch_no\\\", \\\"qty\\\"], \\n\\t\\t filters={\\\"parent\\\": row.serial_and_batch_bundle}) %}\\n\\t\\t {% set serial_nos = [] %}\\n {% set batches = {} %}\\n \\n {% if bundle_data %}\\n\\t\\t\\t {% for data in bundle_data %}\\n\\t\\t\\t {% if data.serial_no %}\\n\\t\\t\\t {{ serial_nos.append(data.serial_no) or \\\"\\\" }}\\n\\t\\t\\t {% endif %}\\n\\t\\t\\t \\n\\t\\t\\t {% if data.batch_no %}\\n\\t\\t\\t {{ batches.update({data.batch_no: data.qty}) or \\\"\\\" }}\\n\\t\\t\\t {% endif %}\\n\\t\\t\\t {% endfor %}\\n\\t\\t\\t{% endif %}\\n\\n\\t\\t\\t<td style=\\\"width: 3%;\\\">{{ row.idx }}</td>\\n\\t\\t\\t<td style=\\\"width: 20%;\\\">\\n\\t\\t\\t\\t{{ row.item_name }}\\n\\t\\t\\t\\t{% if row.item_code != row.item_name -%}\\n\\t\\t\\t\\t<br>Item Code: {{ row.item_code}}\\n\\t\\t\\t\\t{%- endif %}\\n\\t\\t\\t</td>\\n\\t\\t\\t<td style=\\\"width: 10%; text-align: right;\\\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\\n\\t\\t\\t\\n\\t\\t\\t<td style=\\\"width: 30%; text-align: left;\\\">{{ serial_nos|join(',') }}</td>\\n\\t\\t\\t<td style=\\\"width: 30%;\\\">\\n\\t\\t\\t {% if batches %}\\n {% for batch_no, qty in batches.items() %}\\n <p> {{batch_no}} : {{qty}} {{ row.uom or row.stock_uom }} </p>\\n {% endfor %}\\n {% endif %}\\n\\t\\t\\t</td>\\n\\t\\t\\t\\n\\t\\t</tr>\\n\\t\\t{%- endfor -%}\\n\\t</tbody>\\n</table>\\n\"}]",
+ "idx": 0,
+ "line_breaks": 0,
+ "margin_bottom": 15.0,
+ "margin_left": 15.0,
+ "margin_right": 15.0,
+ "margin_top": 15.0,
+ "modified": "2023-06-26 14:51:20.609682",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Purchase Receipt Serial and Batch Bundle Print",
+ "owner": "Administrator",
+ "page_number": "Hide",
+ "print_format_builder": 1,
+ "print_format_builder_beta": 0,
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
+ "show_section_headings": 0,
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 136c78f..9075608 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -67,7 +67,7 @@
else:
projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse))
- if (reorder_level or reorder_qty) and projected_qty < reorder_level:
+ if (reorder_level or reorder_qty) and projected_qty <= reorder_level:
deficiency = reorder_level - projected_qty
if deficiency > reorder_qty:
reorder_qty = deficiency
diff --git a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
index a7d7149..48a72a2 100644
--- a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
@@ -9,13 +9,27 @@
"fieldtype": "Date",
"width": "80",
"default": frappe.sys_defaults.year_start_date,
+ "reqd": 1,
},
{
"fieldname":"to_date",
"label": __("To Date"),
"fieldtype": "Date",
"width": "80",
- "default": frappe.datetime.get_today()
+ "default": frappe.datetime.get_today(),
+ "reqd": 1,
+ },
+ {
+ "fieldname":"item",
+ "label": __("Item"),
+ "fieldtype": "Link",
+ "options": "Item",
+ "width": "100",
+ "get_query": function () {
+ return {
+ filters: {"has_batch_no": 1}
+ }
+ }
}
]
}
diff --git a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
index ef7d6e6..5661e8b 100644
--- a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
@@ -4,113 +4,86 @@
import frappe
from frappe import _
-from frappe.query_builder.functions import IfNull
-from frappe.utils import cint, getdate
+from frappe.query_builder.functions import Date
def execute(filters=None):
- if not filters:
- filters = {}
+ validate_filters(filters)
- float_precision = cint(frappe.db.get_default("float_precision")) or 3
-
- columns = get_columns(filters)
- item_map = get_item_details(filters)
- iwb_map = get_item_warehouse_batch_map(filters, float_precision)
-
- data = []
- for item in sorted(iwb_map):
- for wh in sorted(iwb_map[item]):
- for batch in sorted(iwb_map[item][wh]):
- qty_dict = iwb_map[item][wh][batch]
-
- data.append(
- [
- item,
- item_map[item]["item_name"],
- item_map[item]["description"],
- wh,
- batch,
- frappe.db.get_value("Batch", batch, "expiry_date"),
- qty_dict.expiry_status,
- ]
- )
+ columns = get_columns()
+ data = get_data(filters)
return columns, data
-def get_columns(filters):
- """return columns based on filters"""
+def validate_filters(filters):
+ if not filters:
+ frappe.throw(_("Please select the required filters"))
- columns = (
- [_("Item") + ":Link/Item:100"]
- + [_("Item Name") + "::150"]
- + [_("Description") + "::150"]
- + [_("Warehouse") + ":Link/Warehouse:100"]
- + [_("Batch") + ":Link/Batch:100"]
- + [_("Expires On") + ":Date:90"]
- + [_("Expiry (In Days)") + ":Int:120"]
- )
-
- return columns
-
-
-def get_stock_ledger_entries(filters):
if not filters.get("from_date"):
frappe.throw(_("'From Date' is required"))
if not filters.get("to_date"):
frappe.throw(_("'To Date' is required"))
- sle = frappe.qb.DocType("Stock Ledger Entry")
- query = (
- frappe.qb.from_(sle)
- .select(sle.item_code, sle.batch_no, sle.warehouse, sle.posting_date, sle.actual_qty)
- .where(
- (sle.is_cancelled == 0)
- & (sle.docstatus < 2)
- & (IfNull(sle.batch_no, "") != "")
- & (sle.posting_date <= filters["to_date"])
- )
- .orderby(sle.item_code, sle.warehouse)
+
+def get_columns():
+ return (
+ [_("Item") + ":Link/Item:150"]
+ + [_("Item Name") + "::150"]
+ + [_("Batch") + ":Link/Batch:150"]
+ + [_("Stock UOM") + ":Link/UOM:100"]
+ + [_("Quantity") + ":Float:100"]
+ + [_("Expires On") + ":Date:100"]
+ + [_("Expiry (In Days)") + ":Int:130"]
)
- return query.run(as_dict=True)
+def get_data(filters):
+ data = []
-def get_item_warehouse_batch_map(filters, float_precision):
- sle = get_stock_ledger_entries(filters)
- iwb_map = {}
-
- from_date = getdate(filters["from_date"])
- to_date = getdate(filters["to_date"])
-
- for d in sle:
- iwb_map.setdefault(d.item_code, {}).setdefault(d.warehouse, {}).setdefault(
- d.batch_no, frappe._dict({"expires_on": None, "expiry_status": None})
+ for batch in get_batch_details(filters):
+ data.append(
+ [
+ batch.item,
+ batch.item_name,
+ batch.name,
+ batch.stock_uom,
+ batch.batch_qty,
+ batch.expiry_date,
+ max((batch.expiry_date - frappe.utils.datetime.date.today()).days, 0)
+ if batch.expiry_date
+ else None,
+ ]
)
- qty_dict = iwb_map[d.item_code][d.warehouse][d.batch_no]
-
- expiry_date_unicode = frappe.db.get_value("Batch", d.batch_no, "expiry_date")
- qty_dict.expires_on = expiry_date_unicode
-
- exp_date = frappe.utils.data.getdate(expiry_date_unicode)
- qty_dict.expires_on = exp_date
-
- expires_in_days = (exp_date - frappe.utils.datetime.date.today()).days
-
- if expires_in_days > 0:
- qty_dict.expiry_status = expires_in_days
- else:
- qty_dict.expiry_status = 0
-
- return iwb_map
+ return data
-def get_item_details(filters):
- item_map = {}
- for d in (frappe.qb.from_("Item").select("name", "item_name", "description")).run(as_dict=True):
- item_map.setdefault(d.name, d)
+def get_batch_details(filters):
+ batch = frappe.qb.DocType("Batch")
+ query = (
+ frappe.qb.from_(batch)
+ .select(
+ batch.name,
+ batch.creation,
+ batch.expiry_date,
+ batch.item,
+ batch.item_name,
+ batch.stock_uom,
+ batch.batch_qty,
+ )
+ .where(
+ (batch.disabled == 0)
+ & (batch.batch_qty > 0)
+ & (
+ (Date(batch.creation) >= filters["from_date"]) & (Date(batch.creation) <= filters["to_date"])
+ )
+ )
+ .orderby(batch.creation)
+ )
- return item_map
+ if filters.get("item"):
+ query = query.where(batch.item == filters["item"])
+
+ return query.run(as_dict=True)
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
index 0d57938..c072874 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -5,6 +5,7 @@
import frappe
from frappe import _
from frappe.utils import cint, flt, getdate
+from frappe.utils.deprecations import deprecated
from pypika import functions as fn
from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter
@@ -67,8 +68,15 @@
return columns
-# get all details
def get_stock_ledger_entries(filters):
+ entries = get_stock_ledger_entries_for_batch_no(filters)
+
+ entries += get_stock_ledger_entries_for_batch_bundle(filters)
+ return entries
+
+
+@deprecated
+def get_stock_ledger_entries_for_batch_no(filters):
if not filters.get("from_date"):
frappe.throw(_("'From Date' is required"))
if not filters.get("to_date"):
@@ -99,7 +107,43 @@
if filters.get(field):
query = query.where(sle[field] == filters.get(field))
- return query.run(as_dict=True)
+ return query.run(as_dict=True) or []
+
+
+def get_stock_ledger_entries_for_batch_bundle(filters):
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+ batch_package = frappe.qb.DocType("Serial and Batch Entry")
+
+ query = (
+ frappe.qb.from_(sle)
+ .inner_join(batch_package)
+ .on(batch_package.parent == sle.serial_and_batch_bundle)
+ .select(
+ sle.item_code,
+ sle.warehouse,
+ batch_package.batch_no,
+ sle.posting_date,
+ fn.Sum(batch_package.qty).as_("actual_qty"),
+ )
+ .where(
+ (sle.docstatus < 2)
+ & (sle.is_cancelled == 0)
+ & (sle.has_batch_no == 1)
+ & (sle.posting_date <= filters["to_date"])
+ )
+ .groupby(batch_package.batch_no, batch_package.warehouse)
+ .orderby(sle.item_code, sle.warehouse)
+ )
+
+ query = apply_warehouse_filter(query, sle, filters)
+ for field in ["item_code", "batch_no", "company"]:
+ if filters.get(field):
+ if field == "batch_no":
+ query = query.where(batch_package[field] == filters.get(field))
+ else:
+ query = query.where(sle[field] == filters.get(field))
+
+ return query.run(as_dict=True) or []
def get_item_warehouse_batch_map(filters, float_precision):
diff --git a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
index df01b14..e4f657c 100644
--- a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
+++ b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
@@ -5,7 +5,7 @@
import frappe
from frappe import _
from frappe.query_builder import Field
-from frappe.query_builder.functions import Min, Timestamp
+from frappe.query_builder.functions import CombineDatetime, Min
from frappe.utils import add_days, getdate, today
import erpnext
@@ -75,7 +75,7 @@
& (sle.company == report_filters.company)
& (sle.is_cancelled == 0)
)
- .orderby(Timestamp(sle.posting_date, sle.posting_time), sle.creation)
+ .orderby(CombineDatetime(sle.posting_date, sle.posting_time), sle.creation)
).run(as_dict=True)
for d in data:
@@ -84,7 +84,7 @@
closing_date = add_days(from_date, -1)
for key, stock_data in voucher_wise_dict.items():
prev_stock_value = get_stock_value_on(
- posting_date=closing_date, item_code=key[0], warehouse=key[1]
+ posting_date=closing_date, item_code=key[0], warehouses=key[1]
)
for data in stock_data:
expected_stock_value = prev_stock_value + data.stock_value_difference
diff --git a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
index 616312e..976e515 100644
--- a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
+++ b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
@@ -19,13 +19,6 @@
}
},
{
- 'label': __('Serial No'),
- 'fieldtype': 'Link',
- 'fieldname': 'serial_no',
- 'options': 'Serial No',
- 'reqd': 1
- },
- {
'label': __('Warehouse'),
'fieldtype': 'Link',
'fieldname': 'warehouse',
@@ -43,10 +36,35 @@
}
},
{
+ 'label': __('Serial No'),
+ 'fieldtype': 'Link',
+ 'fieldname': 'serial_no',
+ 'options': 'Serial No',
+ get_query: function() {
+ let item_code = frappe.query_report.get_filter_value('item_code');
+ let warehouse = frappe.query_report.get_filter_value('warehouse');
+
+ let query_filters = {'item_code': item_code};
+ if (warehouse) {
+ query_filters['warehouse'] = warehouse;
+ }
+
+ return {
+ filters: query_filters
+ }
+ }
+ },
+ {
'label': __('As On Date'),
'fieldtype': 'Date',
'fieldname': 'posting_date',
'default': frappe.datetime.get_today()
},
+ {
+ 'label': __('Posting Time'),
+ 'fieldtype': 'Time',
+ 'fieldname': 'posting_time',
+ 'default': frappe.datetime.get_time()
+ },
]
};
diff --git a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py
index e439f51..7212b92 100644
--- a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py
+++ b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py
@@ -1,7 +1,7 @@
# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
-
+import frappe
from frappe import _
from erpnext.stock.stock_ledger import get_stock_ledger_entries
@@ -22,28 +22,41 @@
"fieldtype": "Link",
"fieldname": "voucher_type",
"options": "DocType",
- "width": 220,
+ "width": 160,
},
{
"label": _("Voucher No"),
"fieldtype": "Dynamic Link",
"fieldname": "voucher_no",
"options": "voucher_type",
- "width": 220,
+ "width": 180,
},
{
"label": _("Company"),
"fieldtype": "Link",
"fieldname": "company",
"options": "Company",
- "width": 220,
+ "width": 150,
},
{
"label": _("Warehouse"),
"fieldtype": "Link",
"fieldname": "warehouse",
"options": "Warehouse",
- "width": 220,
+ "width": 150,
+ },
+ {
+ "label": _("Serial No"),
+ "fieldtype": "Link",
+ "fieldname": "serial_no",
+ "options": "Serial No",
+ "width": 150,
+ },
+ {
+ "label": _("Valuation Rate"),
+ "fieldtype": "Float",
+ "fieldname": "valuation_rate",
+ "width": 150,
},
]
@@ -51,4 +64,65 @@
def get_data(filters):
- return get_stock_ledger_entries(filters, "<=", order="asc") or []
+ stock_ledgers = get_stock_ledger_entries(filters, "<=", order="asc", check_serial_no=False)
+
+ if not stock_ledgers:
+ return []
+
+ data = []
+ serial_bundle_ids = [
+ d.serial_and_batch_bundle for d in stock_ledgers if d.serial_and_batch_bundle
+ ]
+
+ bundle_wise_serial_nos = get_serial_nos(filters, serial_bundle_ids)
+
+ for row in stock_ledgers:
+ args = frappe._dict(
+ {
+ "posting_date": row.posting_date,
+ "posting_time": row.posting_time,
+ "voucher_type": row.voucher_type,
+ "voucher_no": row.voucher_no,
+ "company": row.company,
+ "warehouse": row.warehouse,
+ }
+ )
+
+ serial_nos = bundle_wise_serial_nos.get(row.serial_and_batch_bundle, [])
+
+ for index, bundle_data in enumerate(serial_nos):
+ if index == 0:
+ args.serial_no = bundle_data.get("serial_no")
+ args.valuation_rate = bundle_data.get("valuation_rate")
+ data.append(args)
+ else:
+ data.append(
+ {
+ "serial_no": bundle_data.get("serial_no"),
+ "valuation_rate": bundle_data.get("valuation_rate"),
+ }
+ )
+
+ return data
+
+
+def get_serial_nos(filters, serial_bundle_ids):
+ bundle_wise_serial_nos = {}
+ bundle_filters = {"parent": ["in", serial_bundle_ids]}
+ if filters.get("serial_no"):
+ bundle_filters["serial_no"] = filters.get("serial_no")
+
+ for d in frappe.get_all(
+ "Serial and Batch Entry",
+ fields=["serial_no", "parent", "stock_value_difference as valuation_rate"],
+ filters=bundle_filters,
+ order_by="idx asc",
+ ):
+ bundle_wise_serial_nos.setdefault(d.parent, []).append(
+ {
+ "serial_no": d.serial_no,
+ "valuation_rate": abs(d.valuation_rate),
+ }
+ )
+
+ return bundle_wise_serial_nos
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index 2fa97ae..d0929a0 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -96,14 +96,14 @@
range1 = range2 = range3 = above_range3 = 0.0
for item in fifo_queue:
- age = date_diff(to_date, item[1])
+ age = flt(date_diff(to_date, item[1]))
qty = flt(item[0]) if not item_dict["has_serial_no"] else 1.0
- if age <= filters.range1:
+ if age <= flt(filters.range1):
range1 = flt(range1 + qty, precision)
- elif age <= filters.range2:
+ elif age <= flt(filters.range2):
range2 = flt(range2 + qty, precision)
- elif age <= filters.range3:
+ elif age <= flt(filters.range3):
range3 = flt(range3 + qty, precision)
else:
above_range3 = flt(above_range3 + qty, precision)
@@ -281,7 +281,7 @@
# consume transfer data and add stock to fifo queue
self.__adjust_incoming_transfer_qty(transfer_data, fifo_queue, row)
else:
- if not serial_nos:
+ if not serial_nos and not row.get("has_serial_no"):
if fifo_queue and flt(fifo_queue[0][0]) <= 0:
# neutralize 0/negative stock by adding positive stock
fifo_queue[0][0] += flt(row.actual_qty)
diff --git a/erpnext/stock/report/stock_analytics/stock_analytics.py b/erpnext/stock/report/stock_analytics/stock_analytics.py
index 27b94ab..6c5b58c 100644
--- a/erpnext/stock/report/stock_analytics/stock_analytics.py
+++ b/erpnext/stock/report/stock_analytics/stock_analytics.py
@@ -5,15 +5,13 @@
import frappe
from frappe import _, scrub
+from frappe.query_builder.functions import CombineDatetime
from frappe.utils import get_first_day as get_first_day_of_month
from frappe.utils import get_first_day_of_week, get_quarter_start, getdate
+from frappe.utils.nestedset import get_descendants_of
from erpnext.accounts.utils import get_fiscal_year
-from erpnext.stock.report.stock_balance.stock_balance import (
- get_item_details,
- get_items,
- get_stock_ledger_entries,
-)
+from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter
from erpnext.stock.utils import is_reposting_item_valuation_in_progress
@@ -231,7 +229,7 @@
data = []
items = get_items(filters)
sle = get_stock_ledger_entries(filters, items)
- item_details = get_item_details(items, sle, filters)
+ item_details = get_item_details(items, sle)
periodic_data = get_periodic_data(sle, filters)
ranges = get_period_date_ranges(filters)
@@ -265,3 +263,109 @@
chart["type"] = "line"
return chart
+
+
+def get_items(filters):
+ "Get items based on item code, item group or brand."
+ if item_code := filters.get("item_code"):
+ return [item_code]
+ else:
+ item_filters = {}
+ if item_group := filters.get("item_group"):
+ children = get_descendants_of("Item Group", item_group, ignore_permissions=True)
+ item_filters["item_group"] = ("in", children + [item_group])
+ if brand := filters.get("brand"):
+ item_filters["brand"] = brand
+
+ return frappe.get_all("Item", filters=item_filters, pluck="name", order_by=None)
+
+
+def get_stock_ledger_entries(filters, items):
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+
+ query = (
+ frappe.qb.from_(sle)
+ .select(
+ sle.item_code,
+ sle.warehouse,
+ sle.posting_date,
+ sle.actual_qty,
+ sle.valuation_rate,
+ sle.company,
+ sle.voucher_type,
+ sle.qty_after_transaction,
+ sle.stock_value_difference,
+ sle.item_code.as_("name"),
+ sle.voucher_no,
+ sle.stock_value,
+ sle.batch_no,
+ )
+ .where((sle.docstatus < 2) & (sle.is_cancelled == 0))
+ .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
+ .orderby(sle.creation)
+ .orderby(sle.actual_qty)
+ )
+
+ if items:
+ query = query.where(sle.item_code.isin(items))
+
+ query = apply_conditions(query, filters)
+ return query.run(as_dict=True)
+
+
+def apply_conditions(query, filters):
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+ warehouse_table = frappe.qb.DocType("Warehouse")
+
+ if not filters.get("from_date"):
+ frappe.throw(_("'From Date' is required"))
+
+ if to_date := filters.get("to_date"):
+ query = query.where(sle.posting_date <= to_date)
+ else:
+ frappe.throw(_("'To Date' is required"))
+
+ if company := filters.get("company"):
+ query = query.where(sle.company == company)
+
+ if filters.get("warehouse"):
+ query = apply_warehouse_filter(query, sle, filters)
+ elif warehouse_type := filters.get("warehouse_type"):
+ query = (
+ query.join(warehouse_table)
+ .on(warehouse_table.name == sle.warehouse)
+ .where(warehouse_table.warehouse_type == warehouse_type)
+ )
+
+ return query
+
+
+def get_item_details(items, sle):
+ item_details = {}
+ if not items:
+ items = list(set(d.item_code for d in sle))
+
+ if not items:
+ return item_details
+
+ item_table = frappe.qb.DocType("Item")
+
+ query = (
+ frappe.qb.from_(item_table)
+ .select(
+ item_table.name,
+ item_table.item_name,
+ item_table.description,
+ item_table.item_group,
+ item_table.brand,
+ item_table.stock_uom,
+ )
+ .where(item_table.name.isin(items))
+ )
+
+ result = query.run(as_dict=1)
+
+ for item_table in result:
+ item_details.setdefault(item_table.name, item_table)
+
+ return item_details
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
index 7a170be..254f527 100644
--- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
@@ -33,5 +33,43 @@
"fieldtype": "Date",
"default": frappe.datetime.get_today(),
},
- ]
+ ],
+
+ get_datatable_options(options) {
+ return Object.assign(options, {
+ checkboxColumn: true,
+ });
+ },
+
+ onload(report) {
+ report.page.add_inner_button(__("Create Reposting Entries"), function() {
+ let message = `<div>
+ <p>
+ Reposting Entries will change the value of
+ accounts Stock In Hand, and Stock Expenses
+ in the Trial Balance report and will also change
+ the Balance Value in the Stock Balance report.
+ </p>
+ <p>Are you sure you want to create Reposting Entries?</p>
+ </div>
+ `;
+ let indexes = frappe.query_report.datatable.rowmanager.getCheckedRows();
+ let selected_rows = indexes.map(i => frappe.query_report.data[i]);
+
+ if (!selected_rows.length) {
+ frappe.throw(__("Please select rows to create Reposting Entries"));
+ }
+
+ frappe.confirm(__(message), () => {
+ frappe.call({
+ method: "erpnext.stock.report.stock_and_account_value_comparison.stock_and_account_value_comparison.create_reposting_entries",
+ args: {
+ rows: selected_rows,
+ company: frappe.query_report.get_filter_values().company
+ }
+ });
+
+ });
+ });
+ }
};
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
index 106e877..b1da3ec 100644
--- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
@@ -4,6 +4,7 @@
import frappe
from frappe import _
+from frappe.utils import get_link_to_form, parse_json
import erpnext
from erpnext.accounts.utils import get_currency_precision, get_stock_accounts
@@ -134,3 +135,35 @@
"width": "120",
},
]
+
+
+@frappe.whitelist()
+def create_reposting_entries(rows, company):
+ if isinstance(rows, str):
+ rows = parse_json(rows)
+
+ entries = []
+ for row in rows:
+ row = frappe._dict(row)
+
+ try:
+ doc = frappe.get_doc(
+ {
+ "doctype": "Repost Item Valuation",
+ "based_on": "Transaction",
+ "status": "Queued",
+ "voucher_type": row.voucher_type,
+ "voucher_no": row.voucher_no,
+ "posting_date": row.posting_date,
+ "company": company,
+ "allow_nagative_stock": 1,
+ }
+ ).submit()
+
+ entries.append(get_link_to_form("Repost Item Valuation", doc.name))
+ except frappe.DuplicateEntryError:
+ pass
+
+ if entries:
+ entries = ", ".join(entries)
+ frappe.msgprint(_(f"Reposting entries created: {entries}"))
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index 9b3965d..33ed955 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -87,6 +87,12 @@
"label": __('Show Stock Ageing Data'),
"fieldtype": 'Check'
},
+ {
+ "fieldname": 'ignore_closing_balance',
+ "label": __('Ignore Closing Balance'),
+ "fieldtype": 'Check',
+ "default": 1
+ },
],
"formatter": function (value, row, column, data, default_formatter) {
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 66991a9..f2c2e27 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -7,15 +7,16 @@
import frappe
from frappe import _
+from frappe.query_builder import Order
from frappe.query_builder.functions import Coalesce, CombineDatetime
-from frappe.utils import cint, date_diff, flt, getdate
+from frappe.utils import add_days, cint, date_diff, flt, getdate
from frappe.utils.nestedset import get_descendants_of
import erpnext
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions
from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter
from erpnext.stock.report.stock_ageing.stock_ageing import FIFOSlots, get_average_age
-from erpnext.stock.utils import add_additional_uom_columns, is_reposting_item_valuation_in_progress
+from erpnext.stock.utils import add_additional_uom_columns
class StockBalanceFilter(TypedDict):
@@ -35,400 +36,571 @@
def execute(filters: Optional[StockBalanceFilter] = None):
- is_reposting_item_valuation_in_progress()
- if not filters:
- filters = {}
+ return StockBalanceReport(filters).run()
- if filters.get("company"):
- company_currency = erpnext.get_company_currency(filters.get("company"))
- else:
- company_currency = frappe.db.get_single_value("Global Defaults", "default_currency")
- include_uom = filters.get("include_uom")
- columns = get_columns(filters)
- items = get_items(filters)
- sle = get_stock_ledger_entries(filters, items)
+class StockBalanceReport(object):
+ def __init__(self, filters: Optional[StockBalanceFilter]) -> None:
+ self.filters = filters
+ self.from_date = getdate(filters.get("from_date"))
+ self.to_date = getdate(filters.get("to_date"))
- if filters.get("show_stock_ageing_data"):
- filters["show_warehouse_wise_stock"] = True
- item_wise_fifo_queue = FIFOSlots(filters, sle).generate()
+ self.start_from = None
+ self.data = []
+ self.columns = []
+ self.sle_entries: List[SLEntry] = []
+ self.set_company_currency()
- # if no stock ledger entry found return
- if not sle:
- return columns, []
+ def set_company_currency(self) -> None:
+ if self.filters.get("company"):
+ self.company_currency = erpnext.get_company_currency(self.filters.get("company"))
+ else:
+ self.company_currency = frappe.db.get_single_value("Global Defaults", "default_currency")
- iwb_map = get_item_warehouse_map(filters, sle)
- item_map = get_item_details(items, sle, filters)
- item_reorder_detail_map = get_item_reorder_details(item_map.keys())
+ def run(self):
+ self.float_precision = cint(frappe.db.get_default("float_precision")) or 3
- data = []
- conversion_factors = {}
+ self.inventory_dimensions = self.get_inventory_dimension_fields()
+ self.prepare_opening_data_from_closing_balance()
+ self.prepare_stock_ledger_entries()
+ self.prepare_new_data()
- _func = itemgetter(1)
+ if not self.columns:
+ self.columns = self.get_columns()
- to_date = filters.get("to_date")
+ self.add_additional_uom_columns()
- for group_by_key in iwb_map:
- item = group_by_key[1]
- warehouse = group_by_key[2]
- company = group_by_key[0]
+ return self.columns, self.data
- if item_map.get(item):
- qty_dict = iwb_map[group_by_key]
- item_reorder_level = 0
- item_reorder_qty = 0
- if item + warehouse in item_reorder_detail_map:
- item_reorder_level = item_reorder_detail_map[item + warehouse]["warehouse_reorder_level"]
- item_reorder_qty = item_reorder_detail_map[item + warehouse]["warehouse_reorder_qty"]
+ def prepare_opening_data_from_closing_balance(self) -> None:
+ self.opening_data = frappe._dict({})
- report_data = {
- "currency": company_currency,
- "item_code": item,
- "warehouse": warehouse,
- "company": company,
- "reorder_level": item_reorder_level,
- "reorder_qty": item_reorder_qty,
- }
- report_data.update(item_map[item])
- report_data.update(qty_dict)
+ closing_balance = self.get_closing_balance()
+ if not closing_balance:
+ return
- if include_uom:
- conversion_factors.setdefault(item, item_map[item].conversion_factor)
+ self.start_from = add_days(closing_balance[0].to_date, 1)
+ res = frappe.get_doc("Closing Stock Balance", closing_balance[0].name).get_prepared_data()
- if filters.get("show_stock_ageing_data"):
- fifo_queue = item_wise_fifo_queue[(item, warehouse)].get("fifo_queue")
+ for entry in res.data:
+ entry = frappe._dict(entry)
+
+ group_by_key = self.get_group_by_key(entry)
+ if group_by_key not in self.opening_data:
+ self.opening_data.setdefault(group_by_key, entry)
+
+ def prepare_new_data(self):
+ if not self.sle_entries:
+ return
+
+ if self.filters.get("show_stock_ageing_data"):
+ self.filters["show_warehouse_wise_stock"] = True
+ item_wise_fifo_queue = FIFOSlots(self.filters, self.sle_entries).generate()
+
+ _func = itemgetter(1)
+
+ self.item_warehouse_map = self.get_item_warehouse_map()
+ sre_details = self.get_sre_reserved_qty_details()
+
+ variant_values = {}
+ if self.filters.get("show_variant_attributes"):
+ variant_values = self.get_variant_values_for()
+
+ for key, report_data in self.item_warehouse_map.items():
+ if variant_data := variant_values.get(report_data.item_code):
+ report_data.update(variant_data)
+
+ if self.filters.get("show_stock_ageing_data"):
+ opening_fifo_queue = self.get_opening_fifo_queue(report_data) or []
+
+ fifo_queue = []
+ if fifo_queue := item_wise_fifo_queue.get((report_data.item_code, report_data.warehouse)):
+ fifo_queue = fifo_queue.get("fifo_queue")
+
+ if fifo_queue:
+ opening_fifo_queue.extend(fifo_queue)
stock_ageing_data = {"average_age": 0, "earliest_age": 0, "latest_age": 0}
- if fifo_queue:
- fifo_queue = sorted(filter(_func, fifo_queue), key=_func)
+ if opening_fifo_queue:
+ fifo_queue = sorted(filter(_func, opening_fifo_queue), key=_func)
if not fifo_queue:
continue
+ to_date = self.to_date
stock_ageing_data["average_age"] = get_average_age(fifo_queue, to_date)
stock_ageing_data["earliest_age"] = date_diff(to_date, fifo_queue[0][1])
stock_ageing_data["latest_age"] = date_diff(to_date, fifo_queue[-1][1])
+ stock_ageing_data["fifo_queue"] = fifo_queue
report_data.update(stock_ageing_data)
- data.append(report_data)
+ report_data.update(
+ {"reserved_stock": sre_details.get((report_data.item_code, report_data.warehouse), 0.0)}
+ )
+ self.data.append(report_data)
- add_additional_uom_columns(columns, data, include_uom, conversion_factors)
- return columns, data
+ def get_item_warehouse_map(self):
+ item_warehouse_map = {}
+ self.opening_vouchers = self.get_opening_vouchers()
+ for entry in self.sle_entries:
+ group_by_key = self.get_group_by_key(entry)
+ if group_by_key not in item_warehouse_map:
+ self.initialize_data(item_warehouse_map, group_by_key, entry)
-def get_columns(filters: StockBalanceFilter):
- """return columns"""
- columns = [
- {
- "label": _("Item"),
- "fieldname": "item_code",
- "fieldtype": "Link",
- "options": "Item",
- "width": 100,
- },
- {"label": _("Item Name"), "fieldname": "item_name", "width": 150},
- {
- "label": _("Item Group"),
- "fieldname": "item_group",
- "fieldtype": "Link",
- "options": "Item Group",
- "width": 100,
- },
- {
- "label": _("Warehouse"),
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "options": "Warehouse",
- "width": 100,
- },
- ]
+ self.prepare_item_warehouse_map(item_warehouse_map, entry, group_by_key)
- for dimension in get_inventory_dimensions():
- columns.append(
- {
- "label": _(dimension.doctype),
- "fieldname": dimension.fieldname,
- "fieldtype": "Link",
- "options": dimension.doctype,
- "width": 110,
- }
+ if self.opening_data.get(group_by_key):
+ del self.opening_data[group_by_key]
+
+ for group_by_key, entry in self.opening_data.items():
+ if group_by_key not in item_warehouse_map:
+ self.initialize_data(item_warehouse_map, group_by_key, entry)
+
+ item_warehouse_map = filter_items_with_no_transactions(
+ item_warehouse_map, self.float_precision, self.inventory_dimensions
)
- columns.extend(
- [
- {
- "label": _("Stock UOM"),
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "options": "UOM",
- "width": 90,
- },
- {
- "label": _("Balance Qty"),
- "fieldname": "bal_qty",
- "fieldtype": "Float",
- "width": 100,
- "convertible": "qty",
- },
- {
- "label": _("Balance Value"),
- "fieldname": "bal_val",
- "fieldtype": "Currency",
- "width": 100,
- "options": "currency",
- },
- {
- "label": _("Opening Qty"),
- "fieldname": "opening_qty",
- "fieldtype": "Float",
- "width": 100,
- "convertible": "qty",
- },
- {
- "label": _("Opening Value"),
- "fieldname": "opening_val",
- "fieldtype": "Currency",
- "width": 110,
- "options": "currency",
- },
- {
- "label": _("In Qty"),
- "fieldname": "in_qty",
- "fieldtype": "Float",
- "width": 80,
- "convertible": "qty",
- },
- {"label": _("In Value"), "fieldname": "in_val", "fieldtype": "Float", "width": 80},
- {
- "label": _("Out Qty"),
- "fieldname": "out_qty",
- "fieldtype": "Float",
- "width": 80,
- "convertible": "qty",
- },
- {"label": _("Out Value"), "fieldname": "out_val", "fieldtype": "Float", "width": 80},
- {
- "label": _("Valuation Rate"),
- "fieldname": "val_rate",
- "fieldtype": "Currency",
- "width": 90,
- "convertible": "rate",
- "options": "currency",
- },
- {
- "label": _("Reorder Level"),
- "fieldname": "reorder_level",
- "fieldtype": "Float",
- "width": 80,
- "convertible": "qty",
- },
- {
- "label": _("Reorder Qty"),
- "fieldname": "reorder_qty",
- "fieldtype": "Float",
- "width": 80,
- "convertible": "qty",
- },
- {
- "label": _("Company"),
- "fieldname": "company",
- "fieldtype": "Link",
- "options": "Company",
- "width": 100,
- },
- ]
- )
+ return item_warehouse_map
- if filters.get("show_stock_ageing_data"):
- columns += [
- {"label": _("Average Age"), "fieldname": "average_age", "width": 100},
- {"label": _("Earliest Age"), "fieldname": "earliest_age", "width": 100},
- {"label": _("Latest Age"), "fieldname": "latest_age", "width": 100},
- ]
-
- if filters.get("show_variant_attributes"):
- columns += [
- {"label": att_name, "fieldname": att_name, "width": 100}
- for att_name in get_variants_attributes()
- ]
-
- return columns
-
-
-def apply_conditions(query, filters):
- sle = frappe.qb.DocType("Stock Ledger Entry")
- warehouse_table = frappe.qb.DocType("Warehouse")
-
- if not filters.get("from_date"):
- frappe.throw(_("'From Date' is required"))
-
- if to_date := filters.get("to_date"):
- query = query.where(sle.posting_date <= to_date)
- else:
- frappe.throw(_("'To Date' is required"))
-
- if company := filters.get("company"):
- query = query.where(sle.company == company)
-
- if filters.get("warehouse"):
- query = apply_warehouse_filter(query, sle, filters)
- elif warehouse_type := filters.get("warehouse_type"):
- query = (
- query.join(warehouse_table)
- .on(warehouse_table.name == sle.warehouse)
- .where(warehouse_table.warehouse_type == warehouse_type)
+ def get_sre_reserved_qty_details(self) -> dict:
+ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ get_sre_reserved_qty_details_for_item_and_warehouse as get_reserved_qty_details,
)
- return query
+ item_code_list, warehouse_list = [], []
+ for d in self.item_warehouse_map:
+ item_code_list.append(d[1])
+ warehouse_list.append(d[2])
+ return get_reserved_qty_details(item_code_list, warehouse_list)
-def get_stock_ledger_entries(filters: StockBalanceFilter, items: List[str]) -> List[SLEntry]:
- sle = frappe.qb.DocType("Stock Ledger Entry")
+ def prepare_item_warehouse_map(self, item_warehouse_map, entry, group_by_key):
+ qty_dict = item_warehouse_map[group_by_key]
+ for field in self.inventory_dimensions:
+ qty_dict[field] = entry.get(field)
- query = (
- frappe.qb.from_(sle)
- .select(
- sle.item_code,
- sle.warehouse,
- sle.posting_date,
- sle.actual_qty,
- sle.valuation_rate,
- sle.company,
- sle.voucher_type,
- sle.qty_after_transaction,
- sle.stock_value_difference,
- sle.item_code.as_("name"),
- sle.voucher_no,
- sle.stock_value,
- sle.batch_no,
- )
- .where((sle.docstatus < 2) & (sle.is_cancelled == 0))
- .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
- .orderby(sle.creation)
- .orderby(sle.actual_qty)
- )
-
- inventory_dimension_fields = get_inventory_dimension_fields()
- if inventory_dimension_fields:
- for fieldname in inventory_dimension_fields:
- query = query.select(fieldname)
- if fieldname in filters and filters.get(fieldname):
- query = query.where(sle[fieldname].isin(filters.get(fieldname)))
-
- if items:
- query = query.where(sle.item_code.isin(items))
-
- query = apply_conditions(query, filters)
- return query.run(as_dict=True)
-
-
-def get_opening_vouchers(to_date):
- opening_vouchers = {"Stock Entry": [], "Stock Reconciliation": []}
-
- se = frappe.qb.DocType("Stock Entry")
- sr = frappe.qb.DocType("Stock Reconciliation")
-
- vouchers_data = (
- frappe.qb.from_(
- (
- frappe.qb.from_(se)
- .select(se.name, Coalesce("Stock Entry").as_("voucher_type"))
- .where((se.docstatus == 1) & (se.posting_date <= to_date) & (se.is_opening == "Yes"))
- )
- + (
- frappe.qb.from_(sr)
- .select(sr.name, Coalesce("Stock Reconciliation").as_("voucher_type"))
- .where((sr.docstatus == 1) & (sr.posting_date <= to_date) & (sr.purpose == "Opening Stock"))
- )
- ).select("voucher_type", "name")
- ).run(as_dict=True)
-
- if vouchers_data:
- for d in vouchers_data:
- opening_vouchers[d.voucher_type].append(d.name)
-
- return opening_vouchers
-
-
-def get_inventory_dimension_fields():
- return [dimension.fieldname for dimension in get_inventory_dimensions()]
-
-
-def get_item_warehouse_map(filters: StockBalanceFilter, sle: List[SLEntry]):
- iwb_map = {}
- from_date = getdate(filters.get("from_date"))
- to_date = getdate(filters.get("to_date"))
- opening_vouchers = get_opening_vouchers(to_date)
- float_precision = cint(frappe.db.get_default("float_precision")) or 3
- inventory_dimensions = get_inventory_dimension_fields()
-
- for d in sle:
- group_by_key = get_group_by_key(d, filters, inventory_dimensions)
- if group_by_key not in iwb_map:
- iwb_map[group_by_key] = frappe._dict(
- {
- "opening_qty": 0.0,
- "opening_val": 0.0,
- "in_qty": 0.0,
- "in_val": 0.0,
- "out_qty": 0.0,
- "out_val": 0.0,
- "bal_qty": 0.0,
- "bal_val": 0.0,
- "val_rate": 0.0,
- }
- )
-
- qty_dict = iwb_map[group_by_key]
- for field in inventory_dimensions:
- qty_dict[field] = d.get(field)
-
- if d.voucher_type == "Stock Reconciliation" and not d.batch_no:
- qty_diff = flt(d.qty_after_transaction) - flt(qty_dict.bal_qty)
+ if entry.voucher_type == "Stock Reconciliation" and (not entry.batch_no or entry.serial_no):
+ qty_diff = flt(entry.qty_after_transaction) - flt(qty_dict.bal_qty)
else:
- qty_diff = flt(d.actual_qty)
+ qty_diff = flt(entry.actual_qty)
- value_diff = flt(d.stock_value_difference)
+ value_diff = flt(entry.stock_value_difference)
- if d.posting_date < from_date or d.voucher_no in opening_vouchers.get(d.voucher_type, []):
+ if entry.posting_date < self.from_date or entry.voucher_no in self.opening_vouchers.get(
+ entry.voucher_type, []
+ ):
qty_dict.opening_qty += qty_diff
qty_dict.opening_val += value_diff
- elif d.posting_date >= from_date and d.posting_date <= to_date:
- if flt(qty_diff, float_precision) >= 0:
+ elif entry.posting_date >= self.from_date and entry.posting_date <= self.to_date:
+
+ if flt(qty_diff, self.float_precision) >= 0:
qty_dict.in_qty += qty_diff
qty_dict.in_val += value_diff
else:
qty_dict.out_qty += abs(qty_diff)
qty_dict.out_val += abs(value_diff)
- qty_dict.val_rate = d.valuation_rate
+ qty_dict.val_rate = entry.valuation_rate
qty_dict.bal_qty += qty_diff
qty_dict.bal_val += value_diff
- iwb_map = filter_items_with_no_transactions(iwb_map, float_precision, inventory_dimensions)
+ def initialize_data(self, item_warehouse_map, group_by_key, entry):
+ opening_data = self.opening_data.get(group_by_key, {})
- return iwb_map
+ item_warehouse_map[group_by_key] = frappe._dict(
+ {
+ "item_code": entry.item_code,
+ "warehouse": entry.warehouse,
+ "item_group": entry.item_group,
+ "company": entry.company,
+ "currency": self.company_currency,
+ "stock_uom": entry.stock_uom,
+ "item_name": entry.item_name,
+ "opening_qty": opening_data.get("bal_qty") or 0.0,
+ "opening_val": opening_data.get("bal_val") or 0.0,
+ "opening_fifo_queue": opening_data.get("fifo_queue") or [],
+ "in_qty": 0.0,
+ "in_val": 0.0,
+ "out_qty": 0.0,
+ "out_val": 0.0,
+ "bal_qty": opening_data.get("bal_qty") or 0.0,
+ "bal_val": opening_data.get("bal_val") or 0.0,
+ "val_rate": 0.0,
+ }
+ )
+
+ def get_group_by_key(self, row) -> tuple:
+ group_by_key = [row.company, row.item_code, row.warehouse]
+
+ for fieldname in self.inventory_dimensions:
+ if self.filters.get(fieldname):
+ group_by_key.append(row.get(fieldname))
+
+ return tuple(group_by_key)
+
+ def get_closing_balance(self) -> List[Dict[str, Any]]:
+ if self.filters.get("ignore_closing_balance"):
+ return []
+
+ table = frappe.qb.DocType("Closing Stock Balance")
+
+ query = (
+ frappe.qb.from_(table)
+ .select(table.name, table.to_date)
+ .where(
+ (table.docstatus == 1)
+ & (table.company == self.filters.company)
+ & ((table.to_date <= self.from_date))
+ )
+ .orderby(table.to_date, order=Order.desc)
+ .limit(1)
+ )
+
+ for fieldname in ["warehouse", "item_code", "item_group", "warehouse_type"]:
+ if self.filters.get(fieldname):
+ query = query.where(table[fieldname] == self.filters.get(fieldname))
+
+ return query.run(as_dict=True)
+
+ def prepare_stock_ledger_entries(self):
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+ item_table = frappe.qb.DocType("Item")
+
+ query = (
+ frappe.qb.from_(sle)
+ .inner_join(item_table)
+ .on(sle.item_code == item_table.name)
+ .select(
+ sle.item_code,
+ sle.warehouse,
+ sle.posting_date,
+ sle.actual_qty,
+ sle.valuation_rate,
+ sle.company,
+ sle.voucher_type,
+ sle.qty_after_transaction,
+ sle.stock_value_difference,
+ sle.item_code.as_("name"),
+ sle.voucher_no,
+ sle.stock_value,
+ sle.batch_no,
+ sle.serial_no,
+ item_table.item_group,
+ item_table.stock_uom,
+ item_table.item_name,
+ )
+ .where((sle.docstatus < 2) & (sle.is_cancelled == 0))
+ .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
+ .orderby(sle.creation)
+ .orderby(sle.actual_qty)
+ )
+
+ query = self.apply_inventory_dimensions_filters(query, sle)
+ query = self.apply_warehouse_filters(query, sle)
+ query = self.apply_items_filters(query, item_table)
+ query = self.apply_date_filters(query, sle)
+
+ if self.filters.get("company"):
+ query = query.where(sle.company == self.filters.get("company"))
+
+ self.sle_entries = query.run(as_dict=True)
+
+ def apply_inventory_dimensions_filters(self, query, sle) -> str:
+ inventory_dimension_fields = self.get_inventory_dimension_fields()
+ if inventory_dimension_fields:
+ for fieldname in inventory_dimension_fields:
+ query = query.select(fieldname)
+ if self.filters.get(fieldname):
+ query = query.where(sle[fieldname].isin(self.filters.get(fieldname)))
+
+ return query
+
+ def apply_warehouse_filters(self, query, sle) -> str:
+ warehouse_table = frappe.qb.DocType("Warehouse")
+
+ if self.filters.get("warehouse"):
+ query = apply_warehouse_filter(query, sle, self.filters)
+ elif warehouse_type := self.filters.get("warehouse_type"):
+ query = (
+ query.join(warehouse_table)
+ .on(warehouse_table.name == sle.warehouse)
+ .where(warehouse_table.warehouse_type == warehouse_type)
+ )
+
+ return query
+
+ def apply_items_filters(self, query, item_table) -> str:
+ if item_group := self.filters.get("item_group"):
+ children = get_descendants_of("Item Group", item_group, ignore_permissions=True)
+ query = query.where(item_table.item_group.isin(children + [item_group]))
+
+ for field in ["item_code", "brand"]:
+ if not self.filters.get(field):
+ continue
+
+ query = query.where(item_table[field] == self.filters.get(field))
+
+ return query
+
+ def apply_date_filters(self, query, sle) -> str:
+ if not self.filters.ignore_closing_balance and self.start_from:
+ query = query.where(sle.posting_date >= self.start_from)
+
+ if self.to_date:
+ query = query.where(sle.posting_date <= self.to_date)
+
+ return query
+
+ def get_columns(self):
+ columns = [
+ {
+ "label": _("Item"),
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "options": "Item",
+ "width": 100,
+ },
+ {"label": _("Item Name"), "fieldname": "item_name", "width": 150},
+ {
+ "label": _("Item Group"),
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "options": "Item Group",
+ "width": 100,
+ },
+ {
+ "label": _("Warehouse"),
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "options": "Warehouse",
+ "width": 100,
+ },
+ ]
+
+ for dimension in get_inventory_dimensions():
+ columns.append(
+ {
+ "label": _(dimension.doctype),
+ "fieldname": dimension.fieldname,
+ "fieldtype": "Link",
+ "options": dimension.doctype,
+ "width": 110,
+ }
+ )
+
+ columns.extend(
+ [
+ {
+ "label": _("Stock UOM"),
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "options": "UOM",
+ "width": 90,
+ },
+ {
+ "label": _("Balance Qty"),
+ "fieldname": "bal_qty",
+ "fieldtype": "Float",
+ "width": 100,
+ "convertible": "qty",
+ },
+ {
+ "label": _("Balance Value"),
+ "fieldname": "bal_val",
+ "fieldtype": "Currency",
+ "width": 100,
+ "options": "currency",
+ },
+ {
+ "label": _("Opening Qty"),
+ "fieldname": "opening_qty",
+ "fieldtype": "Float",
+ "width": 100,
+ "convertible": "qty",
+ },
+ {
+ "label": _("Opening Value"),
+ "fieldname": "opening_val",
+ "fieldtype": "Currency",
+ "width": 110,
+ "options": "currency",
+ },
+ {
+ "label": _("In Qty"),
+ "fieldname": "in_qty",
+ "fieldtype": "Float",
+ "width": 80,
+ "convertible": "qty",
+ },
+ {"label": _("In Value"), "fieldname": "in_val", "fieldtype": "Float", "width": 80},
+ {
+ "label": _("Out Qty"),
+ "fieldname": "out_qty",
+ "fieldtype": "Float",
+ "width": 80,
+ "convertible": "qty",
+ },
+ {"label": _("Out Value"), "fieldname": "out_val", "fieldtype": "Float", "width": 80},
+ {
+ "label": _("Valuation Rate"),
+ "fieldname": "val_rate",
+ "fieldtype": "Currency",
+ "width": 90,
+ "convertible": "rate",
+ "options": "currency",
+ },
+ {
+ "label": _("Reserved Stock"),
+ "fieldname": "reserved_stock",
+ "fieldtype": "Float",
+ "width": 80,
+ "convertible": "qty",
+ },
+ {
+ "label": _("Company"),
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "options": "Company",
+ "width": 100,
+ },
+ ]
+ )
+
+ if self.filters.get("show_stock_ageing_data"):
+ columns += [
+ {"label": _("Average Age"), "fieldname": "average_age", "width": 100},
+ {"label": _("Earliest Age"), "fieldname": "earliest_age", "width": 100},
+ {"label": _("Latest Age"), "fieldname": "latest_age", "width": 100},
+ ]
+
+ if self.filters.get("show_variant_attributes"):
+ columns += [
+ {"label": att_name, "fieldname": att_name, "width": 100}
+ for att_name in get_variants_attributes()
+ ]
+
+ return columns
+
+ def add_additional_uom_columns(self):
+ if not self.filters.get("include_uom"):
+ return
+
+ conversion_factors = self.get_itemwise_conversion_factor()
+ add_additional_uom_columns(self.columns, self.data, self.filters.include_uom, conversion_factors)
+
+ def get_itemwise_conversion_factor(self):
+ items = []
+ if self.filters.item_code or self.filters.item_group:
+ items = [d.item_code for d in self.data]
+
+ table = frappe.qb.DocType("UOM Conversion Detail")
+ query = (
+ frappe.qb.from_(table)
+ .select(
+ table.conversion_factor,
+ table.parent,
+ )
+ .where((table.parenttype == "Item") & (table.uom == self.filters.include_uom))
+ )
+
+ if items:
+ query = query.where(table.parent.isin(items))
+
+ result = query.run(as_dict=1)
+ if not result:
+ return {}
+
+ return {d.parent: d.conversion_factor for d in result}
+
+ def get_variant_values_for(self):
+ """Returns variant values for items."""
+ attribute_map = {}
+ items = []
+ if self.filters.item_code or self.filters.item_group:
+ items = [d.item_code for d in self.data]
+
+ filters = {}
+ if items:
+ filters = {"parent": ("in", items)}
+
+ attribute_info = frappe.get_all(
+ "Item Variant Attribute",
+ fields=["parent", "attribute", "attribute_value"],
+ filters=filters,
+ )
+
+ for attr in attribute_info:
+ attribute_map.setdefault(attr["parent"], {})
+ attribute_map[attr["parent"]].update({attr["attribute"]: attr["attribute_value"]})
+
+ return attribute_map
+
+ def get_opening_vouchers(self):
+ opening_vouchers = {"Stock Entry": [], "Stock Reconciliation": []}
+
+ se = frappe.qb.DocType("Stock Entry")
+ sr = frappe.qb.DocType("Stock Reconciliation")
+
+ vouchers_data = (
+ frappe.qb.from_(
+ (
+ frappe.qb.from_(se)
+ .select(se.name, Coalesce("Stock Entry").as_("voucher_type"))
+ .where((se.docstatus == 1) & (se.posting_date <= self.to_date) & (se.is_opening == "Yes"))
+ )
+ + (
+ frappe.qb.from_(sr)
+ .select(sr.name, Coalesce("Stock Reconciliation").as_("voucher_type"))
+ .where(
+ (sr.docstatus == 1) & (sr.posting_date <= self.to_date) & (sr.purpose == "Opening Stock")
+ )
+ )
+ ).select("voucher_type", "name")
+ ).run(as_dict=True)
+
+ if vouchers_data:
+ for d in vouchers_data:
+ opening_vouchers[d.voucher_type].append(d.name)
+
+ return opening_vouchers
+
+ @staticmethod
+ def get_inventory_dimension_fields():
+ return [dimension.fieldname for dimension in get_inventory_dimensions()]
+
+ @staticmethod
+ def get_opening_fifo_queue(report_data):
+ opening_fifo_queue = report_data.get("opening_fifo_queue") or []
+ for row in opening_fifo_queue:
+ row[1] = getdate(row[1])
+
+ return opening_fifo_queue
-def get_group_by_key(row, filters, inventory_dimension_fields) -> tuple:
- group_by_key = [row.company, row.item_code, row.warehouse]
-
- for fieldname in inventory_dimension_fields:
- if filters.get(fieldname):
- group_by_key.append(row.get(fieldname))
-
- return tuple(group_by_key)
-
-
-def filter_items_with_no_transactions(iwb_map, float_precision: float, inventory_dimensions: list):
+def filter_items_with_no_transactions(
+ iwb_map, float_precision: float, inventory_dimensions: list = None
+):
pop_keys = []
for group_by_key in iwb_map:
qty_dict = iwb_map[group_by_key]
no_transactions = True
for key, val in qty_dict.items():
- if key in inventory_dimensions:
+ if inventory_dimensions and key in inventory_dimensions:
+ continue
+
+ if key in [
+ "item_code",
+ "warehouse",
+ "item_name",
+ "item_group",
+ "project",
+ "stock_uom",
+ "company",
+ "opening_fifo_queue",
+ ]:
continue
val = flt(val, float_precision)
@@ -445,96 +617,6 @@
return iwb_map
-def get_items(filters: StockBalanceFilter) -> List[str]:
- "Get items based on item code, item group or brand."
- if item_code := filters.get("item_code"):
- return [item_code]
- else:
- item_filters = {}
- if item_group := filters.get("item_group"):
- children = get_descendants_of("Item Group", item_group, ignore_permissions=True)
- item_filters["item_group"] = ("in", children + [item_group])
- if brand := filters.get("brand"):
- item_filters["brand"] = brand
-
- return frappe.get_all("Item", filters=item_filters, pluck="name", order_by=None)
-
-
-def get_item_details(items: List[str], sle: List[SLEntry], filters: StockBalanceFilter):
- item_details = {}
- if not items:
- items = list(set(d.item_code for d in sle))
-
- if not items:
- return item_details
-
- item_table = frappe.qb.DocType("Item")
-
- query = (
- frappe.qb.from_(item_table)
- .select(
- item_table.name,
- item_table.item_name,
- item_table.description,
- item_table.item_group,
- item_table.brand,
- item_table.stock_uom,
- )
- .where(item_table.name.isin(items))
- )
-
- if uom := filters.get("include_uom"):
- uom_conv_detail = frappe.qb.DocType("UOM Conversion Detail")
- query = (
- query.left_join(uom_conv_detail)
- .on((uom_conv_detail.parent == item_table.name) & (uom_conv_detail.uom == uom))
- .select(uom_conv_detail.conversion_factor)
- )
-
- result = query.run(as_dict=1)
-
- for item_table in result:
- item_details.setdefault(item_table.name, item_table)
-
- if filters.get("show_variant_attributes"):
- variant_values = get_variant_values_for(list(item_details))
- item_details = {k: v.update(variant_values.get(k, {})) for k, v in item_details.items()}
-
- return item_details
-
-
-def get_item_reorder_details(items):
- item_reorder_details = frappe._dict()
-
- if items:
- item_reorder_details = frappe.get_all(
- "Item Reorder",
- ["parent", "warehouse", "warehouse_reorder_qty", "warehouse_reorder_level"],
- filters={"parent": ("in", items)},
- )
-
- return dict((d.parent + d.warehouse, d) for d in item_reorder_details)
-
-
def get_variants_attributes() -> List[str]:
"""Return all item variant attributes."""
return frappe.get_all("Item Attribute", pluck="name")
-
-
-def get_variant_values_for(items):
- """Returns variant values for items."""
- attribute_map = {}
-
- attribute_info = frappe.get_all(
- "Item Variant Attribute",
- ["parent", "attribute", "attribute_value"],
- {
- "parent": ("in", items),
- },
- )
-
- for attr in attribute_info:
- attribute_map.setdefault(attr["parent"], {})
- attribute_map[attr["parent"]].update({attr["attribute"]: attr["attribute_value"]})
-
- return attribute_map
diff --git a/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py b/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py
index f93bd66..c3c85aa 100644
--- a/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py
+++ b/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py
@@ -25,18 +25,3 @@
def tearDown(self) -> None:
frappe.db.rollback()
-
- def test_serial_balance(self):
- item_code = "_Test Stock Report Serial Item"
- # Checks serials which were added through stock in entry.
- columns, data = execute(self.filters)
- self.assertEqual(data[0].in_qty, 2)
- serials_added = get_serial_nos(data[0].serial_no)
- self.assertEqual(len(serials_added), 2)
- # Stock out entry for one of the serials.
- dn = create_delivery_note(item=item_code, serial_no=serials_added[1])
- self.filters.voucher_no = dn.name
- columns, data = execute(self.filters)
- self.assertEqual(data[0].out_qty, -1)
- self.assertEqual(data[0].serial_no, serials_added[1])
- self.assertEqual(data[0].balance_serial_no, serials_added[0])
diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
index f477d8f..31c756d 100644
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -76,6 +76,7 @@
bin.ordered_qty,
bin.reserved_qty,
bin.reserved_qty_for_production,
+ bin.reserved_qty_for_production_plan,
bin.reserved_qty_for_sub_contract,
reserved_qty_for_pos,
bin.projected_qty,
@@ -174,6 +175,13 @@
"convertible": "qty",
},
{
+ "label": _("Reserved for Production Plan"),
+ "fieldname": "reserved_qty_for_production_plan",
+ "fieldtype": "Float",
+ "width": 100,
+ "convertible": "qty",
+ },
+ {
"label": _("Reserved for Sub Contracting"),
"fieldname": "reserved_qty_for_sub_contract",
"fieldtype": "Float",
@@ -232,6 +240,7 @@
bin.reserved_qty,
bin.reserved_qty_for_production,
bin.reserved_qty_for_sub_contract,
+ bin.reserved_qty_for_production_plan,
bin.projected_qty,
)
.orderby(bin.item_code, bin.warehouse)
diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
index abbb33b..5dbdcef 100644
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
@@ -8,15 +8,15 @@
import frappe
from frappe import _
from frappe.query_builder.functions import Count
-from frappe.utils import flt
+from frappe.utils import cint, flt, getdate
from erpnext.stock.report.stock_ageing.stock_ageing import FIFOSlots, get_average_age
-from erpnext.stock.report.stock_balance.stock_balance import (
+from erpnext.stock.report.stock_analytics.stock_analytics import (
get_item_details,
- get_item_warehouse_map,
get_items,
get_stock_ledger_entries,
)
+from erpnext.stock.report.stock_balance.stock_balance import filter_items_with_no_transactions
from erpnext.stock.utils import is_reposting_item_valuation_in_progress
@@ -32,7 +32,7 @@
items = get_items(filters)
sle = get_stock_ledger_entries(filters, items)
- item_map = get_item_details(items, sle, filters)
+ item_map = get_item_details(items, sle)
iwb_map = get_item_warehouse_map(filters, sle)
warehouse_list = get_warehouse_list(filters)
item_ageing = FIFOSlots(filters).generate()
@@ -128,3 +128,59 @@
for wh in warehouse_list:
columns += [_(wh.name) + ":Int:100"]
+
+
+def get_item_warehouse_map(filters, sle):
+ iwb_map = {}
+ from_date = getdate(filters.get("from_date"))
+ to_date = getdate(filters.get("to_date"))
+ float_precision = cint(frappe.db.get_default("float_precision")) or 3
+
+ for d in sle:
+ group_by_key = get_group_by_key(d)
+ if group_by_key not in iwb_map:
+ iwb_map[group_by_key] = frappe._dict(
+ {
+ "opening_qty": 0.0,
+ "opening_val": 0.0,
+ "in_qty": 0.0,
+ "in_val": 0.0,
+ "out_qty": 0.0,
+ "out_val": 0.0,
+ "bal_qty": 0.0,
+ "bal_val": 0.0,
+ "val_rate": 0.0,
+ }
+ )
+
+ qty_dict = iwb_map[group_by_key]
+ if d.voucher_type == "Stock Reconciliation" and not d.batch_no:
+ qty_diff = flt(d.qty_after_transaction) - flt(qty_dict.bal_qty)
+ else:
+ qty_diff = flt(d.actual_qty)
+
+ value_diff = flt(d.stock_value_difference)
+
+ if d.posting_date < from_date:
+ qty_dict.opening_qty += qty_diff
+ qty_dict.opening_val += value_diff
+
+ elif d.posting_date >= from_date and d.posting_date <= to_date:
+ if flt(qty_diff, float_precision) >= 0:
+ qty_dict.in_qty += qty_diff
+ qty_dict.in_val += value_diff
+ else:
+ qty_dict.out_qty += abs(qty_diff)
+ qty_dict.out_val += abs(value_diff)
+
+ qty_dict.val_rate = d.valuation_rate
+ qty_dict.bal_qty += qty_diff
+ qty_dict.bal_val += value_diff
+
+ iwb_map = filter_items_with_no_transactions(iwb_map, float_precision)
+
+ return iwb_map
+
+
+def get_group_by_key(row) -> tuple:
+ return (row.company, row.item_code, row.warehouse)
diff --git a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
index 58a043e..752e464 100644
--- a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
+++ b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
@@ -11,6 +11,13 @@
"options": "Company",
"reqd": 1,
"default": frappe.defaults.get_user_default("Company")
+ },
+ {
+ "fieldname":"show_disabled_warehouses",
+ "label": __("Show Disabled Warehouses"),
+ "fieldtype": "Check",
+ "default": 0
+
}
],
"initial_depth": 3,
diff --git a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
index d364b57..a0e9944 100644
--- a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
+++ b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
@@ -11,6 +11,7 @@
class StockBalanceFilter(TypedDict):
company: Optional[str]
warehouse: Optional[str]
+ show_disabled_warehouses: Optional[int]
SLEntry = Dict[str, Any]
@@ -18,7 +19,7 @@
def execute(filters=None):
columns, data = [], []
- columns = get_columns()
+ columns = get_columns(filters)
data = get_data(filters)
return columns, data
@@ -42,10 +43,14 @@
def get_warehouses(report_filters: StockBalanceFilter):
+ filters = {"company": report_filters.company, "disabled": 0}
+ if report_filters.get("show_disabled_warehouses"):
+ filters["disabled"] = ("in", [0, report_filters.show_disabled_warehouses])
+
return frappe.get_all(
"Warehouse",
- fields=["name", "parent_warehouse", "is_group"],
- filters={"company": report_filters.company},
+ fields=["name", "parent_warehouse", "is_group", "disabled"],
+ filters=filters,
order_by="lft",
)
@@ -90,8 +95,8 @@
update_balance(warehouse, warehouse.stock_balance)
-def get_columns():
- return [
+def get_columns(filters: StockBalanceFilter) -> List[Dict]:
+ columns = [
{
"label": _("Warehouse"),
"fieldname": "name",
@@ -101,3 +106,15 @@
},
{"label": _("Stock Balance"), "fieldname": "stock_balance", "fieldtype": "Float", "width": 150},
]
+
+ if filters.get("show_disabled_warehouses"):
+ columns.append(
+ {
+ "label": _("Warehouse Disabled?"),
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "width": 200,
+ }
+ )
+
+ return columns
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
new file mode 100644
index 0000000..d6c840f
--- /dev/null
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -0,0 +1,976 @@
+from collections import defaultdict
+from typing import List
+
+import frappe
+from frappe import _, bold
+from frappe.model.naming import make_autoname
+from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.utils import cint, flt, get_link_to_form, now, nowtime, today
+
+from erpnext.stock.deprecated_serial_batch import (
+ DeprecatedBatchNoValuation,
+ DeprecatedSerialNoValuation,
+)
+from erpnext.stock.valuation import round_off_if_near_zero
+
+
+class SerialBatchBundle:
+ def __init__(self, **kwargs):
+ for key, value in kwargs.items():
+ setattr(self, key, value)
+
+ self.set_item_details()
+ self.process_serial_and_batch_bundle()
+ if self.sle.is_cancelled:
+ self.delink_serial_and_batch_bundle()
+
+ self.post_process()
+
+ def process_serial_and_batch_bundle(self):
+ if self.item_details.has_serial_no:
+ self.process_serial_no()
+ elif self.item_details.has_batch_no:
+ self.process_batch_no()
+
+ def set_item_details(self):
+ fields = [
+ "has_batch_no",
+ "has_serial_no",
+ "item_name",
+ "item_group",
+ "serial_no_series",
+ "create_new_batch",
+ "batch_number_series",
+ ]
+
+ self.item_details = frappe.get_cached_value("Item", self.sle.item_code, fields, as_dict=1)
+
+ def process_serial_no(self):
+ if (
+ not self.sle.is_cancelled
+ and not self.sle.serial_and_batch_bundle
+ and self.item_details.has_serial_no == 1
+ ):
+ self.make_serial_batch_no_bundle()
+ elif not self.sle.is_cancelled:
+ self.validate_item_and_warehouse()
+
+ def make_serial_batch_no_bundle(self):
+ self.validate_item()
+
+ sn_doc = SerialBatchCreation(
+ {
+ "item_code": self.item_code,
+ "warehouse": self.warehouse,
+ "posting_date": self.sle.posting_date,
+ "posting_time": self.sle.posting_time,
+ "voucher_type": self.sle.voucher_type,
+ "voucher_no": self.sle.voucher_no,
+ "voucher_detail_no": self.sle.voucher_detail_no,
+ "qty": self.sle.actual_qty,
+ "avg_rate": self.sle.incoming_rate,
+ "total_amount": flt(self.sle.actual_qty) * flt(self.sle.incoming_rate),
+ "type_of_transaction": "Inward" if self.sle.actual_qty > 0 else "Outward",
+ "company": self.company,
+ "is_rejected": self.is_rejected_entry(),
+ }
+ ).make_serial_and_batch_bundle()
+
+ self.set_serial_and_batch_bundle(sn_doc)
+
+ def validate_actual_qty(self, sn_doc):
+ link = get_link_to_form("Serial and Batch Bundle", sn_doc.name)
+
+ condition = {
+ "Inward": self.sle.actual_qty > 0,
+ "Outward": self.sle.actual_qty < 0,
+ }.get(sn_doc.type_of_transaction)
+
+ if not condition:
+ correct_type = "Inward"
+ if sn_doc.type_of_transaction == "Inward":
+ correct_type = "Outward"
+
+ msg = f"The type of transaction of Serial and Batch Bundle {link} is {bold(sn_doc.type_of_transaction)} but as per the Actual Qty {self.sle.actual_qty} for the item {bold(self.sle.item_code)} in the {self.sle.voucher_type} {self.sle.voucher_no} the type of transaction should be {bold(correct_type)}"
+ frappe.throw(_(msg), title=_("Incorrect Type of Transaction"))
+
+ precision = sn_doc.precision("total_qty")
+ if flt(sn_doc.total_qty, precision) != flt(self.sle.actual_qty, precision):
+ msg = f"Total qty {flt(sn_doc.total_qty, precision)} of Serial and Batch Bundle {link} is not equal to Actual Qty {flt(self.sle.actual_qty, precision)} in the {self.sle.voucher_type} {self.sle.voucher_no}"
+ frappe.throw(_(msg))
+
+ def validate_item(self):
+ msg = ""
+ if self.sle.actual_qty > 0:
+ if not self.item_details.has_batch_no and not self.item_details.has_serial_no:
+ msg = f"Item {self.item_code} is not a batch or serial no item"
+
+ if self.item_details.has_serial_no and not self.item_details.serial_no_series:
+ msg += f". If you want auto pick serial bundle, then kindly set Serial No Series in Item {self.item_code}"
+
+ if (
+ self.item_details.has_batch_no
+ and not self.item_details.batch_number_series
+ and not frappe.db.get_single_value("Stock Settings", "naming_series_prefix")
+ ):
+ msg += f". If you want auto pick batch bundle, then kindly set Batch Number Series in Item {self.item_code}"
+
+ elif self.sle.actual_qty < 0:
+ if not frappe.db.get_single_value(
+ "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"
+ ):
+ msg += ". If you want auto pick serial/batch bundle, then kindly enable 'Auto Create Serial and Batch Bundle' in Stock Settings."
+
+ if msg:
+ error_msg = (
+ f"Serial and Batch Bundle not set for item {self.item_code} in warehouse {self.warehouse}."
+ + msg
+ )
+ frappe.throw(_(error_msg))
+
+ def set_serial_and_batch_bundle(self, sn_doc):
+ self.sle.db_set("serial_and_batch_bundle", sn_doc.name)
+
+ if sn_doc.is_rejected:
+ frappe.db.set_value(
+ self.child_doctype, self.sle.voucher_detail_no, "rejected_serial_and_batch_bundle", sn_doc.name
+ )
+ else:
+ frappe.db.set_value(
+ self.child_doctype, self.sle.voucher_detail_no, "serial_and_batch_bundle", sn_doc.name
+ )
+
+ @property
+ def child_doctype(self):
+ child_doctype = self.sle.voucher_type + " Item"
+ if self.sle.voucher_type == "Stock Entry":
+ child_doctype = "Stock Entry Detail"
+
+ if self.sle.voucher_type == "Asset Capitalization":
+ child_doctype = "Asset Capitalization Stock Item"
+
+ if self.sle.voucher_type == "Asset Repair":
+ child_doctype = "Asset Repair Consumed Item"
+
+ return child_doctype
+
+ def is_rejected_entry(self):
+ return is_rejected(self.sle.voucher_type, self.sle.voucher_detail_no, self.sle.warehouse)
+
+ def process_batch_no(self):
+ if (
+ not self.sle.is_cancelled
+ and not self.sle.serial_and_batch_bundle
+ and self.item_details.has_batch_no == 1
+ and self.item_details.create_new_batch
+ ):
+ self.make_serial_batch_no_bundle()
+ elif not self.sle.is_cancelled:
+ self.validate_item_and_warehouse()
+
+ def validate_item_and_warehouse(self):
+ if self.sle.serial_and_batch_bundle and not frappe.db.exists(
+ "Serial and Batch Bundle",
+ {
+ "name": self.sle.serial_and_batch_bundle,
+ "item_code": self.item_code,
+ "warehouse": self.warehouse,
+ "voucher_no": self.sle.voucher_no,
+ },
+ ):
+ msg = f"""
+ The Serial and Batch Bundle
+ {bold(self.sle.serial_and_batch_bundle)}
+ does not belong to Item {bold(self.item_code)}
+ or Warehouse {bold(self.warehouse)}
+ or {self.sle.voucher_type} no {bold(self.sle.voucher_no)}
+ """
+
+ frappe.throw(_(msg))
+
+ def delink_serial_and_batch_bundle(self):
+ update_values = {
+ "serial_and_batch_bundle": "",
+ }
+
+ if is_rejected(self.sle.voucher_type, self.sle.voucher_detail_no, self.sle.warehouse):
+ update_values["rejected_serial_and_batch_bundle"] = ""
+
+ frappe.db.set_value(self.child_doctype, self.sle.voucher_detail_no, update_values)
+
+ frappe.db.set_value(
+ "Serial and Batch Bundle",
+ {"voucher_no": self.sle.voucher_no, "voucher_type": self.sle.voucher_type},
+ {"is_cancelled": 1, "voucher_no": ""},
+ )
+
+ if self.sle.serial_and_batch_bundle:
+ frappe.get_cached_doc(
+ "Serial and Batch Bundle", self.sle.serial_and_batch_bundle
+ ).validate_serial_and_batch_inventory()
+
+ def post_process(self):
+ if not self.sle.serial_and_batch_bundle:
+ return
+
+ docstatus = frappe.get_cached_value(
+ "Serial and Batch Bundle", self.sle.serial_and_batch_bundle, "docstatus"
+ )
+
+ if docstatus != 1:
+ self.submit_serial_and_batch_bundle()
+
+ if self.item_details.has_serial_no == 1:
+ self.set_warehouse_and_status_in_serial_nos()
+
+ if (
+ self.sle.actual_qty > 0
+ and self.item_details.has_serial_no == 1
+ and self.item_details.has_batch_no == 1
+ ):
+ self.set_batch_no_in_serial_nos()
+
+ if self.item_details.has_batch_no == 1:
+ self.update_batch_qty()
+
+ def submit_serial_and_batch_bundle(self):
+ doc = frappe.get_doc("Serial and Batch Bundle", self.sle.serial_and_batch_bundle)
+ self.validate_actual_qty(doc)
+
+ doc.flags.ignore_voucher_validation = True
+ doc.submit()
+
+ def set_warehouse_and_status_in_serial_nos(self):
+ serial_nos = get_serial_nos(self.sle.serial_and_batch_bundle)
+ warehouse = self.warehouse if self.sle.actual_qty > 0 else None
+
+ if not serial_nos:
+ return
+
+ sn_table = frappe.qb.DocType("Serial No")
+ (
+ frappe.qb.update(sn_table)
+ .set(sn_table.warehouse, warehouse)
+ .set(sn_table.status, "Active" if warehouse else "Inactive")
+ .where(sn_table.name.isin(serial_nos))
+ ).run()
+
+ def set_batch_no_in_serial_nos(self):
+ entries = frappe.get_all(
+ "Serial and Batch Entry",
+ fields=["serial_no", "batch_no"],
+ filters={"parent": self.sle.serial_and_batch_bundle},
+ )
+
+ batch_serial_nos = {}
+ for ledger in entries:
+ batch_serial_nos.setdefault(ledger.batch_no, []).append(ledger.serial_no)
+
+ for batch_no, serial_nos in batch_serial_nos.items():
+ sn_table = frappe.qb.DocType("Serial No")
+ (
+ frappe.qb.update(sn_table)
+ .set(sn_table.batch_no, batch_no)
+ .where(sn_table.name.isin(serial_nos))
+ ).run()
+
+ def update_batch_qty(self):
+ from erpnext.stock.doctype.batch.batch import get_available_batches
+
+ batches = get_batch_nos(self.sle.serial_and_batch_bundle)
+
+ batches_qty = get_available_batches(
+ frappe._dict(
+ {"item_code": self.item_code, "warehouse": self.warehouse, "batch_no": list(batches.keys())}
+ )
+ )
+
+ for batch_no in batches:
+ frappe.db.set_value("Batch", batch_no, "batch_qty", batches_qty.get(batch_no, 0))
+
+
+def get_serial_nos(serial_and_batch_bundle, serial_nos=None):
+ if not serial_and_batch_bundle:
+ return []
+
+ filters = {"parent": serial_and_batch_bundle, "serial_no": ("is", "set")}
+ if isinstance(serial_and_batch_bundle, list):
+ filters = {"parent": ("in", serial_and_batch_bundle)}
+
+ if serial_nos:
+ filters["serial_no"] = ("in", serial_nos)
+
+ entries = frappe.get_all("Serial and Batch Entry", fields=["serial_no"], filters=filters)
+ if not entries:
+ return []
+
+ return [d.serial_no for d in entries if d.serial_no]
+
+
+def get_serial_nos_from_bundle(serial_and_batch_bundle, serial_nos=None):
+ return get_serial_nos(serial_and_batch_bundle, serial_nos=serial_nos)
+
+
+def get_serial_or_batch_nos(bundle):
+ # For print format
+
+ bundle_data = frappe.get_cached_value(
+ "Serial and Batch Bundle", bundle, ["has_serial_no", "has_batch_no"], as_dict=True
+ )
+
+ fields = []
+ if bundle_data.has_serial_no:
+ fields.append("serial_no")
+
+ if bundle_data.has_batch_no:
+ fields.extend(["batch_no", "qty"])
+
+ data = frappe.get_all("Serial and Batch Entry", fields=fields, filters={"parent": bundle})
+
+ if bundle_data.has_serial_no and not bundle_data.has_batch_no:
+ return ", ".join([d.serial_no for d in data])
+
+ elif bundle_data.has_batch_no:
+ html = "<table class= 'table table-borderless' style='margin-top: 0px;margin-bottom: 0px;'>"
+ for d in data:
+ if d.serial_no:
+ html += f"<tr><td>{d.batch_no}</th><th>{d.serial_no}</th ><th>{abs(d.qty)}</th></tr>"
+ else:
+ html += f"<tr><td>{d.batch_no}</td><td>{abs(d.qty)}</td></tr>"
+
+ html += "</table>"
+
+ return html
+
+
+class SerialNoValuation(DeprecatedSerialNoValuation):
+ def __init__(self, **kwargs):
+ for key, value in kwargs.items():
+ setattr(self, key, value)
+
+ self.calculate_stock_value_change()
+ self.calculate_valuation_rate()
+
+ def calculate_stock_value_change(self):
+ if flt(self.sle.actual_qty) > 0:
+ self.stock_value_change = frappe.get_cached_value(
+ "Serial and Batch Bundle", self.sle.serial_and_batch_bundle, "total_amount"
+ )
+
+ else:
+ entries = self.get_serial_no_ledgers()
+
+ self.serial_no_incoming_rate = defaultdict(float)
+ self.stock_value_change = 0.0
+
+ for ledger in entries:
+ self.stock_value_change += ledger.incoming_rate
+ self.serial_no_incoming_rate[ledger.serial_no] += ledger.incoming_rate
+
+ self.calculate_stock_value_from_deprecarated_ledgers()
+
+ def get_serial_no_ledgers(self):
+ serial_nos = self.get_serial_nos()
+ bundle = frappe.qb.DocType("Serial and Batch Bundle")
+ bundle_child = frappe.qb.DocType("Serial and Batch Entry")
+
+ query = (
+ frappe.qb.from_(bundle)
+ .inner_join(bundle_child)
+ .on(bundle.name == bundle_child.parent)
+ .select(
+ bundle.name,
+ bundle_child.serial_no,
+ (bundle_child.incoming_rate * bundle_child.qty).as_("incoming_rate"),
+ )
+ .where(
+ (bundle.is_cancelled == 0)
+ & (bundle.docstatus == 1)
+ & (bundle_child.serial_no.isin(serial_nos))
+ & (bundle.type_of_transaction.isin(["Inward", "Outward"]))
+ & (bundle.item_code == self.sle.item_code)
+ & (bundle_child.warehouse == self.sle.warehouse)
+ )
+ .orderby(bundle.posting_date, bundle.posting_time, bundle.creation)
+ )
+
+ # Important to exclude the current voucher
+ if self.sle.voucher_no:
+ query = query.where(bundle.voucher_no != self.sle.voucher_no)
+
+ if self.sle.posting_date:
+ if self.sle.posting_time is None:
+ self.sle.posting_time = nowtime()
+
+ timestamp_condition = CombineDatetime(
+ bundle.posting_date, bundle.posting_time
+ ) <= CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+
+ query = query.where(timestamp_condition)
+
+ return query.run(as_dict=True)
+
+ def get_serial_nos(self):
+ if self.sle.get("serial_nos"):
+ return self.sle.serial_nos
+
+ return get_serial_nos(self.sle.serial_and_batch_bundle)
+
+ def calculate_valuation_rate(self):
+ if not hasattr(self, "wh_data"):
+ return
+
+ new_stock_qty = self.wh_data.qty_after_transaction + self.sle.actual_qty
+
+ if new_stock_qty > 0:
+ new_stock_value = (
+ self.wh_data.qty_after_transaction * self.wh_data.valuation_rate
+ ) + self.stock_value_change
+ if new_stock_value >= 0:
+ # calculate new valuation rate only if stock value is positive
+ # else it remains the same as that of previous entry
+ self.wh_data.valuation_rate = new_stock_value / new_stock_qty
+
+ if (
+ not self.wh_data.valuation_rate and self.sle.voucher_detail_no and not self.is_rejected_entry()
+ ):
+ allow_zero_rate = self.sle_self.check_if_allow_zero_valuation_rate(
+ self.sle.voucher_type, self.sle.voucher_detail_no
+ )
+ if not allow_zero_rate:
+ self.wh_data.valuation_rate = self.sle_self.get_fallback_rate(self.sle)
+
+ self.wh_data.qty_after_transaction += self.sle.actual_qty
+ self.wh_data.stock_value = flt(self.wh_data.qty_after_transaction) * flt(
+ self.wh_data.valuation_rate
+ )
+
+ def is_rejected_entry(self):
+ return is_rejected(self.sle.voucher_type, self.sle.voucher_detail_no, self.sle.warehouse)
+
+ def get_incoming_rate(self):
+ return abs(flt(self.stock_value_change) / flt(self.sle.actual_qty))
+
+ def get_incoming_rate_of_serial_no(self, serial_no):
+ return self.serial_no_incoming_rate.get(serial_no, 0.0)
+
+
+def is_rejected(voucher_type, voucher_detail_no, warehouse):
+ if voucher_type in ["Purchase Receipt", "Purchase Invoice"]:
+ return warehouse == frappe.get_cached_value(
+ voucher_type + " Item", voucher_detail_no, "rejected_warehouse"
+ )
+
+ return False
+
+
+class BatchNoValuation(DeprecatedBatchNoValuation):
+ def __init__(self, **kwargs):
+ for key, value in kwargs.items():
+ setattr(self, key, value)
+
+ self.batch_nos = self.get_batch_nos()
+ self.prepare_batches()
+ self.calculate_avg_rate()
+ self.calculate_valuation_rate()
+
+ def calculate_avg_rate(self):
+ if flt(self.sle.actual_qty) > 0:
+ self.stock_value_change = frappe.get_cached_value(
+ "Serial and Batch Bundle", self.sle.serial_and_batch_bundle, "total_amount"
+ )
+ else:
+ entries = self.get_batch_no_ledgers()
+ self.stock_value_change = 0.0
+ self.batch_avg_rate = defaultdict(float)
+ self.available_qty = defaultdict(float)
+ self.stock_value_differece = defaultdict(float)
+
+ for ledger in entries:
+ self.stock_value_differece[ledger.batch_no] += flt(ledger.incoming_rate)
+ self.available_qty[ledger.batch_no] += flt(ledger.qty)
+
+ self.calculate_avg_rate_from_deprecarated_ledgers()
+ self.calculate_avg_rate_for_non_batchwise_valuation()
+ self.set_stock_value_difference()
+
+ def get_batch_no_ledgers(self) -> List[dict]:
+ if not self.batchwise_valuation_batches:
+ return []
+
+ parent = frappe.qb.DocType("Serial and Batch Bundle")
+ child = frappe.qb.DocType("Serial and Batch Entry")
+
+ timestamp_condition = ""
+ if self.sle.posting_date and self.sle.posting_time:
+ timestamp_condition = CombineDatetime(
+ parent.posting_date, parent.posting_time
+ ) <= CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+
+ query = (
+ frappe.qb.from_(parent)
+ .inner_join(child)
+ .on(parent.name == child.parent)
+ .select(
+ child.batch_no,
+ Sum(child.stock_value_difference).as_("incoming_rate"),
+ Sum(child.qty).as_("qty"),
+ )
+ .where(
+ (child.batch_no.isin(self.batchwise_valuation_batches))
+ & (parent.warehouse == self.sle.warehouse)
+ & (parent.item_code == self.sle.item_code)
+ & (parent.docstatus == 1)
+ & (parent.is_cancelled == 0)
+ & (parent.type_of_transaction.isin(["Inward", "Outward"]))
+ )
+ .groupby(child.batch_no)
+ )
+
+ # Important to exclude the current voucher
+ if self.sle.voucher_no:
+ query = query.where(parent.voucher_no != self.sle.voucher_no)
+
+ if timestamp_condition:
+ query = query.where(timestamp_condition)
+
+ return query.run(as_dict=True)
+
+ def prepare_batches(self):
+ self.batches = self.batch_nos
+ if isinstance(self.batch_nos, dict):
+ self.batches = list(self.batch_nos.keys())
+
+ self.batchwise_valuation_batches = []
+ self.non_batchwise_valuation_batches = []
+
+ batches = frappe.get_all(
+ "Batch", filters={"name": ("in", self.batches), "use_batchwise_valuation": 1}, fields=["name"]
+ )
+
+ for batch in batches:
+ self.batchwise_valuation_batches.append(batch.name)
+
+ self.non_batchwise_valuation_batches = list(
+ set(self.batches) - set(self.batchwise_valuation_batches)
+ )
+
+ def get_batch_nos(self) -> list:
+ if self.sle.get("batch_nos"):
+ return self.sle.batch_nos
+
+ return get_batch_nos(self.sle.serial_and_batch_bundle)
+
+ def set_stock_value_difference(self):
+ for batch_no, ledger in self.batch_nos.items():
+ if batch_no in self.non_batchwise_valuation_batches:
+ continue
+
+ if not self.available_qty[batch_no]:
+ continue
+
+ self.batch_avg_rate[batch_no] = (
+ self.stock_value_differece[batch_no] / self.available_qty[batch_no]
+ )
+
+ # New Stock Value Difference
+ stock_value_change = self.batch_avg_rate[batch_no] * ledger.qty
+ self.stock_value_change += stock_value_change
+
+ frappe.db.set_value(
+ "Serial and Batch Entry",
+ ledger.name,
+ {
+ "stock_value_difference": stock_value_change,
+ "incoming_rate": self.batch_avg_rate[batch_no],
+ },
+ )
+
+ def calculate_valuation_rate(self):
+ if not hasattr(self, "wh_data"):
+ return
+
+ self.wh_data.stock_value = round_off_if_near_zero(
+ self.wh_data.stock_value + self.stock_value_change
+ )
+
+ self.wh_data.qty_after_transaction += self.sle.actual_qty
+ if self.wh_data.qty_after_transaction:
+ self.wh_data.valuation_rate = self.wh_data.stock_value / self.wh_data.qty_after_transaction
+
+ def get_incoming_rate(self):
+ if not self.sle.actual_qty:
+ self.sle.actual_qty = self.get_actual_qty()
+
+ return abs(flt(self.stock_value_change) / flt(self.sle.actual_qty))
+
+ def get_actual_qty(self):
+ total_qty = 0.0
+ for batch_no in self.available_qty:
+ total_qty += self.available_qty[batch_no]
+
+ return total_qty
+
+
+def get_batch_nos(serial_and_batch_bundle):
+ if not serial_and_batch_bundle:
+ return frappe._dict({})
+
+ entries = frappe.get_all(
+ "Serial and Batch Entry",
+ fields=["batch_no", "qty", "name"],
+ filters={"parent": serial_and_batch_bundle, "batch_no": ("is", "set")},
+ order_by="idx",
+ )
+
+ if not entries:
+ return frappe._dict({})
+
+ return {d.batch_no: d for d in entries}
+
+
+def get_empty_batches_based_work_order(work_order, item_code):
+ batches = get_batches_from_work_order(work_order, item_code)
+ if not batches:
+ return batches
+
+ entries = get_batches_from_stock_entries(work_order, item_code)
+ if not entries:
+ return batches
+
+ ids = [d.serial_and_batch_bundle for d in entries if d.serial_and_batch_bundle]
+ if ids:
+ set_batch_details_from_package(ids, batches)
+
+ # Will be deprecated in v16
+ for d in entries:
+ if not d.batch_no:
+ continue
+
+ batches[d.batch_no] -= d.qty
+
+ return batches
+
+
+def get_batches_from_work_order(work_order, item_code):
+ return frappe._dict(
+ frappe.get_all(
+ "Batch",
+ fields=["name", "qty_to_produce"],
+ filters={"reference_name": work_order, "item": item_code},
+ as_list=1,
+ )
+ )
+
+
+def get_batches_from_stock_entries(work_order, item_code):
+ entries = frappe.get_all(
+ "Stock Entry",
+ filters={"work_order": work_order, "docstatus": 1, "purpose": "Manufacture"},
+ fields=["name"],
+ )
+
+ return frappe.get_all(
+ "Stock Entry Detail",
+ fields=["batch_no", "qty", "serial_and_batch_bundle"],
+ filters={
+ "parent": ("in", [d.name for d in entries]),
+ "is_finished_item": 1,
+ "item_code": item_code,
+ },
+ )
+
+
+def set_batch_details_from_package(ids, batches):
+ entries = frappe.get_all(
+ "Serial and Batch Entry",
+ filters={"parent": ("in", ids), "is_outward": 0},
+ fields=["batch_no", "qty"],
+ )
+
+ for d in entries:
+ batches[d.batch_no] -= d.qty
+
+
+class SerialBatchCreation:
+ def __init__(self, args):
+ self.set(args)
+ self.set_item_details()
+ self.set_other_details()
+
+ def set(self, args):
+ self.__dict__ = {}
+ for key, value in args.items():
+ setattr(self, key, value)
+ self.__dict__[key] = value
+
+ def get(self, key):
+ return self.__dict__.get(key)
+
+ def set_item_details(self):
+ fields = [
+ "has_batch_no",
+ "has_serial_no",
+ "item_name",
+ "item_group",
+ "serial_no_series",
+ "create_new_batch",
+ "batch_number_series",
+ "description",
+ ]
+
+ item_details = frappe.get_cached_value("Item", self.item_code, fields, as_dict=1)
+ for key, value in item_details.items():
+ setattr(self, key, value)
+
+ self.__dict__.update(item_details)
+
+ def set_other_details(self):
+ if not self.get("posting_date"):
+ setattr(self, "posting_date", today())
+ self.__dict__["posting_date"] = self.posting_date
+
+ if not self.get("actual_qty"):
+ qty = self.get("qty") or self.get("total_qty")
+
+ setattr(self, "actual_qty", qty)
+ self.__dict__["actual_qty"] = self.actual_qty
+
+ def duplicate_package(self):
+ if not self.serial_and_batch_bundle:
+ return
+
+ id = self.serial_and_batch_bundle
+ package = frappe.get_doc("Serial and Batch Bundle", id)
+ new_package = frappe.copy_doc(package)
+
+ if self.get("returned_serial_nos"):
+ self.remove_returned_serial_nos(new_package)
+
+ new_package.docstatus = 0
+ new_package.type_of_transaction = self.type_of_transaction
+ new_package.returned_against = self.get("returned_against")
+ new_package.save()
+
+ self.serial_and_batch_bundle = new_package.name
+
+ def remove_returned_serial_nos(self, package):
+ remove_list = []
+ for d in package.entries:
+ if d.serial_no in self.returned_serial_nos:
+ remove_list.append(d)
+
+ for d in remove_list:
+ package.remove(d)
+
+ def make_serial_and_batch_bundle(self):
+ doc = frappe.new_doc("Serial and Batch Bundle")
+ valid_columns = doc.meta.get_valid_columns()
+ for key, value in self.__dict__.items():
+ if key in valid_columns:
+ doc.set(key, value)
+
+ if self.type_of_transaction == "Outward":
+ self.set_auto_serial_batch_entries_for_outward()
+ elif self.type_of_transaction == "Inward":
+ self.set_auto_serial_batch_entries_for_inward()
+ self.add_serial_nos_for_batch_item()
+
+ self.set_serial_batch_entries(doc)
+ if not doc.get("entries"):
+ return frappe._dict({})
+
+ doc.save()
+ self.validate_qty(doc)
+
+ if not hasattr(self, "do_not_submit") or not self.do_not_submit:
+ doc.flags.ignore_voucher_validation = True
+ doc.submit()
+
+ return doc
+
+ def add_serial_nos_for_batch_item(self):
+ if not (self.has_serial_no and self.has_batch_no):
+ return
+
+ if not self.get("serial_nos") and self.get("batches"):
+ batches = list(self.get("batches").keys())
+ if len(batches) == 1:
+ self.batch_no = batches[0]
+ self.serial_nos = self.get_auto_created_serial_nos()
+
+ def update_serial_and_batch_entries(self):
+ doc = frappe.get_doc("Serial and Batch Bundle", self.serial_and_batch_bundle)
+ doc.type_of_transaction = self.type_of_transaction
+ doc.set("entries", [])
+ self.set_auto_serial_batch_entries_for_outward()
+ self.set_serial_batch_entries(doc)
+ if not doc.get("entries"):
+ return frappe._dict({})
+
+ doc.save()
+ return doc
+
+ def validate_qty(self, doc):
+ if doc.type_of_transaction == "Outward":
+ precision = doc.precision("total_qty")
+
+ total_qty = abs(flt(doc.total_qty, precision))
+ required_qty = abs(flt(self.actual_qty, precision))
+
+ if required_qty - total_qty > 0:
+ msg = f"For the item {bold(doc.item_code)}, the Avaliable qty {bold(total_qty)} is less than the Required Qty {bold(required_qty)} in the warehouse {bold(doc.warehouse)}. Please add sufficient qty in the warehouse."
+ frappe.throw(msg, title=_("Insufficient Stock"))
+
+ def set_auto_serial_batch_entries_for_outward(self):
+ from erpnext.stock.doctype.batch.batch import get_available_batches
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos_for_outward
+
+ kwargs = frappe._dict(
+ {
+ "item_code": self.item_code,
+ "warehouse": self.warehouse,
+ "qty": abs(self.actual_qty) if self.actual_qty else 0,
+ "based_on": frappe.db.get_single_value("Stock Settings", "pick_serial_and_batch_based_on"),
+ }
+ )
+
+ if self.get("ignore_serial_nos"):
+ kwargs["ignore_serial_nos"] = self.ignore_serial_nos
+
+ if self.has_serial_no and not self.get("serial_nos"):
+ self.serial_nos = get_serial_nos_for_outward(kwargs)
+ elif not self.has_serial_no and self.has_batch_no and not self.get("batches"):
+ self.batches = get_available_batches(kwargs)
+
+ def set_auto_serial_batch_entries_for_inward(self):
+ if (self.get("batches") and self.has_batch_no) or (
+ self.get("serial_nos") and self.has_serial_no
+ ):
+ return
+
+ self.batch_no = None
+ if self.has_batch_no:
+ self.batch_no = self.create_batch()
+
+ if self.has_serial_no:
+ self.serial_nos = self.get_auto_created_serial_nos()
+ else:
+ self.batches = frappe._dict({self.batch_no: abs(self.actual_qty)})
+
+ def set_serial_batch_entries(self, doc):
+ if self.get("serial_nos"):
+ serial_no_wise_batch = frappe._dict({})
+ if self.has_batch_no:
+ serial_no_wise_batch = self.get_serial_nos_batch(self.serial_nos)
+
+ qty = -1 if self.type_of_transaction == "Outward" else 1
+ for serial_no in self.serial_nos:
+ doc.append(
+ "entries",
+ {
+ "serial_no": serial_no,
+ "qty": qty,
+ "batch_no": serial_no_wise_batch.get(serial_no) or self.get("batch_no"),
+ "incoming_rate": self.get("incoming_rate"),
+ },
+ )
+
+ elif self.get("batches"):
+ for batch_no, batch_qty in self.batches.items():
+ doc.append(
+ "entries",
+ {
+ "batch_no": batch_no,
+ "qty": batch_qty * (-1 if self.type_of_transaction == "Outward" else 1),
+ "incoming_rate": self.get("incoming_rate"),
+ },
+ )
+
+ def get_serial_nos_batch(self, serial_nos):
+ return frappe._dict(
+ frappe.get_all(
+ "Serial No",
+ fields=["name", "batch_no"],
+ filters={"name": ("in", serial_nos)},
+ as_list=1,
+ )
+ )
+
+ def create_batch(self):
+ from erpnext.stock.doctype.batch.batch import make_batch
+
+ return make_batch(
+ frappe._dict(
+ {
+ "item": self.get("item_code"),
+ "reference_doctype": self.get("voucher_type"),
+ "reference_name": self.get("voucher_no"),
+ }
+ )
+ )
+
+ def get_auto_created_serial_nos(self):
+ sr_nos = []
+ serial_nos_details = []
+
+ if not self.serial_no_series:
+ msg = f"Please set Serial No Series in the item {self.item_code} or create Serial and Batch Bundle manually."
+ frappe.throw(_(msg))
+
+ for i in range(abs(cint(self.actual_qty))):
+ serial_no = make_autoname(self.serial_no_series, "Serial No")
+ sr_nos.append(serial_no)
+ serial_nos_details.append(
+ (
+ serial_no,
+ serial_no,
+ now(),
+ now(),
+ frappe.session.user,
+ frappe.session.user,
+ self.warehouse,
+ self.company,
+ self.item_code,
+ self.item_name,
+ self.description,
+ "Active",
+ self.batch_no,
+ )
+ )
+
+ if serial_nos_details:
+ fields = [
+ "name",
+ "serial_no",
+ "creation",
+ "modified",
+ "owner",
+ "modified_by",
+ "warehouse",
+ "company",
+ "item_code",
+ "item_name",
+ "description",
+ "status",
+ "batch_no",
+ ]
+
+ frappe.db.bulk_insert("Serial No", fields=fields, values=set(serial_nos_details))
+
+ return sr_nos
+
+
+def get_serial_or_batch_items(items):
+ serial_or_batch_items = frappe.get_all(
+ "Item",
+ filters={"name": ("in", [d.item_code for d in items])},
+ or_filters={"has_serial_no": 1, "has_batch_no": 1},
+ )
+
+ if not serial_or_batch_items:
+ return
+ else:
+ serial_or_batch_items = [d.name for d in serial_or_batch_items]
+
+ return serial_or_batch_items
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index e3cbb43..a4fe2ee 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -18,7 +18,7 @@
existing_allow_negative_stock = frappe.db.get_value(
"Stock Settings", None, "allow_negative_stock"
)
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+ frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
item_warehouses = frappe.db.sql(
"""
@@ -37,8 +37,8 @@
frappe.db.rollback()
if allow_negative_stock:
- frappe.db.set_value(
- "Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock
+ frappe.db.set_single_value(
+ "Stock Settings", "allow_negative_stock", existing_allow_negative_stock
)
frappe.db.auto_commit_on_many_writes = 0
@@ -295,19 +295,3 @@
"posting_time": posting_time,
}
)
-
-
-def reset_serial_no_status_and_warehouse(serial_nos=None):
- if not serial_nos:
- serial_nos = frappe.db.sql_list("""select name from `tabSerial No` where docstatus = 0""")
- for serial_no in serial_nos:
- try:
- sr = frappe.get_doc("Serial No", serial_no)
- last_sle = sr.get_last_sle()
- if flt(last_sle.actual_qty) > 0:
- sr.warehouse = last_sle.warehouse
-
- sr.via_stock_ledger = True
- sr.save()
- except Exception:
- pass
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index b0a093d..5abb8e8 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -6,13 +6,27 @@
from typing import Optional, Set, Tuple
import frappe
-from frappe import _
+from frappe import _, scrub
from frappe.model.meta import get_field_precision
+from frappe.query_builder import Case
from frappe.query_builder.functions import CombineDatetime, Sum
-from frappe.utils import cint, cstr, flt, get_link_to_form, getdate, now, nowdate
+from frappe.utils import (
+ cint,
+ flt,
+ get_link_to_form,
+ getdate,
+ gzip_compress,
+ gzip_decompress,
+ now,
+ nowdate,
+ parse_json,
+)
import erpnext
from erpnext.stock.doctype.bin.bin import update_qty as update_bin_qty
+from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
+ get_sre_reserved_qty_for_item_and_warehouse as get_reserved_stock,
+)
from erpnext.stock.utils import (
get_incoming_outgoing_rate_for_cancel,
get_or_make_bin,
@@ -211,14 +225,18 @@
if not args:
args = [] # set args to empty list if None to avoid enumerate error
+ reposting_data = {}
+ if doc and doc.reposting_data_file:
+ reposting_data = get_reposting_data(doc.reposting_data_file)
+
items_to_be_repost = get_items_to_be_repost(
- voucher_type=voucher_type, voucher_no=voucher_no, doc=doc
+ voucher_type=voucher_type, voucher_no=voucher_no, doc=doc, reposting_data=reposting_data
)
if items_to_be_repost:
args = items_to_be_repost
- distinct_item_warehouses = get_distinct_item_warehouse(args, doc)
- affected_transactions = get_affected_transactions(doc)
+ distinct_item_warehouses = get_distinct_item_warehouse(args, doc, reposting_data=reposting_data)
+ affected_transactions = get_affected_transactions(doc, reposting_data=reposting_data)
i = get_current_index(doc) or 0
while i < len(args):
@@ -261,6 +279,28 @@
)
+def get_reposting_data(file_path) -> dict:
+ file_name = frappe.db.get_value(
+ "File",
+ {
+ "file_url": file_path,
+ "attached_to_field": "reposting_data_file",
+ },
+ "name",
+ )
+
+ if not file_name:
+ return frappe._dict()
+
+ attached_file = frappe.get_doc("File", file_name)
+
+ data = gzip_decompress(attached_file.get_content())
+ if data := json.loads(data.decode("utf-8")):
+ data = data
+
+ return parse_json(data)
+
+
def validate_item_warehouse(args):
for field in ["item_code", "warehouse", "posting_date", "posting_time"]:
if args.get(field) in [None, ""]:
@@ -271,28 +311,107 @@
def update_args_in_repost_item_valuation(
doc, index, args, distinct_item_warehouses, affected_transactions
):
- doc.db_set(
- {
- "items_to_be_repost": json.dumps(args, default=str),
- "distinct_item_and_warehouse": json.dumps(
- {str(k): v for k, v in distinct_item_warehouses.items()}, default=str
- ),
- "current_index": index,
- "affected_transactions": frappe.as_json(affected_transactions),
- }
- )
+ if not doc.items_to_be_repost:
+ file_name = ""
+ if doc.reposting_data_file:
+ file_name = get_reposting_file_name(doc.doctype, doc.name)
+ # frappe.delete_doc("File", file_name, ignore_permissions=True, delete_permanently=True)
+
+ doc.reposting_data_file = create_json_gz_file(
+ {
+ "items_to_be_repost": args,
+ "distinct_item_and_warehouse": {str(k): v for k, v in distinct_item_warehouses.items()},
+ "affected_transactions": affected_transactions,
+ },
+ doc,
+ file_name,
+ )
+
+ doc.db_set(
+ {
+ "current_index": index,
+ "total_reposting_count": len(args),
+ "reposting_data_file": doc.reposting_data_file,
+ }
+ )
+
+ else:
+ doc.db_set(
+ {
+ "items_to_be_repost": json.dumps(args, default=str),
+ "distinct_item_and_warehouse": json.dumps(
+ {str(k): v for k, v in distinct_item_warehouses.items()}, default=str
+ ),
+ "current_index": index,
+ "affected_transactions": frappe.as_json(affected_transactions),
+ }
+ )
if not frappe.flags.in_test:
frappe.db.commit()
frappe.publish_realtime(
"item_reposting_progress",
- {"name": doc.name, "items_to_be_repost": json.dumps(args, default=str), "current_index": index},
+ {
+ "name": doc.name,
+ "items_to_be_repost": json.dumps(args, default=str),
+ "current_index": index,
+ "total_reposting_count": len(args),
+ },
)
-def get_items_to_be_repost(voucher_type=None, voucher_no=None, doc=None):
+def get_reposting_file_name(dt, dn):
+ return frappe.db.get_value(
+ "File",
+ {
+ "attached_to_doctype": dt,
+ "attached_to_name": dn,
+ "attached_to_field": "reposting_data_file",
+ },
+ "name",
+ )
+
+
+def create_json_gz_file(data, doc, file_name=None) -> str:
+ encoded_content = frappe.safe_encode(frappe.as_json(data))
+ compressed_content = gzip_compress(encoded_content)
+
+ if not file_name:
+ json_filename = f"{scrub(doc.doctype)}-{scrub(doc.name)}.json.gz"
+ _file = frappe.get_doc(
+ {
+ "doctype": "File",
+ "file_name": json_filename,
+ "attached_to_doctype": doc.doctype,
+ "attached_to_name": doc.name,
+ "attached_to_field": "reposting_data_file",
+ "content": compressed_content,
+ "is_private": 1,
+ }
+ )
+ _file.save(ignore_permissions=True)
+
+ return _file.file_url
+ else:
+ file_doc = frappe.get_doc("File", file_name)
+ path = file_doc.get_full_path()
+
+ with open(path, "wb") as f:
+ f.write(compressed_content)
+
+ return doc.reposting_data_file
+
+
+def get_items_to_be_repost(voucher_type=None, voucher_no=None, doc=None, reposting_data=None):
+ if not reposting_data and doc and doc.reposting_data_file:
+ reposting_data = get_reposting_data(doc.reposting_data_file)
+
+ if reposting_data and reposting_data.items_to_be_repost:
+ return reposting_data.items_to_be_repost
+
items_to_be_repost = []
+
if doc and doc.items_to_be_repost:
items_to_be_repost = json.loads(doc.items_to_be_repost) or []
@@ -308,8 +427,15 @@
return items_to_be_repost or []
-def get_distinct_item_warehouse(args=None, doc=None):
+def get_distinct_item_warehouse(args=None, doc=None, reposting_data=None):
+ if not reposting_data and doc and doc.reposting_data_file:
+ reposting_data = get_reposting_data(doc.reposting_data_file)
+
+ if reposting_data and reposting_data.distinct_item_and_warehouse:
+ return reposting_data.distinct_item_and_warehouse
+
distinct_item_warehouses = {}
+
if doc and doc.distinct_item_and_warehouse:
distinct_item_warehouses = json.loads(doc.distinct_item_and_warehouse)
distinct_item_warehouses = {
@@ -324,7 +450,13 @@
return distinct_item_warehouses
-def get_affected_transactions(doc) -> Set[Tuple[str, str]]:
+def get_affected_transactions(doc, reposting_data=None) -> Set[Tuple[str, str]]:
+ if not reposting_data and doc and doc.reposting_data_file:
+ reposting_data = get_reposting_data(doc.reposting_data_file)
+
+ if reposting_data and reposting_data.affected_transactions:
+ return {tuple(transaction) for transaction in reposting_data.affected_transactions}
+
if not doc.affected_transactions:
return set()
@@ -380,6 +512,7 @@
self.new_items_found = False
self.distinct_item_warehouses = args.get("distinct_item_warehouses", frappe._dict())
self.affected_transactions: Set[Tuple[str, str]] = set()
+ self.reserved_stock = get_reserved_stock(self.args.item_code, self.args.warehouse)
self.data = frappe._dict()
self.initialize_previous_data(self.args)
@@ -443,12 +576,11 @@
i += 1
self.process_sle(sle)
+ self.update_bin_data(sle)
if sle.dependant_sle_voucher_detail_no:
entries_to_fix = self.get_dependent_entries_to_fix(entries_to_fix, sle)
- self.update_bin()
-
if self.exceptions:
self.raise_exceptions()
@@ -513,7 +645,8 @@
def update_distinct_item_warehouses(self, dependant_sle):
key = (dependant_sle.item_code, dependant_sle.warehouse)
- val = frappe._dict({"sle": dependant_sle})
+ val = frappe._dict({"sle": dependant_sle, "dependent_voucher_detail_nos": []})
+
if key not in self.distinct_item_warehouses:
self.distinct_item_warehouses[key] = val
self.new_items_found = True
@@ -521,14 +654,28 @@
existing_sle_posting_date = (
self.distinct_item_warehouses[key].get("sle", {}).get("posting_date")
)
+
+ dependent_voucher_detail_nos = self.get_dependent_voucher_detail_nos(key)
+
if getdate(dependant_sle.posting_date) < getdate(existing_sle_posting_date):
val.sle_changed = True
self.distinct_item_warehouses[key] = val
self.new_items_found = True
+ elif dependant_sle.voucher_detail_no not in set(dependent_voucher_detail_nos):
+ # Future dependent voucher needs to be repost to get the correct stock value
+ # If dependent voucher has not reposted, then add it to the list
+ dependent_voucher_detail_nos.append(dependant_sle.voucher_detail_no)
+ self.new_items_found = True
+ val.dependent_voucher_detail_nos = dependent_voucher_detail_nos
+ self.distinct_item_warehouses[key] = val
+
+ def get_dependent_voucher_detail_nos(self, key):
+ if "dependent_voucher_detail_nos" not in self.distinct_item_warehouses[key]:
+ self.distinct_item_warehouses[key].dependent_voucher_detail_nos = []
+
+ return self.distinct_item_warehouses[key].dependent_voucher_detail_nos
def process_sle(self, sle):
- from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-
# previous sle data for this warehouse
self.wh_data = self.data[sle.warehouse]
self.affected_transactions.add((sle.voucher_type, sle.voucher_no))
@@ -545,26 +692,23 @@
self.get_dynamic_incoming_outgoing_rate(sle)
if (
+ sle.voucher_type == "Stock Reconciliation"
+ and (sle.batch_no or (sle.has_batch_no and sle.serial_and_batch_bundle))
+ and sle.voucher_detail_no
+ and sle.actual_qty < 0
+ ):
+ self.reset_actual_qty_for_stock_reco(sle)
+
+ if (
sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"]
and sle.voucher_detail_no
and sle.actual_qty < 0
- and frappe.get_cached_value(sle.voucher_type, sle.voucher_no, "is_internal_supplier")
+ and is_internal_transfer(sle)
):
sle.outgoing_rate = get_incoming_rate_for_inter_company_transfer(sle)
- if get_serial_nos(sle.serial_no):
- self.get_serialized_values(sle)
- self.wh_data.qty_after_transaction += flt(sle.actual_qty)
- if sle.voucher_type == "Stock Reconciliation":
- self.wh_data.qty_after_transaction = sle.qty_after_transaction
-
- self.wh_data.stock_value = flt(self.wh_data.qty_after_transaction) * flt(
- self.wh_data.valuation_rate
- )
- elif sle.batch_no and frappe.db.get_value(
- "Batch", sle.batch_no, "use_batchwise_valuation", cache=True
- ):
- self.update_batched_values(sle)
+ if sle.serial_and_batch_bundle:
+ self.calculate_valuation_for_serial_batch_bundle(sle)
else:
if sle.voucher_type == "Stock Reconciliation" and not sle.batch_no:
# assert
@@ -589,6 +733,7 @@
self.wh_data.stock_value = flt(self.wh_data.stock_value, self.currency_precision)
if not self.wh_data.qty_after_transaction:
self.wh_data.stock_value = 0.0
+
stock_value_difference = self.wh_data.stock_value - self.wh_data.prev_stock_value
self.wh_data.prev_stock_value = self.wh_data.stock_value
@@ -605,12 +750,42 @@
if not self.args.get("sle_id"):
self.update_outgoing_rate_on_transaction(sle)
+ def reset_actual_qty_for_stock_reco(self, sle):
+ if sle.serial_and_batch_bundle:
+ current_qty = frappe.get_cached_value(
+ "Serial and Batch Bundle", sle.serial_and_batch_bundle, "total_qty"
+ )
+
+ if current_qty is not None:
+ current_qty = abs(current_qty)
+ else:
+ current_qty = frappe.get_cached_value(
+ "Stock Reconciliation Item", sle.voucher_detail_no, "current_qty"
+ )
+
+ if current_qty:
+ sle.actual_qty = current_qty * -1
+ elif current_qty == 0:
+ sle.is_cancelled = 1
+
+ def calculate_valuation_for_serial_batch_bundle(self, sle):
+ doc = frappe.get_cached_doc("Serial and Batch Bundle", sle.serial_and_batch_bundle)
+
+ doc.set_incoming_rate(save=True)
+ doc.calculate_qty_and_amount(save=True)
+
+ self.wh_data.stock_value = round_off_if_near_zero(self.wh_data.stock_value + doc.total_amount)
+
+ self.wh_data.qty_after_transaction += doc.total_qty
+ if self.wh_data.qty_after_transaction:
+ self.wh_data.valuation_rate = self.wh_data.stock_value / self.wh_data.qty_after_transaction
+
def validate_negative_stock(self, sle):
"""
validate negative stock for entries current datetime onwards
will not consider cancelled entries
"""
- diff = self.wh_data.qty_after_transaction + flt(sle.actual_qty)
+ diff = self.wh_data.qty_after_transaction + flt(sle.actual_qty) - flt(self.reserved_stock)
diff = flt(diff, self.flt_precision) # respect system precision
if diff < 0 and abs(diff) > 0.0001:
@@ -661,7 +836,7 @@
elif (
sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"]
and sle.voucher_detail_no
- and frappe.get_cached_value(sle.voucher_type, sle.voucher_no, "is_internal_supplier")
+ and is_internal_transfer(sle)
):
rate = get_incoming_rate_for_inter_company_transfer(sle)
else:
@@ -711,6 +886,8 @@
self.update_rate_on_purchase_receipt(sle, outgoing_rate)
elif flt(sle.actual_qty) < 0 and sle.voucher_type == "Subcontracting Receipt":
self.update_rate_on_subcontracting_receipt(sle, outgoing_rate)
+ elif sle.voucher_type == "Stock Reconciliation":
+ self.update_rate_on_stock_reconciliation(sle)
def update_rate_on_stock_entry(self, sle, outgoing_rate):
frappe.db.set_value("Stock Entry Detail", sle.voucher_detail_no, "basic_rate", outgoing_rate)
@@ -763,51 +940,53 @@
d.db_update()
def update_rate_on_subcontracting_receipt(self, sle, outgoing_rate):
- if frappe.db.exists(sle.voucher_type + " Item", sle.voucher_detail_no):
- frappe.db.set_value(sle.voucher_type + " Item", sle.voucher_detail_no, "rate", outgoing_rate)
+ if frappe.db.exists("Subcontracting Receipt Item", sle.voucher_detail_no):
+ frappe.db.set_value("Subcontracting Receipt Item", sle.voucher_detail_no, "rate", outgoing_rate)
else:
frappe.db.set_value(
- "Subcontracting Receipt Supplied Item", sle.voucher_detail_no, "rate", outgoing_rate
+ "Subcontracting Receipt Supplied Item",
+ sle.voucher_detail_no,
+ {"rate": outgoing_rate, "amount": abs(sle.actual_qty) * outgoing_rate},
)
- def get_serialized_values(self, sle):
- incoming_rate = flt(sle.incoming_rate)
- actual_qty = flt(sle.actual_qty)
- serial_nos = cstr(sle.serial_no).split("\n")
+ scr = frappe.get_doc("Subcontracting Receipt", sle.voucher_no, for_update=True)
+ scr.calculate_items_qty_and_amount()
+ scr.db_update()
+ for d in scr.items:
+ d.db_update()
- if incoming_rate < 0:
- # wrong incoming rate
- incoming_rate = self.wh_data.valuation_rate
+ def update_rate_on_stock_reconciliation(self, sle):
+ if not sle.serial_no and not sle.batch_no:
+ sr = frappe.get_doc("Stock Reconciliation", sle.voucher_no, for_update=True)
- stock_value_change = 0
- if actual_qty > 0:
- stock_value_change = actual_qty * incoming_rate
- else:
- # In case of delivery/stock issue, get average purchase rate
- # of serial nos of current entry
- if not sle.is_cancelled:
- outgoing_value = self.get_incoming_value_for_serial_nos(sle, serial_nos)
- stock_value_change = -1 * outgoing_value
+ for item in sr.items:
+ # Skip for Serial and Batch Items
+ if item.name != sle.voucher_detail_no or item.serial_no or item.batch_no:
+ continue
+
+ previous_sle = get_previous_sle(
+ {
+ "item_code": item.item_code,
+ "warehouse": item.warehouse,
+ "posting_date": sr.posting_date,
+ "posting_time": sr.posting_time,
+ "sle": sle.name,
+ }
+ )
+
+ item.current_qty = previous_sle.get("qty_after_transaction") or 0.0
+ item.current_valuation_rate = previous_sle.get("valuation_rate") or 0.0
+ item.current_amount = flt(item.current_qty) * flt(item.current_valuation_rate)
+
+ item.amount = flt(item.qty) * flt(item.valuation_rate)
+ item.quantity_difference = item.qty - item.current_qty
+ item.amount_difference = item.amount - item.current_amount
else:
- stock_value_change = actual_qty * sle.outgoing_rate
+ sr.difference_amount = sum([item.amount_difference for item in sr.items])
+ sr.db_update()
- new_stock_qty = self.wh_data.qty_after_transaction + actual_qty
-
- if new_stock_qty > 0:
- new_stock_value = (
- self.wh_data.qty_after_transaction * self.wh_data.valuation_rate
- ) + stock_value_change
- if new_stock_value >= 0:
- # calculate new valuation rate only if stock value is positive
- # else it remains the same as that of previous entry
- self.wh_data.valuation_rate = new_stock_value / new_stock_qty
-
- if not self.wh_data.valuation_rate and sle.voucher_detail_no:
- allow_zero_rate = self.check_if_allow_zero_valuation_rate(
- sle.voucher_type, sle.voucher_detail_no
- )
- if not allow_zero_rate:
- self.wh_data.valuation_rate = self.get_fallback_rate(sle)
+ for item in sr.items:
+ item.db_update()
def get_incoming_value_for_serial_nos(self, sle, serial_nos):
# get rate from serial nos within same company
@@ -946,7 +1125,7 @@
outgoing_rate = get_batch_incoming_rate(
item_code=sle.item_code,
warehouse=sle.warehouse,
- batch_no=sle.batch_no,
+ serial_and_batch_bundle=sle.serial_and_batch_bundle,
posting_date=sle.posting_date,
posting_time=sle.posting_time,
creation=sle.creation,
@@ -989,7 +1168,6 @@
self.allow_zero_rate,
currency=erpnext.get_company_currency(sle.company),
company=sle.company,
- batch_no=sle.batch_no,
)
def get_sle_before_datetime(self, args):
@@ -1013,7 +1191,7 @@
) in frappe.local.flags.currently_saving:
msg = _("{0} units of {1} needed in {2} to complete this transaction.").format(
- abs(deficiency),
+ frappe.bold(abs(deficiency)),
frappe.get_desk_link("Item", exceptions[0]["item_code"]),
frappe.get_desk_link("Warehouse", warehouse),
)
@@ -1021,7 +1199,7 @@
msg = _(
"{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
).format(
- abs(deficiency),
+ frappe.bold(abs(deficiency)),
frappe.get_desk_link("Item", exceptions[0]["item_code"]),
frappe.get_desk_link("Warehouse", warehouse),
exceptions[0]["posting_date"],
@@ -1030,6 +1208,12 @@
)
if msg:
+ if self.reserved_stock:
+ allowed_qty = abs(exceptions[0]["actual_qty"]) - abs(exceptions[0]["diff"])
+ msg = "{0} As {1} units are reserved, you are allowed to consume only {2} units.".format(
+ msg, frappe.bold(self.reserved_stock), frappe.bold(allowed_qty)
+ )
+
msg_list.append(msg)
if msg_list:
@@ -1039,6 +1223,18 @@
else:
raise NegativeStockError(message)
+ def update_bin_data(self, sle):
+ bin_name = get_or_make_bin(sle.item_code, sle.warehouse)
+ values_to_update = {
+ "actual_qty": sle.qty_after_transaction,
+ "stock_value": sle.stock_value,
+ }
+
+ if sle.valuation_rate is not None:
+ values_to_update["valuation_rate"] = sle.valuation_rate
+
+ frappe.db.set_value("Bin", bin_name, values_to_update)
+
def update_bin(self):
# update bin for each warehouse
for warehouse, data in self.data.items():
@@ -1183,8 +1379,11 @@
[
"item_code",
"warehouse",
+ "actual_qty",
+ "qty_after_transaction",
"posting_date",
"posting_time",
+ "voucher_detail_no",
"timestamp(posting_date, posting_time) as timestamp",
],
as_dict=1,
@@ -1192,10 +1391,11 @@
def get_batch_incoming_rate(
- item_code, warehouse, batch_no, posting_date, posting_time, creation=None
+ item_code, warehouse, serial_and_batch_bundle, posting_date, posting_time, creation=None
):
sle = frappe.qb.DocType("Stock Ledger Entry")
+ batch_ledger = frappe.qb.DocType("Serial and Batch Entry")
timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime(
posting_date, posting_time
@@ -1206,13 +1406,28 @@
== CombineDatetime(posting_date, posting_time)
) & (sle.creation < creation)
+ batches = frappe.get_all(
+ "Serial and Batch Entry", fields=["batch_no"], filters={"parent": serial_and_batch_bundle}
+ )
+
batch_details = (
frappe.qb.from_(sle)
- .select(Sum(sle.stock_value_difference).as_("batch_value"), Sum(sle.actual_qty).as_("batch_qty"))
+ .inner_join(batch_ledger)
+ .on(sle.serial_and_batch_bundle == batch_ledger.parent)
+ .select(
+ Sum(
+ Case()
+ .when(sle.actual_qty > 0, batch_ledger.qty * batch_ledger.incoming_rate)
+ .else_(batch_ledger.qty * batch_ledger.outgoing_rate * -1)
+ ).as_("batch_value"),
+ Sum(Case().when(sle.actual_qty > 0, batch_ledger.qty).else_(batch_ledger.qty * -1)).as_(
+ "batch_qty"
+ ),
+ )
.where(
(sle.item_code == item_code)
& (sle.warehouse == warehouse)
- & (sle.batch_no == batch_no)
+ & (batch_ledger.batch_no.isin([row.batch_no for row in batches]))
& (sle.is_cancelled == 0)
)
.where(timestamp_condition)
@@ -1231,30 +1446,31 @@
currency=None,
company=None,
raise_error_if_no_rate=True,
- batch_no=None,
+ serial_and_batch_bundle=None,
):
+ from erpnext.stock.serial_batch_bundle import BatchNoValuation
+
if not company:
company = frappe.get_cached_value("Warehouse", warehouse, "company")
last_valuation_rate = None
# Get moving average rate of a specific batch number
- if warehouse and batch_no and frappe.db.get_value("Batch", batch_no, "use_batchwise_valuation"):
- last_valuation_rate = frappe.db.sql(
- """
- select sum(stock_value_difference) / sum(actual_qty)
- from `tabStock Ledger Entry`
- where
- item_code = %s
- AND warehouse = %s
- AND batch_no = %s
- AND is_cancelled = 0
- AND NOT (voucher_no = %s AND voucher_type = %s)
- """,
- (item_code, warehouse, batch_no, voucher_no, voucher_type),
+ if warehouse and serial_and_batch_bundle:
+ batch_obj = BatchNoValuation(
+ sle=frappe._dict(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "actual_qty": -1,
+ "serial_and_batch_bundle": serial_and_batch_bundle,
+ }
+ )
)
+ return batch_obj.get_incoming_rate()
+
# Get valuation rate from last sle for the same item and warehouse
if not last_valuation_rate or last_valuation_rate[0][0] is None:
last_valuation_rate = frappe.db.sql(
@@ -1337,7 +1553,7 @@
next_stock_reco_detail = get_next_stock_reco(args)
if next_stock_reco_detail:
detail = next_stock_reco_detail[0]
- if detail.batch_no:
+ if detail.batch_no or (detail.serial_and_batch_bundle and detail.has_batch_no):
regenerate_sle_for_batch_stock_reco(detail)
# add condition to update SLEs before this date & time
@@ -1369,13 +1585,12 @@
def regenerate_sle_for_batch_stock_reco(detail):
doc = frappe.get_cached_doc("Stock Reconciliation", detail.voucher_no)
- doc.docstatus = 2
- doc.update_stock_ledger()
-
doc.recalculate_current_qty(detail.item_code, detail.batch_no)
- doc.docstatus = 1
- doc.update_stock_ledger()
- doc.repost_future_sle_and_gle()
+
+ if not frappe.db.exists(
+ "Repost Item Valuation", {"voucher_no": doc.name, "status": "Queued", "docstatus": "1"}
+ ):
+ doc.repost_future_sle_and_gle(force=True)
def get_stock_reco_qty_shift(args):
@@ -1401,34 +1616,55 @@
return stock_reco_qty_shift
-def get_next_stock_reco(args):
+def get_next_stock_reco(kwargs):
"""Returns next nearest stock reconciliaton's details."""
- return frappe.db.sql(
- """
- select
- name, posting_date, posting_time, creation, voucher_no, item_code, batch_no, actual_qty
- from
- `tabStock Ledger Entry`
- where
- item_code = %(item_code)s
- and warehouse = %(warehouse)s
- and voucher_type = 'Stock Reconciliation'
- and voucher_no != %(voucher_no)s
- and is_cancelled = 0
- and (timestamp(posting_date, posting_time) > timestamp(%(posting_date)s, %(posting_time)s)
- or (
- timestamp(posting_date, posting_time) = timestamp(%(posting_date)s, %(posting_time)s)
- and creation > %(creation)s
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+
+ query = (
+ frappe.qb.from_(sle)
+ .select(
+ sle.name,
+ sle.posting_date,
+ sle.posting_time,
+ sle.creation,
+ sle.voucher_no,
+ sle.item_code,
+ sle.batch_no,
+ sle.serial_and_batch_bundle,
+ sle.actual_qty,
+ sle.has_batch_no,
+ )
+ .where(
+ (sle.item_code == kwargs.get("item_code"))
+ & (sle.warehouse == kwargs.get("warehouse"))
+ & (sle.voucher_type == "Stock Reconciliation")
+ & (sle.voucher_no != kwargs.get("voucher_no"))
+ & (sle.is_cancelled == 0)
+ & (
+ (
+ CombineDatetime(sle.posting_date, sle.posting_time)
+ > CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time"))
+ )
+ | (
+ (
+ CombineDatetime(sle.posting_date, sle.posting_time)
+ == CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time"))
+ )
+ & (sle.creation > kwargs.get("creation"))
)
)
- order by timestamp(posting_date, posting_time) asc, creation asc
- limit 1
- """,
- args,
- as_dict=1,
+ )
+ .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
+ .orderby(sle.creation)
+ .limit(1)
)
+ if kwargs.get("batch_no"):
+ query = query.where(sle.batch_no == kwargs.get("batch_no"))
+
+ return query.run(as_dict=True)
+
def get_datetime_limit_condition(detail):
return f"""
@@ -1573,3 +1809,15 @@
)
return rate
+
+
+def is_internal_transfer(sle):
+ data = frappe.get_cached_value(
+ sle.voucher_type,
+ sle.voucher_no,
+ ["is_internal_supplier", "represents_company", "company"],
+ as_dict=True,
+ )
+
+ if data.is_internal_supplier and data.represents_company == data.company:
+ return True
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index b8c5187..0244406 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -7,10 +7,12 @@
import frappe
from frappe import _
-from frappe.query_builder.functions import CombineDatetime
+from frappe.query_builder.functions import CombineDatetime, IfNull, Sum
from frappe.utils import cstr, flt, get_link_to_form, nowdate, nowtime
import erpnext
+from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
+from erpnext.stock.serial_batch_bundle import BatchNoValuation, SerialNoValuation
from erpnext.stock.valuation import FIFOValuation, LIFOValuation
BarcodeScanResult = Dict[str, Optional[str]]
@@ -53,50 +55,36 @@
return stock_value
-def get_stock_value_on(warehouse=None, posting_date=None, item_code=None):
+def get_stock_value_on(
+ warehouses: list | str = None, posting_date: str = None, item_code: str = None
+) -> float:
if not posting_date:
posting_date = nowdate()
- values, condition = [posting_date], ""
-
- if warehouse:
-
- lft, rgt, is_group = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt", "is_group"])
-
- if is_group:
- values.extend([lft, rgt])
- condition += "and exists (\
- select name from `tabWarehouse` wh where wh.name = sle.warehouse\
- and wh.lft >= %s and wh.rgt <= %s)"
-
- else:
- values.append(warehouse)
- condition += " AND warehouse = %s"
-
- if item_code:
- values.append(item_code)
- condition += " AND item_code = %s"
-
- stock_ledger_entries = frappe.db.sql(
- """
- SELECT item_code, stock_value, name, warehouse
- FROM `tabStock Ledger Entry` sle
- WHERE posting_date <= %s {0}
- and is_cancelled = 0
- ORDER BY timestamp(posting_date, posting_time) DESC, creation DESC
- """.format(
- condition
- ),
- values,
- as_dict=1,
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+ query = (
+ frappe.qb.from_(sle)
+ .select(IfNull(Sum(sle.stock_value_difference), 0))
+ .where((sle.posting_date <= posting_date) & (sle.is_cancelled == 0))
+ .orderby(CombineDatetime(sle.posting_date, sle.posting_time), order=frappe.qb.desc)
+ .orderby(sle.creation, order=frappe.qb.desc)
)
- sle_map = {}
- for sle in stock_ledger_entries:
- if not (sle.item_code, sle.warehouse) in sle_map:
- sle_map[(sle.item_code, sle.warehouse)] = flt(sle.stock_value)
+ if warehouses:
+ if isinstance(warehouses, str):
+ warehouses = [warehouses]
- return sum(sle_map.values())
+ warehouses = set(warehouses)
+ for wh in list(warehouses):
+ if frappe.db.get_value("Warehouse", wh, "is_group"):
+ warehouses.update(get_child_warehouses(wh))
+
+ query = query.where(sle.warehouse.isin(warehouses))
+
+ if item_code:
+ query = query.where(sle.item_code == item_code)
+
+ return query.run(as_list=True)[0][0]
@frappe.whitelist()
@@ -233,7 +221,7 @@
def get_or_make_bin(item_code: str, warehouse: str) -> str:
- bin_record = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse})
+ bin_record = frappe.get_cached_value("Bin", {"item_code": item_code, "warehouse": warehouse})
if not bin_record:
bin_obj = _create_bin(item_code, warehouse)
@@ -260,30 +248,40 @@
@frappe.whitelist()
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_batch_incoming_rate,
- get_previous_sle,
- get_valuation_rate,
- )
+ from erpnext.stock.stock_ledger import get_previous_sle, get_valuation_rate
if isinstance(args, str):
args = json.loads(args)
- voucher_no = args.get("voucher_no") or args.get("name")
-
in_rate = None
- if (args.get("serial_no") or "").strip():
- in_rate = get_avg_purchase_rate(args.get("serial_no"))
- elif args.get("batch_no") and frappe.db.get_value(
- "Batch", args.get("batch_no"), "use_batchwise_valuation", cache=True
- ):
- in_rate = get_batch_incoming_rate(
- item_code=args.get("item_code"),
+
+ item_details = frappe.get_cached_value(
+ "Item", args.get("item_code"), ["has_serial_no", "has_batch_no"], as_dict=1
+ )
+
+ if isinstance(args, dict):
+ args = frappe._dict(args)
+
+ if item_details and item_details.has_serial_no and args.get("serial_and_batch_bundle"):
+ args.actual_qty = args.qty
+ sn_obj = SerialNoValuation(
+ sle=args,
warehouse=args.get("warehouse"),
- batch_no=args.get("batch_no"),
- posting_date=args.get("posting_date"),
- posting_time=args.get("posting_time"),
+ item_code=args.get("item_code"),
)
+
+ in_rate = sn_obj.get_incoming_rate()
+
+ elif item_details and item_details.has_batch_no and args.get("serial_and_batch_bundle"):
+ args.actual_qty = args.qty
+ batch_obj = BatchNoValuation(
+ sle=args,
+ warehouse=args.get("warehouse"),
+ item_code=args.get("item_code"),
+ )
+
+ in_rate = batch_obj.get_incoming_rate()
+
else:
valuation_method = get_valuation_method(args.get("item_code"))
previous_sle = get_previous_sle(args)
@@ -293,12 +291,13 @@
in_rate = (
_get_fifo_lifo_rate(previous_stock_queue, args.get("qty") or 0, valuation_method)
if previous_stock_queue
- else 0
+ else None
)
elif valuation_method == "Moving Average":
- in_rate = previous_sle.get("valuation_rate") or 0
+ in_rate = previous_sle.get("valuation_rate")
if in_rate is None:
+ voucher_no = args.get("voucher_no") or args.get("name")
in_rate = get_valuation_rate(
args.get("item_code"),
args.get("warehouse"),
@@ -308,7 +307,6 @@
currency=erpnext.get_company_currency(args.get("company")),
company=args.get("company"),
raise_error_if_no_rate=raise_error_if_no_rate,
- batch_no=args.get("batch_no"),
)
return flt(in_rate)
@@ -456,17 +454,6 @@
row[key] = value
-def get_available_serial_nos(args):
- return frappe.db.sql(
- """ SELECT name from `tabSerial No`
- WHERE item_code = %(item_code)s and warehouse = %(warehouse)s
- and timestamp(purchase_date, purchase_time) <= timestamp(%(posting_date)s, %(posting_time)s)
- """,
- args,
- as_dict=1,
- )
-
-
def add_additional_uom_columns(columns, result, include_uom, conversion_factors):
if not include_uom or not conversion_factors:
return
@@ -488,7 +475,7 @@
for row_idx, row in enumerate(result):
for convertible_col, data in convertible_column_map.items():
- conversion_factor = conversion_factors[row.get("item_code")] or 1
+ conversion_factor = conversion_factors.get(row.get("item_code")) or 1.0
for_type = data.for_type
value_before_conversion = row.get(convertible_col)
if for_type == "rate":
diff --git a/erpnext/stock/workspace/stock/stock.json b/erpnext/stock/workspace/stock/stock.json
index de5e6de..1a683e2 100644
--- a/erpnext/stock/workspace/stock/stock.json
+++ b/erpnext/stock/workspace/stock/stock.json
@@ -5,25 +5,19 @@
"label": "Warehouse wise Stock Value"
}
],
- "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Stock\",\"col\":12}},{\"type\":\"chart\",\"data\":{\"chart_name\":\"Warehouse wise Stock Value\",\"col\":12}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Quick Access</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Material Request\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Entry\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Receipt\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Delivery Note\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Ledger\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Balance\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Masters & Reports</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Items and Pricing\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Stock Transactions\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Stock Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Serial No and Batch\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Tools\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}}]",
+ "content": "[{\"id\":\"BJTnTemGjc\",\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Stock\",\"col\":12}},{\"id\":\"WKeeHLcyXI\",\"type\":\"number_card\",\"data\":{\"number_card_name\":\"Total Stock Value\",\"col\":4}},{\"id\":\"6nVoOHuy5w\",\"type\":\"number_card\",\"data\":{\"number_card_name\":\"Total Warehouses\",\"col\":4}},{\"id\":\"OUex5VED7d\",\"type\":\"number_card\",\"data\":{\"number_card_name\":\"Total Active Items\",\"col\":4}},{\"id\":\"A3svBa974t\",\"type\":\"chart\",\"data\":{\"chart_name\":\"Warehouse wise Stock Value\",\"col\":12}},{\"id\":\"wwAoBx30p3\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"LkqrpJHM9X\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Quick Access</b></span>\",\"col\":12}},{\"id\":\"OR8PYiYspy\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"KP1A22WjDl\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Material Request\",\"col\":3}},{\"id\":\"0EYKOrx6U1\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Entry\",\"col\":3}},{\"id\":\"cqotiphmhZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Receipt\",\"col\":3}},{\"id\":\"Xhjqnm-JxZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Delivery Note\",\"col\":3}},{\"id\":\"yxCx6Tay4Z\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Ledger\",\"col\":3}},{\"id\":\"o3sdEnNy34\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Balance\",\"col\":3}},{\"id\":\"m9O0HUUDS5\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Dashboard\",\"col\":3}},{\"id\":\"NwWcNC_xNj\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Learn Inventory Management\",\"col\":3}},{\"id\":\"9AmAh9LnPI\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"3SmmwBbOER\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Masters & Reports</b></span>\",\"col\":12}},{\"id\":\"OAGNH9njt7\",\"type\":\"card\",\"data\":{\"card_name\":\"Items Catalogue\",\"col\":4}},{\"id\":\"jF9eKz0qr0\",\"type\":\"card\",\"data\":{\"card_name\":\"Stock Transactions\",\"col\":4}},{\"id\":\"tyTnQo-MIS\",\"type\":\"card\",\"data\":{\"card_name\":\"Stock Reports\",\"col\":4}},{\"id\":\"dJaJw6YNPU\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"id\":\"rQf5vK4N_T\",\"type\":\"card\",\"data\":{\"card_name\":\"Serial No and Batch\",\"col\":4}},{\"id\":\"7oM7hFL4v8\",\"type\":\"card\",\"data\":{\"card_name\":\"Tools\",\"col\":4}},{\"id\":\"ve3L6ZifkB\",\"type\":\"card\",\"data\":{\"card_name\":\"Key Reports\",\"col\":4}},{\"id\":\"8Kfvu3umw7\",\"type\":\"card\",\"data\":{\"card_name\":\"Other Reports\",\"col\":4}}]",
"creation": "2020-03-02 15:43:10.096528",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "stock",
"idx": 0,
+ "is_hidden": 0,
"label": "Stock",
"links": [
{
- "hidden": 0,
- "is_query_report": 0,
- "label": "Items and Pricing",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
@@ -443,113 +437,6 @@
{
"hidden": 0,
"is_query_report": 0,
- "label": "Key Reports",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "Item Price",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Item-wise Price List Rate",
- "link_count": 0,
- "link_to": "Item-wise Price List Rate",
- "link_type": "Report",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "Stock Entry",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Stock Analytics",
- "link_count": 0,
- "link_to": "Stock Analytics",
- "link_type": "Report",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "Item",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Stock Qty vs Serial No Count",
- "link_count": 0,
- "link_to": "Stock Qty vs Serial No Count",
- "link_type": "Report",
- "onboard": 1,
- "type": "Link"
- },
- {
- "dependencies": "Delivery Note",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Delivery Note Trends",
- "link_count": 0,
- "link_to": "Delivery Note Trends",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Purchase Receipt",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Purchase Receipt Trends",
- "link_count": 0,
- "link_to": "Purchase Receipt Trends",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Sales Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Sales Order Analysis",
- "link_count": 0,
- "link_to": "Sales Order Analysis",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Purchase Order",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Purchase Order Analysis",
- "link_count": 0,
- "link_to": "Purchase Order Analysis",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Bin",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Item Shortage Report",
- "link_count": 0,
- "link_to": "Item Shortage Report",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "Batch",
- "hidden": 0,
- "is_query_report": 1,
- "label": "Batch-Wise Balance History",
- "link_count": 0,
- "link_to": "Batch-Wise Balance History",
- "link_type": "Report",
- "onboard": 0,
- "type": "Link"
- },
- {
- "hidden": 0,
- "is_query_report": 0,
"label": "Other Reports",
"link_count": 0,
"onboard": 0,
@@ -715,19 +602,192 @@
"link_type": "Report",
"onboard": 0,
"type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Items Catalogue",
+ "link_count": 6,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Item",
+ "link_count": 0,
+ "link_to": "Item",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Item Group",
+ "link_count": 0,
+ "link_to": "Item Group",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Product Bundle",
+ "link_count": 0,
+ "link_to": "Product Bundle",
+ "link_type": "DocType",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Shipping Rule",
+ "link_count": 0,
+ "link_to": "Shipping Rule",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Item Alternative",
+ "link_count": 0,
+ "link_to": "Item Alternative",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "",
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Item Manufacturer",
+ "link_count": 0,
+ "link_to": "Item Manufacturer",
+ "link_type": "DocType",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "hidden": 0,
+ "is_query_report": 0,
+ "label": "Key Reports",
+ "link_count": 7,
+ "onboard": 0,
+ "type": "Card Break"
+ },
+ {
+ "dependencies": "Stock Entry",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Stock Analytics",
+ "link_count": 0,
+ "link_to": "Stock Analytics",
+ "link_type": "Report",
+ "onboard": 1,
+ "type": "Link"
+ },
+ {
+ "dependencies": "Delivery Note",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Delivery Note Trends",
+ "link_count": 0,
+ "link_to": "Delivery Note Trends",
+ "link_type": "Report",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "Purchase Receipt",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Purchase Receipt Trends",
+ "link_count": 0,
+ "link_to": "Purchase Receipt Trends",
+ "link_type": "Report",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "Sales Order",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Sales Order Analysis",
+ "link_count": 0,
+ "link_to": "Sales Order Analysis",
+ "link_type": "Report",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "Purchase Order",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Purchase Order Analysis",
+ "link_count": 0,
+ "link_to": "Purchase Order Analysis",
+ "link_type": "Report",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "Bin",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Item Shortage Report",
+ "link_count": 0,
+ "link_to": "Item Shortage Report",
+ "link_type": "Report",
+ "onboard": 0,
+ "type": "Link"
+ },
+ {
+ "dependencies": "Batch",
+ "hidden": 0,
+ "is_query_report": 1,
+ "label": "Batch-Wise Balance History",
+ "link_count": 0,
+ "link_to": "Batch-Wise Balance History",
+ "link_type": "Report",
+ "onboard": 0,
+ "type": "Link"
}
],
- "modified": "2022-12-06 17:03:56.397272",
+ "modified": "2023-07-04 14:38:14.988756",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock",
+ "number_cards": [
+ {
+ "label": "Total Warehouses",
+ "number_card_name": "Total Warehouses"
+ },
+ {
+ "label": "Total Stock Value",
+ "number_card_name": "Total Stock Value"
+ },
+ {
+ "label": "Total Active Items",
+ "number_card_name": "Total Active Items"
+ }
+ ],
"owner": "Administrator",
"parent_page": "",
"public": 1,
"quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 24.0,
+ "sequence_id": 7.0,
"shortcuts": [
{
"color": "Green",
@@ -738,6 +798,13 @@
"type": "DocType"
},
{
+ "color": "Grey",
+ "doc_view": "List",
+ "label": "Learn Inventory Management",
+ "type": "URL",
+ "url": "https://frappe.school/courses/inventory-management?utm_source=in_app"
+ },
+ {
"color": "Yellow",
"format": "{} Pending",
"label": "Material Request",
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
index f98f559..28c52c9 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -1,511 +1,512 @@
{
- "actions": [],
- "allow_auto_repeat": 1,
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2022-04-01 22:39:17.662819",
- "doctype": "DocType",
- "document_type": "Document",
- "engine": "InnoDB",
- "field_order": [
- "title",
- "naming_series",
- "purchase_order",
- "supplier",
- "supplier_name",
- "supplier_warehouse",
- "column_break_7",
- "company",
- "transaction_date",
- "schedule_date",
- "amended_from",
- "accounting_dimensions_section",
- "cost_center",
- "dimension_col_break",
- "project",
- "address_and_contact_section",
- "supplier_address",
- "address_display",
- "contact_person",
- "contact_display",
- "contact_mobile",
- "contact_email",
- "column_break_19",
- "shipping_address",
- "shipping_address_display",
- "billing_address",
- "billing_address_display",
- "section_break_24",
- "column_break_25",
- "set_warehouse",
- "items",
- "section_break_32",
- "total_qty",
- "column_break_29",
- "total",
- "service_items_section",
- "service_items",
- "raw_materials_supplied_section",
- "set_reserve_warehouse",
- "supplied_items",
- "additional_costs_section",
- "distribute_additional_costs_based_on",
- "additional_costs",
- "total_additional_costs",
- "order_status_section",
- "status",
- "column_break_39",
- "per_received",
- "printing_settings_section",
- "select_print_heading",
- "column_break_43",
- "letter_head"
- ],
- "fields": [
- {
- "allow_on_submit": 1,
- "default": "{supplier_name}",
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "Title",
- "no_copy": 1,
- "print_hide": 1
- },
- {
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Series",
- "no_copy": 1,
- "options": "SC-ORD-.YYYY.-",
- "print_hide": 1,
- "reqd": 1,
- "set_only_once": 1
- },
- {
- "fieldname": "purchase_order",
- "fieldtype": "Link",
- "label": "Subcontracting Purchase Order",
- "options": "Purchase Order",
- "reqd": 1
- },
- {
- "bold": 1,
- "fieldname": "supplier",
- "fieldtype": "Link",
- "in_global_search": 1,
- "in_standard_filter": 1,
- "label": "Supplier",
- "options": "Supplier",
- "print_hide": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
- "bold": 1,
- "fetch_from": "supplier.supplier_name",
- "fieldname": "supplier_name",
- "fieldtype": "Data",
- "in_global_search": 1,
- "label": "Supplier Name",
- "read_only": 1,
- "reqd": 1
- },
- {
- "depends_on": "supplier",
- "fieldname": "supplier_warehouse",
- "fieldtype": "Link",
- "label": "Supplier Warehouse",
- "options": "Warehouse",
- "reqd": 1
- },
- {
- "fieldname": "column_break_7",
- "fieldtype": "Column Break",
- "print_width": "50%",
- "width": "50%"
- },
- {
- "fieldname": "company",
- "fieldtype": "Link",
- "in_standard_filter": 1,
- "label": "Company",
- "options": "Company",
- "print_hide": 1,
- "remember_last_selected_value": 1,
- "reqd": 1
- },
- {
- "default": "Today",
- "fetch_from": "purchase_order.transaction_date",
- "fetch_if_empty": 1,
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Date",
- "reqd": 1,
- "search_index": 1
- },
- {
- "allow_on_submit": 1,
- "fetch_from": "purchase_order.schedule_date",
- "fetch_if_empty": 1,
- "fieldname": "schedule_date",
- "fieldtype": "Date",
- "label": "Required By",
- "read_only": 1
- },
- {
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Amended From",
- "no_copy": 1,
- "options": "Subcontracting Order",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "address_and_contact_section",
- "fieldtype": "Section Break",
- "label": "Address and Contact"
- },
- {
- "fetch_from": "supplier.supplier_primary_address",
- "fetch_if_empty": 1,
- "fieldname": "supplier_address",
- "fieldtype": "Link",
- "label": "Supplier Address",
- "options": "Address",
- "print_hide": 1
- },
- {
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "label": "Supplier Address Details",
- "read_only": 1
- },
- {
- "fetch_from": "supplier.supplier_primary_contact",
- "fetch_if_empty": 1,
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "label": "Supplier Contact",
- "options": "Contact",
- "print_hide": 1
- },
- {
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "in_global_search": 1,
- "label": "Contact Name",
- "read_only": 1
- },
- {
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "label": "Contact Mobile No",
- "read_only": 1
- },
- {
- "fieldname": "contact_email",
- "fieldtype": "Small Text",
- "label": "Contact Email",
- "options": "Email",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "column_break_19",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "shipping_address",
- "fieldtype": "Link",
- "label": "Company Shipping Address",
- "options": "Address",
- "print_hide": 1
- },
- {
- "fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
- "label": "Shipping Address Details",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "fieldname": "billing_address",
- "fieldtype": "Link",
- "label": "Company Billing Address",
- "options": "Address"
- },
- {
- "fieldname": "billing_address_display",
- "fieldtype": "Small Text",
- "label": "Billing Address Details",
- "read_only": 1
- },
- {
- "fieldname": "section_break_24",
- "fieldtype": "Section Break"
- },
- {
- "fieldname": "column_break_25",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "purchase_order",
- "description": "Sets 'Warehouse' in each row of the Items table.",
- "fieldname": "set_warehouse",
- "fieldtype": "Link",
- "label": "Set Target Warehouse",
- "options": "Warehouse",
- "print_hide": 1
- },
- {
- "allow_bulk_edit": 1,
- "depends_on": "purchase_order",
- "fieldname": "items",
- "fieldtype": "Table",
- "label": "Items",
- "options": "Subcontracting Order Item",
- "reqd": 1
- },
- {
- "fieldname": "section_break_32",
- "fieldtype": "Section Break"
- },
- {
- "depends_on": "purchase_order",
- "fieldname": "total_qty",
- "fieldtype": "Float",
- "label": "Total Quantity",
- "read_only": 1
- },
- {
- "fieldname": "column_break_29",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "purchase_order",
- "fieldname": "total",
- "fieldtype": "Currency",
- "label": "Total",
- "options": "currency",
- "read_only": 1
- },
- {
- "collapsible": 1,
- "depends_on": "purchase_order",
- "fieldname": "service_items_section",
- "fieldtype": "Section Break",
- "label": "Service Items"
- },
- {
- "fieldname": "service_items",
- "fieldtype": "Table",
- "label": "Service Items",
- "options": "Subcontracting Order Service Item",
- "read_only": 1,
- "reqd": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "supplied_items",
- "depends_on": "supplied_items",
- "fieldname": "raw_materials_supplied_section",
- "fieldtype": "Section Break",
- "label": "Raw Materials Supplied"
- },
- {
- "depends_on": "supplied_items",
- "description": "Sets 'Reserve Warehouse' in each row of the Supplied Items table.",
- "fieldname": "set_reserve_warehouse",
- "fieldtype": "Link",
- "label": "Set Reserve Warehouse",
- "options": "Warehouse"
- },
- {
- "fieldname": "supplied_items",
- "fieldtype": "Table",
- "label": "Supplied Items",
- "no_copy": 1,
- "options": "Subcontracting Order Supplied Item",
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "collapsible_depends_on": "total_additional_costs",
- "depends_on": "eval:(doc.docstatus == 0 || doc.total_additional_costs)",
- "fieldname": "additional_costs_section",
- "fieldtype": "Section Break",
- "label": "Additional Costs"
- },
- {
- "fieldname": "additional_costs",
- "fieldtype": "Table",
- "label": "Additional Costs",
- "options": "Landed Cost Taxes and Charges"
- },
- {
- "fieldname": "total_additional_costs",
- "fieldtype": "Currency",
- "label": "Total Additional Costs",
- "print_hide_if_no_value": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "order_status_section",
- "fieldtype": "Section Break",
- "label": "Order Status"
- },
- {
- "default": "Draft",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_standard_filter": 1,
- "label": "Status",
- "no_copy": 1,
- "options": "Draft\nOpen\nPartially Received\nCompleted\nMaterial Transferred\nPartial Material Transferred\nCancelled",
- "print_hide": 1,
- "read_only": 1,
- "reqd": 1,
- "search_index": 1
- },
- {
- "fieldname": "column_break_39",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "per_received",
- "fieldtype": "Percent",
- "in_list_view": 1,
- "label": "% Received",
- "no_copy": 1,
- "print_hide": 1,
- "read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "printing_settings_section",
- "fieldtype": "Section Break",
- "label": "Printing Settings",
- "print_hide": 1,
- "print_width": "50%",
- "width": "50%"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Print Heading",
- "no_copy": 1,
- "options": "Print Heading",
- "print_hide": 1,
- "report_hide": 1
- },
- {
- "fieldname": "column_break_43",
- "fieldtype": "Column Break"
- },
- {
- "allow_on_submit": 1,
- "fieldname": "letter_head",
- "fieldtype": "Link",
- "label": "Letter Head",
- "options": "Letter Head",
- "print_hide": 1
- },
- {
- "default": "Qty",
- "fieldname": "distribute_additional_costs_based_on",
- "fieldtype": "Select",
- "label": "Distribute Additional Costs Based On ",
- "options": "Qty\nAmount"
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
- },
- {
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "dimension_col_break",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "project",
- "fieldtype": "Link",
- "label": "Project",
- "options": "Project"
- }
- ],
- "icon": "fa fa-file-text",
- "is_submittable": 1,
- "links": [],
- "modified": "2022-08-15 14:08:49.204218",
- "modified_by": "Administrator",
- "module": "Subcontracting",
- "name": "Subcontracting Order",
- "naming_rule": "By \"Naming Series\" field",
- "owner": "Administrator",
- "permissions": [
- {
- "read": 1,
- "report": 1,
- "role": "Stock User"
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Manager",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase User",
- "share": 1,
- "submit": 1,
- "write": 1
- },
- {
- "permlevel": 1,
- "read": 1,
- "role": "Purchase Manager",
- "write": 1
- }
- ],
- "search_fields": "status, transaction_date, supplier",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "timeline_field": "supplier",
- "title_field": "supplier_name",
- "track_changes": 1
+ "actions": [],
+ "allow_auto_repeat": 1,
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2022-04-01 22:39:17.662819",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+ "title",
+ "naming_series",
+ "purchase_order",
+ "supplier",
+ "supplier_name",
+ "supplier_warehouse",
+ "column_break_7",
+ "company",
+ "transaction_date",
+ "schedule_date",
+ "amended_from",
+ "accounting_dimensions_section",
+ "cost_center",
+ "dimension_col_break",
+ "project",
+ "address_and_contact_section",
+ "supplier_address",
+ "address_display",
+ "contact_person",
+ "contact_display",
+ "contact_mobile",
+ "contact_email",
+ "column_break_19",
+ "shipping_address",
+ "shipping_address_display",
+ "billing_address",
+ "billing_address_display",
+ "section_break_24",
+ "column_break_25",
+ "set_warehouse",
+ "items",
+ "section_break_32",
+ "total_qty",
+ "column_break_29",
+ "total",
+ "service_items_section",
+ "service_items",
+ "raw_materials_supplied_section",
+ "set_reserve_warehouse",
+ "supplied_items",
+ "additional_costs_section",
+ "distribute_additional_costs_based_on",
+ "additional_costs",
+ "total_additional_costs",
+ "order_status_section",
+ "status",
+ "column_break_39",
+ "per_received",
+ "printing_settings_section",
+ "select_print_heading",
+ "column_break_43",
+ "letter_head"
+ ],
+ "fields": [
+ {
+ "allow_on_submit": 1,
+ "default": "{supplier_name}",
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Title",
+ "no_copy": 1,
+ "print_hide": 1
+ },
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "options": "SC-ORD-.YYYY.-",
+ "print_hide": 1,
+ "reqd": 1,
+ "set_only_once": 1
+ },
+ {
+ "fieldname": "purchase_order",
+ "fieldtype": "Link",
+ "label": "Subcontracting Purchase Order",
+ "options": "Purchase Order",
+ "reqd": 1
+ },
+ {
+ "bold": 1,
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "in_global_search": 1,
+ "in_standard_filter": 1,
+ "label": "Supplier",
+ "options": "Supplier",
+ "print_hide": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "bold": 1,
+ "fetch_from": "supplier.supplier_name",
+ "fieldname": "supplier_name",
+ "fieldtype": "Data",
+ "in_global_search": 1,
+ "label": "Supplier Name",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "depends_on": "supplier",
+ "fieldname": "supplier_warehouse",
+ "fieldtype": "Link",
+ "label": "Supplier Warehouse",
+ "options": "Warehouse",
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break",
+ "print_width": "50%",
+ "width": "50%"
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_standard_filter": 1,
+ "label": "Company",
+ "options": "Company",
+ "print_hide": 1,
+ "remember_last_selected_value": 1,
+ "reqd": 1
+ },
+ {
+ "default": "Today",
+ "fetch_from": "purchase_order.transaction_date",
+ "fetch_if_empty": 1,
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "Date",
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "fetch_from": "purchase_order.schedule_date",
+ "fetch_if_empty": 1,
+ "fieldname": "schedule_date",
+ "fieldtype": "Date",
+ "label": "Required By",
+ "read_only": 1
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Subcontracting Order",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "address_and_contact_section",
+ "fieldtype": "Section Break",
+ "label": "Address and Contact"
+ },
+ {
+ "fetch_from": "supplier.supplier_primary_address",
+ "fetch_if_empty": 1,
+ "fieldname": "supplier_address",
+ "fieldtype": "Link",
+ "label": "Supplier Address",
+ "options": "Address",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "label": "Supplier Address Details",
+ "read_only": 1
+ },
+ {
+ "fetch_from": "supplier.supplier_primary_contact",
+ "fetch_if_empty": 1,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "label": "Supplier Contact",
+ "options": "Contact",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "in_global_search": 1,
+ "label": "Contact Name",
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "label": "Contact Mobile No",
+ "options": "Phone",
+ "read_only": 1
+ },
+ {
+ "fieldname": "contact_email",
+ "fieldtype": "Small Text",
+ "label": "Contact Email",
+ "options": "Email",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_19",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "shipping_address",
+ "fieldtype": "Link",
+ "label": "Company Shipping Address",
+ "options": "Address",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "shipping_address_display",
+ "fieldtype": "Small Text",
+ "label": "Shipping Address Details",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "billing_address",
+ "fieldtype": "Link",
+ "label": "Company Billing Address",
+ "options": "Address"
+ },
+ {
+ "fieldname": "billing_address_display",
+ "fieldtype": "Small Text",
+ "label": "Billing Address Details",
+ "read_only": 1
+ },
+ {
+ "fieldname": "section_break_24",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_25",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "purchase_order",
+ "description": "Sets 'Warehouse' in each row of the Items table.",
+ "fieldname": "set_warehouse",
+ "fieldtype": "Link",
+ "label": "Set Target Warehouse",
+ "options": "Warehouse",
+ "print_hide": 1
+ },
+ {
+ "allow_bulk_edit": 1,
+ "depends_on": "purchase_order",
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "label": "Items",
+ "options": "Subcontracting Order Item",
+ "reqd": 1
+ },
+ {
+ "fieldname": "section_break_32",
+ "fieldtype": "Section Break"
+ },
+ {
+ "depends_on": "purchase_order",
+ "fieldname": "total_qty",
+ "fieldtype": "Float",
+ "label": "Total Quantity",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_29",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "purchase_order",
+ "fieldname": "total",
+ "fieldtype": "Currency",
+ "label": "Total",
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "depends_on": "purchase_order",
+ "fieldname": "service_items_section",
+ "fieldtype": "Section Break",
+ "label": "Service Items"
+ },
+ {
+ "fieldname": "service_items",
+ "fieldtype": "Table",
+ "label": "Service Items",
+ "options": "Subcontracting Order Service Item",
+ "read_only": 1,
+ "reqd": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "supplied_items",
+ "depends_on": "supplied_items",
+ "fieldname": "raw_materials_supplied_section",
+ "fieldtype": "Section Break",
+ "label": "Raw Materials Supplied"
+ },
+ {
+ "depends_on": "supplied_items",
+ "description": "Sets 'Reserve Warehouse' in each row of the Supplied Items table.",
+ "fieldname": "set_reserve_warehouse",
+ "fieldtype": "Link",
+ "label": "Set Reserve Warehouse",
+ "options": "Warehouse"
+ },
+ {
+ "fieldname": "supplied_items",
+ "fieldtype": "Table",
+ "label": "Supplied Items",
+ "no_copy": 1,
+ "options": "Subcontracting Order Supplied Item",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "total_additional_costs",
+ "depends_on": "eval:(doc.docstatus == 0 || doc.total_additional_costs)",
+ "fieldname": "additional_costs_section",
+ "fieldtype": "Section Break",
+ "label": "Additional Costs"
+ },
+ {
+ "fieldname": "additional_costs",
+ "fieldtype": "Table",
+ "label": "Additional Costs",
+ "options": "Landed Cost Taxes and Charges"
+ },
+ {
+ "fieldname": "total_additional_costs",
+ "fieldtype": "Currency",
+ "label": "Total Additional Costs",
+ "print_hide_if_no_value": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "order_status_section",
+ "fieldtype": "Section Break",
+ "label": "Order Status"
+ },
+ {
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_standard_filter": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "options": "Draft\nOpen\nPartially Received\nCompleted\nMaterial Transferred\nPartial Material Transferred\nCancelled",
+ "print_hide": 1,
+ "read_only": 1,
+ "reqd": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "column_break_39",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "per_received",
+ "fieldtype": "Percent",
+ "in_list_view": 1,
+ "label": "% Received",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "printing_settings_section",
+ "fieldtype": "Section Break",
+ "label": "Printing Settings",
+ "print_hide": 1,
+ "print_width": "50%",
+ "width": "50%"
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "no_copy": 1,
+ "options": "Print Heading",
+ "print_hide": 1,
+ "report_hide": 1
+ },
+ {
+ "fieldname": "column_break_43",
+ "fieldtype": "Column Break"
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head",
+ "print_hide": 1
+ },
+ {
+ "default": "Qty",
+ "fieldname": "distribute_additional_costs_based_on",
+ "fieldtype": "Select",
+ "label": "Distribute Additional Costs Based On ",
+ "options": "Qty\nAmount"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "accounting_dimensions_section",
+ "fieldtype": "Section Break",
+ "label": "Accounting Dimensions"
+ },
+ {
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "options": "Cost Center"
+ },
+ {
+ "fieldname": "dimension_col_break",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "label": "Project",
+ "options": "Project"
+ }
+ ],
+ "icon": "fa fa-file-text",
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2023-06-03 16:18:17.782538",
+ "modified_by": "Administrator",
+ "module": "Subcontracting",
+ "name": "Subcontracting Order",
+ "naming_rule": "By \"Naming Series\" field",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "read": 1,
+ "report": 1,
+ "role": "Stock User"
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Manager",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase User",
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "permlevel": 1,
+ "read": 1,
+ "role": "Purchase Manager",
+ "write": 1
+ }
+ ],
+ "search_fields": "status, transaction_date, supplier",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "timeline_field": "supplier",
+ "title_field": "supplier_name",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
index e6de72d..0b14d4d 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
@@ -77,22 +77,22 @@
frappe.throw(_(msg))
def set_missing_values(self):
- self.set_missing_values_in_additional_costs()
- self.set_missing_values_in_service_items()
- self.set_missing_values_in_supplied_items()
- self.set_missing_values_in_items()
+ self.calculate_additional_costs()
+ self.calculate_service_costs()
+ self.calculate_supplied_items_qty_and_amount()
+ self.calculate_items_qty_and_amount()
- def set_missing_values_in_service_items(self):
+ def calculate_service_costs(self):
for idx, item in enumerate(self.get("service_items")):
self.items[idx].service_cost_per_qty = item.amount / self.items[idx].qty
- def set_missing_values_in_supplied_items(self):
+ def calculate_supplied_items_qty_and_amount(self):
for item in self.get("items"):
bom = frappe.get_doc("BOM", item.bom)
rm_cost = sum(flt(rm_item.amount) for rm_item in bom.items)
item.rm_cost_per_qty = rm_cost / flt(bom.quantity)
- def set_missing_values_in_items(self):
+ def calculate_items_qty_and_amount(self):
total_qty = total = 0
for item in self.items:
item.rate = item.rm_cost_per_qty + item.service_cost_per_qty + flt(item.additional_cost_per_qty)
@@ -163,9 +163,10 @@
elif self.per_received > 0 and self.per_received < 100:
status = "Partially Received"
for item in self.supplied_items:
- if item.returned_qty:
- status = "Closed"
+ if not item.returned_qty or (item.supplied_qty - item.consumed_qty - item.returned_qty) > 0:
break
+ else:
+ status = "Closed"
else:
total_required_qty = total_supplied_qty = 0
for item in self.supplied_items:
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
index 3a2c53f..5ee1f7b 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
@@ -7,6 +7,7 @@
frappe.ui.form.on('Subcontracting Receipt', {
setup: (frm) => {
+ frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle'];
frm.get_field('supplied_items').grid.cannot_add_rows = true;
frm.get_field('supplied_items').grid.only_sortable();
@@ -67,26 +68,45 @@
}
});
- let batch_no_field = frm.get_docfield("items", "batch_no");
- if (batch_no_field) {
- batch_no_field.get_route_options_for_new_doc = function(row) {
+ frm.set_query('batch_no', 'supplied_items', function(doc, cdt, cdn) {
+ var row = locals[cdt][cdn];
+ return {
+ filters: {
+ item: row.rm_item_code
+ }
+ }
+ });
+
+ frm.set_query("serial_and_batch_bundle", "supplied_items", (doc, cdt, cdn) => {
+ let row = locals[cdt][cdn];
+ return {
+ filters: {
+ 'item_code': row.rm_item_code,
+ 'voucher_type': doc.doctype,
+ 'voucher_no': ["in", [doc.name, ""]],
+ 'is_cancelled': 0,
+ }
+ }
+ });
+
+ let sbb_field = frm.get_docfield('supplied_items', 'serial_and_batch_bundle');
+ if (sbb_field) {
+ sbb_field.get_route_options_for_new_doc = (row) => {
return {
- "item": row.doc.item_code
+ 'item_code': row.doc.rm_item_code,
+ 'voucher_type': frm.doc.doctype,
}
};
}
- frappe.db.get_single_value('Buying Settings', 'backflush_raw_materials_of_subcontract_based_on').then(val => {
- if (val == 'Material Transferred for Subcontract') {
- frm.fields_dict['supplied_items'].grid.grid_rows.forEach((grid_row) => {
- grid_row.docfields.forEach((df) => {
- if (df.fieldname == 'consumed_qty') {
- df.read_only = 0;
- }
- });
- });
- }
- });
+ let batch_no_field = frm.get_docfield('items', 'batch_no');
+ if (batch_no_field) {
+ batch_no_field.get_route_options_for_new_doc = function(row) {
+ return {
+ 'item': row.doc.item_code
+ }
+ };
+ }
},
refresh: (frm) => {
@@ -148,6 +168,8 @@
}
});
}, __('Get Items From'));
+
+ frm.fields_dict.supplied_items.grid.update_docfield_property('consumed_qty', 'read_only', frm.doc.__onload && frm.doc.__onload.backflush_based_on === 'BOM');
}
},
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
index 3385eac..4b3cc83 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -205,6 +205,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -250,6 +251,7 @@
"description": "Sets 'Rejected Warehouse' in each row of the Items table.",
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"options": "Warehouse",
@@ -629,7 +631,7 @@
"in_create": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-11-16 14:18:57.001239",
+ "modified": "2023-07-06 18:43:16.171842",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
index 4f8e045..60746d9 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -28,6 +28,14 @@
},
]
+ def onload(self):
+ self.set_onload(
+ "backflush_based_on",
+ frappe.db.get_single_value(
+ "Buying Settings", "backflush_raw_materials_of_subcontract_based_on"
+ ),
+ )
+
def update_status_updater_args(self):
if cint(self.is_return):
self.status_updater.extend(
@@ -73,9 +81,6 @@
self.validate_posting_time()
self.validate_rejected_warehouse()
- if self._action == "submit":
- self.make_batches("warehouse")
-
if getdate(self.posting_date) > getdate(nowdate()):
frappe.throw(_("Posting Date cannot be future date"))
@@ -83,6 +88,11 @@
self.reset_default_field_value("rejected_warehouse", "items", "rejected_warehouse")
self.get_current_stock()
+ def on_update(self):
+ for table_field in ["items", "supplied_items"]:
+ if self.get(table_field):
+ self.set_serial_and_batch_bundle(table_field)
+
def on_submit(self):
self.validate_available_qty_for_consumption()
self.update_status_updater_args()
@@ -90,17 +100,17 @@
self.set_subcontracting_order_status()
self.set_consumed_qty_in_subcontract_order()
self.update_stock_ledger()
-
- from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
-
- update_serial_nos_after_submit(self, "items")
-
self.make_gl_entries()
self.repost_future_sle_and_gle()
self.update_status()
def on_cancel(self):
- self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
+ self.ignore_linked_doctypes = (
+ "GL Entry",
+ "Stock Ledger Entry",
+ "Repost Item Valuation",
+ "Serial and Batch Bundle",
+ )
self.update_status_updater_args()
self.update_prevdoc_status()
self.update_stock_ledger()
@@ -113,9 +123,9 @@
@frappe.whitelist()
def set_missing_values(self):
- self.set_missing_values_in_additional_costs()
- self.set_missing_values_in_supplied_items()
- self.set_missing_values_in_items()
+ self.calculate_additional_costs()
+ self.calculate_supplied_items_qty_and_amount()
+ self.calculate_items_qty_and_amount()
def set_available_qty_for_consumption(self):
supplied_items_details = {}
@@ -147,13 +157,13 @@
item.rm_item_code, 0
)
- def set_missing_values_in_supplied_items(self):
+ def calculate_supplied_items_qty_and_amount(self):
for item in self.get("supplied_items") or []:
item.amount = item.rate * item.consumed_qty
self.set_available_qty_for_consumption()
- def set_missing_values_in_items(self):
+ def calculate_items_qty_and_amount(self):
rm_supp_cost = {}
for item in self.get("supplied_items") or []:
if item.reference_name in rm_supp_cost:
@@ -182,13 +192,23 @@
self.total = total_amount
def validate_rejected_warehouse(self):
- if not self.rejected_warehouse:
- for item in self.items:
- if item.rejected_qty:
+ for item in self.items:
+ if flt(item.rejected_qty) and not item.rejected_warehouse:
+ if self.rejected_warehouse:
+ item.rejected_warehouse = self.rejected_warehouse
+
+ if not item.rejected_warehouse:
frappe.throw(
- _("Rejected Warehouse is mandatory against rejected Item {0}").format(item.item_code)
+ _("Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}").format(
+ item.idx, item.item_code
+ )
)
+ if item.get("rejected_warehouse") and (item.get("rejected_warehouse") == item.get("warehouse")):
+ frappe.throw(
+ _("Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same").format(item.idx)
+ )
+
def validate_available_qty_for_consumption(self):
for item in self.get("supplied_items"):
precision = item.precision("consumed_qty")
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 72ed4d4..4663209 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -6,7 +6,7 @@
import frappe
from frappe.tests.utils import FrappeTestCase
-from frappe.utils import cint, flt
+from frappe.utils import add_days, cint, cstr, flt, today
import erpnext
from erpnext.accounts.doctype.account.test_account import get_inventory_account
@@ -26,6 +26,9 @@
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
+ create_stock_reconciliation,
+)
from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import (
make_subcontracting_receipt,
)
@@ -239,94 +242,6 @@
scr1.submit()
self.assertRaises(frappe.ValidationError, scr2.submit)
- def test_subcontracted_scr_for_multi_transfer_batches(self):
- from erpnext.controllers.subcontracting_controller import make_rm_stock_entry
- from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import (
- make_subcontracting_receipt,
- )
-
- set_backflush_based_on("Material Transferred for Subcontract")
- item_code = "_Test Subcontracted FG Item 3"
-
- make_item(
- "Sub Contracted Raw Material 3",
- {"is_stock_item": 1, "is_sub_contracted_item": 1, "has_batch_no": 1, "create_new_batch": 1},
- )
-
- make_subcontracted_item(
- item_code=item_code, has_batch_no=1, raw_materials=["Sub Contracted Raw Material 3"]
- )
-
- order_qty = 500
- service_items = [
- {
- "warehouse": "_Test Warehouse - _TC",
- "item_code": "Subcontracted Service Item 3",
- "qty": order_qty,
- "rate": 100,
- "fg_item": "_Test Subcontracted FG Item 3",
- "fg_item_qty": order_qty,
- },
- ]
- sco = get_subcontracting_order(service_items=service_items)
-
- ste1 = make_stock_entry(
- target="_Test Warehouse - _TC",
- item_code="Sub Contracted Raw Material 3",
- qty=300,
- basic_rate=100,
- )
- ste2 = make_stock_entry(
- target="_Test Warehouse - _TC",
- item_code="Sub Contracted Raw Material 3",
- qty=200,
- basic_rate=100,
- )
-
- transferred_batch = {ste1.items[0].batch_no: 300, ste2.items[0].batch_no: 200}
-
- rm_items = [
- {
- "item_code": item_code,
- "rm_item_code": "Sub Contracted Raw Material 3",
- "item_name": "_Test Item",
- "qty": 300,
- "warehouse": "_Test Warehouse - _TC",
- "stock_uom": "Nos",
- "name": sco.supplied_items[0].name,
- },
- {
- "item_code": item_code,
- "rm_item_code": "Sub Contracted Raw Material 3",
- "item_name": "_Test Item",
- "qty": 200,
- "warehouse": "_Test Warehouse - _TC",
- "stock_uom": "Nos",
- "name": sco.supplied_items[0].name,
- },
- ]
-
- se = frappe.get_doc(make_rm_stock_entry(sco.name, rm_items))
- self.assertEqual(len(se.items), 2)
- se.items[0].batch_no = ste1.items[0].batch_no
- se.items[1].batch_no = ste2.items[0].batch_no
- se.submit()
-
- supplied_qty = frappe.db.get_value(
- "Subcontracting Order Supplied Item",
- {"parent": sco.name, "rm_item_code": "Sub Contracted Raw Material 3"},
- "supplied_qty",
- )
-
- self.assertEqual(supplied_qty, 500.00)
-
- scr = make_subcontracting_receipt(sco.name)
- scr.save()
- self.assertEqual(len(scr.supplied_items), 2)
-
- for row in scr.supplied_items:
- self.assertEqual(transferred_batch.get(row.batch_no), row.consumed_qty)
-
def test_subcontracting_receipt_partial_return(self):
sco = get_subcontracting_order()
rm_items = get_rm_items(sco.supplied_items)
@@ -528,6 +443,69 @@
# consumed_qty should be (accepted_qty * qty_consumed_per_unit) = (6 * 1) = 6
self.assertEqual(scr.supplied_items[0].consumed_qty, 6)
+ def test_supplied_items_cost_after_reposting(self):
+ # Set Backflush Based On as "BOM"
+ set_backflush_based_on("BOM")
+
+ # Create Material Receipt for RM's
+ make_stock_entry(
+ item_code="_Test Item",
+ qty=100,
+ target="_Test Warehouse 1 - _TC",
+ basic_rate=100,
+ posting_date=add_days(today(), -2),
+ )
+ make_stock_entry(
+ item_code="_Test Item Home Desktop 100",
+ qty=100,
+ target="_Test Warehouse 1 - _TC",
+ basic_rate=100,
+ )
+
+ service_items = [
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 1",
+ "qty": 10,
+ "rate": 100,
+ "fg_item": "_Test FG Item",
+ "fg_item_qty": 10,
+ },
+ ]
+
+ # Create Subcontracting Order
+ sco = get_subcontracting_order(service_items=service_items)
+
+ # Transfer RM's
+ rm_items = get_rm_items(sco.supplied_items)
+
+ itemwise_details = make_stock_in_entry(rm_items=rm_items)
+ make_stock_transfer_entry(
+ sco_no=sco.name,
+ rm_items=rm_items,
+ itemwise_details=copy.deepcopy(itemwise_details),
+ )
+
+ # Create Subcontracting Receipt
+ scr = make_subcontracting_receipt(sco.name)
+ scr.save()
+ scr.submit()
+
+ # Create Backdated Stock Reconciliation
+ sr = create_stock_reconciliation(
+ item_code=rm_items[0].get("item_code"),
+ warehouse="_Test Warehouse 1 - _TC",
+ qty=100,
+ rate=50,
+ posting_date=add_days(today(), -1),
+ )
+
+ # Cost should be updated in Subcontracting Receipt after reposting
+ prev_cost = scr.supplied_items[0].rate
+ scr.load_from_db()
+ self.assertNotEqual(scr.supplied_items[0].rate, prev_cost)
+ self.assertEqual(scr.supplied_items[0].rate, sr.items[0].valuation_rate)
+
def make_return_subcontracting_receipt(**args):
args = frappe._dict(args)
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
index 4b64e4b..d728780 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -46,8 +46,10 @@
"subcontracting_receipt_item",
"section_break_45",
"bom",
+ "serial_and_batch_bundle",
"serial_no",
"col_break5",
+ "rejected_serial_and_batch_bundle",
"batch_no",
"rejected_serial_no",
"manufacture_details",
@@ -252,6 +254,7 @@
"depends_on": "eval: !parent.is_return",
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
+ "ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"options": "Warehouse",
@@ -298,19 +301,19 @@
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "serial_no",
"fieldtype": "Small Text",
- "in_list_view": 1,
"label": "Serial No",
- "no_copy": 1
+ "no_copy": 1,
+ "read_only": 1
},
{
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "batch_no",
"fieldtype": "Link",
- "in_list_view": 1,
"label": "Batch No",
"no_copy": 1,
"options": "Batch",
- "print_hide": 1
+ "print_hide": 1,
+ "read_only": 1
},
{
"depends_on": "eval: !parent.is_return",
@@ -471,12 +474,28 @@
"fieldname": "recalculate_rate",
"fieldtype": "Check",
"label": "Recalculate Rate"
+ },
+ {
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "rejected_serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "label": "Rejected Serial and Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-11-16 14:21:26.125815",
+ "modified": "2023-07-06 18:43:45.599761",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt Item",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
index d21bc22..90bcf4e 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -25,6 +25,7 @@
"consumed_qty",
"current_stock",
"secbreak_3",
+ "serial_and_batch_bundle",
"batch_no",
"col_break4",
"serial_no",
@@ -32,6 +33,7 @@
],
"fields": [
{
+ "columns": 2,
"fieldname": "main_item_code",
"fieldtype": "Link",
"in_list_view": 1,
@@ -40,6 +42,7 @@
"read_only": 1
},
{
+ "columns": 2,
"fieldname": "rm_item_code",
"fieldtype": "Link",
"in_list_view": 1,
@@ -61,27 +64,31 @@
"fieldtype": "Link",
"label": "Batch No",
"no_copy": 1,
- "options": "Batch"
+ "options": "Batch",
+ "read_only": 1
},
{
"fieldname": "serial_no",
"fieldtype": "Text",
"label": "Serial No",
- "no_copy": 1
+ "no_copy": 1,
+ "read_only": 1
},
{
"fieldname": "col_break1",
"fieldtype": "Column Break"
},
{
+ "columns": 1,
"fieldname": "required_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Required Qty",
"print_hide": 1,
"read_only": 1
},
{
- "columns": 2,
+ "columns": 1,
"fieldname": "consumed_qty",
"fieldtype": "Float",
"in_list_view": 1,
@@ -99,6 +106,7 @@
{
"fieldname": "rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Rate",
"options": "Company:company:default_currency",
"read_only": 1
@@ -121,7 +129,6 @@
{
"fieldname": "current_stock",
"fieldtype": "Float",
- "in_list_view": 1,
"label": "Current Stock",
"read_only": 1
},
@@ -185,16 +192,25 @@
"default": "0",
"fieldname": "available_qty_for_consumption",
"fieldtype": "Float",
- "in_list_view": 1,
"label": "Available Qty For Consumption",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "columns": 2,
+ "fieldname": "serial_and_batch_bundle",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Serial / Batch Bundle",
+ "no_copy": 1,
+ "options": "Serial and Batch Bundle",
+ "print_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-11-07 17:17:21.670761",
+ "modified": "2023-03-15 13:55:08.132626",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt Supplied Item",
diff --git a/erpnext/support/doctype/issue/test_issue.py b/erpnext/support/doctype/issue/test_issue.py
index a440124..b30b699 100644
--- a/erpnext/support/doctype/issue/test_issue.py
+++ b/erpnext/support/doctype/issue/test_issue.py
@@ -20,7 +20,7 @@
frappe.db.sql("delete from `tabSLA Fulfilled On Status`")
frappe.db.sql("delete from `tabPause SLA On Status`")
frappe.db.sql("delete from `tabService Day`")
- frappe.db.set_value("Support Settings", None, "track_service_level_agreement", 1)
+ frappe.db.set_single_value("Support Settings", "track_service_level_agreement", 1)
create_service_level_agreements_for_issues()
diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
index 1698e23..1c6f24b 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
@@ -192,7 +192,7 @@
}
],
"links": [],
- "modified": "2021-11-26 15:45:33.289911",
+ "modified": "2023-04-21 17:16:56.192560",
"modified_by": "Administrator",
"module": "Support",
"name": "Service Level Agreement",
@@ -212,19 +212,12 @@
"write": 1
},
{
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "print": 1,
"read": 1,
- "report": 1,
- "role": "All",
- "share": 1,
- "write": 1
+ "role": "All"
}
],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
index 472f6bc..1f8f4a2 100644
--- a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
@@ -16,7 +16,7 @@
class TestServiceLevelAgreement(unittest.TestCase):
def setUp(self):
self.create_company()
- frappe.db.set_value("Support Settings", None, "track_service_level_agreement", 1)
+ frappe.db.set_single_value("Support Settings", "track_service_level_agreement", 1)
lead = frappe.qb.DocType("Lead")
frappe.qb.from_(lead).delete().where(lead.company == self.company).run()
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 45485ca..01d9b01 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -1,9 +1,11 @@
{
+ "actions": [],
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-01-10 16:34:30",
"doctype": "DocType",
"document_type": "Setup",
+ "engine": "InnoDB",
"field_order": [
"naming_series",
"status",
@@ -249,6 +251,7 @@
"fieldname": "contact_mobile",
"fieldtype": "Data",
"label": "Mobile No",
+ "options": "Phone",
"read_only": 1
},
{
@@ -362,10 +365,12 @@
],
"icon": "fa fa-bug",
"idx": 1,
- "modified": "2021-11-09 17:26:09.703215",
+ "links": [],
+ "modified": "2023-06-03 16:17:07.694449",
"modified_by": "Administrator",
"module": "Support",
"name": "Warranty Claim",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -384,6 +389,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"timeline_field": "customer",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/support/report/issue_analytics/test_issue_analytics.py b/erpnext/support/report/issue_analytics/test_issue_analytics.py
index 169392e..e30b31b 100644
--- a/erpnext/support/report/issue_analytics/test_issue_analytics.py
+++ b/erpnext/support/report/issue_analytics/test_issue_analytics.py
@@ -17,7 +17,7 @@
@classmethod
def setUpClass(self):
frappe.db.sql("delete from `tabIssue` where company='_Test Company'")
- frappe.db.set_value("Support Settings", None, "track_service_level_agreement", 1)
+ frappe.db.set_single_value("Support Settings", "track_service_level_agreement", 1)
current_month_date = getdate()
last_month_date = add_months(current_month_date, -1)
diff --git a/erpnext/support/workspace/support/support.json b/erpnext/support/workspace/support/support.json
index 8ca3a67..1aaf2de 100644
--- a/erpnext/support/workspace/support/support.json
+++ b/erpnext/support/workspace/support/support.json
@@ -1,13 +1,15 @@
{
"charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Issue\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Maintenance Visit\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Service Level Agreement\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Issues\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Maintenance\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Service Level Agreement\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Warranty\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
+ "content": "[{\"id\":\"qzP2mZrGOu\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Your Shortcuts</b></span>\",\"col\":12}},{\"id\":\"Fkdjo6bJ7A\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Issue\",\"col\":3}},{\"id\":\"OTS8kx2f3x\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Maintenance Visit\",\"col\":3}},{\"id\":\"smDTSjBR3Z\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Service Level Agreement\",\"col\":3}},{\"id\":\"WCqL_gBYGU\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"oxhWhXp9b2\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"id\":\"Ff8Ab3nLLN\",\"type\":\"card\",\"data\":{\"card_name\":\"Issues\",\"col\":4}},{\"id\":\"_lndiuJTVP\",\"type\":\"card\",\"data\":{\"card_name\":\"Maintenance\",\"col\":4}},{\"id\":\"R_aNO5ESzJ\",\"type\":\"card\",\"data\":{\"card_name\":\"Service Level Agreement\",\"col\":4}},{\"id\":\"N8aA2afWfi\",\"type\":\"card\",\"data\":{\"card_name\":\"Warranty\",\"col\":4}},{\"id\":\"M5fxGuFwUR\",\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}},{\"id\":\"xKH0kO9q4P\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]",
"creation": "2020-03-02 15:48:23.224699",
+ "custom_blocks": [],
"docstatus": 0,
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "support",
"idx": 0,
+ "is_hidden": 0,
"label": "Support",
"links": [
{
@@ -169,16 +171,18 @@
"type": "Link"
}
],
- "modified": "2022-01-13 17:48:27.247406",
+ "modified": "2023-05-24 14:47:23.408966",
"modified_by": "Administrator",
"module": "Support",
"name": "Support",
+ "number_cards": [],
"owner": "Administrator",
"parent_page": "",
"public": 1,
+ "quick_lists": [],
"restrict_to_domain": "",
"roles": [],
- "sequence_id": 25.0,
+ "sequence_id": 12.0,
"shortcuts": [
{
"color": "Yellow",
diff --git a/erpnext/templates/generators/item/item_add_to_cart.html b/erpnext/templates/generators/item/item_add_to_cart.html
index 8000a24..1381dfe 100644
--- a/erpnext/templates/generators/item/item_add_to_cart.html
+++ b/erpnext/templates/generators/item/item_add_to_cart.html
@@ -11,7 +11,10 @@
<div class="product-price">
<!-- Final Price -->
- {{ price_info.formatted_price_sales_uom }}
+ <span itemprop="offers" itemscope itemtype="https://schema.org/Offer">
+ <span itemprop="price" content="{{ price_info.price_list_rate }}">{{ price_info.formatted_price_sales_uom }}</span>
+ <span style="display:none;" itemprop="priceCurrency" content="{{ price_info.currency }}">{{ price_info.currency }}</span>
+ </span>
<!-- Striked Price and Discount -->
{% if price_info.formatted_mrp %}
diff --git a/erpnext/templates/generators/item/item_configure.js b/erpnext/templates/generators/item/item_configure.js
index 613c967..9beba3f 100644
--- a/erpnext/templates/generators/item/item_configure.js
+++ b/erpnext/templates/generators/item/item_configure.js
@@ -219,7 +219,8 @@
: ''
}
- ${available_qty === 0 ? '<span class="text-danger">(' + __('Out of Stock') + ')</span>' : ''}
+ ${available_qty === 0 && product_info && product_info?.is_stock_item
+ ? '<span class="text-danger">(' + __('Out of Stock') + ')</span>' : ''}
</div></div>
<a href data-action="btn_clear_values" data-item-code="${one_item}">
@@ -236,7 +237,8 @@
</div>`;
/* eslint-disable indent */
- if (!product_info?.allow_items_not_in_stock && available_qty === 0) {
+ if (!product_info?.allow_items_not_in_stock && available_qty === 0
+ && product_info && product_info?.is_stock_item) {
item_add_to_cart = '';
}
diff --git a/erpnext/templates/print_formats/includes/serial_and_batch_bundle.html b/erpnext/templates/print_formats/includes/serial_and_batch_bundle.html
new file mode 100644
index 0000000..8e62586
--- /dev/null
+++ b/erpnext/templates/print_formats/includes/serial_and_batch_bundle.html
@@ -0,0 +1,4 @@
+{% if doc.get("serial_and_batch_bundle") %}
+ {% set bundle_print = get_serial_or_batch_nos(doc.serial_and_batch_bundle) %}
+ {{bundle_print}}
+{%- endif %}
diff --git a/erpnext/tests/test_webform.py b/erpnext/tests/test_webform.py
index 202467b..af50a05 100644
--- a/erpnext/tests/test_webform.py
+++ b/erpnext/tests/test_webform.py
@@ -3,18 +3,21 @@
import frappe
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
+from erpnext.buying.doctype.supplier.test_supplier import create_supplier
class TestWebsite(unittest.TestCase):
def test_permission_for_custom_doctype(self):
create_user("Supplier 1", "supplier1@gmail.com")
create_user("Supplier 2", "supplier2@gmail.com")
- create_supplier_with_contact(
- "Supplier1", "All Supplier Groups", "Supplier 1", "supplier1@gmail.com"
- )
- create_supplier_with_contact(
- "Supplier2", "All Supplier Groups", "Supplier 2", "supplier2@gmail.com"
- )
+
+ supplier1 = create_supplier(supplier_name="Supplier1")
+ supplier2 = create_supplier(supplier_name="Supplier2")
+ supplier1.append("portal_users", {"user": "supplier1@gmail.com"})
+ supplier1.save()
+ supplier2.append("portal_users", {"user": "supplier2@gmail.com"})
+ supplier2.save()
+
po1 = create_purchase_order(supplier="Supplier1")
po2 = create_purchase_order(supplier="Supplier2")
@@ -61,21 +64,6 @@
).insert(ignore_if_duplicate=True)
-def create_supplier_with_contact(name, group, contact_name, contact_email):
- supplier = frappe.get_doc(
- {"doctype": "Supplier", "supplier_name": name, "supplier_group": group}
- ).insert(ignore_if_duplicate=True)
-
- if not frappe.db.exists("Contact", contact_name + "-1-" + name):
- new_contact = frappe.new_doc("Contact")
- new_contact.first_name = contact_name
- new_contact.is_primary_contact = (True,)
- new_contact.append("links", {"link_doctype": "Supplier", "link_name": supplier.name})
- new_contact.append("email_ids", {"email_id": contact_email, "is_primary": 1})
-
- new_contact.insert(ignore_mandatory=True)
-
-
def create_custom_doctype():
frappe.get_doc(
{
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
index 159ce70..b553a7c 100644
--- a/erpnext/tests/utils.py
+++ b/erpnext/tests/utils.py
@@ -94,3 +94,25 @@
except Exception:
print(f"Report failed to execute with filters: {test_filter}")
raise
+
+
+def if_lending_app_installed(function):
+ """Decorator to check if lending app is installed"""
+
+ def wrapper(*args, **kwargs):
+ if "lending" in frappe.get_installed_apps():
+ return function(*args, **kwargs)
+ return
+
+ return wrapper
+
+
+def if_lending_app_not_installed(function):
+ """Decorator to check if lending app is not installed"""
+
+ def wrapper(*args, **kwargs):
+ if "lending" not in frappe.get_installed_apps():
+ return function(*args, **kwargs)
+ return
+
+ return wrapper
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index f2458e3..68f8cce 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Van toepassing as die onderneming SpA, SApA of SRL is",
Applicable if the company is a limited liability company,Van toepassing indien die maatskappy 'n maatskappy met beperkte aanspreeklikheid is,
Applicable if the company is an Individual or a Proprietorship,Van toepassing indien die onderneming 'n individu of 'n eiendomsreg is,
-Applicant,aansoeker,
-Applicant Type,Aansoeker Tipe,
Application of Funds (Assets),Toepassing van fondse (bates),
Application period cannot be across two allocation records,Aansoekperiode kan nie oor twee toekenningsrekords wees nie,
Application period cannot be outside leave allocation period,Aansoek tydperk kan nie buite verlof toekenning tydperk,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lys van beskikbare Aandeelhouers met folio nommers,
Loading Payment System,Laai betaalstelsel,
Loan,lening,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Lening Bedrag kan nie Maksimum Lening Bedrag van {0},
-Loan Application,Leningsaansoek,
-Loan Management,Leningbestuur,
-Loan Repayment,Lening Terugbetaling,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Die begindatum van die lening en die leningstydperk is verpligtend om die faktuurdiskontering te bespaar,
Loans (Liabilities),Lenings (laste),
Loans and Advances (Assets),Lenings en voorskotte (bates),
@@ -1611,7 +1605,6 @@
Monday,Maandag,
Monthly,maandelikse,
Monthly Distribution,Maandelikse Verspreiding,
-Monthly Repayment Amount cannot be greater than Loan Amount,Maandelikse Terugbetalingsbedrag kan nie groter wees as Leningbedrag nie,
More,meer,
More Information,Meer inligting,
More than one selection for {0} not allowed,Meer as een keuse vir {0} word nie toegelaat nie,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Betaal {0} {1},
Payable,betaalbaar,
Payable Account,Betaalbare rekening,
-Payable Amount,Betaalbare bedrag,
Payment,betaling,
Payment Cancelled. Please check your GoCardless Account for more details,Betaling gekanselleer. Gaan asseblief jou GoCardless rekening vir meer besonderhede,
Payment Confirmation,Bevestiging van betaling,
-Payment Date,Betaaldatum,
Payment Days,Betalingsdae,
Payment Document,Betalingsdokument,
Payment Due Date,Betaaldatum,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Voer asseblief eers Aankoop Ontvangst in,
Please enter Receipt Document,Vul asseblief die kwitansie dokument in,
Please enter Reference date,Voer asseblief Verwysingsdatum in,
-Please enter Repayment Periods,Voer asseblief terugbetalingsperiodes in,
Please enter Reqd by Date,Voer asseblief Reqd by Date in,
Please enter Woocommerce Server URL,Voer asseblief die Woocommerce-bediener-URL in,
Please enter Write Off Account,Voer asseblief 'Skryf 'n rekening in,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Voer asseblief ouer koste sentrum in,
Please enter quantity for Item {0},Gee asseblief die hoeveelheid vir item {0},
Please enter relieving date.,Vul asseblief die verlig datum in.,
-Please enter repayment Amount,Voer asseblief terugbetalingsbedrag in,
Please enter valid Financial Year Start and End Dates,Voer asseblief geldige finansiële jaar se begin- en einddatums in,
Please enter valid email address,Voer asseblief 'n geldige e-posadres in,
Please enter {0} first,Voer asseblief eers {0} in,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Prysreëls word verder gefiltreer op grond van hoeveelheid.,
Primary Address Details,Primêre adresbesonderhede,
Primary Contact Details,Primêre kontakbesonderhede,
-Principal Amount,Hoofbedrag,
Print Format,Drukformaat,
Print IRS 1099 Forms,Druk IRS 1099-vorms uit,
Print Report Card,Druk verslagkaart,
@@ -2550,7 +2538,6 @@
Sample Collection,Voorbeeld versameling,
Sample quantity {0} cannot be more than received quantity {1},Voorbeeldhoeveelheid {0} kan nie meer wees as die hoeveelheid ontvang nie {1},
Sanctioned,beboet,
-Sanctioned Amount,Beperkte bedrag,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gekonfekteerde bedrag kan nie groter wees as eisbedrag in ry {0} nie.,
Sand,sand,
Saturday,Saterdag,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} het reeds 'n ouerprosedure {1}.,
API,API,
Annual,jaarlikse,
-Approved,goedgekeur,
Change,verandering,
Contact Email,Kontak e-pos,
Export Type,Uitvoer Tipe,
@@ -3571,7 +3557,6 @@
Account Value,Rekeningwaarde,
Account is mandatory to get payment entries,Rekeninge is verpligtend om betalingsinskrywings te kry,
Account is not set for the dashboard chart {0},Die rekening is nie opgestel vir die paneelkaart {0},
-Account {0} does not belong to company {1},Rekening {0} behoort nie aan die maatskappy {1},
Account {0} does not exists in the dashboard chart {1},Rekening {0} bestaan nie in die paneelkaart {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Rekening: <b>{0}</b> is kapitaal Werk aan die gang en kan nie deur die joernaalinskrywing bygewerk word nie,
Account: {0} is not permitted under Payment Entry,Rekening: {0} is nie toegelaat onder betalingstoelae nie,
@@ -3582,7 +3567,6 @@
Activity,aktiwiteit,
Add / Manage Email Accounts.,Voeg / Bestuur e-pos rekeninge.,
Add Child,Voeg kind by,
-Add Loan Security,Voeg leningsekuriteit by,
Add Multiple,Voeg meerdere by,
Add Participants,Voeg Deelnemers by,
Add to Featured Item,Voeg by die voorgestelde artikel,
@@ -3593,15 +3577,12 @@
Address Line 1,Adres Lyn 1,
Addresses,adresse,
Admission End Date should be greater than Admission Start Date.,Einddatum vir toelating moet groter wees as die aanvangsdatum vir toelating.,
-Against Loan,Teen lening,
-Against Loan:,Teen lening:,
All,Almal,
All bank transactions have been created,Alle banktransaksies is geskep,
All the depreciations has been booked,Al die waardevermindering is bespreek,
Allocation Expired!,Toekenning verval!,
Allow Resetting Service Level Agreement from Support Settings.,Laat die diensvlakooreenkoms weer instel van ondersteuninginstellings.,
Amount of {0} is required for Loan closure,Bedrag van {0} is nodig vir leningsluiting,
-Amount paid cannot be zero,Bedrag betaal kan nie nul wees nie,
Applied Coupon Code,Toegepaste koeponkode,
Apply Coupon Code,Pas koeponkode toe,
Appointment Booking,Aanstellings bespreking,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Kan nie die aankomstyd bereken nie, aangesien die adres van die bestuurder ontbreek.",
Cannot Optimize Route as Driver Address is Missing.,"Kan nie die roete optimaliseer nie, aangesien die bestuurder se adres ontbreek.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Kan nie taak {0} voltooi nie, want die afhanklike taak {1} is nie saamgevoeg / gekanselleer nie.",
-Cannot create loan until application is approved,Kan nie 'n lening maak totdat die aansoek goedgekeur is nie,
Cannot find a matching Item. Please select some other value for {0}.,Kan nie 'n ooreenstemmende item vind nie. Kies asseblief 'n ander waarde vir {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Kan nie meer as {2} oor item {0} in ry {1} oorkoop nie. Om oorfakturering toe te laat, stel asseblief toelae in rekeninginstellings",
"Capacity Planning Error, planned start time can not be same as end time","Kapasiteitsbeplanningsfout, beplande begintyd kan nie dieselfde wees as eindtyd nie",
@@ -3812,20 +3792,9 @@
Less Than Amount,Minder as die bedrag,
Liabilities,laste,
Loading...,Laai ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Leningsbedrag oorskry die maksimum leningsbedrag van {0} volgens voorgestelde sekuriteite,
Loan Applications from customers and employees.,Leningsaansoeke van kliënte en werknemers.,
-Loan Disbursement,Leninguitbetaling,
Loan Processes,Leningsprosesse,
-Loan Security,Leningsekuriteit,
-Loan Security Pledge,Veiligheidsbelofte vir lenings,
-Loan Security Pledge Created : {0},Veiligheidsbelofte vir lenings geskep: {0},
-Loan Security Price,Leningsprys,
-Loan Security Price overlapping with {0},Lening-sekuriteitsprys wat met {0} oorvleuel,
-Loan Security Unpledge,Uitleen van sekuriteitslenings,
-Loan Security Value,Leningsekuriteitswaarde,
Loan Type for interest and penalty rates,Tipe lening vir rente en boetes,
-Loan amount cannot be greater than {0},Leningsbedrag kan nie groter wees as {0},
-Loan is mandatory,Lening is verpligtend,
Loans,lenings,
Loans provided to customers and employees.,Lenings aan kliënte en werknemers.,
Location,plek,
@@ -3894,7 +3863,6 @@
Pay,betaal,
Payment Document Type,Betaaldokumenttipe,
Payment Name,Betaalnaam,
-Penalty Amount,Strafbedrag,
Pending,hangende,
Performance,Optrede,
Period based On,Tydperk gebaseer op,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Meld asseblief aan as 'n Marketplace-gebruiker om hierdie artikel te wysig.,
Please login as a Marketplace User to report this item.,Meld u as 'n Marketplace-gebruiker aan om hierdie item te rapporteer.,
Please select <b>Template Type</b> to download template,Kies <b>Sjabloontipe</b> om die sjabloon af te laai,
-Please select Applicant Type first,Kies eers die aansoeker tipe,
Please select Customer first,Kies eers kliënt,
Please select Item Code first,Kies eers die itemkode,
-Please select Loan Type for company {0},Kies leningstipe vir maatskappy {0},
Please select a Delivery Note,Kies 'n afleweringsnota,
Please select a Sales Person for item: {0},Kies 'n verkoopspersoon vir item: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Kies asseblief 'n ander betaalmetode. Stripe ondersteun nie transaksies in valuta '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Stel asseblief 'n standaardbankrekening vir maatskappy {0} op,
Please specify,Spesifiseer asseblief,
Please specify a {0},Spesifiseer asseblief 'n {0},lead
-Pledge Status,Belofte status,
-Pledge Time,Beloftetyd,
Printing,druk,
Priority,prioriteit,
Priority has been changed to {0}.,Prioriteit is verander na {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Verwerk XML-lêers,
Profitability,winsgewendheid,
Project,projek,
-Proposed Pledges are mandatory for secured Loans,Voorgestelde pandjies is verpligtend vir versekerde lenings,
Provide the academic year and set the starting and ending date.,Voorsien die akademiese jaar en stel die begin- en einddatum vas.,
Public token is missing for this bank,Daar is 'n openbare teken vir hierdie bank ontbreek,
Publish,publiseer,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Die aankoopbewys het geen item waarvoor die behoudmonster geaktiveer is nie.,
Purchase Return,Koop opgawe,
Qty of Finished Goods Item,Aantal eindprodukte,
-Qty or Amount is mandatroy for loan security,Aantal of Bedrag is verpligtend vir leningsekuriteit,
Quality Inspection required for Item {0} to submit,Kwaliteitinspeksie benodig vir indiening van item {0},
Quantity to Manufacture,Hoeveelheid te vervaardig,
Quantity to Manufacture can not be zero for the operation {0},Hoeveelheid te vervaardig kan nie nul wees vir die bewerking {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Verligtingsdatum moet groter wees as of gelyk wees aan die Datum van aansluiting,
Rename,hernoem,
Rename Not Allowed,Hernoem nie toegelaat nie,
-Repayment Method is mandatory for term loans,Terugbetalingsmetode is verpligtend vir termynlenings,
-Repayment Start Date is mandatory for term loans,Aanvangsdatum vir terugbetaling is verpligtend vir termynlenings,
Report Item,Rapporteer item,
Report this Item,Rapporteer hierdie item,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Gereserveerde hoeveelheid vir subkontrakte: hoeveelheid grondstowwe om onderaangekoopte items te maak.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Ry ({0}): {1} is alreeds afslag op {2},
Rows Added in {0},Rye bygevoeg in {0},
Rows Removed in {0},Rye is verwyder in {0},
-Sanctioned Amount limit crossed for {0} {1},Die goedgekeurde hoeveelheid limiete is gekruis vir {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Bestaande leningsbedrag bestaan reeds vir {0} teen maatskappy {1},
Save,Save,
Save Item,Stoor item,
Saved Items,Gestoorde items,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Gebruiker {0} is gedeaktiveer,
Users and Permissions,Gebruikers en toestemmings,
Vacancies cannot be lower than the current openings,Vakatures kan nie laer wees as die huidige openings nie,
-Valid From Time must be lesser than Valid Upto Time.,Geldig vanaf tyd moet kleiner wees as geldig tot tyd.,
Valuation Rate required for Item {0} at row {1},Waardasietempo benodig vir item {0} op ry {1},
Values Out Of Sync,Waardes buite sinchronisasie,
Vehicle Type is required if Mode of Transport is Road,Die voertuigtipe word benodig as die manier van vervoer op pad is,
@@ -4211,7 +4168,6 @@
Add to Cart,Voeg by die winkelwagen,
Days Since Last Order,Dae sedert die laaste bestelling,
In Stock,Op voorraad,
-Loan Amount is mandatory,Leningsbedrag is verpligtend,
Mode Of Payment,Betaalmetode,
No students Found,Geen studente gevind nie,
Not in Stock,Nie in voorraad nie,
@@ -4240,7 +4196,6 @@
Group by,Groep By,
In stock,In voorraad,
Item name,Item naam,
-Loan amount is mandatory,Leningsbedrag is verpligtend,
Minimum Qty,Minimum Aantal,
More details,Meer besonderhede,
Nature of Supplies,Aard van voorrade,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Totale voltooide hoeveelheid,
Qty to Manufacture,Hoeveelheid om te vervaardig,
Repay From Salary can be selected only for term loans,Terugbetaling uit salaris kan slegs vir termynlenings gekies word,
-No valid Loan Security Price found for {0},Geen geldige sekuriteitsprys vir lenings gevind vir {0},
-Loan Account and Payment Account cannot be same,Leningrekening en betaalrekening kan nie dieselfde wees nie,
-Loan Security Pledge can only be created for secured loans,Leningversekeringsbelofte kan slegs vir veilige lenings aangegaan word,
Social Media Campaigns,Sosiale media-veldtogte,
From Date can not be greater than To Date,Vanaf datum kan nie groter wees as tot op datum nie,
Please set a Customer linked to the Patient,Stel 'n kliënt in wat aan die pasiënt gekoppel is,
@@ -6437,7 +6389,6 @@
HR User,HR gebruiker,
Appointment Letter,Aanstellingsbrief,
Job Applicant,Werksaansoeker,
-Applicant Name,Aansoeker Naam,
Appointment Date,Aanstellingsdatum,
Appointment Letter Template,Aanstellingsbriefsjabloon,
Body,liggaam,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinkroniseer in voortsetting,
Hub Seller Name,Hub Verkoper Naam,
Custom Data,Aangepaste data,
-Member,lid,
-Partially Disbursed,Gedeeltelik uitbetaal,
-Loan Closure Requested,Leningsluiting gevra,
Repay From Salary,Terugbetaal van Salaris,
-Loan Details,Leningsbesonderhede,
-Loan Type,Lening Tipe,
-Loan Amount,Leningsbedrag,
-Is Secured Loan,Is versekerde lening,
-Rate of Interest (%) / Year,Rentekoers (%) / Jaar,
-Disbursement Date,Uitbetalingsdatum,
-Disbursed Amount,Uitbetaalde bedrag,
-Is Term Loan,Is termynlening,
-Repayment Method,Terugbetaling Metode,
-Repay Fixed Amount per Period,Herstel vaste bedrag per Periode,
-Repay Over Number of Periods,Terugbetaling oor aantal periodes,
-Repayment Period in Months,Terugbetalingsperiode in maande,
-Monthly Repayment Amount,Maandelikse Terugbetalingsbedrag,
-Repayment Start Date,Terugbetaling Begin Datum,
-Loan Security Details,Leningsekuriteitsbesonderhede,
-Maximum Loan Value,Maksimum leningswaarde,
-Account Info,Rekeninginligting,
-Loan Account,Leningsrekening,
-Interest Income Account,Rente Inkomsterekening,
-Penalty Income Account,Boete-inkomsterekening,
-Repayment Schedule,Terugbetalingskedule,
-Total Payable Amount,Totale betaalbare bedrag,
-Total Principal Paid,Totale hoofbetaal,
-Total Interest Payable,Totale rente betaalbaar,
-Total Amount Paid,Totale bedrag betaal,
-Loan Manager,Leningsbestuurder,
-Loan Info,Leningsinligting,
-Rate of Interest,Rentekoers,
-Proposed Pledges,Voorgestelde beloftes,
-Maximum Loan Amount,Maksimum leningsbedrag,
-Repayment Info,Terugbetalingsinligting,
-Total Payable Interest,Totale betaalbare rente,
-Against Loan ,Teen lening,
-Loan Interest Accrual,Toeval van lenings,
-Amounts,bedrae,
-Pending Principal Amount,Hangende hoofbedrag,
-Payable Principal Amount,Hoofbedrag betaalbaar,
-Paid Principal Amount,Betaalde hoofbedrag,
-Paid Interest Amount,Betaalde rente bedrag,
-Process Loan Interest Accrual,Verwerking van lening rente,
-Repayment Schedule Name,Terugbetalingskedule Naam,
Regular Payment,Gereelde betaling,
Loan Closure,Leningsluiting,
-Payment Details,Betaling besonderhede,
-Interest Payable,Rente betaalbaar,
-Amount Paid,Bedrag betaal,
-Principal Amount Paid,Hoofbedrag betaal,
-Repayment Details,Terugbetalingsbesonderhede,
-Loan Repayment Detail,Terugbetaling van lening,
-Loan Security Name,Leningsekuriteitsnaam,
-Unit Of Measure,Maateenheid,
-Loan Security Code,Leningsekuriteitskode,
-Loan Security Type,Tipe lenings,
-Haircut %,Haarknip%,
-Loan Details,Leningsbesonderhede,
-Unpledged,Unpledged,
-Pledged,belowe,
-Partially Pledged,Gedeeltelik belowe,
-Securities,sekuriteite,
-Total Security Value,Totale sekuriteitswaarde,
-Loan Security Shortfall,Tekort aan leningsekuriteit,
-Loan ,lening,
-Shortfall Time,Tekort tyd,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Tekortbedrag,
-Security Value ,Sekuriteitswaarde,
-Process Loan Security Shortfall,Verwerk leningsekuriteit,
-Loan To Value Ratio,Lening tot Waardeverhouding,
-Unpledge Time,Unpedge-tyd,
-Loan Name,Lening Naam,
Rate of Interest (%) Yearly,Rentekoers (%) Jaarliks,
-Penalty Interest Rate (%) Per Day,Boete rentekoers (%) per dag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Boete word op 'n daaglikse basis op die hangende rentebedrag gehef in geval van uitgestelde terugbetaling,
-Grace Period in Days,Genade tydperk in dae,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Aantal dae vanaf die vervaldatum totdat die boete nie gehef sal word in geval van vertraging in die terugbetaling van die lening nie,
-Pledge,belofte,
-Post Haircut Amount,Bedrag na kapsel,
-Process Type,Proses tipe,
-Update Time,Opdateringstyd,
-Proposed Pledge,Voorgestelde belofte,
-Total Payment,Totale betaling,
-Balance Loan Amount,Saldo Lening Bedrag,
-Is Accrued,Opgeloop,
Salary Slip Loan,Salaris Slip Lening,
Loan Repayment Entry,Terugbetaling van lenings,
-Sanctioned Loan Amount,Goedgekeurde leningsbedrag,
-Sanctioned Amount Limit,Sanktiewe Bedraglimiet,
-Unpledge,Unpledge,
-Haircut,haarsny,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Genereer skedule,
Schedules,skedules,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projek sal op hierdie webwerf toeganklik wees,
Copied From,Gekopieer vanaf,
Start and End Dates,Begin en einddatums,
-Actual Time (in Hours),Werklike tyd (in ure),
+Actual Time in Hours (via Timesheet),Werklike tyd (in ure),
Costing and Billing,Koste en faktuur,
-Total Costing Amount (via Timesheets),Totale kosteberekening (via tydskrifte),
-Total Expense Claim (via Expense Claims),Totale koste-eis (via koste-eise),
+Total Costing Amount (via Timesheet),Totale kosteberekening (via tydskrifte),
+Total Expense Claim (via Expense Claim),Totale koste-eis (via koste-eise),
Total Purchase Cost (via Purchase Invoice),Totale Aankoopprys (via Aankoopfaktuur),
Total Sales Amount (via Sales Order),Totale verkoopsbedrag (via verkoopsbestelling),
-Total Billable Amount (via Timesheets),Totale Rekeninge Bedrag (via Tydstate),
-Total Billed Amount (via Sales Invoices),Totale gefaktureerde bedrag (via verkoopsfakture),
-Total Consumed Material Cost (via Stock Entry),Totale verbruikte materiaalkoste (via voorraadinskrywing),
+Total Billable Amount (via Timesheet),Totale Rekeninge Bedrag (via Tydstate),
+Total Billed Amount (via Sales Invoice),Totale gefaktureerde bedrag (via verkoopsfakture),
+Total Consumed Material Cost (via Stock Entry),Totale verbruikte materiaalkoste (via voorraadinskrywing),
Gross Margin,Bruto Marge,
Gross Margin %,Bruto Marge%,
Monitor Progress,Monitor vordering,
@@ -7521,12 +7385,10 @@
Dependencies,afhanklikhede,
Dependent Tasks,Afhanklike take,
Depends on Tasks,Hang af van take,
-Actual Start Date (via Time Sheet),Werklike Aanvangsdatum (via Tydblad),
-Actual Time (in hours),Werklike tyd (in ure),
-Actual End Date (via Time Sheet),Werklike Einddatum (via Tydblad),
-Total Costing Amount (via Time Sheet),Totale kosteberekening (via tydblad),
+Actual Start Date (via Timesheet),Werklike Aanvangsdatum (via Tydblad),
+Actual Time in Hours (via Timesheet),Werklike tyd (in ure),
+Actual End Date (via Timesheet),Werklike Einddatum (via Tydblad),
Total Expense Claim (via Expense Claim),Totale koste-eis (via koste-eis),
-Total Billing Amount (via Time Sheet),Totale faktuurbedrag (via tydblad),
Review Date,Hersieningsdatum,
Closing Date,Sluitingsdatum,
Task Depends On,Taak hang af,
@@ -7887,7 +7749,6 @@
Update Series,Update Series,
Change the starting / current sequence number of an existing series.,Verander die begin- / huidige volgordenommer van 'n bestaande reeks.,
Prefix,voorvoegsel,
-Current Value,Huidige waarde,
This is the number of the last created transaction with this prefix,Dit is die nommer van die laaste geskep transaksie met hierdie voorvoegsel,
Update Series Number,Werk reeksnommer,
Quotation Lost Reason,Kwotasie Verlore Rede,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Recommended Reorder Level,
Lead Details,Loodbesonderhede,
Lead Owner Efficiency,Leier Eienaar Efficiency,
-Loan Repayment and Closure,Terugbetaling en sluiting van lenings,
-Loan Security Status,Leningsekuriteitstatus,
Lost Opportunity,Geleë geleentheid verloor,
Maintenance Schedules,Onderhoudskedules,
Material Requests for which Supplier Quotations are not created,Materiële Versoeke waarvoor Verskaffer Kwotasies nie geskep word nie,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Getal getel: {0},
Payment Account is mandatory,Betaalrekening is verpligtend,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","As dit gekontroleer word, sal die volle bedrag van die belasbare inkomste afgetrek word voordat inkomstebelasting bereken word sonder enige verklaring of bewys.",
-Disbursement Details,Uitbetalingsbesonderhede,
Material Request Warehouse,Materiaalversoekpakhuis,
Select warehouse for material requests,Kies pakhuis vir materiaalversoeke,
Transfer Materials For Warehouse {0},Oordragmateriaal vir pakhuis {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Betaal onopgeëiste bedrag terug van die salaris,
Deduction from salary,Aftrekking van salaris,
Expired Leaves,Verlore blare,
-Reference No,Verwysingsnommer,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Kapselpersentasie is die persentasieverskil tussen die markwaarde van die Leningsekuriteit en die waarde wat aan die Leningsekuriteit toegeskryf word wanneer dit as waarborg vir daardie lening gebruik word.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Lening-tot-waarde-verhouding druk die verhouding tussen die leningsbedrag en die waarde van die verpande sekuriteit uit. 'N Tekort aan leningsekuriteit sal veroorsaak word as dit onder die gespesifiseerde waarde vir 'n lening val,
If this is not checked the loan by default will be considered as a Demand Loan,"As dit nie gekontroleer word nie, sal die lening by verstek as 'n vraaglening beskou word",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Hierdie rekening word gebruik om lenings van die lener terug te betaal en ook om lenings aan die lener uit te betaal,
This account is capital account which is used to allocate capital for loan disbursal account ,Hierdie rekening is 'n kapitaalrekening wat gebruik word om kapitaal toe te ken vir die uitbetaling van lenings,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Handeling {0} behoort nie tot die werkbestelling nie {1},
Print UOM after Quantity,Druk UOM na hoeveelheid uit,
Set default {0} account for perpetual inventory for non stock items,Stel die standaard {0} -rekening vir permanente voorraad vir nie-voorraaditems,
-Loan Security {0} added multiple times,Leningsekuriteit {0} is verskeie kere bygevoeg,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Leningsekuriteite met verskillende LTV-verhoudings kan nie teen een lening verpand word nie,
-Qty or Amount is mandatory for loan security!,Aantal of bedrag is verpligtend vir leningsekuriteit!,
-Only submittted unpledge requests can be approved,Slegs ingediende onversekeringsversoeke kan goedgekeur word,
-Interest Amount or Principal Amount is mandatory,Rentebedrag of hoofbedrag is verpligtend,
-Disbursed Amount cannot be greater than {0},Uitbetaalde bedrag mag nie groter as {0} wees nie,
-Row {0}: Loan Security {1} added multiple times,Ry {0}: Leningsekuriteit {1} is verskeie kere bygevoeg,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Ry # {0}: Kinditem mag nie 'n produkbundel wees nie. Verwyder asseblief item {1} en stoor,
Credit limit reached for customer {0},Kredietlimiet vir kliënt {0} bereik,
Could not auto create Customer due to the following missing mandatory field(s):,Kon nie kliënt outomaties skep nie weens die volgende ontbrekende verpligte veld (e):,
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index d4db285..a9db089 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",ኩባንያው ስፓ ፣ ኤስ.ኤስ.ኤ ወይም ኤስ.ኤ.አር. ከሆነ የሚመለከተው,
Applicable if the company is a limited liability company,ኩባንያው ውስን የኃላፊነት ኩባንያ ከሆነ ተፈጻሚ ይሆናል ፡፡,
Applicable if the company is an Individual or a Proprietorship,ኩባንያው የግለሰባዊ ወይም የግል ባለቤት ከሆነ የሚመለከተው።,
-Applicant,አመልካች,
-Applicant Type,የአመልካች ዓይነት,
Application of Funds (Assets),ፈንድ (ንብረት) ውስጥ ማመልከቻ,
Application period cannot be across two allocation records,የመመዝገቢያ ጊዜ በሁለት የምደባ መዛግብት ውስጥ ሊገኝ አይችልም,
Application period cannot be outside leave allocation period,የማመልከቻው ወቅት ውጪ ፈቃድ አመዳደብ ጊዜ ሊሆን አይችልም,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ሊገኙ የሚችሉ አክሲዮኖችን ዝርዝር በ folio ቁጥሮች,
Loading Payment System,የክፍያ ስርዓት በመጫን ላይ,
Loan,ብድር,
-Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0},
-Loan Application,የብድር ማመልከቻ,
-Loan Management,የብድር አስተዳደር,
-Loan Repayment,ብድር ብድር መክፈል,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,የብድር የመጀመሪያ ቀን እና የብድር ወቅት የክፍያ መጠየቂያ ቅነሳን ለማዳን ግዴታ ናቸው።,
Loans (Liabilities),ብድር (ተጠያቂነቶች),
Loans and Advances (Assets),ብድር እና እድገት (እሴቶች),
@@ -1611,7 +1605,6 @@
Monday,ሰኞ,
Monthly,ወርሃዊ,
Monthly Distribution,ወርሃዊ ስርጭት,
-Monthly Repayment Amount cannot be greater than Loan Amount,ወርሃዊ የሚያየን መጠን ብድር መጠን በላይ ሊሆን አይችልም,
More,ይበልጥ,
More Information,ተጨማሪ መረጃ,
More than one selection for {0} not allowed,ከአንድ በላይ ምርጫ ለ {0} አይፈቀድም።,
@@ -1884,11 +1877,9 @@
Pay {0} {1},ይክፈሉ {0} {1},
Payable,ትርፍ የሚያስገኝ,
Payable Account,የሚከፈለው መለያ,
-Payable Amount,የሚከፈል መጠን,
Payment,ክፍያ,
Payment Cancelled. Please check your GoCardless Account for more details,ክፍያ ተሰርዟል. ለተጨማሪ ዝርዝሮች እባክዎ የ GoCardless መለያዎን ይመልከቱ,
Payment Confirmation,የክፍያ ማረጋገጫ,
-Payment Date,የክፍያ ቀን,
Payment Days,የክፍያ ቀኖች,
Payment Document,የክፍያ ሰነድ,
Payment Due Date,ክፍያ መጠናቀቅ ያለበት ቀን,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,በመጀመሪያ የግዢ ደረሰኝ ያስገቡ,
Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ,
Please enter Reference date,የማጣቀሻ ቀን ያስገቡ,
-Please enter Repayment Periods,የሚያየን ክፍለ ጊዜዎች ያስገቡ,
Please enter Reqd by Date,እባክዎ በቀን Reqd ያስገባሉ,
Please enter Woocommerce Server URL,እባክዎ የ Woocommerce አገልጋይ ዩ አር ኤል ያስገቡ,
Please enter Write Off Account,መለያ ጠፍቷል ይጻፉ ያስገቡ,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,ወላጅ የወጪ ማዕከል ያስገቡ,
Please enter quantity for Item {0},ንጥል ለ ብዛት ያስገቡ {0},
Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.,
-Please enter repayment Amount,ብድር መክፈል መጠን ያስገቡ,
Please enter valid Financial Year Start and End Dates,ልክ የፋይናንስ ዓመት የመጀመሪያ እና መጨረሻ ቀኖች ያስገቡ,
Please enter valid email address,ልክ የሆነ የኢሜይል አድራሻ ያስገቡ,
Please enter {0} first,በመጀመሪያ {0} ያስገቡ,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,የዋጋ ደንቦች ተጨማሪ በብዛት ላይ ተመስርተው ይጣራሉ.,
Primary Address Details,ዋና አድራሻዎች ዝርዝሮች,
Primary Contact Details,ዋና እውቂያ ዝርዝሮች,
-Principal Amount,ዋና ዋና መጠን,
Print Format,አትም ቅርጸት,
Print IRS 1099 Forms,IRS 1099 ቅጾችን ያትሙ ፡፡,
Print Report Card,የህትመት ሪፖርት ካርድ,
@@ -2550,7 +2538,6 @@
Sample Collection,የናሙና ስብስብ,
Sample quantity {0} cannot be more than received quantity {1},የናሙና መጠን {0} ከተላከ በላይ መሆን አይሆንም {1},
Sanctioned,ማዕቀብ,
-Sanctioned Amount,ማዕቀብ መጠን,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ማዕቀብ መጠን ረድፍ ውስጥ የይገባኛል ጥያቄ መጠን መብለጥ አይችልም {0}.,
Sand,አሸዋ,
Saturday,ቅዳሜ,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ቀድሞውኑ የወላጅ አሰራር ሂደት አለው {1}።,
API,ኤ ፒ አይ,
Annual,ዓመታዊ,
-Approved,ጸድቋል,
Change,ለዉጥ,
Contact Email,የዕውቂያ ኢሜይል,
Export Type,ወደ ውጪ ላክ,
@@ -3571,7 +3557,6 @@
Account Value,የመለያ ዋጋ,
Account is mandatory to get payment entries,የክፍያ ግቤቶችን ለማግኘት መለያ ግዴታ ነው,
Account is not set for the dashboard chart {0},መለያ ለዳሽቦርድ ገበታ {0} አልተዘጋጀም,
-Account {0} does not belong to company {1},መለያ {0} ኩባንያ የእርሱ ወገን አይደለም {1},
Account {0} does not exists in the dashboard chart {1},መለያ {0} በዳሽቦርዱ ገበታ ላይ አይገኝም {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,መለያ <b>{0}</b> በሂደት ላይ ያለ የካፒታል ስራ ነው እናም በጆርናል ግቤት ሊዘመን አይችልም።,
Account: {0} is not permitted under Payment Entry,መለያ {0} በክፍያ መግቢያ ስር አይፈቀድም።,
@@ -3582,7 +3567,6 @@
Activity,ሥራ,
Add / Manage Email Accounts.,የኢሜይል መለያዎችን ያቀናብሩ / ያክሉ.,
Add Child,የልጅ አክል,
-Add Loan Security,የብድር ደህንነት ያክሉ,
Add Multiple,በርካታ ያክሉ,
Add Participants,ተሳታፊዎችን ያክሉ,
Add to Featured Item,ወደ ተለይቶ የቀረበ ንጥል ያክሉ።,
@@ -3593,15 +3577,12 @@
Address Line 1,አድራሻ መስመር 1,
Addresses,አድራሻዎች,
Admission End Date should be greater than Admission Start Date.,የመግቢያ ማለቂያ ቀን ከማስታወቂያ መጀመሪያ ቀን የበለጠ መሆን አለበት።,
-Against Loan,በብድር ላይ,
-Against Loan:,በብድር ላይ:,
All,ሁሉም,
All bank transactions have been created,ሁሉም የባንክ ግብይቶች ተፈጥረዋል።,
All the depreciations has been booked,ሁሉም ዋጋዎች ቀጠሮ ተይዘዋል።,
Allocation Expired!,ምደባው ጊዜው አብቅቷል!,
Allow Resetting Service Level Agreement from Support Settings.,ከድጋፍ ቅንጅቶች እንደገና ማስጀመር የአገልግሎት ደረጃ ስምምነትን ይፍቀዱ።,
Amount of {0} is required for Loan closure,የብድር መዘጋት የ {0} መጠን ያስፈልጋል,
-Amount paid cannot be zero,የተከፈለበት መጠን ዜሮ ሊሆን አይችልም,
Applied Coupon Code,የተተገበረ የኩፖን ኮድ,
Apply Coupon Code,የኩፖን ኮድ ይተግብሩ,
Appointment Booking,የቀጠሮ ቦታ ማስያዝ,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,የአሽከርካሪው አድራሻ የጠፋ እንደመሆኑ የመድረሻ ሰዓቱን ማስላት አይቻልም።,
Cannot Optimize Route as Driver Address is Missing.,የአሽከርካሪ አድራሻ የጎደለው ስለሆነ መንገድን ማመቻቸት አይቻልም ፡፡,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,ተግባሩን ማጠናቀቅ አልተቻለም {0} እንደ ጥገኛ ተግባሩ {1} አልተጠናቀቀም / ተሰር .ል።,
-Cannot create loan until application is approved,ትግበራ እስኪፀድቅ ድረስ ብድር መፍጠር አይቻልም,
Cannot find a matching Item. Please select some other value for {0}.,አንድ ተዛማጅ ንጥል ማግኘት አልተቻለም. ለ {0} ሌላ ዋጋ ይምረጡ.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",በንጥል {0} በተከታታይ {1} ከ {2} በላይ መብለጥ አይቻልም። ከመጠን በላይ ክፍያ መጠየቅን ለመፍቀድ እባክዎ በመለያዎች ቅንብሮች ውስጥ አበል ያዘጋጁ,
"Capacity Planning Error, planned start time can not be same as end time",የአቅም ዕቅድ ስህተት ፣ የታቀደ የመጀመሪያ ጊዜ ልክ እንደ መጨረሻ ጊዜ ተመሳሳይ ሊሆን አይችልም,
@@ -3812,20 +3792,9 @@
Less Than Amount,ከዕድሜ በታች,
Liabilities,ግዴታዎች,
Loading...,በመጫን ላይ ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,የብድር መጠን ከታቀዱት ዋስትናዎች አንጻር ከሚፈቀደው ከፍተኛ የብድር መጠን ከ {0} ይበልጣል,
Loan Applications from customers and employees.,የብድር ማመልከቻዎች ከደንበኞች እና ከሠራተኞች ፡፡,
-Loan Disbursement,የብድር ክፍያ,
Loan Processes,የብድር ሂደቶች,
-Loan Security,የብድር ደህንነት,
-Loan Security Pledge,የብድር ዋስትና ቃል,
-Loan Security Pledge Created : {0},የብድር ዋስትና ቃል ተፈጥረዋል: {0},
-Loan Security Price,የብድር ደህንነት ዋጋ,
-Loan Security Price overlapping with {0},የብድር ደህንነት ዋጋ ከ {0} ጋር መደራረብ,
-Loan Security Unpledge,የብድር ደህንነት ማራገፊያ,
-Loan Security Value,የብድር ደህንነት እሴት,
Loan Type for interest and penalty rates,የብድር አይነት ለወለድ እና ለቅጣት ተመኖች,
-Loan amount cannot be greater than {0},የብድር መጠን ከ {0} መብለጥ አይችልም,
-Loan is mandatory,ብድር ግዴታ ነው,
Loans,ብድሮች,
Loans provided to customers and employees.,ለደንበኞች እና ለሠራተኞች የሚሰጡ ብድሮች ፡፡,
Location,አካባቢ,
@@ -3894,7 +3863,6 @@
Pay,ይክፈሉ,
Payment Document Type,የክፍያ ሰነድ ዓይነት።,
Payment Name,የክፍያ ስም,
-Penalty Amount,የቅጣት መጠን,
Pending,በመጠባበቅ ላይ,
Performance,አፈፃፀም ፡፡,
Period based On,በ ላይ የተመሠረተ ጊዜ።,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,ይህንን ንጥል ለማርትዕ እባክዎ እንደ የገቢያ ቦታ ተጠቃሚ ይግቡ ፡፡,
Please login as a Marketplace User to report this item.,ይህንን ንጥል ሪፖርት ለማድረግ እባክዎ እንደ የገቢያ ቦታ ተጠቃሚ ይግቡ ፡፡,
Please select <b>Template Type</b> to download template,አብነት ለማውረድ እባክዎ <b>የአብነት አይነት</b> ይምረጡ,
-Please select Applicant Type first,እባክዎ መጀመሪያ የአመልካች ዓይነት ይምረጡ,
Please select Customer first,እባክዎ መጀመሪያ ደንበኛውን ይምረጡ።,
Please select Item Code first,እባክዎን የእቃ ኮዱን በመጀመሪያ ይምረጡ,
-Please select Loan Type for company {0},እባክዎን ለድርጅት የብድር አይነት ይምረጡ {0},
Please select a Delivery Note,እባክዎን የማስረከቢያ ማስታወሻ ይምረጡ ፡፡,
Please select a Sales Person for item: {0},እባክዎ ለንጥል የሽያጭ ሰው ይምረጡ {{}},
Please select another payment method. Stripe does not support transactions in currency '{0}',ሌላ የክፍያ ስልት ይምረጡ. ግርፋት «{0}» ምንዛሬ ግብይቶችን አይደግፍም,
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},እባክዎ ለኩባንያ ነባሪ የባንክ ሂሳብ ያቀናብሩ {0},
Please specify,እባክዎን ይግለጹ,
Please specify a {0},ይጥቀሱ እባክዎ {0},lead
-Pledge Status,የዋስትና ሁኔታ,
-Pledge Time,የዋስትና ጊዜ,
Printing,ማተም,
Priority,ቅድሚያ,
Priority has been changed to {0}.,ቅድሚያ የተሰጠው ወደ {0} ተለው hasል።,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML ፋይሎችን በመስራት ላይ,
Profitability,ትርፋማነት።,
Project,ፕሮጀክት,
-Proposed Pledges are mandatory for secured Loans,የታቀደው ቃል ኪዳኖች አስተማማኝ ዋስትና ላላቸው ብድሮች አስገዳጅ ናቸው,
Provide the academic year and set the starting and ending date.,የትምህርት ዓመቱን ያቅርቡ እና የመጀመሪያ እና የመጨረሻ ቀን ያዘጋጁ።,
Public token is missing for this bank,ለዚህ ባንክ ይፋዊ ምልክት የለም,
Publish,አትም,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,የግ Rece ደረሰኝ Retain Sample የሚነቃበት ምንም ንጥል የለውም።,
Purchase Return,የግዢ ተመለስ,
Qty of Finished Goods Item,የተጠናቀቁ ዕቃዎች ንጥል ነገር።,
-Qty or Amount is mandatroy for loan security,ጫን ወይም መጠን ለድርድር ብድር ዋስትና ግዴታ ነው,
Quality Inspection required for Item {0} to submit,ለማቅረብ ንጥል (0 0) የጥራት ምርመራ ያስፈልጋል {0} ፡፡,
Quantity to Manufacture,ብዛት ወደ አምራች,
Quantity to Manufacture can not be zero for the operation {0},ለምርት ለማምረት ብዛቱ ዜሮ መሆን አይችልም {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,የመልሶ ማግኛ ቀን ከተቀላቀለበት ቀን የሚበልጥ ወይም እኩል መሆን አለበት,
Rename,ዳግም ሰይም,
Rename Not Allowed,ዳግም መሰየም አልተፈቀደም።,
-Repayment Method is mandatory for term loans,የመክፈያ ዘዴ ለጊዜ ብድሮች አስገዳጅ ነው,
-Repayment Start Date is mandatory for term loans,የመክፈያ መጀመሪያ ቀን ለአበዳሪ ብድሮች አስገዳጅ ነው,
Report Item,ንጥል ሪፖርት ያድርጉ ፡፡,
Report this Item,ይህንን ንጥል ሪፖርት ያድርጉ,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,የተያዙ ዕቃዎች ለንዑስ-ኮንትራክተር-የተዋረዱ እቃዎችን ለመስራት ጥሬ ዕቃዎች ብዛት።,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},ረድፍ ({0}): {1} በ {2} ውስጥ ቀድሞውኑ ቅናሽ ተደርጓል,
Rows Added in {0},ረድፎች በ {0} ውስጥ ታክለዋል,
Rows Removed in {0},በ {0} ረድፎች ተወግደዋል,
-Sanctioned Amount limit crossed for {0} {1},ለ {0} {1} የታገደ የገንዘብ መጠን ተገድቧል,
-Sanctioned Loan Amount already exists for {0} against company {1},የተጣራ የብድር መጠን ቀድሞውኑ ከድርጅት {1} ጋር {0},
Save,አስቀምጥ,
Save Item,ንጥል አስቀምጥ።,
Saved Items,የተቀመጡ ዕቃዎች,
@@ -4135,7 +4093,6 @@
User {0} is disabled,አባል {0} ተሰናክሏል,
Users and Permissions,ተጠቃሚዎች እና ፈቃዶች,
Vacancies cannot be lower than the current openings,ክፍት ቦታዎች ከአሁኑ ክፍት ቦታዎች በታች መሆን አይችሉም ፡፡,
-Valid From Time must be lesser than Valid Upto Time.,ከጊዜ ጊዜ ልክ የሆነ ከሚተገበር የቶቶ ሰዓት ያነሰ መሆን አለበት።,
Valuation Rate required for Item {0} at row {1},በእቃው {0} ረድፍ {1} ላይ የዋጋ ዋጋ ይፈለጋል,
Values Out Of Sync,ዋጋዎች ከማመሳሰል ውጭ,
Vehicle Type is required if Mode of Transport is Road,የመጓጓዣ ሁኔታ መንገድ ከሆነ የተሽከርካሪ ዓይነት ያስፈልጋል።,
@@ -4211,7 +4168,6 @@
Add to Cart,ወደ ግዢው ቅርጫት ጨምር,
Days Since Last Order,ከመጨረሻው ትእዛዝ ጀምሮ ቀናት,
In Stock,ለሽያጭ የቀረበ እቃ,
-Loan Amount is mandatory,የብድር መጠን አስገዳጅ ነው,
Mode Of Payment,የክፍያ ዘዴ,
No students Found,ምንም ተማሪዎች አልተገኙም,
Not in Stock,አይደለም የክምችት ውስጥ,
@@ -4240,7 +4196,6 @@
Group by,ቡድን በ,
In stock,ለሽያጭ የቀረበ እቃ,
Item name,ንጥል ስም,
-Loan amount is mandatory,የብድር መጠን አስገዳጅ ነው,
Minimum Qty,አነስተኛ ሂሳብ,
More details,ተጨማሪ ዝርዝሮች,
Nature of Supplies,የችግሮች አይነት,
@@ -4409,9 +4364,6 @@
Total Completed Qty,ጠቅላላ ተጠናቋል,
Qty to Manufacture,ለማምረት ብዛት,
Repay From Salary can be selected only for term loans,ከደመወዝ ክፍያ መመለስ ለጊዜ ብድሮች ብቻ ሊመረጥ ይችላል,
-No valid Loan Security Price found for {0},ለ {0} የሚሰራ የብድር ዋስትና ዋጋ አልተገኘም,
-Loan Account and Payment Account cannot be same,የብድር ሂሳብ እና የክፍያ ሂሳብ አንድ ሊሆኑ አይችሉም,
-Loan Security Pledge can only be created for secured loans,የብድር ዋስትና ቃል ኪዳን ሊፈጠር የሚችለው ዋስትና ላላቸው ብድሮች ብቻ ነው,
Social Media Campaigns,የማኅበራዊ ሚዲያ ዘመቻዎች,
From Date can not be greater than To Date,ከቀን ከዛሬ የበለጠ ሊሆን አይችልም,
Please set a Customer linked to the Patient,እባክዎ ከሕመምተኛው ጋር የተገናኘ ደንበኛ ያዘጋጁ,
@@ -6437,7 +6389,6 @@
HR User,የሰው ሀይል ተጠቃሚ,
Appointment Letter,የቀጠሮ ደብዳቤ,
Job Applicant,ሥራ አመልካች,
-Applicant Name,የአመልካች ስም,
Appointment Date,የቀጠሮ ቀን,
Appointment Letter Template,የቀጠሮ ደብዳቤ አብነት,
Body,አካል,
@@ -7059,99 +7010,12 @@
Sync in Progress,ማመሳሰል በሂደት ላይ,
Hub Seller Name,የሆብ ሻጭ ስም,
Custom Data,ብጁ ውሂብ,
-Member,አባል,
-Partially Disbursed,በከፊል በመገኘቱ,
-Loan Closure Requested,የብድር መዝጊያ ተጠይቋል,
Repay From Salary,ደመወዝ ከ ልከፍለው,
-Loan Details,ብድር ዝርዝሮች,
-Loan Type,የብድር አይነት,
-Loan Amount,የብድር መጠን,
-Is Secured Loan,ደህንነቱ የተጠበቀ ብድር ነው,
-Rate of Interest (%) / Year,በፍላጎት ላይ (%) / የዓመቱ ይስጡት,
-Disbursement Date,ከተዛወሩ ቀን,
-Disbursed Amount,የተከፋፈለ መጠን,
-Is Term Loan,የጊዜ ብድር ነው,
-Repayment Method,ብድር መክፈል ስልት,
-Repay Fixed Amount per Period,ክፍለ ጊዜ በአንድ ቋሚ መጠን ብድራትን,
-Repay Over Number of Periods,ጊዜዎች በላይ ቁጥር ብድራትን,
-Repayment Period in Months,ወራት ውስጥ ብድር መክፈል ክፍለ ጊዜ,
-Monthly Repayment Amount,ወርሃዊ የሚያየን መጠን,
-Repayment Start Date,የክፍያ ቀን ጅምር,
-Loan Security Details,የብድር ደህንነት ዝርዝሮች,
-Maximum Loan Value,ከፍተኛ የብድር ዋጋ,
-Account Info,የመለያ መረጃ,
-Loan Account,የብድር መለያን,
-Interest Income Account,የወለድ ገቢ መለያ,
-Penalty Income Account,የቅጣት ገቢ ሂሳብ,
-Repayment Schedule,ብድር መክፈል ፕሮግራም,
-Total Payable Amount,ጠቅላላ የሚከፈል መጠን,
-Total Principal Paid,ጠቅላላ ዋና ክፍያ ተከፍሏል,
-Total Interest Payable,ተከፋይ ጠቅላላ የወለድ,
-Total Amount Paid,ጠቅላላ መጠን የተከፈለ,
-Loan Manager,የብድር አስተዳዳሪ,
-Loan Info,ብድር መረጃ,
-Rate of Interest,የወለድ ተመን,
-Proposed Pledges,የታቀደ ቃል,
-Maximum Loan Amount,ከፍተኛ የብድር መጠን,
-Repayment Info,ብድር መክፈል መረጃ,
-Total Payable Interest,ጠቅላላ የሚከፈል የወለድ,
-Against Loan ,በብድር ላይ,
-Loan Interest Accrual,የብድር ወለድ ክፍያ,
-Amounts,መጠን,
-Pending Principal Amount,በመጠባበቅ ላይ ያለ ዋና ገንዘብ መጠን,
-Payable Principal Amount,የሚከፈል ፕሪሚየም ገንዘብ መጠን,
-Paid Principal Amount,የተከፈለበት የዋና ገንዘብ መጠን,
-Paid Interest Amount,የተከፈለ የወለድ መጠን,
-Process Loan Interest Accrual,የሂሳብ ብድር የወለድ ሂሳብ,
-Repayment Schedule Name,የክፍያ መርሃ ግብር ስም,
Regular Payment,መደበኛ ክፍያ,
Loan Closure,የብድር መዘጋት,
-Payment Details,የክፍያ ዝርዝሮች,
-Interest Payable,የወለድ ክፍያ,
-Amount Paid,መጠን የሚከፈልበት,
-Principal Amount Paid,የዋና ገንዘብ ክፍያ ተከፍሏል,
-Repayment Details,የክፍያ ዝርዝሮች,
-Loan Repayment Detail,የብድር ክፍያ ዝርዝር,
-Loan Security Name,የብድር ደህንነት ስም,
-Unit Of Measure,የመለኪያ አሃድ,
-Loan Security Code,የብድር ደህንነት ኮድ,
-Loan Security Type,የብድር ደህንነት አይነት,
-Haircut %,የፀጉር ቀለም%,
-Loan Details,የብድር ዝርዝሮች,
-Unpledged,ያልደፈረ,
-Pledged,ተጭኗል,
-Partially Pledged,በከፊል ተጭኗል,
-Securities,ደህንነቶች,
-Total Security Value,አጠቃላይ የደህንነት እሴት,
-Loan Security Shortfall,የብድር ደህንነት እጥረት,
-Loan ,ብድር,
-Shortfall Time,የአጭር ጊዜ ጊዜ,
-America/New_York,አሜሪካ / New_York,
-Shortfall Amount,የአጭር ጊዜ ብዛት,
-Security Value ,የደህንነት እሴት,
-Process Loan Security Shortfall,የሂሳብ ብድር ደህንነት እጥረት,
-Loan To Value Ratio,ብድር ዋጋን ለመለየት ብድር,
-Unpledge Time,ማራገፊያ ጊዜ,
-Loan Name,ብድር ስም,
Rate of Interest (%) Yearly,የወለድ ምጣኔ (%) ዓመታዊ,
-Penalty Interest Rate (%) Per Day,የቅጣት የወለድ መጠን (%) በቀን,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,የክፍያ ጊዜ መዘግየት ቢዘገይ የቅጣቱ የወለድ መጠን በየቀኑ በሚጠባበቅ ወለድ ወለድ ላይ ይቀጣል,
-Grace Period in Days,በቀናት ውስጥ የችሮታ ጊዜ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,የብድር ክፍያ መዘግየት ቢከሰት ከሚከፈለው ቀን ጀምሮ እስከየትኛው ቅጣት አይከሰስም,
-Pledge,ቃል ገባ,
-Post Haircut Amount,የፀጉር ቀለም መጠንን ይለጥፉ,
-Process Type,የሂደት ዓይነት,
-Update Time,የጊዜ አዘምን,
-Proposed Pledge,የታቀደው ቃል ኪዳኖች,
-Total Payment,ጠቅላላ ክፍያ,
-Balance Loan Amount,ቀሪ የብድር መጠን,
-Is Accrued,ተሰብስቧል,
Salary Slip Loan,የደመወዝ ወረቀት ብድር,
Loan Repayment Entry,የብድር ክፍያ ምዝገባ,
-Sanctioned Loan Amount,የተጣራ የብድር መጠን,
-Sanctioned Amount Limit,የተቀነሰ የገንዘብ መጠን,
-Unpledge,ማራገፊያ,
-Haircut,የፀጉር ቀለም,
MAT-MSH-.YYYY.-,MAT-MSH-yYYY.-,
Generate Schedule,መርሐግብር አመንጭ,
Schedules,መርሐግብሮች,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,ፕሮጀክት በእነዚህ ተጠቃሚዎች ወደ ድረ ገጽ ላይ ተደራሽ ይሆናል,
Copied From,ከ ተገልብጧል,
Start and End Dates,ይጀምሩ እና ቀኖች የማይኖርበት,
-Actual Time (in Hours),ትክክለኛው ጊዜ (በሰዓታት ውስጥ),
+Actual Time in Hours (via Timesheet),ትክክለኛው ጊዜ (በሰዓታት ውስጥ),
Costing and Billing,ዋጋና አከፋፈል,
-Total Costing Amount (via Timesheets),ጠቅላላ ወለድ ሂሳብ (በዳገርስ ወረቀቶች በኩል),
-Total Expense Claim (via Expense Claims),ጠቅላላ የወጪ የይገባኛል ጥያቄ (የወጪ የይገባኛል በኩል),
+Total Costing Amount (via Timesheet),ጠቅላላ ወለድ ሂሳብ (በዳገርስ ወረቀቶች በኩል),
+Total Expense Claim (via Expense Claim),ጠቅላላ የወጪ የይገባኛል ጥያቄ (የወጪ የይገባኛል በኩል),
Total Purchase Cost (via Purchase Invoice),ጠቅላላ የግዢ ዋጋ (የግዢ ደረሰኝ በኩል),
Total Sales Amount (via Sales Order),ጠቅላላ የሽያጭ መጠን (በሽያጭ ትእዛዝ),
-Total Billable Amount (via Timesheets),ጠቅላላ የክፍያ መጠን (በዳበጣ ሉሆች በኩል),
-Total Billed Amount (via Sales Invoices),አጠቃላይ የተጠየቀው መጠን (በሽያጭ ደረሰኞች በኩል),
-Total Consumed Material Cost (via Stock Entry),ጠቅላላ የዋጋ ቁሳቁስ ወጪ (በቅጥፈት መግቢያ በኩል),
+Total Billable Amount (via Timesheet),ጠቅላላ የክፍያ መጠን (በዳበጣ ሉሆች በኩል),
+Total Billed Amount (via Sales Invoice),አጠቃላይ የተጠየቀው መጠን (በሽያጭ ደረሰኞች በኩል),
+Total Consumed Material Cost (via Stock Entry),ጠቅላላ የዋጋ ቁሳቁስ ወጪ (በቅጥፈት መግቢያ በኩል),
Gross Margin,ግዙፍ ኅዳግ,
Gross Margin %,ግዙፍ ኅዳግ %,
Monitor Progress,የክትትል ሂደት,
@@ -7521,12 +7385,10 @@
Dependencies,ጥገኛ።,
Dependent Tasks,ጥገኛ ተግባራት,
Depends on Tasks,ተግባራት ላይ ይመረኮዛል,
-Actual Start Date (via Time Sheet),ትክክለኛው የማስጀመሪያ ቀን (ሰዓት ሉህ በኩል),
-Actual Time (in hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት,
-Actual End Date (via Time Sheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል),
-Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን,
+Actual Start Date (via Timesheet),ትክክለኛው የማስጀመሪያ ቀን (ሰዓት ሉህ በኩል),
+Actual Time in Hours (via Timesheet),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት,
+Actual End Date (via Timesheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል),
Total Expense Claim (via Expense Claim),(የወጪ የይገባኛል በኩል) ጠቅላላ የወጪ የይገባኛል ጥያቄ,
-Total Billing Amount (via Time Sheet),ጠቅላላ የሂሳብ አከፋፈል መጠን (ጊዜ ሉህ በኩል),
Review Date,ግምገማ ቀን,
Closing Date,መዝጊያ ቀን,
Task Depends On,ተግባር ላይ ይመረኮዛል,
@@ -7887,7 +7749,6 @@
Update Series,አዘምን ተከታታይ,
Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.,
Prefix,ባዕድ መነሻ,
-Current Value,የአሁኑ ዋጋ,
This is the number of the last created transaction with this prefix,ይህ የዚህ ቅጥያ ጋር የመጨረሻ የፈጠረው የግብይት ቁጥር ነው,
Update Series Number,አዘምን ተከታታይ ቁጥር,
Quotation Lost Reason,ጥቅስ የጠፋ ምክንያት,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise አስይዝ ደረጃ የሚመከር,
Lead Details,ቀዳሚ ዝርዝሮች,
Lead Owner Efficiency,ቀዳሚ ባለቤት ቅልጥፍና,
-Loan Repayment and Closure,የብድር ክፍያ እና መዝጊያ,
-Loan Security Status,የብድር ደህንነት ሁኔታ,
Lost Opportunity,የጠፋ ዕድል ፡፡,
Maintenance Schedules,ጥገና ፕሮግራም,
Material Requests for which Supplier Quotations are not created,አቅራቢው ጥቅሶች የተፈጠሩ አይደሉም ይህም ቁሳዊ ጥያቄዎች,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},የታለሙ ቆጠራዎች {0},
Payment Account is mandatory,የክፍያ ሂሳብ ግዴታ ነው,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",ከተመረመረ ሙሉው መጠን ያለማወቂያ ወይም ማረጋገጫ ማቅረቢያ የገቢ ግብርን ከማስላት በፊት ከታክስ ከሚከፈልበት ገቢ ላይ ይቀነሳል ፡፡,
-Disbursement Details,የሥርጭት ዝርዝሮች,
Material Request Warehouse,የቁሳቁስ ጥያቄ መጋዘን,
Select warehouse for material requests,ለቁሳዊ ጥያቄዎች መጋዘን ይምረጡ,
Transfer Materials For Warehouse {0},ቁሳቁሶችን ለመጋዘን ያስተላልፉ {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,ከደመወዝ ያልተጠየቀውን መጠን ይክፈሉ,
Deduction from salary,ከደመወዝ መቀነስ,
Expired Leaves,ጊዜው ያለፈባቸው ቅጠሎች,
-Reference No,ማጣቀሻ ቁጥር,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,የፀጉር አቆራረጥ መቶኛ በብድር ዋስትና (የገቢያ ዋጋ) ዋጋ እና ለዚያ ብድር ዋስትና በሚውልበት ጊዜ ለዚያ ብድር ዋስትና በሚሰጠው እሴት መካከል ያለው የመቶኛ ልዩነት ነው።,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,የብድር መጠን ዋጋ የብድር መጠን ቃል ከተገባው ዋስትና ዋጋ ጋር ያለውን ድርሻ ያሳያል። ለማንኛውም ብድር ከተጠቀሰው እሴት በታች ቢወድቅ የብድር ዋስትና ጉድለት ይነሳል,
If this is not checked the loan by default will be considered as a Demand Loan,ይህ ካልተረጋገጠ ብድሩ በነባሪነት እንደ ብድር ይቆጠራል,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,ይህ ሂሳብ ከተበዳሪው የብድር ክፍያዎችን ለማስያዝ እና እንዲሁም ለተበዳሪው ብድሮችን ለማሰራጨት ያገለግላል,
This account is capital account which is used to allocate capital for loan disbursal account ,ይህ አካውንት ለብድር ማስከፈያ ሂሳብ ካፒታል ለመመደብ የሚያገለግል የካፒታል ሂሳብ ነው,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ክዋኔ {0} የሥራ ትዕዛዝ አይደለም {1},
Print UOM after Quantity,ከቁጥር በኋላ UOM ን ያትሙ,
Set default {0} account for perpetual inventory for non stock items,ለክምችት ያልሆኑ ዕቃዎች ለዘለዓለም ክምችት ነባሪ የ {0} መለያ ያዘጋጁ,
-Loan Security {0} added multiple times,የብድር ደህንነት {0} ብዙ ጊዜ ታክሏል,
-Loan Securities with different LTV ratio cannot be pledged against one loan,የተለያዩ የኤልቲቪ ሬሾ ያላቸው የብድር ዋስትናዎች በአንድ ብድር ላይ ቃል ሊገቡ አይችሉም,
-Qty or Amount is mandatory for loan security!,ለብድር ዋስትና ኪቲ ወይም መጠን ግዴታ ነው!,
-Only submittted unpledge requests can be approved,የገቡት ያልተሞከሩ ጥያቄዎች ብቻ ሊፀድቁ ይችላሉ,
-Interest Amount or Principal Amount is mandatory,የወለድ መጠን ወይም የዋናው መጠን ግዴታ ነው,
-Disbursed Amount cannot be greater than {0},የተከፋፈለ መጠን ከ {0} ሊበልጥ አይችልም,
-Row {0}: Loan Security {1} added multiple times,ረድፍ {0} የብድር ደህንነት {1} ብዙ ጊዜ ታክሏል,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,ረድፍ # {0} የልጆች እቃ የምርት ቅርቅብ መሆን የለበትም። እባክዎ ንጥል {1} ን ያስወግዱ እና ያስቀምጡ,
Credit limit reached for customer {0},ለደንበኛ የብድር ገደብ ደርሷል {0},
Could not auto create Customer due to the following missing mandatory field(s):,በሚቀጥሉት አስገዳጅ መስክ (ዶች) ምክንያት ደንበኛን በራስ ሰር መፍጠር አልተቻለም-,
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index ea2777f..1020351 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",قابل للتطبيق إذا كانت الشركة SpA أو SApA أو SRL,
Applicable if the company is a limited liability company,قابل للتطبيق إذا كانت الشركة شركة ذات مسؤولية محدودة,
Applicable if the company is an Individual or a Proprietorship,قابل للتطبيق إذا كانت الشركة فردية أو مملوكة,
-Applicant,مقدم الطلب,
-Applicant Type,نوع مقدم الطلب,
Application of Funds (Assets),استخدام الاموال (الأصول),
Application period cannot be across two allocation records,فترة الطلب لا يمكن ان تكون خلال سجلين مخصصين,
Application period cannot be outside leave allocation period,فترة الاجازة لا يمكن أن تكون خارج فترة الاجازة المسموحة للموظف.\n<br>\nApplication period cannot be outside leave allocation period,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,قائمة المساهمين المتاحين بأرقام الأوراق,
Loading Payment System,تحميل نظام الدفع,
Loan,قرض,
-Loan Amount cannot exceed Maximum Loan Amount of {0},مبلغ القرض لا يمكن أن يتجاوز الحد الأقصى للقرض {0}\n<br>\nLoan Amount cannot exceed Maximum Loan Amount of {0},
-Loan Application,طلب القرض,
-Loan Management,إدارة القروض,
-Loan Repayment,سداد القروض,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,تاريخ بدء القرض وفترة القرض إلزامية لحفظ خصم الفاتورة,
Loans (Liabilities),القروض (الخصوم),
Loans and Advances (Assets),القروض والسلفيات (الأصول),
@@ -1611,7 +1605,6 @@
Monday,يوم الاثنين,
Monthly,شهريا,
Monthly Distribution,التوزيع الشهري,
-Monthly Repayment Amount cannot be greater than Loan Amount,قيمة السداد الشهري لا يمكن أن يكون أكبر من قيمة القرض,
More,أكثر,
More Information,المزيد من المعلومات,
More than one selection for {0} not allowed,أكثر من اختيار واحد لـ {0} غير مسموح به,
@@ -1884,11 +1877,9 @@
Pay {0} {1},ادفع {0} {1},
Payable,واجب الدفع,
Payable Account,حساب الدائنين,
-Payable Amount,المبلغ المستحق,
Payment,دفع,
Payment Cancelled. Please check your GoCardless Account for more details,دفع ملغى. يرجى التحقق من حسابك في GoCardless لمزيد من التفاصيل,
Payment Confirmation,تأكيد الدفعة,
-Payment Date,تاريخ الدفعة,
Payment Days,أيام الدفع,
Payment Document,وثيقة الدفع,
Payment Due Date,تاريخ استحقاق السداد,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,الرجاء إدخال إيصال الشراء أولا\n<br>\nPlease enter Purchase Receipt first,
Please enter Receipt Document,الرجاء إدخال مستند الاستلام\n<br>\nPlease enter Receipt Document,
Please enter Reference date,الرجاء إدخال تاريخ المرجع\n<br>\nPlease enter Reference date,
-Please enter Repayment Periods,الرجاء إدخال فترات السداد,
Please enter Reqd by Date,الرجاء إدخال ريد حسب التاريخ,
Please enter Woocommerce Server URL,الرجاء إدخال عنوان URL لخادم Woocommerce,
Please enter Write Off Account,الرجاء إدخال حساب الشطب,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,الرجاء إدخال مركز تكلفة الأب,
Please enter quantity for Item {0},الرجاء إدخال الكمية للعنصر {0},
Please enter relieving date.,من فضلك ادخل تاريخ ترك العمل.,
-Please enter repayment Amount,الرجاء إدخال مبلغ السداد\n<br>\nPlease enter repayment Amount,
Please enter valid Financial Year Start and End Dates,الرجاء إدخال تاريخ بداية السنة المالية وتاريخ النهاية,
Please enter valid email address,الرجاء إدخال عنوان بريد إلكتروني صالح,
Please enter {0} first,الرجاء إدخال {0} أولاً,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,كما تتم فلترت قواعد التسعير على أساس الكمية.,
Primary Address Details,تفاصيل العنوان الرئيسي,
Primary Contact Details,تفاصيل الاتصال الأساسية,
-Principal Amount,المبلغ الرئيسي,
Print Format,تنسيق الطباعة,
Print IRS 1099 Forms,طباعة نماذج مصلحة الضرائب 1099,
Print Report Card,طباعة بطاقة التقرير,
@@ -2550,7 +2538,6 @@
Sample Collection,جمع العينات,
Sample quantity {0} cannot be more than received quantity {1},كمية العينة {0} لا يمكن أن تكون أكثر من الكمية المستلمة {1},
Sanctioned,مقرر,
-Sanctioned Amount,القيمة المقرر صرفه,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,لا يمكن أن يكون المبلغ الموافق عليه أكبر من مبلغ المطالبة في الصف {0}.,
Sand,رمل,
Saturday,السبت,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} يحتوي بالفعل على إجراء الأصل {1}.,
API,API,
Annual,سنوي,
-Approved,موافق عليه,
Change,تغيير,
Contact Email,عنوان البريد الإلكتروني,
Export Type,نوع التصدير,
@@ -3571,7 +3557,6 @@
Account Value,قيمة الحساب,
Account is mandatory to get payment entries,الحساب إلزامي للحصول على إدخالات الدفع,
Account is not set for the dashboard chart {0},لم يتم تعيين الحساب لمخطط لوحة المعلومات {0},
-Account {0} does not belong to company {1},الحساب {0} لا ينتمي إلى شركة {1},
Account {0} does not exists in the dashboard chart {1},الحساب {0} غير موجود في مخطط لوحة المعلومات {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,الحساب: <b>{0}</b> عبارة "Capital work" قيد التقدم ولا يمكن تحديثها بواسطة "إدخال دفتر اليومية",
Account: {0} is not permitted under Payment Entry,الحساب: {0} غير مسموح به بموجب إدخال الدفع,
@@ -3582,7 +3567,6 @@
Activity,نشاط,
Add / Manage Email Accounts.,إضافة / إدارة حسابات البريد الإلكتروني.,
Add Child,إضافة الطفل,
-Add Loan Security,إضافة قرض الضمان,
Add Multiple,إضافة متعددة,
Add Participants,أضف مشاركين,
Add to Featured Item,إضافة إلى البند المميز,
@@ -3593,15 +3577,12 @@
Address Line 1,العنوان سطر 1,
Addresses,عناوين,
Admission End Date should be greater than Admission Start Date.,يجب أن يكون تاريخ انتهاء القبول أكبر من تاريخ بدء القبول.,
-Against Loan,ضد القرض,
-Against Loan:,ضد القرض:,
All,الكل,
All bank transactions have been created,تم إنشاء جميع المعاملات المصرفية,
All the depreciations has been booked,تم حجز جميع الإهلاكات,
Allocation Expired!,تخصيص انتهت!,
Allow Resetting Service Level Agreement from Support Settings.,السماح بإعادة ضبط اتفاقية مستوى الخدمة من إعدادات الدعم.,
Amount of {0} is required for Loan closure,المبلغ {0} مطلوب لإغلاق القرض,
-Amount paid cannot be zero,لا يمكن أن يكون المبلغ المدفوع صفرًا,
Applied Coupon Code,رمز القسيمة المطبق,
Apply Coupon Code,تطبيق رمز القسيمة,
Appointment Booking,حجز موعد,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,لا يمكن حساب وقت الوصول حيث أن عنوان برنامج التشغيل مفقود.,
Cannot Optimize Route as Driver Address is Missing.,لا يمكن تحسين المسار لأن عنوان برنامج التشغيل مفقود.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,لا يمكن إكمال المهمة {0} لأن المهمة التابعة {1} ليست مكتملة / ملغاة.,
-Cannot create loan until application is approved,لا يمكن إنشاء قرض حتى تتم الموافقة على الطلب,
Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على بند مطابق. يرجى اختيار قيمة أخرى ل {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",لا يمكن زيادة حجم العنصر {0} في الصف {1} أكثر من {2}. للسماح بالإفراط في الفوترة ، يرجى تعيين بدل في إعدادات الحسابات,
"Capacity Planning Error, planned start time can not be same as end time",خطأ في تخطيط السعة ، لا يمكن أن يكون وقت البدء المخطط له هو نفسه وقت الانتهاء,
@@ -3812,20 +3792,9 @@
Less Than Amount,أقل من المبلغ,
Liabilities,المطلوبات,
Loading...,تحميل ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,يتجاوز مبلغ القرض الحد الأقصى لمبلغ القرض {0} وفقًا للأوراق المالية المقترحة,
Loan Applications from customers and employees.,طلبات القروض من العملاء والموظفين.,
-Loan Disbursement,إنفاق تمويل,
Loan Processes,عمليات القرض,
-Loan Security,ضمان القرض,
-Loan Security Pledge,تعهد ضمان القرض,
-Loan Security Pledge Created : {0},تعهد ضمان القرض: {0},
-Loan Security Price,سعر ضمان القرض,
-Loan Security Price overlapping with {0},سعر ضمان القرض متداخل مع {0},
-Loan Security Unpledge,قرض ضمان unpledge,
-Loan Security Value,قيمة ضمان القرض,
Loan Type for interest and penalty rates,نوع القرض لأسعار الفائدة والعقوبة,
-Loan amount cannot be greater than {0},لا يمكن أن يكون مبلغ القرض أكبر من {0},
-Loan is mandatory,القرض إلزامي,
Loans,القروض,
Loans provided to customers and employees.,القروض المقدمة للعملاء والموظفين.,
Location,الموقع,
@@ -3894,7 +3863,6 @@
Pay,دفع,
Payment Document Type,نوع مستند الدفع,
Payment Name,اسم الدفع,
-Penalty Amount,مبلغ العقوبة,
Pending,معلق,
Performance,أداء,
Period based On,فترة بناء على,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,الرجاء تسجيل الدخول كمستخدم Marketplace لتعديل هذا العنصر.,
Please login as a Marketplace User to report this item.,يرجى تسجيل الدخول كمستخدم Marketplace للإبلاغ عن هذا العنصر.,
Please select <b>Template Type</b> to download template,يرجى تحديد <b>نوع</b> القالب لتنزيل القالب,
-Please select Applicant Type first,يرجى اختيار نوع مقدم الطلب أولاً,
Please select Customer first,يرجى اختيار العميل أولا,
Please select Item Code first,يرجى اختيار رمز البند أولاً,
-Please select Loan Type for company {0},يرجى اختيار نوع القرض للشركة {0},
Please select a Delivery Note,يرجى اختيار مذكرة التسليم,
Please select a Sales Person for item: {0},يرجى اختيار مندوب مبيعات للعنصر: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',يرجى تحديد طريقة دفع أخرى. Stripe لا يدعم المعاملات بالعملة '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},يرجى إعداد حساب بنكي افتراضي للشركة {0},
Please specify,رجاء حدد,
Please specify a {0},الرجاء تحديد {0},lead
-Pledge Status,حالة التعهد,
-Pledge Time,وقت التعهد,
Printing,طبع,
Priority,أفضلية,
Priority has been changed to {0}.,تم تغيير الأولوية إلى {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,معالجة ملفات XML,
Profitability,الربحية,
Project,مشروع,
-Proposed Pledges are mandatory for secured Loans,التعهدات المقترحة إلزامية للقروض المضمونة,
Provide the academic year and set the starting and ending date.,تقديم السنة الدراسية وتحديد تاريخ البداية والنهاية.,
Public token is missing for this bank,الرمز العام مفقود لهذا البنك,
Publish,نشر,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,لا يحتوي إيصال الشراء على أي عنصر تم تمكين الاحتفاظ عينة به.,
Purchase Return,شراء العودة,
Qty of Finished Goods Item,الكمية من السلع تامة الصنع,
-Qty or Amount is mandatroy for loan security,الكمية أو المبلغ هو mandatroy لضمان القرض,
Quality Inspection required for Item {0} to submit,فحص الجودة مطلوب للبند {0} لتقديمه,
Quantity to Manufacture,كمية لتصنيع,
Quantity to Manufacture can not be zero for the operation {0},لا يمكن أن تكون الكمية للتصنيع صفراً للتشغيل {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,يجب أن يكون تاريخ التخفيف أكبر من أو يساوي تاريخ الانضمام,
Rename,إعادة تسمية,
Rename Not Allowed,إعادة تسمية غير مسموح به,
-Repayment Method is mandatory for term loans,طريقة السداد إلزامية للقروض لأجل,
-Repayment Start Date is mandatory for term loans,تاريخ بدء السداد إلزامي للقروض لأجل,
Report Item,بلغ عن شيء,
Report this Item,الإبلاغ عن هذا البند,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,الكمية المحجوزة للعقد من الباطن: كمية المواد الخام اللازمة لصنع سلع من الباطن.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},الصف ({0}): {1} مخصوم بالفعل في {2},
Rows Added in {0},تمت إضافة الصفوف في {0},
Rows Removed in {0},تمت إزالة الصفوف في {0},
-Sanctioned Amount limit crossed for {0} {1},تم تجاوز حد المبلغ المعتمد لـ {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},مبلغ القرض المعتمد موجود بالفعل لـ {0} ضد الشركة {1},
Save,حفظ,
Save Item,حفظ البند,
Saved Items,العناصر المحفوظة,
@@ -4135,7 +4093,6 @@
User {0} is disabled,المستخدم {0} تم تعطيل,
Users and Permissions,المستخدمين والصلاحيات,
Vacancies cannot be lower than the current openings,لا يمكن أن تكون الوظائف الشاغرة أقل من الفتحات الحالية,
-Valid From Time must be lesser than Valid Upto Time.,يجب أن يكون "صالح من الوقت" أقل من "وقت صلاحية صالح".,
Valuation Rate required for Item {0} at row {1},معدل التقييم مطلوب للبند {0} في الصف {1},
Values Out Of Sync,القيم خارج المزامنة,
Vehicle Type is required if Mode of Transport is Road,نوع المركبة مطلوب إذا كان وضع النقل هو الطريق,
@@ -4211,7 +4168,6 @@
Add to Cart,أضف إلى السلة,
Days Since Last Order,أيام منذ آخر طلب,
In Stock,متوفر,
-Loan Amount is mandatory,مبلغ القرض إلزامي,
Mode Of Payment,طريقة الدفع,
No students Found,لم يتم العثور على الطلاب,
Not in Stock,غير متوفر,
@@ -4240,7 +4196,6 @@
Group by,المجموعة حسب,
In stock,في المخزن,
Item name,اسم السلعة,
-Loan amount is mandatory,مبلغ القرض إلزامي,
Minimum Qty,الكمية الدنيا,
More details,مزيد من التفاصيل,
Nature of Supplies,طبيعة الامدادات,
@@ -4409,9 +4364,6 @@
Total Completed Qty,إجمالي الكمية المكتملة,
Qty to Manufacture,الكمية للتصنيع,
Repay From Salary can be selected only for term loans,يمكن اختيار السداد من الراتب للقروض لأجل فقط,
-No valid Loan Security Price found for {0},لم يتم العثور على سعر ضمان قرض صالح لـ {0},
-Loan Account and Payment Account cannot be same,لا يمكن أن يكون حساب القرض وحساب الدفع متماثلين,
-Loan Security Pledge can only be created for secured loans,لا يمكن إنشاء تعهد ضمان القرض إلا للقروض المضمونة,
Social Media Campaigns,حملات التواصل الاجتماعي,
From Date can not be greater than To Date,لا يمكن أن يكون من تاريخ أكبر من تاريخ,
Please set a Customer linked to the Patient,يرجى تعيين عميل مرتبط بالمريض,
@@ -6437,7 +6389,6 @@
HR User,مستخدم الموارد البشرية,
Appointment Letter,رسالة موعد,
Job Applicant,طالب الوظيفة,
-Applicant Name,اسم طالب الوظيفة,
Appointment Date,تاريخ الموعد,
Appointment Letter Template,قالب رسالة التعيين,
Body,الجسم,
@@ -7059,99 +7010,12 @@
Sync in Progress,المزامنة قيد التقدم,
Hub Seller Name,اسم البائع المحور,
Custom Data,البيانات المخصصة,
-Member,عضو,
-Partially Disbursed,صرف جزئ,
-Loan Closure Requested,مطلوب قرض الإغلاق,
Repay From Salary,سداد من الراتب,
-Loan Details,تفاصيل القرض,
-Loan Type,نوع القرض,
-Loan Amount,قيمة القرض,
-Is Secured Loan,هو قرض مضمون,
-Rate of Interest (%) / Year,معدل الفائدة (٪) / السنة,
-Disbursement Date,تاريخ الصرف,
-Disbursed Amount,المبلغ المصروف,
-Is Term Loan,هو قرض لأجل,
-Repayment Method,طريقة السداد,
-Repay Fixed Amount per Period,سداد قيمة ثابتة لكل فترة,
-Repay Over Number of Periods,سداد على عدد فترات,
-Repayment Period in Months,فترة السداد بالأشهر,
-Monthly Repayment Amount,قيمة السداد الشهري,
-Repayment Start Date,تاريخ بداية السداد,
-Loan Security Details,تفاصيل ضمان القرض,
-Maximum Loan Value,الحد الأقصى لقيمة القرض,
-Account Info,معلومات الحساب,
-Loan Account,حساب القرض,
-Interest Income Account,الحساب الخاص بإيرادات الفائدة,
-Penalty Income Account,حساب دخل الجزاء,
-Repayment Schedule,الجدول الزمني للسداد,
-Total Payable Amount,المبلغ الكلي المستحق,
-Total Principal Paid,إجمالي المبلغ المدفوع,
-Total Interest Payable,مجموع الفائدة الواجب دفعها,
-Total Amount Paid,مجموع المبلغ المدفوع,
-Loan Manager,مدير القرض,
-Loan Info,معلومات قرض,
-Rate of Interest,معدل الفائدة,
-Proposed Pledges,التعهدات المقترحة,
-Maximum Loan Amount,أعلى قيمة للقرض,
-Repayment Info,معلومات السداد,
-Total Payable Interest,مجموع الفوائد الدائنة,
-Against Loan ,مقابل القرض,
-Loan Interest Accrual,استحقاق فائدة القرض,
-Amounts,مبالغ,
-Pending Principal Amount,في انتظار المبلغ الرئيسي,
-Payable Principal Amount,المبلغ الرئيسي المستحق,
-Paid Principal Amount,المبلغ الأساسي المدفوع,
-Paid Interest Amount,مبلغ الفائدة المدفوعة,
-Process Loan Interest Accrual,استحقاق الفائدة من قرض العملية,
-Repayment Schedule Name,اسم جدول السداد,
Regular Payment,الدفع المنتظم,
Loan Closure,إغلاق القرض,
-Payment Details,تفاصيل الدفع,
-Interest Payable,الفوائد المستحقة الدفع,
-Amount Paid,القيمة المدفوعة,
-Principal Amount Paid,المبلغ الرئيسي المدفوع,
-Repayment Details,تفاصيل السداد,
-Loan Repayment Detail,تفاصيل سداد القرض,
-Loan Security Name,اسم ضمان القرض,
-Unit Of Measure,وحدة القياس,
-Loan Security Code,رمز ضمان القرض,
-Loan Security Type,نوع ضمان القرض,
-Haircut %,حلاقة شعر ٪,
-Loan Details,تفاصيل القرض,
-Unpledged,Unpledged,
-Pledged,تعهد,
-Partially Pledged,تعهد جزئي,
-Securities,ضمانات,
-Total Security Value,إجمالي قيمة الأمن,
-Loan Security Shortfall,قرض أمن النقص,
-Loan ,قرض,
-Shortfall Time,وقت العجز,
-America/New_York,أمريكا / نيويورك,
-Shortfall Amount,عجز المبلغ,
-Security Value ,قيمة الأمن,
-Process Loan Security Shortfall,النقص في عملية قرض القرض,
-Loan To Value Ratio,نسبة القروض إلى قيمة,
-Unpledge Time,الوقت unpledge,
-Loan Name,اسم قرض,
Rate of Interest (%) Yearly,معدل الفائدة (٪) سنوي,
-Penalty Interest Rate (%) Per Day,عقوبة سعر الفائدة (٪) في اليوم الواحد,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,يتم فرض معدل الفائدة الجزائية على مبلغ الفائدة المعلق على أساس يومي في حالة التأخر في السداد,
-Grace Period in Days,فترة السماح بالأيام,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,عدد الأيام من تاريخ الاستحقاق التي لن يتم فرض غرامة عليها في حالة التأخير في سداد القرض,
-Pledge,التعهد,
-Post Haircut Amount,بعد قص شعر,
-Process Type,نوع العملية,
-Update Time,تحديث الوقت,
-Proposed Pledge,التعهد المقترح,
-Total Payment,إجمالي الدفعة,
-Balance Loan Amount,رصيد مبلغ القرض,
-Is Accrued,المستحقة,
Salary Slip Loan,قرض كشف الراتب,
Loan Repayment Entry,إدخال سداد القرض,
-Sanctioned Loan Amount,مبلغ القرض المحكوم عليه,
-Sanctioned Amount Limit,الحد الأقصى للعقوبة,
-Unpledge,Unpledge,
-Haircut,حلاقة شعر,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,إنشاء جدول,
Schedules,جداول,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,والمشروع أن تكون متاحة على الموقع الإلكتروني لهؤلاء المستخدمين,
Copied From,تم نسخها من,
Start and End Dates,تواريخ البدء والانتهاء,
-Actual Time (in Hours),الوقت الفعلي (بالساعات),
+Actual Time in Hours (via Timesheet),الوقت الفعلي (بالساعات),
Costing and Billing,التكلفة و الفواتير,
-Total Costing Amount (via Timesheets),إجمالي مبلغ التكلفة (عبر الجداول الزمنية),
-Total Expense Claim (via Expense Claims),مجموع المطالبة المصاريف (عبر مطالبات النفقات),
+Total Costing Amount (via Timesheet),إجمالي مبلغ التكلفة (عبر الجداول الزمنية),
+Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات النفقات),
Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة),
Total Sales Amount (via Sales Order),إجمالي مبلغ المبيعات (عبر أمر المبيعات),
-Total Billable Amount (via Timesheets),إجمالي المبلغ القابل للفوترة (عبر الجداول الزمنية),
-Total Billed Amount (via Sales Invoices),إجمالي مبلغ الفاتورة (عبر فواتير المبيعات),
-Total Consumed Material Cost (via Stock Entry),إجمالي تكلفة المواد المستهلكة (عبر إدخال المخزون),
+Total Billable Amount (via Timesheet),إجمالي المبلغ القابل للفوترة (عبر الجداول الزمنية),
+Total Billed Amount (via Sales Invoice),إجمالي مبلغ الفاتورة (عبر فواتير المبيعات),
+Total Consumed Material Cost (via Stock Entry),إجمالي تكلفة المواد المستهلكة (عبر إدخال المخزون),
Gross Margin,هامش الربح الإجمالي,
Gross Margin %,هامش إجمالي٪,
Monitor Progress,التقدم المرئى,
@@ -7521,12 +7385,10 @@
Dependencies,تبعيات,
Dependent Tasks,المهام التابعة,
Depends on Tasks,تعتمد على المهام,
-Actual Start Date (via Time Sheet),تاريخ البدء الفعلي (عبر ورقة الوقت),
-Actual Time (in hours),الوقت الفعلي (بالساعات),
-Actual End Date (via Time Sheet),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت),
-Total Costing Amount (via Time Sheet),إجمالي حساب التكاليف المبلغ (عبر ورقة الوقت),
+Actual Start Date (via Timesheet),تاريخ البدء الفعلي (عبر ورقة الوقت),
+Actual Time in Hours (via Timesheet),الوقت الفعلي (بالساعات),
+Actual End Date (via Timesheet),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت),
Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات مصاريف),
-Total Billing Amount (via Time Sheet),المبلغ الكلي الفواتير (عبر ورقة الوقت),
Review Date,مراجعة تاريخ,
Closing Date,تاريخ الاغلاق,
Task Depends On,المهمة تعتمد على,
@@ -7887,7 +7749,6 @@
Update Series,تحديث الرقم المتسلسل,
Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.,
Prefix,بادئة,
-Current Value,القيمة الحالية,
This is the number of the last created transaction with this prefix,هذا هو عدد المعاملات التي تم إنشاؤها باستخدام مشاركة هذه البادئة,
Update Series Number,تحديث الرقم المتسلسل,
Quotation Lost Reason,سبب خسارة المناقصة,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,مستوى إعادة ترتيب يوصى به وفقاً للصنف,
Lead Details,تفاصيل الزبون المحتمل,
Lead Owner Efficiency,يؤدي كفاءة المالك,
-Loan Repayment and Closure,سداد القرض وإغلاقه,
-Loan Security Status,حالة ضمان القرض,
Lost Opportunity,فرصة ضائعة,
Maintenance Schedules,جداول الصيانة,
Material Requests for which Supplier Quotations are not created,طلبات المواد التي لم ينشأ لها عروض أسعار من الموردين,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},الأعداد المستهدفة: {0},
Payment Account is mandatory,حساب الدفع إلزامي,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",إذا تم تحديده ، فسيتم خصم المبلغ بالكامل من الدخل الخاضع للضريبة قبل حساب ضريبة الدخل دون تقديم أي إعلان أو إثبات.,
-Disbursement Details,تفاصيل الصرف,
Material Request Warehouse,مستودع طلب المواد,
Select warehouse for material requests,حدد المستودع لطلبات المواد,
Transfer Materials For Warehouse {0},نقل المواد للمستودع {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,سداد المبلغ غير المطالب به من الراتب,
Deduction from salary,خصم من الراتب,
Expired Leaves,أوراق منتهية الصلاحية,
-Reference No,رقم المرجع,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,نسبة الحلاقة هي النسبة المئوية للفرق بين القيمة السوقية لسند القرض والقيمة المنسوبة إلى ضمان القرض هذا عند استخدامها كضمان لهذا القرض.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,تعبر نسبة القرض إلى القيمة عن نسبة مبلغ القرض إلى قيمة الضمان المرهون. سيحدث عجز في تأمين القرض إذا انخفض عن القيمة المحددة لأي قرض,
If this is not checked the loan by default will be considered as a Demand Loan,إذا لم يتم التحقق من ذلك ، فسيتم اعتبار القرض بشكل افتراضي كقرض تحت الطلب,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,يستخدم هذا الحساب لحجز أقساط سداد القرض من المقترض وأيضًا صرف القروض للمقترض,
This account is capital account which is used to allocate capital for loan disbursal account ,هذا الحساب هو حساب رأس المال الذي يستخدم لتخصيص رأس المال لحساب صرف القرض,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},العملية {0} لا تنتمي إلى أمر العمل {1},
Print UOM after Quantity,اطبع UOM بعد الكمية,
Set default {0} account for perpetual inventory for non stock items,تعيين حساب {0} الافتراضي للمخزون الدائم للعناصر غير المخزنة,
-Loan Security {0} added multiple times,تمت إضافة ضمان القرض {0} عدة مرات,
-Loan Securities with different LTV ratio cannot be pledged against one loan,لا يمكن رهن سندات القرض ذات نسبة القيمة الدائمة المختلفة لقرض واحد,
-Qty or Amount is mandatory for loan security!,الكمية أو المبلغ إلزامي لضمان القرض!,
-Only submittted unpledge requests can be approved,يمكن الموافقة على طلبات إلغاء التعهد المقدمة فقط,
-Interest Amount or Principal Amount is mandatory,مبلغ الفائدة أو المبلغ الأساسي إلزامي,
-Disbursed Amount cannot be greater than {0},لا يمكن أن يكون المبلغ المصروف أكبر من {0},
-Row {0}: Loan Security {1} added multiple times,الصف {0}: تمت إضافة ضمان القرض {1} عدة مرات,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,الصف رقم {0}: يجب ألا يكون العنصر الفرعي عبارة عن حزمة منتج. يرجى إزالة العنصر {1} وحفظه,
Credit limit reached for customer {0},تم بلوغ حد الائتمان للعميل {0},
Could not auto create Customer due to the following missing mandatory field(s):,تعذر إنشاء العميل تلقائيًا بسبب الحقول الإلزامية التالية المفقودة:,
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 6839129..e909e4b 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Приложимо, ако компанията е SpA, SApA или SRL",
Applicable if the company is a limited liability company,"Приложимо, ако дружеството е дружество с ограничена отговорност",
Applicable if the company is an Individual or a Proprietorship,"Приложимо, ако дружеството е физическо лице или собственик",
-Applicant,кандидат,
-Applicant Type,Тип на кандидата,
Application of Funds (Assets),Прилагане на средства (активи),
Application period cannot be across two allocation records,Периодът на кандидатстване не може да бъде в две записи за разпределение,
Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Списък на наличните акционери с номера на фолиото,
Loading Payment System,Зареждане на платежна система,
Loan,заем,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем {0},
-Loan Application,Искане за кредит,
-Loan Management,Управление на заемите,
-Loan Repayment,Погасяване на кредита,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Началната дата на кредита и Периодът на заема са задължителни за запазване на отстъпката от фактури,
Loans (Liabilities),Заеми (пасиви),
Loans and Advances (Assets),Кредити и аванси (активи),
@@ -1611,7 +1605,6 @@
Monday,Понеделник,
Monthly,Месечно,
Monthly Distribution,Месечно разпределение,
-Monthly Repayment Amount cannot be greater than Loan Amount,Месечна погасителна сума не може да бъде по-голяма от Размер на заема,
More,Още,
More Information,Повече информация,
More than one selection for {0} not allowed,Повече от един избор за {0} не е разрешен,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Платете {0} {1},
Payable,платим,
Payable Account,Платими Акаунт,
-Payable Amount,Дължима сума,
Payment,плащане,
Payment Cancelled. Please check your GoCardless Account for more details,"Плащането е отменено. Моля, проверете профила си в GoCardless за повече подробности",
Payment Confirmation,Потвърждение за плащане,
-Payment Date,Дата за плащане,
Payment Days,Плащане Дни,
Payment Document,платежен документ,
Payment Due Date,Дължимото плащане Дата,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Моля, въведете Покупка Квитанция първия",
Please enter Receipt Document,"Моля, въведете Получаване на документация",
Please enter Reference date,"Моля, въведете референтна дата",
-Please enter Repayment Periods,"Моля, въведете Възстановяване Периоди",
Please enter Reqd by Date,"Моля, въведете Reqd по дата",
Please enter Woocommerce Server URL,"Моля, въведете URL адреса на Woocommerce Server",
Please enter Write Off Account,"Моля, въведете отпишат Акаунт",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Моля, въведете разходен център майка",
Please enter quantity for Item {0},"Моля, въведете количество за т {0}",
Please enter relieving date.,"Моля, въведете облекчаване дата.",
-Please enter repayment Amount,"Моля, въведете погасяване сума",
Please enter valid Financial Year Start and End Dates,"Моля, въведете валидни начални и крайни дати за финансова година",
Please enter valid email address,"Моля, въведете валиден имейл адрес",
Please enter {0} first,"Моля, въведете {0} първо",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството.,
Primary Address Details,Основни данни за адреса,
Primary Contact Details,Основни данни за контакт,
-Principal Amount,Размер на главницата,
Print Format,Print Format,
Print IRS 1099 Forms,Печат IRS 1099 Форми,
Print Report Card,Отпечатайте отчетната карта,
@@ -2550,7 +2538,6 @@
Sample Collection,Колекция от проби,
Sample quantity {0} cannot be more than received quantity {1},Количеството на пробата {0} не може да бъде повече от полученото количество {1},
Sanctioned,санкционирана,
-Sanctioned Amount,Санкционирани Сума,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.,
Sand,Пясък,
Saturday,Събота,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} вече има родителска процедура {1}.,
API,API,
Annual,Годишен,
-Approved,Одобрен,
Change,Промяна,
Contact Email,Контакт Email,
Export Type,Тип експорт,
@@ -3571,7 +3557,6 @@
Account Value,Стойност на сметката,
Account is mandatory to get payment entries,Сметката е задължителна за получаване на плащания,
Account is not set for the dashboard chart {0},Профилът не е зададен за таблицата на таблото {0},
-Account {0} does not belong to company {1},Сметка {0} не принадлежи към Фирма {1},
Account {0} does not exists in the dashboard chart {1},Акаунт {0} не съществува в таблицата на таблото {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Акаунт: <b>{0}</b> е капитал Незавършено производство и не може да бъде актуализиран от Entry Entry,
Account: {0} is not permitted under Payment Entry,Акаунт: {0} не е разрешено при въвеждане на плащане,
@@ -3582,7 +3567,6 @@
Activity,Дейност,
Add / Manage Email Accounts.,Добавяне / Управление на имейл акаунти.,
Add Child,Добави Поделемент,
-Add Loan Security,Добавете Заемна гаранция,
Add Multiple,Добави няколко,
Add Participants,Добавете участници,
Add to Featured Item,Добавяне към Featured Item,
@@ -3593,15 +3577,12 @@
Address Line 1,Адрес - Ред 1,
Addresses,Адреси,
Admission End Date should be greater than Admission Start Date.,Крайната дата на приемане трябва да бъде по-голяма от началната дата на приемане.,
-Against Loan,Срещу заем,
-Against Loan:,Срещу заем:,
All,всичко,
All bank transactions have been created,Всички банкови транзакции са създадени,
All the depreciations has been booked,Всички амортизации са записани,
Allocation Expired!,Разпределението изтече!,
Allow Resetting Service Level Agreement from Support Settings.,Разрешаване на нулиране на споразумението за ниво на обслужване от настройките за поддръжка.,
Amount of {0} is required for Loan closure,Сума от {0} е необходима за закриване на заем,
-Amount paid cannot be zero,Изплатената сума не може да бъде нула,
Applied Coupon Code,Приложен купонов код,
Apply Coupon Code,Приложете купонния код,
Appointment Booking,Резервация за назначение,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Не може да се изчисли времето на пристигане, тъй като адресът на водача липсва.",
Cannot Optimize Route as Driver Address is Missing.,"Не може да се оптимизира маршрута, тъй като адресът на драйвера липсва.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Не може да се изпълни задача {0}, тъй като нейната зависима задача {1} не е завършена / анулирана.",
-Cannot create loan until application is approved,"Не може да се създаде заем, докато заявлението не бъде одобрено",
Cannot find a matching Item. Please select some other value for {0}.,Няма съвпадащи записи. Моля изберете някоя друга стойност за {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Не може да се таксува за елемент {0} в ред {1} повече от {2}. За да разрешите надплащането, моля, задайте квота в Настройки на акаунти",
"Capacity Planning Error, planned start time can not be same as end time","Грешка при планиране на капацитета, планираното начално време не може да бъде същото като крайното време",
@@ -3812,20 +3792,9 @@
Less Than Amount,По-малко от сумата,
Liabilities,пасив,
Loading...,Зарежда се ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Заемът надвишава максималния размер на заема от {0} според предложените ценни книжа,
Loan Applications from customers and employees.,Заявления за заем от клиенти и служители.,
-Loan Disbursement,Изплащане на заем,
Loan Processes,Заемни процеси,
-Loan Security,Заемна гаранция,
-Loan Security Pledge,Залог за заем на заем,
-Loan Security Pledge Created : {0},Залог за заем на заем създаден: {0},
-Loan Security Price,Цена на заемна гаранция,
-Loan Security Price overlapping with {0},Цената на заемната гаранция се припокрива с {0},
-Loan Security Unpledge,Отстраняване на сигурността на заема,
-Loan Security Value,Стойност на сигурността на кредита,
Loan Type for interest and penalty rates,Тип заем за лихви и наказателни лихви,
-Loan amount cannot be greater than {0},Сумата на заема не може да бъде по-голяма от {0},
-Loan is mandatory,Заемът е задължителен,
Loans,Кредити,
Loans provided to customers and employees.,"Кредити, предоставяни на клиенти и служители.",
Location,Местоположение,
@@ -3894,7 +3863,6 @@
Pay,Плащане,
Payment Document Type,Тип на документа за плащане,
Payment Name,Име на плащане,
-Penalty Amount,Сума на наказанието,
Pending,В очакване на,
Performance,производителност,
Period based On,"Период, базиран на",
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Моля, влезте като потребител на Marketplace, за да редактирате този елемент.",
Please login as a Marketplace User to report this item.,"Моля, влезте като потребител на Marketplace, за да докладвате за този артикул.",
Please select <b>Template Type</b> to download template,"Моля, изберете <b>Тип шаблон</b> за изтегляне на шаблон",
-Please select Applicant Type first,"Моля, първо изберете типа кандидат",
Please select Customer first,"Моля, първо изберете клиента",
Please select Item Code first,"Моля, първо изберете кода на артикула",
-Please select Loan Type for company {0},"Моля, изберете тип заем за компания {0}",
Please select a Delivery Note,"Моля, изберете Бележка за доставка",
Please select a Sales Person for item: {0},"Моля, изберете продавач за артикул: {0}",
Please select another payment method. Stripe does not support transactions in currency '{0}',"Моля, изберете друг начин на плащане. Слоя не поддържа транзакции във валута "{0}"",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},"Моля, настройте банкова сметка по подразбиране за компания {0}",
Please specify,"Моля, посочете",
Please specify a {0},"Моля, посочете {0}",lead
-Pledge Status,Статус на залог,
-Pledge Time,Време за залог,
Printing,Печатане,
Priority,Приоритет,
Priority has been changed to {0}.,Приоритетът е променен на {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Обработка на XML файлове,
Profitability,Доходност,
Project,Проект,
-Proposed Pledges are mandatory for secured Loans,Предложените залози са задължителни за обезпечените заеми,
Provide the academic year and set the starting and ending date.,Посочете учебната година и задайте началната и крайната дата.,
Public token is missing for this bank,Публичен маркер липсва за тази банка,
Publish,публикувам,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Покупка на разписка няма артикул, за който е активирана задържана проба.",
Purchase Return,Покупка Return,
Qty of Finished Goods Item,Брой готови стоки,
-Qty or Amount is mandatroy for loan security,Количеството или сумата е мандатрой за гаранция на заема,
Quality Inspection required for Item {0} to submit,"Проверка на качеството, необходима за изпращане на артикул {0}",
Quantity to Manufacture,Количество за производство,
Quantity to Manufacture can not be zero for the operation {0},Количеството за производство не може да бъде нула за операцията {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Дата на освобождаване трябва да бъде по-голяма или равна на датата на присъединяване,
Rename,Преименувай,
Rename Not Allowed,Преименуването не е позволено,
-Repayment Method is mandatory for term loans,Методът на погасяване е задължителен за срочните заеми,
-Repayment Start Date is mandatory for term loans,Началната дата на погасяване е задължителна за срочните заеми,
Report Item,Елемент на отчета,
Report this Item,Подайте сигнал за този елемент,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,"Количество, запазено за подизпълнение: Количеството суровини за изработка на артикули, възложени на подизпълнители.",
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Ред ({0}): {1} вече се отстъпва от {2},
Rows Added in {0},Редове добавени в {0},
Rows Removed in {0},Редовете са премахнати в {0},
-Sanctioned Amount limit crossed for {0} {1},Пределно ограничената сума е пресечена за {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Сумата на санкционирания заем вече съществува за {0} срещу компания {1},
Save,Запази,
Save Item,Запазване на елемент,
Saved Items,Запазени елементи,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Потребителят {0} е деактивиран,
Users and Permissions,Потребители и права,
Vacancies cannot be lower than the current openings,Свободните места не могат да бъдат по-ниски от сегашните отвори,
-Valid From Time must be lesser than Valid Upto Time.,Валидно от времето трябва да е по-малко от валидното до време.,
Valuation Rate required for Item {0} at row {1},"Степен на оценка, необходим за позиция {0} в ред {1}",
Values Out Of Sync,Стойности извън синхронизирането,
Vehicle Type is required if Mode of Transport is Road,"Тип превозно средство се изисква, ако начинът на транспорт е път",
@@ -4211,7 +4168,6 @@
Add to Cart,Добави в кошницата,
Days Since Last Order,Дни от последната поръчка,
In Stock,В наличност,
-Loan Amount is mandatory,Размерът на заема е задължителен,
Mode Of Payment,Начин на плащане,
No students Found,Няма намерени ученици,
Not in Stock,Не е в наличност,
@@ -4240,7 +4196,6 @@
Group by,Групирай по,
In stock,В наличност,
Item name,Име на артикул,
-Loan amount is mandatory,Размерът на заема е задължителен,
Minimum Qty,Минимален брой,
More details,Повече детайли,
Nature of Supplies,Природа на консумативите,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Общо завършен брой,
Qty to Manufacture,Количество за производство,
Repay From Salary can be selected only for term loans,Погасяване от заплата може да бъде избрано само за срочни заеми,
-No valid Loan Security Price found for {0},Не е намерена валидна цена за сигурност на заема за {0},
-Loan Account and Payment Account cannot be same,Заемната сметка и платежната сметка не могат да бъдат еднакви,
-Loan Security Pledge can only be created for secured loans,Залогът за обезпечение на кредита може да бъде създаден само за обезпечени заеми,
Social Media Campaigns,Кампании в социалните медии,
From Date can not be greater than To Date,От дата не може да бъде по-голяма от до дата,
Please set a Customer linked to the Patient,"Моля, задайте клиент, свързан с пациента",
@@ -6437,7 +6389,6 @@
HR User,ЧР потребителя,
Appointment Letter,Писмо за уговаряне на среща,
Job Applicant,Кандидат За Работа,
-Applicant Name,Заявител Име,
Appointment Date,Дата на назначаване,
Appointment Letter Template,Шаблон писмо за назначаване,
Body,тяло,
@@ -7059,99 +7010,12 @@
Sync in Progress,Синхронизиране в процес,
Hub Seller Name,Име на продавача,
Custom Data,Персонализирани данни,
-Member,Член,
-Partially Disbursed,Частично Изплатени,
-Loan Closure Requested,Изисквано закриване на заем,
Repay From Salary,Погасяване от Заплата,
-Loan Details,Заем - Детайли,
-Loan Type,Вид на кредита,
-Loan Amount,Заета сума,
-Is Secured Loan,Осигурен е заем,
-Rate of Interest (%) / Year,Лихвен процент (%) / Година,
-Disbursement Date,Изплащане - Дата,
-Disbursed Amount,Изплатена сума,
-Is Term Loan,Термин заем ли е,
-Repayment Method,Възстановяване Метод,
-Repay Fixed Amount per Period,Погасяване фиксирана сума за Период,
-Repay Over Number of Periods,Погасяване Над брой периоди,
-Repayment Period in Months,Възстановяването Период в месеци,
-Monthly Repayment Amount,Месечна погасителна сума,
-Repayment Start Date,Начална дата на погасяване,
-Loan Security Details,Детайли за сигурност на заема,
-Maximum Loan Value,Максимална стойност на кредита,
-Account Info,Информация за профила,
-Loan Account,Кредитна сметка,
-Interest Income Account,Сметка Приходи от лихви,
-Penalty Income Account,Сметка за доходи от санкции,
-Repayment Schedule,погасителен план,
-Total Payable Amount,Общо Задължения Сума,
-Total Principal Paid,Общо платена главница,
-Total Interest Payable,"Общо дължима лихва,",
-Total Amount Paid,Обща платена сума,
-Loan Manager,Кредитен мениджър,
-Loan Info,Заем - Информация,
-Rate of Interest,Размерът на лихвата,
-Proposed Pledges,Предложени обещания,
-Maximum Loan Amount,Максимален Размер на заема,
-Repayment Info,Възстановяване Info,
-Total Payable Interest,Общо дължими лихви,
-Against Loan ,Срещу заем,
-Loan Interest Accrual,Начисляване на лихви по заеми,
-Amounts,суми,
-Pending Principal Amount,Висяща главна сума,
-Payable Principal Amount,Дължима главна сума,
-Paid Principal Amount,Платена главница,
-Paid Interest Amount,Платена лихва,
-Process Loan Interest Accrual,Начисляване на лихви по заемни процеси,
-Repayment Schedule Name,Име на графика за погасяване,
Regular Payment,Редовно плащане,
Loan Closure,Закриване на заем,
-Payment Details,Подробности на плащане,
-Interest Payable,Дължими лихви,
-Amount Paid,"Сума, платена",
-Principal Amount Paid,Основна изплатена сума,
-Repayment Details,Подробности за погасяване,
-Loan Repayment Detail,Подробности за изплащането на заема,
-Loan Security Name,Име на сигурността на заема,
-Unit Of Measure,Мерна единица,
-Loan Security Code,Код за сигурност на заема,
-Loan Security Type,Тип на заема,
-Haircut %,Прическа%,
-Loan Details,Подробности за заема,
-Unpledged,Unpledged,
-Pledged,Заложените,
-Partially Pledged,Частично заложено,
-Securities,ценни книжа,
-Total Security Value,Обща стойност на сигурността,
-Loan Security Shortfall,Недостиг на кредитна сигурност,
-Loan ,заем,
-Shortfall Time,Време за недостиг,
-America/New_York,Америка / New_York,
-Shortfall Amount,Сума на недостиг,
-Security Value ,Стойност на сигурността,
-Process Loan Security Shortfall,Дефицит по сигурността на заемния процес,
-Loan To Value Ratio,Съотношение заем към стойност,
-Unpledge Time,Време за сваляне,
-Loan Name,Заем - Име,
Rate of Interest (%) Yearly,Лихвен процент (%) Годишен,
-Penalty Interest Rate (%) Per Day,Наказателна лихва (%) на ден,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Наказателната лихва се начислява ежедневно върху чакащата лихва в случай на забавено погасяване,
-Grace Period in Days,Грейс период за дни,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Брой дни от датата на падежа, до която неустойката няма да бъде начислена в случай на забавяне на изплащането на заема",
-Pledge,залог,
-Post Haircut Amount,Сума на прическата след публикуване,
-Process Type,Тип процес,
-Update Time,Време за актуализация,
-Proposed Pledge,Предложен залог,
-Total Payment,Общо плащане,
-Balance Loan Amount,Баланс на заема,
-Is Accrued,Начислява се,
Salary Slip Loan,Кредит за заплащане,
Loan Repayment Entry,Вписване за погасяване на заем,
-Sanctioned Loan Amount,Санкционирана сума на заема,
-Sanctioned Amount Limit,Ограничен размер на санкционираната сума,
-Unpledge,Unpledge,
-Haircut,подстригване,
MAT-MSH-.YYYY.-,МАТ-MSH-.YYYY.-,
Generate Schedule,Генериране на график,
Schedules,Графици,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Проектът ще бъде достъпен на интернет страницата на тези потребители,
Copied From,Копирано от,
Start and End Dates,Начална и крайна дата,
-Actual Time (in Hours),Действително време (в часове),
+Actual Time in Hours (via Timesheet),Действително време (в часове),
Costing and Billing,Остойностяване и фактуриране,
-Total Costing Amount (via Timesheets),Обща сума за изчисляване на разходите (чрез Timesheets),
-Total Expense Claim (via Expense Claims),Общо разход претенция (чрез разход Вземания),
+Total Costing Amount (via Timesheet),Обща сума за изчисляване на разходите (чрез Timesheets),
+Total Expense Claim (via Expense Claim),Общо разход претенция (чрез разход Вземания),
Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура),
Total Sales Amount (via Sales Order),Обща продажна сума (чрез поръчка за продажба),
-Total Billable Amount (via Timesheets),Обща таксуваема сума (чрез Timesheets),
-Total Billed Amount (via Sales Invoices),Обща таксувана сума (чрез фактури за продажби),
-Total Consumed Material Cost (via Stock Entry),Общо разходи за потребление на материали (чрез вписване в наличност),
+Total Billable Amount (via Timesheet),Обща таксуваема сума (чрез Timesheets),
+Total Billed Amount (via Sales Invoice),Обща таксувана сума (чрез фактури за продажби),
+Total Consumed Material Cost (via Stock Entry),Общо разходи за потребление на материали (чрез вписване в наличност),
Gross Margin,Брутна печалба,
Gross Margin %,Брутна печалба %,
Monitor Progress,Наблюдение на напредъка,
@@ -7521,12 +7385,10 @@
Dependencies,Зависимостите,
Dependent Tasks,Зависими задачи,
Depends on Tasks,Зависи от Задачи,
-Actual Start Date (via Time Sheet),Действително Начална дата (чрез Time Sheet),
-Actual Time (in hours),Действителното време (в часове),
-Actual End Date (via Time Sheet),Действително Крайна дата (чрез Time Sheet),
-Total Costing Amount (via Time Sheet),Общо Остойностяване сума (чрез Time Sheet),
+Actual Start Date (via Timesheet),Действително Начална дата (чрез Time Sheet),
+Actual Time in Hours (via Timesheet),Действителното време (в часове),
+Actual End Date (via Timesheet),Действително Крайна дата (чрез Time Sheet),
Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция),
-Total Billing Amount (via Time Sheet),Обща сума за плащане (чрез Time Sheet),
Review Date,Преглед Дата,
Closing Date,Крайна дата,
Task Depends On,Задачата зависи от,
@@ -7887,7 +7749,6 @@
Update Series,Актуализация Номериране,
Change the starting / current sequence number of an existing series.,Промяна на изходния / текущия номер за последователност на съществуваща серия.,
Prefix,Префикс,
-Current Value,Текуща стойност,
This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс,
Update Series Number,Актуализация на номер за номериране,
Quotation Lost Reason,Оферта Причина за загубване,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level,
Lead Details,Потенциален клиент - Детайли,
Lead Owner Efficiency,Водеща ефективност на собственика,
-Loan Repayment and Closure,Погасяване и закриване на заем,
-Loan Security Status,Състояние на сигурността на кредита,
Lost Opportunity,Изгубена възможност,
Maintenance Schedules,Графици за поддръжка,
Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Насочени бройки: {0},
Payment Account is mandatory,Платежната сметка е задължителна,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ако е отметнато, пълната сума ще бъде приспадната от облагаемия доход, преди да се изчисли данък върху дохода, без да се подават декларация или доказателство.",
-Disbursement Details,Подробности за изплащане,
Material Request Warehouse,Склад за заявки за материали,
Select warehouse for material requests,Изберете склад за заявки за материали,
Transfer Materials For Warehouse {0},Прехвърляне на материали за склад {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Изплатете непотърсена сума от заплата,
Deduction from salary,Приспадане от заплата,
Expired Leaves,Листа с изтекъл срок на годност,
-Reference No,Референтен номер,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Процентът на подстригване е процентната разлика между пазарната стойност на обезпечението на заема и стойността, приписана на тази заемна гаранция, когато се използва като обезпечение за този заем.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Съотношението заем към стойност изразява съотношението на сумата на заема към стойността на заложената гаранция. Дефицит на обезпечение на заема ще се задейства, ако той падне под определената стойност за който и да е заем",
If this is not checked the loan by default will be considered as a Demand Loan,"Ако това не е отметнато, заемът по подразбиране ще се счита за кредит за търсене",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Тази сметка се използва за резервиране на изплащане на заеми от кредитополучателя, както и за изплащане на заеми на кредитополучателя",
This account is capital account which is used to allocate capital for loan disbursal account ,"Тази сметка е капиталова сметка, която се използва за разпределяне на капитал за сметка за оттегляне на заеми",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Операция {0} не принадлежи към работната поръчка {1},
Print UOM after Quantity,Отпечатайте UOM след Количество,
Set default {0} account for perpetual inventory for non stock items,"Задайте по подразбиране {0} акаунт за непрекъснат инвентар за артикули, които не са на склад",
-Loan Security {0} added multiple times,Защита на заема {0} добавена няколко пъти,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Заемни ценни книжа с различно съотношение LTV не могат да бъдат заложени срещу един заем,
-Qty or Amount is mandatory for loan security!,Количеството или сумата са задължителни за обезпечение на заема!,
-Only submittted unpledge requests can be approved,Могат да бъдат одобрени само подадени заявки за необвързване,
-Interest Amount or Principal Amount is mandatory,Сумата на лихвата или главницата е задължителна,
-Disbursed Amount cannot be greater than {0},Изплатената сума не може да бъде по-голяма от {0},
-Row {0}: Loan Security {1} added multiple times,Ред {0}: Заем за сигурност {1} е добавен няколко пъти,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,"Ред № {0}: Дочерният елемент не трябва да бъде продуктов пакет. Моля, премахнете елемент {1} и запазете",
Credit limit reached for customer {0},Достигнат е кредитен лимит за клиент {0},
Could not auto create Customer due to the following missing mandatory field(s):,Не можа да се създаде автоматично клиент поради следните липсващи задължителни полета:,
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index a944d99..af6c1b9 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","প্রযোজ্য যদি সংস্থাটি স্পা, এসএপিএ বা এসআরএল হয়",
Applicable if the company is a limited liability company,প্রযোজ্য যদি সংস্থাটি একটি সীমাবদ্ধ দায়বদ্ধ সংস্থা হয়,
Applicable if the company is an Individual or a Proprietorship,প্রযোজ্য যদি সংস্থাটি ব্যক্তিগত বা স্বত্বাধিকারী হয়,
-Applicant,আবেদক,
-Applicant Type,আবেদনকারী প্রকার,
Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন,
Application period cannot be across two allocation records,অ্যাপ্লিকেশন সময়সীমা দুটি বরাদ্দ রেকর্ড জুড়ে হতে পারে না,
Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ফোলিও নম্বরগুলি সহ উপলব্ধ অংশীদারদের তালিকা,
Loading Payment System,পেমেন্ট সিস্টেম লোড হচ্ছে,
Loan,ঋণ,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0},
-Loan Application,ঋণ আবেদন,
-Loan Management,ঋণ ব্যবস্থাপনা,
-Loan Repayment,ঋণ পরিশোধ,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,চালানের ছাড় ছাড়ের জন্য anণ শুরুর তারিখ এবং Perণের সময়কাল বাধ্যতামূলক,
Loans (Liabilities),ঋণ (দায়),
Loans and Advances (Assets),ঋণ ও অগ্রিমের (সম্পদ),
@@ -1611,7 +1605,6 @@
Monday,সোমবার,
Monthly,মাসিক,
Monthly Distribution,মাসিক বন্টন,
-Monthly Repayment Amount cannot be greater than Loan Amount,মাসিক পরিশোধ পরিমাণ ঋণের পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না,
More,অধিক,
More Information,অধিক তথ্য,
More than one selection for {0} not allowed,{0} এর জন্য একাধিক নির্বাচন অনুমোদিত নয়,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} পে,
Payable,প্রদেয়,
Payable Account,প্রদেয় অ্যাকাউন্ট,
-Payable Amount,প্রদেয় পরিমান,
Payment,প্রদান,
Payment Cancelled. Please check your GoCardless Account for more details,পেমেন্ট বাতিল আরো তথ্যের জন্য আপনার GoCardless অ্যাকাউন্ট চেক করুন,
Payment Confirmation,বিল প্রদানের সত্ততা,
-Payment Date,টাকা প্রদানের তারিখ,
Payment Days,পেমেন্ট দিন,
Payment Document,পেমেন্ট ডকুমেন্ট,
Payment Due Date,পরিশোধযোগ্য তারিখ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,প্রথম কেনার রসিদ লিখুন দয়া করে,
Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে,
Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে,
-Please enter Repayment Periods,পরিশোধ সময়কাল প্রবেশ করুন,
Please enter Reqd by Date,তারিখ দ্বারা Reqd লিখুন দয়া করে,
Please enter Woocommerce Server URL,দয়া করে Woocommerce সার্ভার URL প্রবেশ করুন,
Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,ঊর্ধ্বতন খরচ কেন্দ্র লিখুন দয়া করে,
Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0},
Please enter relieving date.,তারিখ মুক্তিদান লিখুন.,
-Please enter repayment Amount,ঋণ পরিশোধের পরিমাণ প্রবেশ করুন,
Please enter valid Financial Year Start and End Dates,বৈধ আর্থিক বছরের শুরু এবং শেষ তারিখগুলি লিখুন দয়া করে,
Please enter valid email address,বৈধ ইমেইল ঠিকানা লিখুন,
Please enter {0} first,প্রথম {0} লিখুন দয়া করে,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়.,
Primary Address Details,প্রাথমিক ঠিকানা বিবরণ,
Primary Contact Details,প্রাথমিক যোগাযোগের বিবরণ,
-Principal Amount,প্রধান পরিমাণ,
Print Format,মুদ্রণ বিন্যাস,
Print IRS 1099 Forms,আইআরএস 1099 ফর্মগুলি মুদ্রণ করুন,
Print Report Card,রিপোর্ট কার্ড মুদ্রণ করুন,
@@ -2550,7 +2538,6 @@
Sample Collection,নমুনা সংগ্রহ,
Sample quantity {0} cannot be more than received quantity {1},নমুনা পরিমাণ {0} প্রাপ্ত পরিমাণের চেয়ে বেশি হতে পারে না {1},
Sanctioned,অনুমোদিত,
-Sanctioned Amount,অনুমোদিত পরিমাণ,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.,
Sand,বালি,
Saturday,শনিবার,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ইতিমধ্যে একটি মূল পদ্ধতি আছে {1}।,
API,এপিআই,
Annual,বার্ষিক,
-Approved,অনুমোদিত,
Change,পরিবর্তন,
Contact Email,যোগাযোগের ই - মেইল,
Export Type,রপ্তানি প্রকার,
@@ -3571,7 +3557,6 @@
Account Value,অ্যাকাউন্টের মান,
Account is mandatory to get payment entries,পেমেন্ট এন্ট্রি পেতে অ্যাকাউন্ট বাধ্যতামূলক,
Account is not set for the dashboard chart {0},ড্যাশবোর্ড চার্টের জন্য অ্যাকাউন্ট সেট করা নেই {0},
-Account {0} does not belong to company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1},
Account {0} does not exists in the dashboard chart {1},অ্যাকাউন্ট {0 the ড্যাশবোর্ড চার্টে বিদ্যমান নেই {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,অ্যাকাউন্ট: <b>{0</b> মূলধন কাজ চলছে এবং জার্নাল এন্ট্রি দ্বারা আপডেট করা যাবে না,
Account: {0} is not permitted under Payment Entry,অ্যাকাউন্ট: Ent 0 Pay পেমেন্ট এন্ট্রি অধীনে অনুমোদিত নয়,
@@ -3582,7 +3567,6 @@
Activity,কার্যকলাপ,
Add / Manage Email Accounts.,ইমেইল একাউন্ট পরিচালনা / যুক্ত করো.,
Add Child,শিশু করো,
-Add Loan Security,Securityণ সুরক্ষা যুক্ত করুন,
Add Multiple,একাধিক যোগ করুন,
Add Participants,অংশগ্রহণকারীদের যোগ করুন,
Add to Featured Item,বৈশিষ্ট্যযুক্ত আইটেম যোগ করুন,
@@ -3593,15 +3577,12 @@
Address Line 1,ঠিকানা লাইন 1,
Addresses,ঠিকানা,
Admission End Date should be greater than Admission Start Date.,ভর্তির সমাপ্তির তারিখ ভর্তি শুরুর তারিখের চেয়ে বেশি হওয়া উচিত।,
-Against Loan,Anণের বিপরীতে,
-Against Loan:,Anণের বিপরীতে:,
All,সব,
All bank transactions have been created,সমস্ত ব্যাংক লেনদেন তৈরি করা হয়েছে,
All the depreciations has been booked,সমস্ত অবমূল্যায়ন বুক করা হয়েছে,
Allocation Expired!,বরাদ্দের মেয়াদ শেষ!,
Allow Resetting Service Level Agreement from Support Settings.,সহায়তা সেটিংস থেকে পরিষেবা স্তরের চুক্তি পুনরায় সেট করার অনুমতি দিন।,
Amount of {0} is required for Loan closure,Closureণ বন্ধের জন্য {0} পরিমাণ প্রয়োজন,
-Amount paid cannot be zero,প্রদত্ত পরিমাণ শূন্য হতে পারে না,
Applied Coupon Code,প্রয়োগকৃত কুপন কোড,
Apply Coupon Code,কুপন কোড প্রয়োগ করুন,
Appointment Booking,অ্যাপয়েন্টমেন্ট বুকিং,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ড্রাইভার ঠিকানা অনুপস্থিত থাকায় আগমনের সময় গণনা করা যায় না।,
Cannot Optimize Route as Driver Address is Missing.,ড্রাইভারের ঠিকানা মিস হওয়ায় রুটটি অনুকূল করা যায় না।,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Dependent 1 its এর নির্ভরশীল টাস্ক com 1 c কমপ্লিট / বাতিল না হওয়ায় কাজটি সম্পূর্ণ করতে পারবেন না।,
-Cannot create loan until application is approved,আবেদন অনুমোদিত না হওয়া পর্যন্ত loanণ তৈরি করতে পারবেন না,
Cannot find a matching Item. Please select some other value for {0}.,একটি মিল খুঁজে খুঁজে পাচ্ছেন না. জন্য {0} অন্য কোনো মান নির্বাচন করুন.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","আইটেম for 0 row সারিতে {1} {2} এর বেশি ওভারবিল করতে পারে না} অতিরিক্ত বিলিংয়ের অনুমতি দেওয়ার জন্য, দয়া করে অ্যাকাউন্ট সেটিংসে ভাতা সেট করুন",
"Capacity Planning Error, planned start time can not be same as end time","সক্ষমতা পরিকল্পনার ত্রুটি, পরিকল্পিত শুরুর সময় শেষ সময়ের মতো হতে পারে না",
@@ -3812,20 +3792,9 @@
Less Than Amount,পরিমাণের চেয়ে কম,
Liabilities,দায়,
Loading...,লোড হচ্ছে ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,প্রস্তাবিত সিকিওরিটি অনুযায়ী anণের পরিমাণ 0। সর্বাধিক loanণের পরিমাণ অতিক্রম করে,
Loan Applications from customers and employees.,গ্রাহক ও কর্মচারীদের কাছ থেকে Applicationsণের আবেদন।,
-Loan Disbursement,Bণ বিতরণ,
Loan Processes,Anণ প্রক্রিয়া,
-Loan Security,Securityণ সুরক্ষা,
-Loan Security Pledge,Securityণ সুরক্ষা প্রতিশ্রুতি,
-Loan Security Pledge Created : {0},Securityণ সুরক্ষা প্রতিশ্রুতি তৈরি: {0},
-Loan Security Price,Securityণ সুরক্ষা মূল্য,
-Loan Security Price overlapping with {0},Security 0 with দিয়ে Securityণ সুরক্ষা মূল্য ওভারল্যাপিং,
-Loan Security Unpledge,Securityণ সুরক্ষা আনপ্লেজ,
-Loan Security Value,Securityণ সুরক্ষা মান,
Loan Type for interest and penalty rates,সুদের এবং জরিমানার হারের জন্য Typeণের ধরণ,
-Loan amount cannot be greater than {0},Anণের পরিমাণ {0 than এর বেশি হতে পারে না,
-Loan is mandatory,Anণ বাধ্যতামূলক,
Loans,ঋণ,
Loans provided to customers and employees.,গ্রাহক এবং কর্মচারীদের প্রদান .ণ।,
Location,অবস্থান,
@@ -3894,7 +3863,6 @@
Pay,বেতন,
Payment Document Type,পেমেন্ট ডকুমেন্ট প্রকার,
Payment Name,পেমেন্ট নাম,
-Penalty Amount,জরিমানার পরিমাণ,
Pending,বিচারাধীন,
Performance,কর্মক্ষমতা,
Period based On,পিরিয়ড ভিত্তিক,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,এই আইটেমটি সম্পাদনা করতে দয়া করে মার্কেটপ্লেস ব্যবহারকারী হিসাবে লগইন করুন।,
Please login as a Marketplace User to report this item.,এই আইটেমটি রিপোর্ট করতে দয়া করে একটি মার্কেটপ্লেস ব্যবহারকারী হিসাবে লগইন করুন।,
Please select <b>Template Type</b> to download template,<b>টেমপ্লেট</b> ডাউনলোড করতে দয়া করে <b>টেম্পলেট টাইপ</b> নির্বাচন করুন,
-Please select Applicant Type first,প্রথমে আবেদনকারী প্রকারটি নির্বাচন করুন,
Please select Customer first,প্রথমে গ্রাহক নির্বাচন করুন,
Please select Item Code first,প্রথমে আইটেম কোডটি নির্বাচন করুন,
-Please select Loan Type for company {0},দয়া করে সংস্থার জন্য anণ প্রকার নির্বাচন করুন {0,
Please select a Delivery Note,একটি বিতরণ নোট নির্বাচন করুন,
Please select a Sales Person for item: {0},আইটেমের জন্য দয়া করে বিক্রয় ব্যক্তি নির্বাচন করুন: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',দয়া করে অন্য একটি অর্থ প্রদানের পদ্ধতি নির্বাচন করুন। ডোরা মুদ্রায় লেনদেন অবলম্বন পাওয়া যায়নি '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},দয়া করে সংস্থার জন্য একটি ডিফল্ট ব্যাংক অ্যাকাউন্ট সেটআপ করুন {0},
Please specify,অনুগ্রহ করে নির্দিষ্ট করুন,
Please specify a {0},দয়া করে একটি {0} নির্দিষ্ট করুন,lead
-Pledge Status,অঙ্গীকার স্থিতি,
-Pledge Time,প্রতিশ্রুতি সময়,
Printing,মুদ্রণ,
Priority,অগ্রাধিকার,
Priority has been changed to {0}.,অগ্রাধিকার পরিবর্তন করে {0} করা হয়েছে},
@@ -3944,7 +3908,6 @@
Processing XML Files,এক্সএমএল ফাইলগুলি প্রক্রিয়া করা হচ্ছে,
Profitability,লাভযোগ্যতা,
Project,প্রকল্প,
-Proposed Pledges are mandatory for secured Loans,সুরক্ষিত forণের জন্য প্রস্তাবিত প্রতিশ্রুতি বাধ্যতামূলক,
Provide the academic year and set the starting and ending date.,শিক্ষাগত বছর সরবরাহ করুন এবং শুরুর এবং শেষের তারিখটি সেট করুন।,
Public token is missing for this bank,এই ব্যাংকের জন্য সর্বজনীন টোকেন অনুপস্থিত,
Publish,প্রকাশ করা,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,ক্রয়ের রশিদে কোনও আইটেম নেই যার জন্য পুনরায় ধরে রাখার নমুনা সক্ষম করা আছে।,
Purchase Return,ক্রয় প্রত্যাবর্তন,
Qty of Finished Goods Item,সমাপ্ত জিনিস আইটেম পরিমাণ,
-Qty or Amount is mandatroy for loan security,পরিমাণ বা পরিমাণ loanণ সুরক্ষার জন্য মানডট্রয়,
Quality Inspection required for Item {0} to submit,আইটেম জমা দেওয়ার জন্য গুণমান পরিদর্শন প্রয়োজন {0।,
Quantity to Manufacture,উত্পাদন পরিমাণ,
Quantity to Manufacture can not be zero for the operation {0},উত্পাদন পরিমাণ {0 operation অপারেশন জন্য শূন্য হতে পারে না,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,মুক্তির তারিখ অবশ্যই যোগদানের তারিখের চেয়ে বড় বা সমান হতে হবে,
Rename,পুনঃনামকরণ,
Rename Not Allowed,পুনঃনামকরণ অনুমোদিত নয়,
-Repayment Method is mandatory for term loans,মেয়াদী loansণের জন্য পরিশোধের পদ্ধতি বাধ্যতামূলক,
-Repayment Start Date is mandatory for term loans,মেয়াদী loansণের জন্য পরিশোধ পরিশোধের তারিখ বাধ্যতামূলক,
Report Item,আইটেম প্রতিবেদন করুন,
Report this Item,এই আইটেমটি রিপোর্ট করুন,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,সাবকন্ট্রাক্টের জন্য সংরক্ষিত পরিমাণ: উপকন্ট্রাক্ট আইটেমগুলি তৈরি করতে কাঁচামাল পরিমাণ।,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},সারি ({0}): already 1 ইতিমধ্যে {2 ounted এ ছাড় রয়েছে,
Rows Added in {0},সারিগুলি {0 in এ যুক্ত হয়েছে,
Rows Removed in {0},সারিগুলি {0 in এ সরানো হয়েছে,
-Sanctioned Amount limit crossed for {0} {1},অনুমোদিত পরিমাণের সীমাটি {0} {1 for এর জন্য অতিক্রম করেছে,
-Sanctioned Loan Amount already exists for {0} against company {1},অনুমোদিত anণের পরিমাণ ইতিমধ্যে কোম্পানির বিরুদ্ধে {0 for এর জন্য বিদ্যমান {1},
Save,সংরক্ষণ,
Save Item,আইটেম সংরক্ষণ করুন,
Saved Items,সংরক্ষিত আইটেম,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ব্যবহারকারী {0} নিষ্ক্রিয় করা হয়,
Users and Permissions,ব্যবহারকারী এবং অনুমতি,
Vacancies cannot be lower than the current openings,শূন্যপদগুলি বর্তমান খোলার চেয়ে কম হতে পারে না,
-Valid From Time must be lesser than Valid Upto Time.,সময় থেকে বৈধ অবধি বৈধ আপ সময়ের চেয়ে কম হতে হবে।,
Valuation Rate required for Item {0} at row {1},আইটেম for 0 row সারিতে {1} মূল্য মূল্য নির্ধারণ করতে হবে,
Values Out Of Sync,সিঙ্কের বাইরে মানগুলি,
Vehicle Type is required if Mode of Transport is Road,পরিবহনের মোডটি যদি রাস্তা হয় তবে যানবাহনের প্রকারের প্রয়োজন,
@@ -4211,7 +4168,6 @@
Add to Cart,কার্ট যোগ করুন,
Days Since Last Order,শেষ আদেশের দিনগুলি,
In Stock,স্টক ইন,
-Loan Amount is mandatory,Anণের পরিমাণ বাধ্যতামূলক,
Mode Of Payment,পেমেন্ট মোড,
No students Found,কোন ছাত্র পাওয়া যায় নি,
Not in Stock,মজুদ নাই,
@@ -4240,7 +4196,6 @@
Group by,গ্রুপ দ্বারা,
In stock,স্টক ইন,
Item name,আইটেম নাম,
-Loan amount is mandatory,Anণের পরিমাণ বাধ্যতামূলক,
Minimum Qty,ন্যূনতম Qty,
More details,আরো বিস্তারিত,
Nature of Supplies,সরবরাহ প্রকৃতি,
@@ -4409,9 +4364,6 @@
Total Completed Qty,মোট সম্পূর্ণ পরিমাণ,
Qty to Manufacture,উত্পাদনপ্রণালী Qty,
Repay From Salary can be selected only for term loans,বেতন থেকে পরিশোধ কেবল মেয়াদী loansণের জন্য নির্বাচন করা যেতে পারে,
-No valid Loan Security Price found for {0},Valid 0 for এর জন্য কোনও বৈধ Loণ সুরক্ষা মূল্য পাওয়া যায়নি,
-Loan Account and Payment Account cannot be same,Accountণ অ্যাকাউন্ট এবং পেমেন্ট অ্যাকাউন্ট এক হতে পারে না,
-Loan Security Pledge can only be created for secured loans,সুরক্ষিত onlyণের জন্য Securityণ সুরক্ষা প্রতিশ্রুতি তৈরি করা যেতে পারে,
Social Media Campaigns,সামাজিক মিডিয়া প্রচারণা,
From Date can not be greater than To Date,তারিখ থেকে তারিখের চেয়ে বড় হতে পারে না,
Please set a Customer linked to the Patient,দয়া করে রোগীর সাথে সংযুক্ত কোনও গ্রাহক সেট করুন,
@@ -6437,7 +6389,6 @@
HR User,এইচআর ব্যবহারকারী,
Appointment Letter,নিয়োগপত্র,
Job Applicant,কাজ আবেদনকারী,
-Applicant Name,আবেদনকারীর নাম,
Appointment Date,সাক্ষাৎকারের তারিখ,
Appointment Letter Template,অ্যাপয়েন্টমেন্ট লেটার টেম্পলেট,
Body,শরীর,
@@ -7059,99 +7010,12 @@
Sync in Progress,অগ্রগতিতে সিঙ্ক,
Hub Seller Name,হাব বিক্রেতা নাম,
Custom Data,কাস্টম ডেটা,
-Member,সদস্য,
-Partially Disbursed,আংশিকভাবে বিতরণ,
-Loan Closure Requested,Cণ বন্ধের অনুরোধ করা হয়েছে,
Repay From Salary,বেতন থেকে শুধা,
-Loan Details,ঋণ বিবরণ,
-Loan Type,ঋণ প্রকার,
-Loan Amount,ঋণের পরিমাণ,
-Is Secured Loan,সুরক্ষিত .ণ,
-Rate of Interest (%) / Year,ইন্টারেস্ট (%) / বর্ষসেরা হার,
-Disbursement Date,ব্যয়ন তারিখ,
-Disbursed Amount,বিতরণকৃত পরিমাণ,
-Is Term Loan,ইজ টার্ম লোন,
-Repayment Method,পরিশোধ পদ্ধতি,
-Repay Fixed Amount per Period,শোধ সময়কাল প্রতি নির্দিষ্ট পরিমাণ,
-Repay Over Number of Periods,শোধ ওভার পর্যায়কাল সংখ্যা,
-Repayment Period in Months,মাস মধ্যে ঋণ পরিশোধের সময় সীমা,
-Monthly Repayment Amount,মাসিক পরিশোধ পরিমাণ,
-Repayment Start Date,ফেরত শুরুর তারিখ,
-Loan Security Details,Securityণ সুরক্ষা বিবরণ,
-Maximum Loan Value,সর্বাধিক .ণের মান,
-Account Info,অ্যাকাউন্ট তথ্য,
-Loan Account,ঋণ অ্যাকাউন্ট,
-Interest Income Account,সুদ আয় অ্যাকাউন্ট,
-Penalty Income Account,পেনাল্টি আয় অ্যাকাউন্ট,
-Repayment Schedule,ঋণ পরিশোধের সময় নির্ধারণ,
-Total Payable Amount,মোট প্রদেয় টাকার পরিমাণ,
-Total Principal Paid,মোট অধ্যক্ষ প্রদেয়,
-Total Interest Payable,প্রদেয় মোট সুদ,
-Total Amount Paid,মোট পরিমাণ পরিশোধ,
-Loan Manager,Managerণ ব্যবস্থাপক,
-Loan Info,ঋণ তথ্য,
-Rate of Interest,সুদের হার,
-Proposed Pledges,প্রস্তাবিত প্রতিশ্রুতি,
-Maximum Loan Amount,সর্বোচ্চ ঋণের পরিমাণ,
-Repayment Info,ঋণ পরিশোধের তথ্য,
-Total Payable Interest,মোট প্রদেয় সুদের,
-Against Loan ,Anণের বিপরীতে,
-Loan Interest Accrual,Interestণের সুদের পরিমাণ,
-Amounts,রাশি,
-Pending Principal Amount,মুলতুবি অধ্যক্ষের পরিমাণ,
-Payable Principal Amount,প্রদেয় অধ্যক্ষের পরিমাণ,
-Paid Principal Amount,প্রদত্ত অধ্যক্ষের পরিমাণ,
-Paid Interest Amount,প্রদত্ত সুদের পরিমাণ,
-Process Loan Interest Accrual,প্রক্রিয়া Interestণ সুদের আদায়,
-Repayment Schedule Name,পরিশোধের সময়সূচীর নাম,
Regular Payment,নিয়মিত পেমেন্ট,
Loan Closure,Cণ বন্ধ,
-Payment Details,অর্থ প্রদানের বিবরণ,
-Interest Payable,প্রদেয় সুদ,
-Amount Paid,পরিমাণ অর্থ প্রদান করা,
-Principal Amount Paid,অধ্যক্ষের পরিমাণ পরিশোধিত,
-Repayment Details,Ayণ পরিশোধের বিশদ,
-Loan Repayment Detail,Repণ পরিশোধের বিশদ,
-Loan Security Name,Securityণ সুরক্ষার নাম,
-Unit Of Measure,পরিমাপের একক,
-Loan Security Code,Securityণ সুরক্ষা কোড,
-Loan Security Type,Securityণ সুরক্ষা প্রকার,
-Haircut %,কেশকর্তন %,
-Loan Details,.ণের বিশদ,
-Unpledged,অপ্রতিশ্রুতিবদ্ধ,
-Pledged,প্রতিশ্রুত,
-Partially Pledged,আংশিক প্রতিশ্রুতিবদ্ধ,
-Securities,সিকিউরিটিজ,
-Total Security Value,মোট সুরক্ষা মান,
-Loan Security Shortfall,Securityণ সুরক্ষার ঘাটতি,
-Loan ,ঋণ,
-Shortfall Time,সংক্ষিপ্ত সময়ের,
-America/New_York,আমেরিকা / New_York,
-Shortfall Amount,সংক্ষিপ্ত পরিমাণ,
-Security Value ,সুরক্ষা মান,
-Process Loan Security Shortfall,প্রক্রিয়া Securityণ সুরক্ষা ঘাটতি,
-Loan To Value Ratio,মূল্য অনুপাত Loণ,
-Unpledge Time,আনপ্লেজ সময়,
-Loan Name,ঋণ নাম,
Rate of Interest (%) Yearly,সুদের হার (%) বাত্সরিক,
-Penalty Interest Rate (%) Per Day,পেনাল্টি সুদের হার (%) প্রতি দিন,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,বিলম্বিত ayণ পরিশোধের ক্ষেত্রে পেনাল্টি সুদের হার দৈনিক ভিত্তিতে মুলতুবি সুদের পরিমাণের উপর ধার্য করা হয়,
-Grace Period in Days,দিনগুলিতে গ্রেস পিরিয়ড,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,নির্ধারিত তারিখ থেকে দিন পর্যন্ত penaltyণ পরিশোধে বিলম্বের ক্ষেত্রে জরিমানা আদায় করা হবে না,
-Pledge,অঙ্গীকার,
-Post Haircut Amount,চুল কাটার পরিমাণ পোস্ট করুন,
-Process Type,প্রক্রিয়া প্রকার,
-Update Time,আপডেটের সময়,
-Proposed Pledge,প্রস্তাবিত প্রতিশ্রুতি,
-Total Payment,মোট পরিশোধ,
-Balance Loan Amount,ব্যালেন্স ঋণের পরিমাণ,
-Is Accrued,জমা হয়,
Salary Slip Loan,বেতন স্লিপ ঋণ,
Loan Repayment Entry,Anণ পরিশোধের প্রবেশ,
-Sanctioned Loan Amount,অনুমোদিত anণের পরিমাণ,
-Sanctioned Amount Limit,অনুমোদিত পরিমাণ সীমা,
-Unpledge,Unpledge,
-Haircut,কেশকর্তন,
MAT-MSH-.YYYY.-,Mat-msh-.YYYY.-,
Generate Schedule,সূচি নির্মাণ,
Schedules,সূচী,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,প্রকল্প এই ব্যবহারকারীর জন্য ওয়েবসাইটে অ্যাক্সেস করা যাবে,
Copied From,থেকে অনুলিপি,
Start and End Dates,শুরু এবং তারিখগুলি End,
-Actual Time (in Hours),আসল সময় (ঘন্টা সময়),
+Actual Time in Hours (via Timesheet),আসল সময় (ঘন্টা সময়),
Costing and Billing,খোয়াতে এবং বিলিং,
-Total Costing Amount (via Timesheets),মোট খরচ পরিমাণ (টাইমসাইটের মাধ্যমে),
-Total Expense Claim (via Expense Claims),মোট ব্যয় দাবি (ব্যয় দাবি মাধ্যমে),
+Total Costing Amount (via Timesheet),মোট খরচ পরিমাণ (টাইমসাইটের মাধ্যমে),
+Total Expense Claim (via Expense Claim),মোট ব্যয় দাবি (ব্যয় দাবি মাধ্যমে),
Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে),
Total Sales Amount (via Sales Order),মোট বিক্রয় পরিমাণ (বিক্রয় আদেশের মাধ্যমে),
-Total Billable Amount (via Timesheets),মোট বিলযোগ্য পরিমাণ (টাইমসাইটের মাধ্যমে),
-Total Billed Amount (via Sales Invoices),মোট বিল পরিমাণ (বিক্রয় চালান মাধ্যমে),
-Total Consumed Material Cost (via Stock Entry),মোট খরচকৃত উপাদান খরচ (স্টক এন্ট্রি মাধ্যমে),
+Total Billable Amount (via Timesheet),মোট বিলযোগ্য পরিমাণ (টাইমসাইটের মাধ্যমে),
+Total Billed Amount (via Sales Invoice),মোট বিল পরিমাণ (বিক্রয় চালান মাধ্যমে),
+Total Consumed Material Cost (via Stock Entry),মোট খরচকৃত উপাদান খরচ (স্টক এন্ট্রি মাধ্যমে),
Gross Margin,গ্রস মার্জিন,
Gross Margin %,গ্রস মার্জিন%,
Monitor Progress,মনিটর অগ্রগতি,
@@ -7521,12 +7385,10 @@
Dependencies,নির্ভরতা,
Dependent Tasks,নির্ভরশীল কাজ,
Depends on Tasks,কার্যগুলি উপর নির্ভর করে,
-Actual Start Date (via Time Sheet),প্রকৃত স্টার্ট তারিখ (টাইম শিট মাধ্যমে),
-Actual Time (in hours),(ঘন্টায়) প্রকৃত সময়,
-Actual End Date (via Time Sheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে),
-Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে),
+Actual Start Date (via Timesheet),প্রকৃত স্টার্ট তারিখ (টাইম শিট মাধ্যমে),
+Actual Time in Hours (via Timesheet),(ঘন্টায়) প্রকৃত সময়,
+Actual End Date (via Timesheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে),
Total Expense Claim (via Expense Claim),(ব্যয় দাবি মাধ্যমে) মোট ব্যয় দাবি,
-Total Billing Amount (via Time Sheet),মোট বিলিং পরিমাণ (টাইম শিট মাধ্যমে),
Review Date,পর্যালোচনা তারিখ,
Closing Date,বন্ধের তারিখ,
Task Depends On,কাজের উপর নির্ভর করে,
@@ -7887,7 +7749,6 @@
Update Series,আপডেট সিরিজ,
Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.,
Prefix,উপসর্গ,
-Current Value,বর্তমান মূল্য,
This is the number of the last created transaction with this prefix,এই উপসর্গবিশিষ্ট সর্বশেষ নির্মিত লেনদেনের সংখ্যা,
Update Series Number,আপডেট সিরিজ সংখ্যা,
Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত,
Lead Details,সীসা বিবরণ,
Lead Owner Efficiency,লিড মালিক দক্ষতা,
-Loan Repayment and Closure,Anণ পরিশোধ এবং বন্ধ,
-Loan Security Status,Securityণের সুরক্ষা স্থিতি,
Lost Opportunity,হারানো সুযোগ,
Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী,
Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},লক্ষ্য হিসাবে গণনা: {0},
Payment Account is mandatory,পেমেন্ট অ্যাকাউন্ট বাধ্যতামূলক,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","যদি যাচাই করা হয়, কোনও ঘোষণা বা প্রমাণ জমা না দিয়ে আয়কর গণনার আগে করযোগ্য আয় থেকে পুরো পরিমাণটি কেটে নেওয়া হবে।",
-Disbursement Details,বিতরণ বিশদ,
Material Request Warehouse,উপাদান অনুরোধ গুদাম,
Select warehouse for material requests,উপাদান অনুরোধের জন্য গুদাম নির্বাচন করুন,
Transfer Materials For Warehouse {0},গুদাম {0 For জন্য উপাদান স্থানান্তর,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,বেতন থেকে দায়হীন পরিমাণ পরিশোধ করুন ay,
Deduction from salary,বেতন থেকে ছাড়,
Expired Leaves,মেয়াদ শেষ হয়ে গেছে,
-Reference No,রেফারেন্স নং,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,চুল কাটা শতাংশ হ'ল Securityণ সুরক্ষার বাজার মূল্য এবং সেই Securityণ সুরক্ষার জন্য স্বীকৃত মানের মধ্যে loan শতাংশের পার্থক্য যখন loanণের জন্য জামানত হিসাবে ব্যবহৃত হয়।,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Toণ থেকে মূল্য অনুপাতটি প্রতিশ্রুতিবদ্ধ জামানতের মান হিসাবে loanণের পরিমাণের অনুপাত প্রকাশ করে। যদি এটি কোনও loanণের জন্য নির্দিষ্ট মূল্যের নিচে পড়ে তবে একটি loanণ সুরক্ষার ঘাটতি সৃষ্টি হবে,
If this is not checked the loan by default will be considered as a Demand Loan,এটি যদি চেক না করা হয় তবে ডিফল্ট হিসাবে loanণকে ডিমান্ড anণ হিসাবে বিবেচনা করা হবে,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,এই অ্যাকাউন্টটি orণগ্রহীতা থেকে repণ পরিশোধের বুকিং এবং orণগ্রহীতাকে loansণ বিতরণের জন্য ব্যবহৃত হয়,
This account is capital account which is used to allocate capital for loan disbursal account ,এই অ্যাকাউন্টটি মূলধন অ্যাকাউন্ট যা disণ বিতরণ অ্যাকাউন্টের জন্য মূলধন বরাদ্দ করতে ব্যবহৃত হয়,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},অপারেশন {0 the কাজের আদেশের সাথে সম্পর্কিত নয় {1},
Print UOM after Quantity,পরিমাণের পরে ইউওএম প্রিন্ট করুন,
Set default {0} account for perpetual inventory for non stock items,স্টক নন আইটেমগুলির জন্য স্থায়ী ইনভেন্টরির জন্য ডিফল্ট {0} অ্যাকাউন্ট সেট করুন,
-Loan Security {0} added multiple times,Securityণ সুরক্ষা {0 multiple একাধিকবার যুক্ত হয়েছে,
-Loan Securities with different LTV ratio cannot be pledged against one loan,বিভিন্ন এলটিভি অনুপাত সহ anণ সিকিওরিটিগুলি একটি againstণের বিপরীতে প্রতিজ্ঞা করা যায় না,
-Qty or Amount is mandatory for loan security!,Loanণ সুরক্ষার জন্য পরিমাণ বা পরিমাণ বাধ্যতামূলক!,
-Only submittted unpledge requests can be approved,কেবল জমা দেওয়া আনপ্লেজ অনুরোধগুলি অনুমোদিত হতে পারে,
-Interest Amount or Principal Amount is mandatory,সুদের পরিমাণ বা প্রধান পরিমাণ বাধ্যতামূলক,
-Disbursed Amount cannot be greater than {0},বিতরণকৃত পরিমাণ {0 than এর চেয়ে বেশি হতে পারে না,
-Row {0}: Loan Security {1} added multiple times,সারি {0}: Securityণ সুরক্ষা {1 multiple একাধিকবার যুক্ত হয়েছে,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,সারি # {0}: শিশু আইটেম কোনও পণ্য বান্ডেল হওয়া উচিত নয়। আইটেম remove 1 remove এবং সংরক্ষণ করুন দয়া করে,
Credit limit reached for customer {0},গ্রাহকের জন্য Creditণ সীমা পৌঁছেছে {0},
Could not auto create Customer due to the following missing mandatory field(s):,নিম্নলিখিত অনুপস্থিত বাধ্যতামূলক ক্ষেত্রগুলির কারণে গ্রাহককে স্বয়ংক্রিয় তৈরি করতে পারেনি:,
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 2d9c26d..7b01c27 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Primjenjivo ako je tvrtka SpA, SApA ili SRL",
Applicable if the company is a limited liability company,Primjenjivo ako je društvo s ograničenom odgovornošću,
Applicable if the company is an Individual or a Proprietorship,Primjenjivo ako je kompanija fizička osoba ili vlasništvo,
-Applicant,Podnosilac prijave,
-Applicant Type,Tip podnosioca zahteva,
Application of Funds (Assets),Primjena sredstava ( aktiva ),
Application period cannot be across two allocation records,Period primene ne može biti preko dve evidencije alokacije,
Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Spisak dostupnih akcionara sa brojevima folije,
Loading Payment System,Uplata platnog sistema,
Loan,Loan,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0},
-Loan Application,Aplikacija za kredit,
-Loan Management,Upravljanje zajmovima,
-Loan Repayment,Otplata kredita,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Datum početka i Period zajma su obavezni da biste spremili popust na računu,
Loans (Liabilities),Zajmovi (pasiva),
Loans and Advances (Assets),Zajmovi i predujmovi (aktiva),
@@ -1611,7 +1605,6 @@
Monday,Ponedjeljak,
Monthly,Mjesečno,
Monthly Distribution,Mjesečni Distribucija,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečna otplate iznos ne može biti veći od iznos kredita,
More,Više,
More Information,Više informacija,
More than one selection for {0} not allowed,Više od jednog izbora za {0} nije dozvoljeno,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Plaćajte {0} {1},
Payable,Plativ,
Payable Account,Račun se plaća,
-Payable Amount,Iznos koji treba platiti,
Payment,Plaćanje,
Payment Cancelled. Please check your GoCardless Account for more details,Plaćanje je otkazano. Molimo provjerite svoj GoCardless račun za više detalja,
Payment Confirmation,Potvrda o plaćanju,
-Payment Date,Datum plaćanja,
Payment Days,Plaćanja Dana,
Payment Document,plaćanje Document,
Payment Due Date,Plaćanje Due Date,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Molimo prvo unesite Kupovina prijem,
Please enter Receipt Document,Unesite dokument o prijemu,
Please enter Reference date,Unesite referentni datum,
-Please enter Repayment Periods,Unesite rokovi otplate,
Please enter Reqd by Date,Molimo unesite Reqd po datumu,
Please enter Woocommerce Server URL,Molimo unesite URL adresu Woocommerce Servera,
Please enter Write Off Account,Unesite otpis račun,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Unesite roditelj troška,
Please enter quantity for Item {0},Molimo unesite količinu za točku {0},
Please enter relieving date.,Unesite olakšavanja datum .,
-Please enter repayment Amount,Unesite iznos otplate,
Please enter valid Financial Year Start and End Dates,Molimo vas da unesete važeću finansijsku godinu datume početka i završetka,
Please enter valid email address,Molimo vas da unesete važeću e-mail adresu,
Please enter {0} first,Unesite {0} prvi,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.,
Primary Address Details,Primarne adrese,
Primary Contact Details,Primarni kontakt podaci,
-Principal Amount,iznos glavnice,
Print Format,Format ispisa,
Print IRS 1099 Forms,Ispiši obrasce IRS 1099,
Print Report Card,Štampaj izveštaj karticu,
@@ -2550,7 +2538,6 @@
Sample Collection,Prikupljanje uzoraka,
Sample quantity {0} cannot be more than received quantity {1},Količina uzorka {0} ne može biti veća od primljene količine {1},
Sanctioned,sankcionisani,
-Sanctioned Amount,Iznos kažnjeni,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.,
Sand,Pesak,
Saturday,Subota,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} već ima roditeljsku proceduru {1}.,
API,API,
Annual,godišnji,
-Approved,Odobreno,
Change,Promjena,
Contact Email,Kontakt email,
Export Type,Tip izvoza,
@@ -3571,7 +3557,6 @@
Account Value,Vrijednost računa,
Account is mandatory to get payment entries,Račun je obavezan za unos plaćanja,
Account is not set for the dashboard chart {0},Za grafikon nadzorne ploče nije postavljen račun {0},
-Account {0} does not belong to company {1},Konto {0} ne pripada preduzeću {1},
Account {0} does not exists in the dashboard chart {1},Račun {0} ne postoji u grafikonu nadzorne ploče {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Račun: <b>{0}</b> je kapital Ne radi se i ne može se ažurirati unos u časopisu,
Account: {0} is not permitted under Payment Entry,Račun: {0} nije dozvoljen unosom plaćanja,
@@ -3582,7 +3567,6 @@
Activity,Aktivnost,
Add / Manage Email Accounts.,Dodaj / Upravljanje Email Accounts.,
Add Child,Dodaj podređenu stavku,
-Add Loan Security,Dodajte osiguranje kredita,
Add Multiple,dodavanje više,
Add Participants,Dodajte Učesnike,
Add to Featured Item,Dodaj u istaknuti artikl,
@@ -3593,15 +3577,12 @@
Address Line 1,Adresa - linija 1,
Addresses,Adrese,
Admission End Date should be greater than Admission Start Date.,Datum završetka prijema trebao bi biti veći od datuma početka upisa.,
-Against Loan,Protiv zajma,
-Against Loan:,Protiv zajma:,
All,Sve,
All bank transactions have been created,Sve bankarske transakcije su stvorene,
All the depreciations has been booked,Sve amortizacije su knjižene,
Allocation Expired!,Raspored je istekao!,
Allow Resetting Service Level Agreement from Support Settings.,Dopustite resetiranje sporazuma o nivou usluge iz postavki podrške.,
Amount of {0} is required for Loan closure,Za zatvaranje zajma potreban je iznos {0},
-Amount paid cannot be zero,Plaćeni iznos ne može biti nula,
Applied Coupon Code,Primenjeni kod kupona,
Apply Coupon Code,Primijenite kupon kod,
Appointment Booking,Rezervacija termina,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Ne mogu izračunati vrijeme dolaska jer nedostaje adresa vozača.,
Cannot Optimize Route as Driver Address is Missing.,Ruta ne može da se optimizira jer nedostaje adresa vozača.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Ne mogu dovršiti zadatak {0} jer njegov ovisni zadatak {1} nije dovršen / otkazan.,
-Cannot create loan until application is approved,Nije moguće kreiranje zajma dok aplikacija ne bude odobrena,
Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Ne mogu se preplatiti za stavku {0} u redu {1} više od {2}. Da biste omogućili prekomerno naplaćivanje, molimo postavite dodatak u Postavkama računa",
"Capacity Planning Error, planned start time can not be same as end time","Pogreška planiranja kapaciteta, planirano vrijeme početka ne može biti isto koliko i vrijeme završetka",
@@ -3812,20 +3792,9 @@
Less Than Amount,Manje od iznosa,
Liabilities,Obaveze,
Loading...,Učitavanje ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Iznos zajma premašuje maksimalni iznos zajma od {0} po predloženim vrijednosnim papirima,
Loan Applications from customers and employees.,Prijave za zajmove od kupaca i zaposlenih.,
-Loan Disbursement,Isplata zajma,
Loan Processes,Procesi zajma,
-Loan Security,Zajam zajma,
-Loan Security Pledge,Zalog za zajam kredita,
-Loan Security Pledge Created : {0},Stvoreno jamstvo zajma: {0},
-Loan Security Price,Cijena garancije zajma,
-Loan Security Price overlapping with {0},Cijena osiguranja zajma se preklapa s {0},
-Loan Security Unpledge,Bez plaćanja zajma,
-Loan Security Value,Vrijednost zajma kredita,
Loan Type for interest and penalty rates,Vrsta kredita za kamate i zatezne stope,
-Loan amount cannot be greater than {0},Iznos zajma ne može biti veći od {0},
-Loan is mandatory,Zajam je obavezan,
Loans,Krediti,
Loans provided to customers and employees.,Krediti kupcima i zaposlenima.,
Location,Lokacija,
@@ -3894,7 +3863,6 @@
Pay,Platiti,
Payment Document Type,Vrsta dokumenta plaćanja,
Payment Name,Naziv plaćanja,
-Penalty Amount,Iznos kazne,
Pending,Čekanje,
Performance,Performanse,
Period based On,Period zasnovan na,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Prijavite se kao Korisnik Marketplace-a da biste uredili ovu stavku.,
Please login as a Marketplace User to report this item.,Prijavite se kao korisnik Marketplacea kako biste prijavili ovu stavku.,
Please select <b>Template Type</b> to download template,Molimo odaberite <b>Vrsta predloška</b> za preuzimanje predloška,
-Please select Applicant Type first,Prvo odaberite vrstu prijavitelja,
Please select Customer first,Prvo odaberite kupca,
Please select Item Code first,Prvo odaberite šifru predmeta,
-Please select Loan Type for company {0},Molimo odaberite vrstu kredita za kompaniju {0},
Please select a Delivery Note,Odaberite bilješku o dostavi,
Please select a Sales Person for item: {0},Izaberite prodajnu osobu za predmet: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Odaberite drugi način plaćanja. Pruga ne podržava transakcije u valuti '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Postavite zadani bankovni račun za kompaniju {0},
Please specify,Navedite,
Please specify a {0},Navedite {0},lead
-Pledge Status,Status zaloga,
-Pledge Time,Vreme zaloga,
Printing,Štampanje,
Priority,Prioritet,
Priority has been changed to {0}.,Prioritet je promijenjen u {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Obrada XML datoteka,
Profitability,Profitabilnost,
Project,Projekat,
-Proposed Pledges are mandatory for secured Loans,Predložene zaloge su obavezne za osigurane zajmove,
Provide the academic year and set the starting and ending date.,Navedite akademsku godinu i postavite datum početka i završetka.,
Public token is missing for this bank,Javni token nedostaje za ovu banku,
Publish,Objavite,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Kupoprodajna potvrda nema stavku za koju je omogućen zadržati uzorak.,
Purchase Return,Kupnja Povratak,
Qty of Finished Goods Item,Količina proizvoda gotove robe,
-Qty or Amount is mandatroy for loan security,Količina ili iznos je mandatroy za osiguranje kredita,
Quality Inspection required for Item {0} to submit,Inspekcija kvaliteta potrebna za podnošenje predmeta {0},
Quantity to Manufacture,Količina za proizvodnju,
Quantity to Manufacture can not be zero for the operation {0},Količina za proizvodnju ne može biti nula za operaciju {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Datum oslobađanja mora biti veći ili jednak datumu pridruživanja,
Rename,preimenovati,
Rename Not Allowed,Preimenovanje nije dozvoljeno,
-Repayment Method is mandatory for term loans,Način otplate je obavezan za oročene kredite,
-Repayment Start Date is mandatory for term loans,Datum početka otplate je obavezan za oročene kredite,
Report Item,Izvještaj,
Report this Item,Prijavi ovu stavku,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Količina rezervisanog za podugovor: Količina sirovina za izradu predmeta koji su predmet podugovora.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Red ({0}): {1} već je diskontiran u {2},
Rows Added in {0},Redovi dodani u {0},
Rows Removed in {0},Redovi su uklonjeni za {0},
-Sanctioned Amount limit crossed for {0} {1},Granica sankcionisanog iznosa pređena za {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Već postoji sankcionirani iznos zajma za {0} protiv kompanije {1},
Save,Snimi,
Save Item,Spremi stavku,
Saved Items,Spremljene stavke,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Korisnik {0} je onemogućen,
Users and Permissions,Korisnici i dozvole,
Vacancies cannot be lower than the current openings,Slobodna radna mjesta ne mogu biti niža od postojećih,
-Valid From Time must be lesser than Valid Upto Time.,Vrijedi od vremena mora biti kraće od Važećeg vremena uputa.,
Valuation Rate required for Item {0} at row {1},Stopa vrednovanja potrebna za poziciju {0} u retku {1},
Values Out Of Sync,Vrijednosti van sinkronizacije,
Vehicle Type is required if Mode of Transport is Road,Vrsta vozila je obavezna ako je način prevoza cestovni,
@@ -4211,7 +4168,6 @@
Add to Cart,Dodaj u košaricu,
Days Since Last Order,Dani od poslednje narudžbe,
In Stock,U Stock,
-Loan Amount is mandatory,Iznos zajma je obavezan,
Mode Of Payment,Način plaćanja,
No students Found,Nije pronađen nijedan student,
Not in Stock,Nije raspoloživo,
@@ -4240,7 +4196,6 @@
Group by,Group By,
In stock,Na zalihama,
Item name,Naziv artikla,
-Loan amount is mandatory,Iznos zajma je obavezan,
Minimum Qty,Minimalni količina,
More details,Više informacija,
Nature of Supplies,Nature of Supplies,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Ukupno završeno Količina,
Qty to Manufacture,Količina za proizvodnju,
Repay From Salary can be selected only for term loans,Otplata plaće može se odabrati samo za oročene kredite,
-No valid Loan Security Price found for {0},Nije pronađena valjana cijena osiguranja zajma za {0},
-Loan Account and Payment Account cannot be same,Račun zajma i račun za plaćanje ne mogu biti isti,
-Loan Security Pledge can only be created for secured loans,Zalog osiguranja kredita može se stvoriti samo za osigurane kredite,
Social Media Campaigns,Kampanje na društvenim mrežama,
From Date can not be greater than To Date,Od datuma ne može biti veći od datuma,
Please set a Customer linked to the Patient,Postavite kupca povezanog s pacijentom,
@@ -6437,7 +6389,6 @@
HR User,HR korisnika,
Appointment Letter,Pismo o imenovanju,
Job Applicant,Posao podnositelj,
-Applicant Name,Podnositelj zahtjeva Ime,
Appointment Date,Datum imenovanja,
Appointment Letter Template,Predložak pisma o imenovanju,
Body,Telo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinhronizacija u toku,
Hub Seller Name,Hub Ime prodavca,
Custom Data,Korisnički podaci,
-Member,Član,
-Partially Disbursed,djelomično Isplaćeno,
-Loan Closure Requested,Zatraženo zatvaranje zajma,
Repay From Salary,Otplatiti iz Plata,
-Loan Details,kredit Detalji,
-Loan Type,Vrsta kredita,
-Loan Amount,Iznos kredita,
-Is Secured Loan,Zajam je osiguran,
-Rate of Interest (%) / Year,Kamatnu stopu (%) / godina,
-Disbursement Date,datuma isplate,
-Disbursed Amount,Izplaćena suma,
-Is Term Loan,Term zajam,
-Repayment Method,otplata Način,
-Repay Fixed Amount per Period,Otplatiti fiksni iznos po periodu,
-Repay Over Number of Periods,Otplatiti Preko broj perioda,
-Repayment Period in Months,Rok otplate u mjesecima,
-Monthly Repayment Amount,Mjesečna otplate Iznos,
-Repayment Start Date,Datum početka otplate,
-Loan Security Details,Pojedinosti o zajmu,
-Maximum Loan Value,Maksimalna vrijednost zajma,
-Account Info,Account Info,
-Loan Account,Račun zajma,
-Interest Income Account,Prihod od kamata računa,
-Penalty Income Account,Račun primanja penala,
-Repayment Schedule,otplata Raspored,
-Total Payable Amount,Ukupan iznos,
-Total Principal Paid,Ukupno plaćeno glavnice,
-Total Interest Payable,Ukupno kamata,
-Total Amount Paid,Ukupan iznos plaćen,
-Loan Manager,Menadžer kredita,
-Loan Info,kredit Info,
-Rate of Interest,Kamatna stopa,
-Proposed Pledges,Predložena obećanja,
-Maximum Loan Amount,Maksimalni iznos kredita,
-Repayment Info,otplata Info,
-Total Payable Interest,Ukupno plaćaju interesa,
-Against Loan ,Protiv zajma,
-Loan Interest Accrual,Prihodi od kamata na zajmove,
-Amounts,Iznosi,
-Pending Principal Amount,Na čekanju glavni iznos,
-Payable Principal Amount,Plativi glavni iznos,
-Paid Principal Amount,Plaćeni iznos glavnice,
-Paid Interest Amount,Iznos plaćene kamate,
-Process Loan Interest Accrual,Proces obračuna kamata na zajmove,
-Repayment Schedule Name,Naziv rasporeda otplate,
Regular Payment,Redovna uplata,
Loan Closure,Zatvaranje zajma,
-Payment Details,Detalji plaćanja,
-Interest Payable,Kamata se plaća,
-Amount Paid,Plaćeni iznos,
-Principal Amount Paid,Iznos glavnice,
-Repayment Details,Detalji otplate,
-Loan Repayment Detail,Detalji otplate zajma,
-Loan Security Name,Naziv osiguranja zajma,
-Unit Of Measure,Jedinica mjere,
-Loan Security Code,Kôd za sigurnost kredita,
-Loan Security Type,Vrsta osiguranja zajma,
-Haircut %,Šišanje%,
-Loan Details,Detalji o zajmu,
-Unpledged,Nepotpunjeno,
-Pledged,Založeno,
-Partially Pledged,Djelomično založeno,
-Securities,Hartije od vrednosti,
-Total Security Value,Ukupna vrednost sigurnosti,
-Loan Security Shortfall,Nedostatak osiguranja zajma,
-Loan ,Loan,
-Shortfall Time,Vreme kraćenja,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Iznos manjka,
-Security Value ,Vrijednost sigurnosti,
-Process Loan Security Shortfall,Nedostatak sigurnosti zajma u procesu,
-Loan To Value Ratio,Odnos zajma do vrijednosti,
-Unpledge Time,Vreme odvrtanja,
-Loan Name,kredit ime,
Rate of Interest (%) Yearly,Kamatnu stopu (%) Godišnji,
-Penalty Interest Rate (%) Per Day,Kamatna stopa (%) po danu,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Zatezna kamata se svakodnevno obračunava na viši iznos kamate u slučaju kašnjenja sa otplatom,
-Grace Period in Days,Grace period u danima,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Broj dana od datuma dospijeća do kojeg se kazna neće naplatiti u slučaju kašnjenja u otplati kredita,
-Pledge,Zalog,
-Post Haircut Amount,Iznos pošiljanja frizure,
-Process Type,Tip procesa,
-Update Time,Vreme ažuriranja,
-Proposed Pledge,Predloženo založno pravo,
-Total Payment,Ukupna uplata,
-Balance Loan Amount,Balance Iznos kredita,
-Is Accrued,Je nagomilano,
Salary Slip Loan,Loan Slip Loan,
Loan Repayment Entry,Otplata zajma,
-Sanctioned Loan Amount,Iznos sankcije zajma,
-Sanctioned Amount Limit,Limitirani iznos ograničenja,
-Unpledge,Unpledge,
-Haircut,Šišanje,
MAT-MSH-.YYYY.-,MAT-MSH-YYYY.-,
Generate Schedule,Generiranje Raspored,
Schedules,Rasporedi,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekt će biti dostupna na web stranici ovih korisnika,
Copied From,kopira iz,
Start and End Dates,Datume početka i završetka,
-Actual Time (in Hours),Stvarno vrijeme (u satima),
+Actual Time in Hours (via Timesheet),Stvarno vrijeme (u satima),
Costing and Billing,Cijena i naplata,
-Total Costing Amount (via Timesheets),Ukupni iznos troškova (preko Timesheeta),
-Total Expense Claim (via Expense Claims),Ukupni rashodi potraživanja (preko rashodi potraživanja),
+Total Costing Amount (via Timesheet),Ukupni iznos troškova (preko Timesheeta),
+Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanja),
Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi),
Total Sales Amount (via Sales Order),Ukupan iznos prodaje (preko prodajnog naloga),
-Total Billable Amount (via Timesheets),Ukupan iznos iznosa (preko Timesheeta),
-Total Billed Amount (via Sales Invoices),Ukupan fakturisani iznos (preko faktura prodaje),
-Total Consumed Material Cost (via Stock Entry),Ukupni troškovi potrošnje materijala (preko zaliha zaliha),
+Total Billable Amount (via Timesheet),Ukupan iznos iznosa (preko Timesheeta),
+Total Billed Amount (via Sales Invoice),Ukupan fakturisani iznos (preko faktura prodaje),
+Total Consumed Material Cost (via Stock Entry),Ukupni troškovi potrošnje materijala (preko zaliha zaliha),
Gross Margin,Bruto marža,
Gross Margin %,Bruto marža %,
Monitor Progress,Napredak monitora,
@@ -7521,12 +7385,10 @@
Dependencies,Zavisnosti,
Dependent Tasks,Zavisni zadaci,
Depends on Tasks,Ovisi o Zadaci,
-Actual Start Date (via Time Sheet),Stvarni Ozljede Datum (preko Time Sheet),
-Actual Time (in hours),Stvarno vrijeme (u satima),
-Actual End Date (via Time Sheet),Stvarni Završni datum (preko Time Sheet),
-Total Costing Amount (via Time Sheet),Ukupno Costing Iznos (preko Time Sheet),
+Actual Start Date (via Timesheet),Stvarni Ozljede Datum (preko Time Sheet),
+Actual Time in Hours (via Timesheet),Stvarno vrijeme (u satima),
+Actual End Date (via Timesheet),Stvarni Završni datum (preko Time Sheet),
Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanje),
-Total Billing Amount (via Time Sheet),Ukupno Billing Iznos (preko Time Sheet),
Review Date,Datum pregleda,
Closing Date,Datum zatvaranja,
Task Depends On,Zadatak ovisi o,
@@ -7887,7 +7749,6 @@
Update Series,Update serija,
Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.,
Prefix,Prefiks,
-Current Value,Trenutna vrijednost,
This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom,
Update Series Number,Update serije Broj,
Quotation Lost Reason,Razlog nerealizirane ponude,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level,
Lead Details,Detalji potenciajalnog kupca,
Lead Owner Efficiency,Lead Vlasnik efikasnost,
-Loan Repayment and Closure,Otplata i zatvaranje zajma,
-Loan Security Status,Status osiguranja kredita,
Lost Opportunity,Izgubljena prilika,
Maintenance Schedules,Rasporedi održavanja,
Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Broj ciljanih brojeva: {0},
Payment Account is mandatory,Račun za plaćanje je obavezan,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ako se označi, puni iznos odbit će se od oporezivog dohotka prije izračuna poreza na dohodak bez ikakve izjave ili podnošenja dokaza.",
-Disbursement Details,Detalji isplate,
Material Request Warehouse,Skladište zahtjeva za materijalom,
Select warehouse for material requests,Odaberite skladište za zahtjeve za materijalom,
Transfer Materials For Warehouse {0},Transfer materijala za skladište {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Otplatite neiskorišteni iznos iz plate,
Deduction from salary,Odbitak od plate,
Expired Leaves,Isteklo lišće,
-Reference No,Referenca br,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Procenat šišanja je procentualna razlika između tržišne vrijednosti zajma zajma i vrijednosti koja se pripisuje tom zajmu kada se koristi kao kolateral za taj zajam.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Odnos zajma i vrijednosti izražava odnos iznosa zajma prema vrijednosti založenog vrijednosnog papira. Propust osiguranja zajma pokrenut će se ako padne ispod navedene vrijednosti za bilo koji zajam,
If this is not checked the loan by default will be considered as a Demand Loan,"Ako ovo nije potvrđeno, zajam će se prema zadanim postavkama smatrati zajmom na zahtjev",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ovaj račun koristi se za rezerviranje otplate zajma od zajmoprimca i za isplatu zajmova zajmoprimcu,
This account is capital account which is used to allocate capital for loan disbursal account ,Ovaj račun je račun kapitala koji se koristi za alokaciju kapitala za račun izdvajanja kredita,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operacija {0} ne pripada radnom nalogu {1},
Print UOM after Quantity,Ispis UOM nakon količine,
Set default {0} account for perpetual inventory for non stock items,Postavite zadani {0} račun za vječni inventar za stavke koje nisu na zalihi,
-Loan Security {0} added multiple times,Sigurnost kredita {0} dodana je više puta,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Garancije zajma sa različitim odnosom LTV ne mogu se založiti za jedan zajam,
-Qty or Amount is mandatory for loan security!,Količina ili iznos je obavezan za osiguranje kredita!,
-Only submittted unpledge requests can be approved,Mogu se odobriti samo podneseni zahtjevi za neupitništvo,
-Interest Amount or Principal Amount is mandatory,Iznos kamate ili iznos glavnice je obavezan,
-Disbursed Amount cannot be greater than {0},Isplaćeni iznos ne može biti veći od {0},
-Row {0}: Loan Security {1} added multiple times,Red {0}: Sigurnost zajma {1} dodan je više puta,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Redak {0}: Podređena stavka ne bi trebala biti paket proizvoda. Uklonite stavku {1} i spremite,
Credit limit reached for customer {0},Dosegnuto kreditno ograničenje za kupca {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nije moguće automatski kreirati kupca zbog sljedećih obaveznih polja koja nedostaju:,
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 85c6285..796379c 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Aplicable si l'empresa és SpA, SApA o SRL",
Applicable if the company is a limited liability company,Aplicable si l'empresa és una societat de responsabilitat limitada,
Applicable if the company is an Individual or a Proprietorship,Aplicable si l'empresa és una persona física o privada,
-Applicant,Sol · licitant,
-Applicant Type,Tipus de sol·licitant,
Application of Funds (Assets),Aplicació de fons (actius),
Application period cannot be across two allocation records,El període d'aplicació no pot estar en dos registres d'assignació,
Application period cannot be outside leave allocation period,Període d'aplicació no pot ser període d'assignació llicència fos,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Llista d'accionistes disponibles amb números de foli,
Loading Payment System,S'està carregant el sistema de pagament,
Loan,Préstec,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0},
-Loan Application,Sol·licitud de préstec,
-Loan Management,Gestió de préstecs,
-Loan Repayment,reemborsament dels préstecs,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,La data d’inici del préstec i el període de préstec són obligatoris per guardar el descompte de la factura,
Loans (Liabilities),Préstecs (passius),
Loans and Advances (Assets),Préstecs i bestretes (Actius),
@@ -1611,7 +1605,6 @@
Monday,Dilluns,
Monthly,Mensual,
Monthly Distribution,Distribució mensual,
-Monthly Repayment Amount cannot be greater than Loan Amount,Quantitat Mensual La devolució no pot ser més gran que Suma del préstec,
More,Més,
More Information,Més informació,
More than one selection for {0} not allowed,No s’admeten més d’una selecció per a {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pagueu {0} {1},
Payable,Pagador,
Payable Account,Compte per Pagar,
-Payable Amount,Import pagable,
Payment,Pagament,
Payment Cancelled. Please check your GoCardless Account for more details,"Pagament cancel·lat. Si us plau, consulteu el vostre compte GoCardless per obtenir més detalls",
Payment Confirmation,Confirmació de pagament,
-Payment Date,Data de pagament,
Payment Days,Dies de pagament,
Payment Document,El pagament del document,
Payment Due Date,Data de pagament,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Si us plau primer entra el rebut de compra,
Please enter Receipt Document,"Si us plau, introdueixi recepció de documents",
Please enter Reference date,"Si us plau, introduïu la data de referència",
-Please enter Repayment Periods,"Si us plau, introdueixi terminis d'amortització",
Please enter Reqd by Date,Introduïu Reqd per data,
Please enter Woocommerce Server URL,Introduïu l'URL del servidor Woocommerce,
Please enter Write Off Account,Si us plau indica el Compte d'annotació,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Si us plau, introduïu el centre de cost dels pares",
Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0},
Please enter relieving date.,Please enter relieving date.,
-Please enter repayment Amount,"Si us plau, ingressi la suma d'amortització",
Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final",
Please enter valid email address,"Si us plau, introdueixi l'adreça de correu electrònic vàlida",
Please enter {0} first,"Si us plau, introdueixi {0} primer",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat.,
Primary Address Details,Detalls de l'adreça principal,
Primary Contact Details,Detalls de contacte primaris,
-Principal Amount,Suma de Capital,
Print Format,Format d'impressió,
Print IRS 1099 Forms,Imprimeix formularis IRS 1099,
Print Report Card,Impressió de la targeta d'informe,
@@ -2550,7 +2538,6 @@
Sample Collection,Col.lecció de mostres,
Sample quantity {0} cannot be more than received quantity {1},La quantitat de mostra {0} no pot ser més de la quantitat rebuda {1},
Sanctioned,sancionada,
-Sanctioned Amount,Sanctioned Amount,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.,
Sand,Sorra,
Saturday,Dissabte,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ja té un procediment progenitor {1}.,
API,API,
Annual,Anual,
-Approved,Aprovat,
Change,Canvi,
Contact Email,Correu electrònic de contacte,
Export Type,Tipus d'exportació,
@@ -3571,7 +3557,6 @@
Account Value,Valor del compte,
Account is mandatory to get payment entries,El compte és obligatori per obtenir entrades de pagament,
Account is not set for the dashboard chart {0},El compte no està definit per al gràfic de tauler {0},
-Account {0} does not belong to company {1},El compte {0} no pertany a l'empresa {1},
Account {0} does not exists in the dashboard chart {1},El compte {0} no existeix al gràfic de tauler {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Compte: <b>{0}</b> és un treball capital en curs i no pot ser actualitzat per Journal Entry,
Account: {0} is not permitted under Payment Entry,Compte: {0} no està permès a l'entrada de pagament,
@@ -3582,7 +3567,6 @@
Activity,Activitat,
Add / Manage Email Accounts.,Afegir / Administrar comptes de correu electrònic.,
Add Child,Afegir Nen,
-Add Loan Security,Afegir seguretat de préstec,
Add Multiple,Afegir múltiple,
Add Participants,Afegeix participants,
Add to Featured Item,Afegeix a l'element destacat,
@@ -3593,15 +3577,12 @@
Address Line 1,Adreça Línia 1,
Addresses,Direccions,
Admission End Date should be greater than Admission Start Date.,La data de finalització de l’entrada ha de ser superior a la data d’inici d’entrada.,
-Against Loan,Contra el préstec,
-Against Loan:,Contra el préstec:,
All,Tots,
All bank transactions have been created,S'han creat totes les transaccions bancàries,
All the depreciations has been booked,S'han reservat totes les depreciacions,
Allocation Expired!,Assignació caducada!,
Allow Resetting Service Level Agreement from Support Settings.,Permet restablir l'Acord de nivell de servei des de la configuració de suport.,
Amount of {0} is required for Loan closure,Es necessita una quantitat de {0} per al tancament del préstec,
-Amount paid cannot be zero,La quantitat pagada no pot ser zero,
Applied Coupon Code,Codi de cupó aplicat,
Apply Coupon Code,Apliqueu el codi de cupó,
Appointment Booking,Reserva de cites,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,No es pot calcular l'hora d'arribada perquè falta l'adreça del conductor.,
Cannot Optimize Route as Driver Address is Missing.,No es pot optimitzar la ruta com a adreça del conductor.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,No es pot completar / cancel·lar la tasca {0} com a tasca depenent {1}.,
-Cannot create loan until application is approved,No es pot crear préstec fins que no s'aprovi l'aplicació,
Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","No es pot generar l'excés de l'element {0} a la fila {1} més de {2}. Per permetre l'excés de facturació, establiu la quantitat a la configuració del compte",
"Capacity Planning Error, planned start time can not be same as end time","Error de planificació de la capacitat, l'hora d'inici planificada no pot ser el mateix que el de finalització",
@@ -3812,20 +3792,9 @@
Less Than Amount,Menys que Quantitat,
Liabilities,Passiu,
Loading...,Carregant ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,L'import del préstec supera l'import màxim del préstec de {0} segons els valors proposats,
Loan Applications from customers and employees.,Sol·licituds de préstecs de clients i empleats.,
-Loan Disbursement,Desemborsament de préstecs,
Loan Processes,Processos de préstec,
-Loan Security,Seguretat del préstec,
-Loan Security Pledge,Préstec de seguretat,
-Loan Security Pledge Created : {0},Seguretat de préstec creat: {0},
-Loan Security Price,Preu de seguretat de préstec,
-Loan Security Price overlapping with {0},Preu de seguretat de préstec sobreposat amb {0},
-Loan Security Unpledge,Desconnexió de seguretat del préstec,
-Loan Security Value,Valor de seguretat del préstec,
Loan Type for interest and penalty rates,Tipus de préstec per als tipus d’interès i penalitzacions,
-Loan amount cannot be greater than {0},La quantitat de préstec no pot ser superior a {0},
-Loan is mandatory,El préstec és obligatori,
Loans,Préstecs,
Loans provided to customers and employees.,Préstecs proporcionats a clients i empleats.,
Location,Ubicació,
@@ -3894,7 +3863,6 @@
Pay,Pagar,
Payment Document Type,Tipus de document de pagament,
Payment Name,Nom de pagament,
-Penalty Amount,Import de la sanció,
Pending,Pendent,
Performance,Rendiment,
Period based On,Període basat en,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Inicieu la sessió com a usuari del Marketplace per editar aquest article.,
Please login as a Marketplace User to report this item.,Inicieu la sessió com a usuari del Marketplace per informar d'aquest article.,
Please select <b>Template Type</b> to download template,Seleccioneu <b>Tipus de plantilla</b> per baixar la plantilla,
-Please select Applicant Type first,Seleccioneu primer el tipus d’aplicant,
Please select Customer first,Seleccioneu primer el client,
Please select Item Code first,Seleccioneu primer el Codi de l’element,
-Please select Loan Type for company {0},Seleccioneu Tipus de préstec per a l'empresa {0},
Please select a Delivery Note,Seleccioneu un albarà,
Please select a Sales Person for item: {0},Seleccioneu una persona de vendes per a l'article: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Si us plau seleccioneu un altre mètode de pagament. Raya no admet transaccions en moneda '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Configureu un compte bancari predeterminat per a l'empresa {0},
Please specify,"Si us plau, especifiqui",
Please specify a {0},Especifiqueu un {0},lead
-Pledge Status,Estat de la promesa,
-Pledge Time,Temps de promesa,
Printing,Impressió,
Priority,Prioritat,
Priority has been changed to {0}.,La prioritat s'ha canviat a {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Processament de fitxers XML,
Profitability,Rendibilitat,
Project,Projecte,
-Proposed Pledges are mandatory for secured Loans,Els compromisos proposats són obligatoris per a préstecs garantits,
Provide the academic year and set the starting and ending date.,Proporciona el curs acadèmic i estableix la data d’inici i finalització.,
Public token is missing for this bank,Falta un testimoni públic per a aquest banc,
Publish,Publica,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,El rebut de compra no té cap element per al qual estigui habilitat la conservació de l'exemple.,
Purchase Return,Devolució de compra,
Qty of Finished Goods Item,Quantitat d'articles de productes acabats,
-Qty or Amount is mandatroy for loan security,Quantitat o import és mandatroy per a la seguretat del préstec,
Quality Inspection required for Item {0} to submit,Inspecció de qualitat necessària per enviar l'article {0},
Quantity to Manufacture,Quantitat a la fabricació,
Quantity to Manufacture can not be zero for the operation {0},La quantitat a la fabricació no pot ser zero per a l'operació {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,La data de alleujament ha de ser superior o igual a la data d'adhesió,
Rename,Canviar el nom,
Rename Not Allowed,Canvia de nom no permès,
-Repayment Method is mandatory for term loans,El mètode de reemborsament és obligatori per a préstecs a termini,
-Repayment Start Date is mandatory for term loans,La data d’inici del reemborsament és obligatòria per als préstecs a termini,
Report Item,Informe,
Report this Item,Informa d'aquest element,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Quantitat reservada per a subcontractes: quantitat de matèries primeres per fabricar articles subcontractats.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Fila ({0}): {1} ja es descompta a {2},
Rows Added in {0},Línies afegides a {0},
Rows Removed in {0},Línies suprimides a {0},
-Sanctioned Amount limit crossed for {0} {1},Límit de quantitat sancionat traspassat per {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},La quantitat de préstec sancionat ja existeix per a {0} contra l'empresa {1},
Save,Guardar,
Save Item,Desa l'element,
Saved Items,Elements desats,
@@ -4135,7 +4093,6 @@
User {0} is disabled,L'usuari {0} està deshabilitat,
Users and Permissions,Usuaris i permisos,
Vacancies cannot be lower than the current openings,Les places vacants no poden ser inferiors a les obertures actuals,
-Valid From Time must be lesser than Valid Upto Time.,Valid From Time ha de ser inferior al Valid Upto Time.,
Valuation Rate required for Item {0} at row {1},Taxa de valoració necessària per a l’element {0} a la fila {1},
Values Out Of Sync,Valors fora de sincronització,
Vehicle Type is required if Mode of Transport is Road,El tipus de vehicle és obligatori si el mode de transport és per carretera,
@@ -4211,7 +4168,6 @@
Add to Cart,Afegir a la cistella,
Days Since Last Order,Dies des de la darrera comanda,
In Stock,En estoc,
-Loan Amount is mandatory,La quantitat de préstec és obligatòria,
Mode Of Payment,Forma de pagament,
No students Found,No s’han trobat estudiants,
Not in Stock,No en Stock,
@@ -4240,7 +4196,6 @@
Group by,Agrupar per,
In stock,En estoc,
Item name,Nom de l'article,
-Loan amount is mandatory,La quantitat de préstec és obligatòria,
Minimum Qty,Quantitat mínima,
More details,Més detalls,
Nature of Supplies,Natura dels subministraments,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Quantitat total completada,
Qty to Manufacture,Quantitat a fabricar,
Repay From Salary can be selected only for term loans,La devolució del salari només es pot seleccionar per a préstecs a termini,
-No valid Loan Security Price found for {0},No s'ha trobat cap preu de seguretat de préstec vàlid per a {0},
-Loan Account and Payment Account cannot be same,El compte de préstec i el compte de pagament no poden ser els mateixos,
-Loan Security Pledge can only be created for secured loans,La promesa de seguretat de préstecs només es pot crear per a préstecs garantits,
Social Media Campaigns,Campanyes de xarxes socials,
From Date can not be greater than To Date,Des de la data no pot ser superior a fins a la data,
Please set a Customer linked to the Patient,Configureu un client vinculat al pacient,
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Carta de cita,
Job Applicant,Job Applicant,
-Applicant Name,Nom del sol·licitant,
Appointment Date,Data de citació,
Appointment Letter Template,Plantilla de carta de cites,
Body,Cos,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sincronització en progrés,
Hub Seller Name,Nom del venedor del concentrador,
Custom Data,Dades personalitzades,
-Member,Membre,
-Partially Disbursed,parcialment Desemborsament,
-Loan Closure Requested,Sol·licitud de tancament del préstec,
Repay From Salary,Pagar del seu sou,
-Loan Details,Detalls de préstec,
-Loan Type,Tipus de préstec,
-Loan Amount,Total del préstec,
-Is Secured Loan,El préstec està garantit,
-Rate of Interest (%) / Year,Taxa d'interès (%) / Any,
-Disbursement Date,Data de desemborsament,
-Disbursed Amount,Import desemborsat,
-Is Term Loan,És préstec a termini,
-Repayment Method,Mètode d'amortització,
-Repay Fixed Amount per Period,Pagar una quantitat fixa per Període,
-Repay Over Number of Periods,Retornar al llarg Nombre de períodes,
-Repayment Period in Months,Termini de devolució en Mesos,
-Monthly Repayment Amount,Quantitat de pagament mensual,
-Repayment Start Date,Data d'inici del reemborsament,
-Loan Security Details,Detalls de seguretat del préstec,
-Maximum Loan Value,Valor màxim del préstec,
-Account Info,Informació del compte,
-Loan Account,Compte de préstec,
-Interest Income Account,Compte d'Utilitat interès,
-Penalty Income Account,Compte d'ingressos sancionadors,
-Repayment Schedule,Calendari de reemborsament,
-Total Payable Amount,La quantitat total a pagar,
-Total Principal Paid,Principal principal pagat,
-Total Interest Payable,L'interès total a pagar,
-Total Amount Paid,Import total pagat,
-Loan Manager,Gestor de préstecs,
-Loan Info,Informació sobre préstecs,
-Rate of Interest,Tipus d'interès,
-Proposed Pledges,Promesos proposats,
-Maximum Loan Amount,La quantitat màxima del préstec,
-Repayment Info,Informació de la devolució,
-Total Payable Interest,L'interès total a pagar,
-Against Loan ,Contra el préstec,
-Loan Interest Accrual,Meritació d’interès de préstec,
-Amounts,Quantitats,
-Pending Principal Amount,Import pendent principal,
-Payable Principal Amount,Import principal pagable,
-Paid Principal Amount,Import principal pagat,
-Paid Interest Amount,Import d’interès pagat,
-Process Loan Interest Accrual,Compra d’interessos de préstec de procés,
-Repayment Schedule Name,Nom de l’horari d’amortització,
Regular Payment,Pagament regular,
Loan Closure,Tancament del préstec,
-Payment Details,Detalls del pagament,
-Interest Payable,Interessos a pagar,
-Amount Paid,Quantitat pagada,
-Principal Amount Paid,Import principal pagat,
-Repayment Details,Detalls de la devolució,
-Loan Repayment Detail,Detall de l’amortització del préstec,
-Loan Security Name,Nom de seguretat del préstec,
-Unit Of Measure,Unitat de mesura,
-Loan Security Code,Codi de seguretat del préstec,
-Loan Security Type,Tipus de seguretat del préstec,
-Haircut %,Tall de cabell %,
-Loan Details,Detalls del préstec,
-Unpledged,No inclòs,
-Pledged,Prometut,
-Partially Pledged,Parcialment compromès,
-Securities,Valors,
-Total Security Value,Valor de seguretat total,
-Loan Security Shortfall,Falta de seguretat del préstec,
-Loan ,Préstec,
-Shortfall Time,Temps de falta,
-America/New_York,Amèrica / New_York,
-Shortfall Amount,Import de la falta,
-Security Value ,Valor de seguretat,
-Process Loan Security Shortfall,Fallada de seguretat del préstec de procés,
-Loan To Value Ratio,Ràtio de préstec al valor,
-Unpledge Time,Temps de desunió,
-Loan Name,Nom del préstec,
Rate of Interest (%) Yearly,Taxa d'interès (%) anual,
-Penalty Interest Rate (%) Per Day,Tipus d’interès de penalització (%) per dia,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,El tipus d’interès de penalització es percep sobre l’import de l’interès pendent diàriament en cas d’amortització retardada,
-Grace Period in Days,Període de gràcia en dies,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Nombre de dies des de la data de venciment fins a la qual no es cobrarà cap penalització en cas de retard en la devolució del préstec,
-Pledge,Compromís,
-Post Haircut Amount,Publicar la quantitat de tall de cabell,
-Process Type,Tipus de procés,
-Update Time,Hora d’actualització,
-Proposed Pledge,Promesa proposada,
-Total Payment,El pagament total,
-Balance Loan Amount,Saldo del Préstec Monto,
-Is Accrued,Es merita,
Salary Slip Loan,Préstec antilliscant,
Loan Repayment Entry,Entrada de reemborsament del préstec,
-Sanctioned Loan Amount,Import del préstec sancionat,
-Sanctioned Amount Limit,Límite de la quantitat sancionada,
-Unpledge,Desconnectat,
-Haircut,Tall de cabell,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generar Calendari,
Schedules,Horaris,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projecte serà accessible a la pàgina web a aquests usuaris,
Copied From,de copiat,
Start and End Dates,Les dates d'inici i fi,
-Actual Time (in Hours),Hora real (en hores),
+Actual Time in Hours (via Timesheet),Hora real (en hores),
Costing and Billing,Càlcul de costos i facturació,
-Total Costing Amount (via Timesheets),Import total de costos (a través de fulls de temps),
-Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses),
+Total Costing Amount (via Timesheet),Import total de costos (a través de fulls de temps),
+Total Expense Claim (via Expense Claim),Reclamació de Despeses totals (a través de reclamacions de despeses),
Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura),
Total Sales Amount (via Sales Order),Import total de vendes (a través de l'ordre de vendes),
-Total Billable Amount (via Timesheets),Import total facturat (mitjançant fulls de temps),
-Total Billed Amount (via Sales Invoices),Import total facturat (mitjançant factures de vendes),
-Total Consumed Material Cost (via Stock Entry),Cost del material consumit total (a través de l'entrada d'accions),
+Total Billable Amount (via Timesheet),Import total facturat (mitjançant fulls de temps),
+Total Billed Amount (via Sales Invoice),Import total facturat (mitjançant factures de vendes),
+Total Consumed Material Cost (via Stock Entry),Cost del material consumit total (a través de l'entrada d'accions),
Gross Margin,Marge Brut,
Gross Margin %,Marge Brut%,
Monitor Progress,Progrés del monitor,
@@ -7521,12 +7385,10 @@
Dependencies,Dependències,
Dependent Tasks,Tasques depenents,
Depends on Tasks,Depèn de Tasques,
-Actual Start Date (via Time Sheet),Data d'inici real (a través de fulla d'hores),
-Actual Time (in hours),Temps real (en hores),
-Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d'hores),
-Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d'hores),
+Actual Start Date (via Timesheet),Data d'inici real (a través de fulla d'hores),
+Actual Time in Hours (via Timesheet),Temps real (en hores),
+Actual End Date (via Timesheet),Data de finalització real (a través de fulla d'hores),
Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses),
-Total Billing Amount (via Time Sheet),Facturació quantitat total (a través de fulla d'hores),
Review Date,Data de revisió,
Closing Date,Data de tancament,
Task Depends On,Tasca Depèn de,
@@ -7887,7 +7749,6 @@
Update Series,Actualitza Sèries,
Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.,
Prefix,Prefix,
-Current Value,Valor actual,
This is the number of the last created transaction with this prefix,Aquest és el nombre de l'última transacció creat amb aquest prefix,
Update Series Number,Actualització Nombre Sèries,
Quotation Lost Reason,Cita Perduda Raó,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda,
Lead Details,Detalls del client potencial,
Lead Owner Efficiency,Eficiència plom propietari,
-Loan Repayment and Closure,Devolució i tancament del préstec,
-Loan Security Status,Estat de seguretat del préstec,
Lost Opportunity,Oportunitat perduda,
Maintenance Schedules,Programes de manteniment,
Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Comptes orientats: {0},
Payment Account is mandatory,El compte de pagament és obligatori,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Si es marca, l'import íntegre es descomptarà de la renda imposable abans de calcular l'impost sobre la renda sense cap declaració ni presentació de proves.",
-Disbursement Details,Detalls del desemborsament,
Material Request Warehouse,Sol·licitud de material Magatzem,
Select warehouse for material requests,Seleccioneu un magatzem per a sol·licituds de material,
Transfer Materials For Warehouse {0},Transferència de materials per a magatzem {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Reemborsar l’import no reclamat del salari,
Deduction from salary,Deducció del salari,
Expired Leaves,Fulles caducades,
-Reference No,Número de referència,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,El percentatge de tall de cabell és la diferència percentual entre el valor de mercat del títol de préstec i el valor atribuït a aquest títol quan s’utilitza com a garantia d’aquest préstec.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,La ràtio de préstec a valor expressa la relació entre l’import del préstec i el valor de la garantia compromesa. Es produirà un dèficit de seguretat del préstec si aquesta baixa per sota del valor especificat per a qualsevol préstec,
If this is not checked the loan by default will be considered as a Demand Loan,"Si no es comprova això, el préstec per defecte es considerarà un préstec a la demanda",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Aquest compte s’utilitza per reservar els pagaments de préstecs del prestatari i també per desemborsar préstecs al prestatari,
This account is capital account which is used to allocate capital for loan disbursal account ,Aquest compte és un compte de capital que s’utilitza per assignar capital per al compte de desemborsament del préstec,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},L'operació {0} no pertany a l'ordre de treball {1},
Print UOM after Quantity,Imprimiu UOM després de Quantity,
Set default {0} account for perpetual inventory for non stock items,Definiu un compte {0} predeterminat per a l'inventari perpetu dels articles que no estiguin en estoc,
-Loan Security {0} added multiple times,La seguretat del préstec {0} s'ha afegit diverses vegades,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Els títols de préstec amb una ràtio LTV diferent no es poden empenyorar contra un préstec,
-Qty or Amount is mandatory for loan security!,Quantitat o import és obligatori per a la seguretat del préstec.,
-Only submittted unpledge requests can be approved,Només es poden aprovar les sol·licituds unpledge enviades,
-Interest Amount or Principal Amount is mandatory,L’interès o l’import del capital són obligatoris,
-Disbursed Amount cannot be greater than {0},La quantitat desemborsada no pot ser superior a {0},
-Row {0}: Loan Security {1} added multiple times,Fila {0}: seguretat del préstec {1} afegida diverses vegades,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Fila núm. {0}: l'article secundari no ha de ser un paquet de productes. Traieu l'element {1} i deseu,
Credit limit reached for customer {0},S'ha assolit el límit de crèdit per al client {0},
Could not auto create Customer due to the following missing mandatory field(s):,No s'ha pogut crear el client automàticament perquè falten els camps obligatoris següents:,
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 3fb67e7..6826b2d 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Platí, pokud je společností SpA, SApA nebo SRL",
Applicable if the company is a limited liability company,"Platí, pokud je společnost společností s ručením omezeným",
Applicable if the company is an Individual or a Proprietorship,"Platí, pokud je společnost jednotlivec nebo vlastník",
-Applicant,Žadatel,
-Applicant Type,Typ žadatele,
Application of Funds (Assets),Aplikace fondů (aktiv),
Application period cannot be across two allocation records,Období žádosti nesmí být v rámci dvou alokačních záznamů,
Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Seznam dostupných akcionářů s čísly folií,
Loading Payment System,Načítání platebního systému,
Loan,Půjčka,
-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},
-Loan Application,Žádost o půjčku,
-Loan Management,Správa úvěrů,
-Loan Repayment,Splácení úvěru,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Datum zahájení výpůjčky a období výpůjčky jsou povinné pro uložení diskontování faktury,
Loans (Liabilities),Úvěry (závazky),
Loans and Advances (Assets),Úvěry a zálohy (aktiva),
@@ -1611,7 +1605,6 @@
Monday,Pondělí,
Monthly,Měsíčně,
Monthly Distribution,Měsíční Distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Měsíční splátka částka nemůže být větší než Výše úvěru,
More,Více,
More Information,Víc informací,
More than one selection for {0} not allowed,Více než jeden výběr pro {0} není povolen,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Platit {0} {1},
Payable,Splatný,
Payable Account,Splatnost účtu,
-Payable Amount,Splatná částka,
Payment,Platba,
Payment Cancelled. Please check your GoCardless Account for more details,Platba byla zrušena. Zkontrolujte svůj účet GoCardless pro více informací,
Payment Confirmation,Potvrzení platby,
-Payment Date,Datum splatnosti,
Payment Days,Platební dny,
Payment Document,platba Document,
Payment Due Date,Splatno dne,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení",
Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu",
Please enter Reference date,"Prosím, zadejte Referenční den",
-Please enter Repayment Periods,"Prosím, zadejte dobu splácení",
Please enter Reqd by Date,Zadejte Reqd podle data,
Please enter Woocommerce Server URL,Zadejte adresu URL serveru Woocommerce,
Please enter Write Off Account,"Prosím, zadejte odepsat účet",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský",
Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}",
Please enter relieving date.,Zadejte zmírnění datum.,
-Please enter repayment Amount,"Prosím, zadejte splácení Částka",
Please enter valid Financial Year Start and End Dates,Zadejte prosím platnou finanční rok datum zahájení a ukončení,
Please enter valid email address,Zadejte platnou e-mailovou adresu,
Please enter {0} first,"Prosím, zadejte {0} jako první",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.,
Primary Address Details,Údaje o primární adrese,
Primary Contact Details,Primární kontaktní údaje,
-Principal Amount,jistina,
Print Format,Formát tisku,
Print IRS 1099 Forms,Tisk IRS 1099 formulářů,
Print Report Card,Tiskněte kartu přehledů,
@@ -2550,7 +2538,6 @@
Sample Collection,Kolekce vzorků,
Sample quantity {0} cannot be more than received quantity {1},Množství vzorku {0} nemůže být větší než přijaté množství {1},
Sanctioned,schválený,
-Sanctioned Amount,Sankcionována Částka,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.,
Sand,Písek,
Saturday,Sobota,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} již má rodičovský postup {1}.,
API,API,
Annual,Roční,
-Approved,Schválený,
Change,Změna,
Contact Email,Kontaktní e-mail,
Export Type,Typ exportu,
@@ -3571,7 +3557,6 @@
Account Value,Hodnota účtu,
Account is mandatory to get payment entries,Účet je povinný pro získání platebních záznamů,
Account is not set for the dashboard chart {0},Účet není nastaven pro graf dashboardu {0},
-Account {0} does not belong to company {1},Účet {0} nepatří do společnosti {1},
Account {0} does not exists in the dashboard chart {1},Účet {0} neexistuje v grafu dashboardu {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Účet: <b>{0}</b> je kapitál Probíhá zpracování a nelze jej aktualizovat zápisem do deníku,
Account: {0} is not permitted under Payment Entry,Účet: {0} není povolen v rámci zadání platby,
@@ -3582,7 +3567,6 @@
Activity,Činnost,
Add / Manage Email Accounts.,Přidat / Správa e-mailových účtů.,
Add Child,Přidat dítě,
-Add Loan Security,Přidejte zabezpečení půjčky,
Add Multiple,Přidat více,
Add Participants,Přidat účastníky,
Add to Featured Item,Přidat k vybrané položce,
@@ -3593,15 +3577,12 @@
Address Line 1,Adresní řádek 1,
Addresses,Adresy,
Admission End Date should be greater than Admission Start Date.,Datum ukončení vstupu by mělo být vyšší než datum zahájení vstupu.,
-Against Loan,Proti půjčce,
-Against Loan:,Proti úvěru:,
All,Všechno,
All bank transactions have been created,Byly vytvořeny všechny bankovní transakce,
All the depreciations has been booked,Všechny odpisy byly zaúčtovány,
Allocation Expired!,Platnost přidělení vypršela!,
Allow Resetting Service Level Agreement from Support Settings.,Povolit resetování dohody o úrovni služeb z nastavení podpory.,
Amount of {0} is required for Loan closure,Pro uzavření úvěru je požadována částka {0},
-Amount paid cannot be zero,Zaplacená částka nesmí být nulová,
Applied Coupon Code,Kód použitého kupónu,
Apply Coupon Code,Použijte kód kupónu,
Appointment Booking,Rezervace schůzek,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Nelze vypočítat čas příjezdu, protože chybí adresa řidiče.",
Cannot Optimize Route as Driver Address is Missing.,"Nelze optimalizovat trasu, protože chybí adresa ovladače.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Nelze dokončit úkol {0}, protože jeho závislá úloha {1} není dokončena / zrušena.",
-Cannot create loan until application is approved,"Dokud nebude žádost schválena, nelze vytvořit půjčku",
Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nelze přeplatit za položku {0} v řádku {1} více než {2}. Chcete-li povolit nadměrnou fakturaci, nastavte v Nastavení účtu povolenky",
"Capacity Planning Error, planned start time can not be same as end time","Chyba plánování kapacity, plánovaný čas zahájení nemůže být stejný jako čas ukončení",
@@ -3812,20 +3792,9 @@
Less Than Amount,Méně než částka,
Liabilities,Pasiva,
Loading...,Nahrávám...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Částka půjčky překračuje maximální částku půjčky {0} podle navrhovaných cenných papírů,
Loan Applications from customers and employees.,Žádosti o půjčku od zákazníků a zaměstnanců.,
-Loan Disbursement,Vyplacení půjčky,
Loan Processes,Úvěrové procesy,
-Loan Security,Zabezpečení půjčky,
-Loan Security Pledge,Úvěrový příslib,
-Loan Security Pledge Created : {0},Vytvořen záložní úvěr: {0},
-Loan Security Price,Cena za půjčku,
-Loan Security Price overlapping with {0},Cena půjčky se překrývá s {0},
-Loan Security Unpledge,Zabezpečení úvěru Unpledge,
-Loan Security Value,Hodnota zabezpečení úvěru,
Loan Type for interest and penalty rates,Typ půjčky za úroky a penále,
-Loan amount cannot be greater than {0},Výše půjčky nesmí být větší než {0},
-Loan is mandatory,Půjčka je povinná,
Loans,Půjčky,
Loans provided to customers and employees.,Půjčky poskytnuté zákazníkům a zaměstnancům.,
Location,Místo,
@@ -3894,7 +3863,6 @@
Pay,Zaplatit,
Payment Document Type,Typ platebního dokladu,
Payment Name,Název platby,
-Penalty Amount,Trestná částka,
Pending,Až do,
Performance,Výkon,
Period based On,Období založené na,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Chcete-li tuto položku upravit, přihlaste se jako uživatel Marketplace.",
Please login as a Marketplace User to report this item.,"Chcete-li tuto položku nahlásit, přihlaste se jako uživatel Marketplace.",
Please select <b>Template Type</b> to download template,Vyberte <b>šablonu</b> pro stažení šablony,
-Please select Applicant Type first,Nejprve vyberte typ žadatele,
Please select Customer first,Nejprve prosím vyberte Zákazníka,
Please select Item Code first,Nejprve vyberte kód položky,
-Please select Loan Type for company {0},Vyberte typ půjčky pro společnost {0},
Please select a Delivery Note,Vyberte dodací list,
Please select a Sales Person for item: {0},Vyberte obchodní osobu pro položku: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Vyberte prosím jinou platební metodu. Stripe nepodporuje transakce v měně {0} ',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Nastavte prosím výchozí bankovní účet společnosti {0},
Please specify,Prosím specifikujte,
Please specify a {0},Zadejte prosím {0},lead
-Pledge Status,Stav zástavy,
-Pledge Time,Pledge Time,
Printing,Tisk,
Priority,Priorita,
Priority has been changed to {0}.,Priorita byla změněna na {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Zpracování souborů XML,
Profitability,Ziskovost,
Project,Zakázka,
-Proposed Pledges are mandatory for secured Loans,Navrhované zástavy jsou povinné pro zajištěné půjčky,
Provide the academic year and set the starting and ending date.,Uveďte akademický rok a stanovte počáteční a konečné datum.,
Public token is missing for this bank,Pro tuto banku chybí veřejný token,
Publish,Publikovat,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Potvrzení o nákupu neobsahuje žádnou položku, pro kterou je povolen Retain Sample.",
Purchase Return,Nákup Return,
Qty of Finished Goods Item,Množství hotového zboží,
-Qty or Amount is mandatroy for loan security,Množství nebo částka je mandatroy pro zajištění půjčky,
Quality Inspection required for Item {0} to submit,Pro odeslání položky {0} je vyžadována kontrola kvality,
Quantity to Manufacture,Množství k výrobě,
Quantity to Manufacture can not be zero for the operation {0},Množství na výrobu nemůže být pro operaci nulové {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Datum vydání musí být větší nebo rovno Datum připojení,
Rename,Přejmenovat,
Rename Not Allowed,Přejmenovat není povoleno,
-Repayment Method is mandatory for term loans,Způsob splácení je povinný pro termínované půjčky,
-Repayment Start Date is mandatory for term loans,Datum zahájení splácení je povinné pro termínované půjčky,
Report Item,Položka sestavy,
Report this Item,Nahlásit tuto položku,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Vyhrazeno Množství pro subdodávky: Množství surovin pro výrobu subdodávek.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Řádek ({0}): {1} je již zlevněn v {2},
Rows Added in {0},Řádky přidané v {0},
Rows Removed in {0},Řádky odebrány za {0},
-Sanctioned Amount limit crossed for {0} {1},Překročení limitu sankce za {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Částka schváleného úvěru již existuje pro {0} proti společnosti {1},
Save,Uložit,
Save Item,Uložit položku,
Saved Items,Uložené položky,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Uživatel {0} je zakázána,
Users and Permissions,Uživatelé a oprávnění,
Vacancies cannot be lower than the current openings,Volná pracovní místa nemohou být nižší než stávající otvory,
-Valid From Time must be lesser than Valid Upto Time.,Platný od času musí být menší než platný až do doby.,
Valuation Rate required for Item {0} at row {1},Míra ocenění požadovaná pro položku {0} v řádku {1},
Values Out Of Sync,Hodnoty ze synchronizace,
Vehicle Type is required if Mode of Transport is Road,"Typ vozidla je vyžadován, pokud je způsob dopravy silniční",
@@ -4211,7 +4168,6 @@
Add to Cart,Přidat do košíku,
Days Since Last Order,Dny od poslední objednávky,
In Stock,Na skladě,
-Loan Amount is mandatory,Částka půjčky je povinná,
Mode Of Payment,Způsob platby,
No students Found,Nebyli nalezeni žádní studenti,
Not in Stock,Není skladem,
@@ -4240,7 +4196,6 @@
Group by,Seskupit podle,
In stock,Na skladě,
Item name,Název položky,
-Loan amount is mandatory,Částka půjčky je povinná,
Minimum Qty,Minimální počet,
More details,Další podrobnosti,
Nature of Supplies,Příroda Dodávky,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Celkem dokončeno Množství,
Qty to Manufacture,Množství K výrobě,
Repay From Salary can be selected only for term loans,Výplatu z platu lze vybrat pouze u termínovaných půjček,
-No valid Loan Security Price found for {0},Nebyla nalezena platná cena zabezpečení půjčky pro {0},
-Loan Account and Payment Account cannot be same,Úvěrový účet a platební účet nemohou být stejné,
-Loan Security Pledge can only be created for secured loans,Slib zajištění půjčky lze vytvořit pouze pro zajištěné půjčky,
Social Media Campaigns,Kampaně na sociálních médiích,
From Date can not be greater than To Date,Od data nemůže být větší než od data,
Please set a Customer linked to the Patient,Nastavte prosím zákazníka spojeného s pacientem,
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Jmenovací dopis,
Job Applicant,Job Žadatel,
-Applicant Name,Žadatel Název,
Appointment Date,Datum schůzky,
Appointment Letter Template,Šablona dopisu schůzky,
Body,Tělo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Synchronizace probíhá,
Hub Seller Name,Jméno prodejce hubu,
Custom Data,Vlastní data,
-Member,Člen,
-Partially Disbursed,částečně Vyplacené,
-Loan Closure Requested,Požadováno uzavření úvěru,
Repay From Salary,Splatit z platu,
-Loan Details,půjčka Podrobnosti,
-Loan Type,Typ úvěru,
-Loan Amount,Částka půjčky,
-Is Secured Loan,Je zajištěná půjčka,
-Rate of Interest (%) / Year,Úroková sazba (%) / rok,
-Disbursement Date,výplata Datum,
-Disbursed Amount,Částka vyplacená,
-Is Term Loan,Je termín půjčka,
-Repayment Method,splácení Metoda,
-Repay Fixed Amount per Period,Splatit pevná částka na období,
-Repay Over Number of Periods,Splatit Over počet období,
-Repayment Period in Months,Splácení doba v měsících,
-Monthly Repayment Amount,Výše měsíční splátky,
-Repayment Start Date,Datum zahájení splacení,
-Loan Security Details,Podrobnosti o půjčce,
-Maximum Loan Value,Maximální hodnota půjčky,
-Account Info,Informace o účtu,
-Loan Account,Úvěrový účet,
-Interest Income Account,Účet Úrokové výnosy,
-Penalty Income Account,Účet peněžitých příjmů,
-Repayment Schedule,splátkový kalendář,
-Total Payable Amount,Celková částka Splatné,
-Total Principal Paid,Celková zaplacená jistina,
-Total Interest Payable,Celkem splatných úroků,
-Total Amount Paid,Celková částka zaplacena,
-Loan Manager,Správce půjček,
-Loan Info,Informace o úvěr,
-Rate of Interest,Úroková sazba,
-Proposed Pledges,Navrhované zástavy,
-Maximum Loan Amount,Maximální výše úvěru,
-Repayment Info,splácení Info,
-Total Payable Interest,Celkem Splatné úroky,
-Against Loan ,Proti půjčce,
-Loan Interest Accrual,Úvěrový úrok,
-Amounts,Množství,
-Pending Principal Amount,Čeká částka jistiny,
-Payable Principal Amount,Splatná jistina,
-Paid Principal Amount,Vyplacená jistina,
-Paid Interest Amount,Částka zaplaceného úroku,
-Process Loan Interest Accrual,Časově rozlišené úroky z procesu,
-Repayment Schedule Name,Název splátkového kalendáře,
Regular Payment,Pravidelná platba,
Loan Closure,Uznání úvěru,
-Payment Details,Platební údaje,
-Interest Payable,Úroky splatné,
-Amount Paid,Zaplacené částky,
-Principal Amount Paid,Hlavní zaplacená částka,
-Repayment Details,Podrobnosti splácení,
-Loan Repayment Detail,Podrobnosti o splácení půjčky,
-Loan Security Name,Název zabezpečení půjčky,
-Unit Of Measure,Měrná jednotka,
-Loan Security Code,Bezpečnostní kód půjčky,
-Loan Security Type,Typ zabezpečení půjčky,
-Haircut %,Střih%,
-Loan Details,Podrobnosti o půjčce,
-Unpledged,Unpledged,
-Pledged,Slíbil,
-Partially Pledged,Částečně zastaveno,
-Securities,Cenné papíry,
-Total Security Value,Celková hodnota zabezpečení,
-Loan Security Shortfall,Nedostatek zabezpečení úvěru,
-Loan ,Půjčka,
-Shortfall Time,Zkratový čas,
-America/New_York,America / New_York,
-Shortfall Amount,Částka schodku,
-Security Value ,Hodnota zabezpečení,
-Process Loan Security Shortfall,Nedostatek zabezpečení procesních půjček,
-Loan To Value Ratio,Poměr půjčky k hodnotě,
-Unpledge Time,Unpledge Time,
-Loan Name,půjčka Name,
Rate of Interest (%) Yearly,Úroková sazba (%) Roční,
-Penalty Interest Rate (%) Per Day,Trestní úroková sazba (%) za den,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,V případě opožděného splacení se z nedočkané výše úroku vybírá penalizační úroková sazba denně,
-Grace Period in Days,Grace Období ve dnech,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Počet dní od data splatnosti, do kterých nebude účtována pokuta v případě zpoždění splácení půjčky",
-Pledge,Slib,
-Post Haircut Amount,Částka za účes,
-Process Type,Typ procesu,
-Update Time,Čas aktualizace,
-Proposed Pledge,Navrhovaný slib,
-Total Payment,Celková platba,
-Balance Loan Amount,Balance Výše úvěru,
-Is Accrued,Je narostl,
Salary Slip Loan,Úvěrový půjček,
Loan Repayment Entry,Úvěrová splátka,
-Sanctioned Loan Amount,Částka schváleného úvěru,
-Sanctioned Amount Limit,Povolený limit částky,
-Unpledge,Unpledge,
-Haircut,Střih,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generování plán,
Schedules,Plány,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekt bude k dispozici na webových stránkách k těmto uživatelům,
Copied From,Zkopírován z,
Start and End Dates,Datum zahájení a ukončení,
-Actual Time (in Hours),Skutečný čas (v hodinách),
+Actual Time in Hours (via Timesheet),Skutečný čas (v hodinách),
Costing and Billing,Kalkulace a fakturace,
-Total Costing Amount (via Timesheets),Celková částka kalkulování (prostřednictvím časových lístků),
-Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků),
+Total Costing Amount (via Timesheet),Celková částka kalkulování (prostřednictvím časových lístků),
+Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároků),
Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury),
Total Sales Amount (via Sales Order),Celková částka prodeje (prostřednictvím objednávky prodeje),
-Total Billable Amount (via Timesheets),Celková fakturační částka (prostřednictvím časových lístků),
-Total Billed Amount (via Sales Invoices),Celková fakturační částka (prostřednictvím prodejních faktur),
-Total Consumed Material Cost (via Stock Entry),Celkové náklady na spotřebu materiálu (přes vstup zboží),
+Total Billable Amount (via Timesheet),Celková fakturační částka (prostřednictvím časových lístků),
+Total Billed Amount (via Sales Invoice),Celková fakturační částka (prostřednictvím prodejních faktur),
+Total Consumed Material Cost (via Stock Entry),Celkové náklady na spotřebu materiálu (přes vstup zboží),
Gross Margin,Hrubá marže,
Gross Margin %,Hrubá Marže %,
Monitor Progress,Monitorování pokroku,
@@ -7521,12 +7385,10 @@
Dependencies,Závislosti,
Dependent Tasks,Závislé úkoly,
Depends on Tasks,Závisí na Úkoly,
-Actual Start Date (via Time Sheet),Skutečné datum zahájení (přes Time Sheet),
-Actual Time (in hours),Skutečná doba (v hodinách),
-Actual End Date (via Time Sheet),Skutečné datum ukončení (přes Time Sheet),
-Total Costing Amount (via Time Sheet),Celková kalkulace Částka (přes Time Sheet),
+Actual Start Date (via Timesheet),Skutečné datum zahájení (přes Time Sheet),
+Actual Time in Hours (via Timesheet),Skutečná doba (v hodinách),
+Actual End Date (via Timesheet),Skutečné datum ukončení (přes Time Sheet),
Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku),
-Total Billing Amount (via Time Sheet),Celková částka Billing (přes Time Sheet),
Review Date,Review Datum,
Closing Date,Uzávěrka Datum,
Task Depends On,Úkol je závislá na,
@@ -7887,7 +7749,6 @@
Update Series,Řada Aktualizace,
Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.,
Prefix,Prefix,
-Current Value,Current Value,
This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem,
Update Series Number,Aktualizace Series Number,
Quotation Lost Reason,Důvod ztráty nabídky,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level,
Lead Details,Detaily leadu,
Lead Owner Efficiency,Vedoucí účinnost vlastníka,
-Loan Repayment and Closure,Splácení a uzavření úvěru,
-Loan Security Status,Stav zabezpečení úvěru,
Lost Opportunity,Ztracená příležitost,
Maintenance Schedules,Plány údržby,
Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Počet zacílených: {0},
Payment Account is mandatory,Platební účet je povinný,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Pokud je zaškrtnuto, bude odečtena celá částka ze zdanitelného příjmu před výpočtem daně z příjmu bez jakéhokoli prohlášení nebo předložení dokladu.",
-Disbursement Details,Podrobnosti o výplatě,
Material Request Warehouse,Sklad požadavku na materiál,
Select warehouse for material requests,Vyberte sklad pro požadavky na materiál,
Transfer Materials For Warehouse {0},Přenos materiálů do skladu {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Vrátit nevyzvednutou částku z platu,
Deduction from salary,Srážka z platu,
Expired Leaves,Vypršela platnost listů,
-Reference No,Referenční číslo,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Procento srážky je procentní rozdíl mezi tržní hodnotou zajištění úvěru a hodnotou připisovanou tomuto zajištění úvěru, pokud je použit jako kolaterál pro danou půjčku.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Poměr půjčky k hodnotě vyjadřuje poměr výše půjčky k hodnotě zastaveného cenného papíru. Nedostatek zabezpečení půjčky se spustí, pokud poklesne pod stanovenou hodnotu jakékoli půjčky",
If this is not checked the loan by default will be considered as a Demand Loan,"Pokud to není zaškrtnuto, bude se úvěr ve výchozím nastavení považovat za půjčku na vyžádání",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Tento účet slouží k rezervaci splátek půjčky od dlužníka a také k vyplácení půjček dlužníkovi,
This account is capital account which is used to allocate capital for loan disbursal account ,"Tento účet je kapitálovým účtem, který se používá k přidělení kapitálu pro účet vyplácení půjček",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operace {0} nepatří do pracovního příkazu {1},
Print UOM after Quantity,Tisk MJ po množství,
Set default {0} account for perpetual inventory for non stock items,U výchozích položek nastavte výchozí účet {0} pro věčný inventář,
-Loan Security {0} added multiple times,Zabezpečení půjčky {0} přidáno několikrát,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Úvěrové cenné papíry s různým poměrem LTV nelze zastavit proti jedné půjčce,
-Qty or Amount is mandatory for loan security!,Množství nebo částka je pro zajištění půjčky povinné!,
-Only submittted unpledge requests can be approved,Schváleny mohou být pouze odeslané žádosti o odpojení,
-Interest Amount or Principal Amount is mandatory,Částka úroku nebo částka jistiny je povinná,
-Disbursed Amount cannot be greater than {0},Vyplacená částka nemůže být větší než {0},
-Row {0}: Loan Security {1} added multiple times,Řádek {0}: Zabezpečení půjčky {1} přidáno několikrát,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Řádek č. {0}: Podřízená položka by neměla být balíkem produktů. Odeberte prosím položku {1} a uložte ji,
Credit limit reached for customer {0},Dosažen úvěrový limit pro zákazníka {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nelze automaticky vytvořit zákazníka kvůli následujícím chybějícím povinným polím:,
diff --git a/erpnext/translations/cz.csv b/erpnext/translations/cz.csv
index fabf35f..270a710 100644
--- a/erpnext/translations/cz.csv
+++ b/erpnext/translations/cz.csv
@@ -1,686 +1,686 @@
-DocType: Employee,Salary Mode,Mode Plat
-DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
-DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
-DocType: Purchase Order,"If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu nákupem daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consumer Products,Spotřební zboží
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +72,Please select Party Type first,"Prosím, vyberte typ Party první"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,Žíhání
-DocType: Item,Customer Items,Zákazník položky
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
-DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +63,Email Notifications,E-mailová upozornění
-DocType: Item,Default Unit of Measure,Výchozí Měrná jednotka
-DocType: SMS Center,All Sales Partner Contact,Všechny Partneři Kontakt
-DocType: Employee,Leave Approvers,Nechte schvalovatelů
-DocType: Sales Partner,Dealer,Dealer
-DocType: Employee,Rented,Pronajato
-DocType: Stock Entry,Get Stock and Rate,Získejte skladem a Rate
-DocType: About Us Settings,Website,Stránky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Compaction plus sintering,Zhutňování a spékání
-DocType: Sales BOM,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","Položka, která představuje balíček. Tato položka musí mít ""je skladem"" jako ""No"" a ""Je Sales Item"" jako ""Yes"""
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,"Prosím, zadejte ID zaměstnance této kupní farář"
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},Prosím nastavte klíče pro přístup Google Drive In {0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,Z materiálu Poptávka
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0} Strom
-DocType: Job Applicant,Job Applicant,Job Žadatel
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,Právní
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
-DocType: C-Form,Customer,Zákazník
-DocType: Purchase Receipt Item,Required By,Vyžadováno
-DocType: Department,Department,Oddělení
-DocType: Purchase Order,% Billed,% Fakturováno
-DocType: Selling Settings,Customer Name,Jméno zákazníka
-DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Všech oblastech souvisejících vývozní jako měnu, přepočítacího koeficientu, export celkem, export celkovém součtu etc jsou k dispozici v dodací list, POS, citace, prodejní faktury, prodejní objednávky atd"
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
-DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
-DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,Řada Aktualizováno Úspěšně
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Stitching,Šití
-DocType: Pricing Rule,Apply On,Naneste na
-DocType: Item Price,Multiple Item prices.,Více ceny položku.
-,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
-DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
-DocType: Quality Inspection Reading,Parameter,Parametr
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +52,Please specify a Price List which is valid for Territory,"Uveďte prosím ceníku, který je platný pro území"
-apps/erpnext/erpnext/projects/doctype/project/project.py +35,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +235,Do really want to unstop production order:,Opravdu chcete uvolnit výrobní zakázky:
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,Bank Návrh
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
-DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
-apps/erpnext/erpnext/stock/doctype/item/item.js +60,Show Variants,Zobrazit Varianty
-DocType: Sales Invoice Item,Quantity,Množství
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
-DocType: Employee Education,Year of Passing,Rok Passing
-DocType: Designation,Designation,Označení
-DocType: Production Plan Item,Production Plan Item,Výrobní program Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +137,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Health Care,Péče o zdraví
-DocType: Purchase Invoice,Monthly,Měsíčně
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Invoice,Faktura
-DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +355,Email Address,E-mailová adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Defense,Obrana
-DocType: Company,Abbr,Zkr
-DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +62,Row # {0}:,Řádek # {0}:
-DocType: Delivery Note,Vehicle No,Vozidle
-sites/assets/js/erpnext.min.js +50,Please select Price List,"Prosím, vyberte Ceník"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Zpracování dřeva
-DocType: Production Order Operation,Work In Progress,Work in Progress
-DocType: Company,If Monthly Budget Exceeded,Pokud Měsíční rozpočet překročen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,3D tisk
-DocType: Employee,Holiday List,Dovolená Seznam
-DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Účetní
-DocType: Company,Phone No,Telefon
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
-apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nový {0}: # {1}
-,Sales Partners Commission,Obchodní partneři Komise
-apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
-DocType: Backup Manager,Allow Google Drive Access,Povolit Google disku přístup
-DocType: Email Digest,Projects & System,Projekty a System
-DocType: Print Settings,Classic,Klasické
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
-DocType: Shopping Cart Settings,Shipping Rules,Přepravní řád
-DocType: BOM,Operations,Operace
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
-DocType: Bin,Quantity Requested for Purchase,Požadovaného množství na nákup
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Připojit CSV soubor se dvěma sloupci, jeden pro starý název a jeden pro nový název"
-DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Kg,Kg
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +5,Advertising,Reklama
-DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
-DocType: Payment Reconciliation,Reconcile,Srovnat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,Grocery,Potraviny
-DocType: Quality Inspection Reading,Reading 1,Čtení 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +93,Make Bank Entry,Proveďte Bank Vstup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/account/account.py +116,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
-DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
-DocType: Backup Manager,Credentials,Pověřovací listiny
-DocType: Purchase Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se, zrušte zaškrtnutí políčka zastavit opakované nebo dát správné datum ukončení"
-DocType: Sales Invoice Item,Sales Invoice Item,Prodejní faktuře položka
-DocType: Account,Credit,Úvěr
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, setup zaměstnanců pojmenování systému v oblasti lidských zdrojů> Nastavení HR"
-DocType: POS Setting,Write Off Cost Center,Odepsat nákladové středisko
-DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,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/accounts/doctype/gl_entry/gl_entry.py +114,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
-apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,Parent Item {0} nesmí být skladem a musí být prodejní položky
-DocType: Item,Item Image (if not slideshow),Item Image (ne-li slideshow)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutečná Provozní doba
-DocType: SMS Log,SMS Log,SMS Log
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
-DocType: Blog Post,Guest,Host
-DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
-DocType: Lead,Interested,Zájemci
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},Od {0} do {1}
-DocType: Item,Copy From Item Group,Kopírovat z bodu Group
-DocType: Journal Entry,Opening Entry,Otevření Entry
-apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} je povinné
-apps/erpnext/erpnext/config/setup.py +111,Contact master.,Kontakt master.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
-DocType: Lead,Product Enquiry,Dotaz Product
-DocType: Standard Reply,Owner,Majitel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +35,Please select Company first,"Prosím, vyberte první firma"
-DocType: Employee Education,Under Graduate,Za absolventa
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
-DocType: BOM,Total Cost,Celkové náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Reaming,Vystružování
-DocType: Email Digest,Stub,Pahýl
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +8,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Real Estate,Nemovitost
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pharmaceuticals,Farmaceutické
-DocType: Expense Claim Detail,Claim Amount,Nárok Částka
-DocType: Employee,Mr,Pan
-DocType: Custom Script,Client,Klient
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
-DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,Spotřební
-DocType: Upload Attendance,Import Log,Záznam importu
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
-DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Roční Plat
-DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Náklady
-DocType: Newsletter,Email Sent?,E-mail odeslán?
-DocType: Journal Entry,Contra Entry,Contra Entry
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,Show Time Záznamy
-DocType: Email Digest,Bank/Cash Balance,Bank / Cash Balance
-DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
-DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pro nákup
-apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
-DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
+Salary Mode,Mode Plat,
+"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
+Divorced,Rozveden$1,
+Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
+Items already synced,Položky již synchronizovat,
+"If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu nákupem daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
+Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit,
+Consumer Products,Spotřební zbožt,
+Please select Party Type first,"Prosím, vyberte typ Party první"
+Annealing,Žíhány,
+Customer Items,Zákazník položky,
+Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha,
+Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com,
+Email Notifications,E-mailová upozorněny,
+Default Unit of Measure,Výchozí Měrná jednotka,
+All Sales Partner Contact,Všechny Partneři Kontakt,
+Leave Approvers,Nechte schvalovately,
+Dealer,Dealer,
+Rented,Pronajato,
+Get Stock and Rate,Získejte skladem a Rate,
+Website,Stránky,
+Compaction plus sintering,Zhutňování a spékány,
+"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","Položka, která představuje balíček. Tato položka musí mít ""je skladem"" jako ""No"" a ""Je Sales Item"" jako ""Yes"""
+Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
+* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
+Please enter Employee Id of this sales parson,"Prosím, zadejte ID zaměstnance této kupní farář"
+Please set Google Drive access keys in {0},Prosím nastavte klíče pro přístup Google Drive In {0}
+From Material Request,Z materiálu Poptávka,
+{0} Tree,{0} Strom,
+Job Applicant,Job Žadatel,
+No more results.,Žádné další výsledky.
+Legal,Právn$1,
+Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
+Customer,Zákazník,
+Required By,Vyžadováno,
+Department,Oddělenk,
+% Billed,% Fakturováno,
+Customer Name,Jméno zákazníka,
+"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Všech oblastech souvisejících vývozní jako měnu, přepočítacího koeficientu, export celkem, export celkovém součtu etc jsou k dispozici v dodací list, POS, citace, prodejní faktury, prodejní objednávky atd"
+Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
+Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
+Default 10 mins,Výchozí 10 min,
+Leave Type Name,Nechte Typ Jméno,
+Series Updated Successfully,Řada Aktualizováno Úspěšnn,
+Stitching,Šitn,
+Apply On,Naneste na,
+Multiple Item prices.,Více ceny položku.
+Purchase Order Items To Be Received,Položky vydané objednávky k přijett,
+All Supplier Contact,Vše Dodavatel Kontakt,
+Parameter,Parametr,
+Please specify a Price List which is valid for Territory,"Uveďte prosím ceníku, který je platný pro území"
+Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
+Do really want to unstop production order:,Opravdu chcete uvolnit výrobní zakázky:
+New Leave Application,New Leave Application,
+Bank Draft,Bank Návrh,
+1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
+Mode of Payment Account,Způsob platby účtu,
+Show Variants,Zobrazit Varianty,
+Quantity,Množstvu,
+Loans (Liabilities),Úvěry (závazky)
+Year of Passing,Rok Passing,
+Designation,Označeng,
+Production Plan Item,Výrobní program Item,
+User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
+Health Care,Péče o zdrava,
+Monthly,Měsíčna,
+Invoice,Faktura,
+Periodicity,Periodicita,
+Email Address,E-mailová adresa,
+Defense,Obrana,
+Abbr,Zkr,
+Score (0-5),Score (0-5)
+Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+Row # {0}:,Řádek # {0}:
+Vehicle No,Vozidle,
+Please select Price List,"Prosím, vyberte Ceník"
+Woodworking,Zpracování dřeva,
+Work In Progress,Work in Progress,
+If Monthly Budget Exceeded,Pokud Měsíční rozpočet překročen,
+3D printing,3D tisk,
+Holiday List,Dovolená Seznam,
+Time Log,Time Log,
+Accountant,Účetna,
+Phone No,Telefon,
+"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
+New {0}: #{1},Nový {0}: # {1}
+Sales Partners Commission,Obchodní partneři Komise,
+Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znake,
+Allow Google Drive Access,Povolit Google disku přístup,
+Projects & System,Projekty a System,
+Classic,Klasicke,
+This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
+Shipping Rules,Přepravní řád,
+Operations,Operace,
+Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
+Quantity Requested for Purchase,Požadovaného množství na nákup,
+"Attach .csv file with two columns, one for the old name and one for the new name","Připojit CSV soubor se dvěma sloupci, jeden pro starý název a jeden pro nový název"
+Parent Detail docname,Parent Detail docname,
+Kg,Kg,
+Opening for a Job.,Otevření o zaměstnání.
+Advertising,Reklama,
+Married,Ženata,
+Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+Reconcile,Srovnat,
+Grocery,Potraviny,
+Reading 1,Čtení 1,
+Make Bank Entry,Proveďte Bank Vstup,
+Pension Funds,Penzijní fondy,
+Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
+All Sales Person,Všichni obchodní zástupci,
+Credentials,Pověřovací listiny,
+"Check if recurring order, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se, zrušte zaškrtnutí políčka zastavit opakované nebo dát správné datum ukončení"
+Sales Invoice Item,Prodejní faktuře položka,
+Credit,Úvěr,
+Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, setup zaměstnanců pojmenování systému v oblasti lidských zdrojů> Nastavení HR"
+Write Off Cost Center,Odepsat nákladové středisko,
+Warehouse Detail,Sklad Detail,
+Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
+Parent Item {0} must be not Stock Item and must be a Sales Item,Parent Item {0} nesmí být skladem a musí být prodejní položky,
+Item Image (if not slideshow),Item Image (ne-li slideshow)
+An Customer exists with same name,Zákazník existuje se stejným názvem,
+(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutečná Provozní doba,
+SMS Log,SMS Log,
+Cost of Delivered Items,Náklady na dodávaných výrobkm,
+Guest,Host,
+Get Specification Details,Získat Specifikace Podrobnosti,
+Interested,Zájemci,
+Bill of Material,Bill of materiálu,
+From {0} to {1},Od {0} do {1}
+Copy From Item Group,Kopírovat z bodu Group,
+Opening Entry,Otevření Entry,
+{0} is mandatory,{0} je povinnp,
+Contact master.,Kontakt master.
+Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+Product Enquiry,Dotaz Product,
+Owner,Majitel,
+Please enter company first,"Prosím, nejprave zadejte společnost"
+Please select Company first,"Prosím, vyberte první firma"
+Under Graduate,Za absolventa,
+Target On,Target On,
+Total Cost,Celkové náklady,
+Reaming,Vystružována,
+Stub,Pahýl,
+Activity Log:,Aktivita Log:
+Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela,
+Real Estate,Nemovitost,
+Statement of Account,Výpis z účtu,
+Pharmaceuticals,Farmaceuticka,
+Claim Amount,Nárok Částka,
+Mr,Pan,
+Client,Klient,
+Supplier Type / Supplier,Dodavatel Typ / dovozce,
+Prefix,Prefix,
+Consumable,Spotřebna,
+Import Log,Záznam importu,
+Send,Odeslat,
+All Contact,Vše Kontakt,
+Annual Salary,Roční Plat,
+Closing Fiscal Year,Uzavření fiskálního roku,
+Stock Expenses,Stock Náklady,
+Email Sent?,E-mail odeslán?
+Contra Entry,Contra Entry,
+Show Time Logs,Show Time Záznamy,
+Bank/Cash Balance,Bank / Cash Balance,
+Installation Status,Stav instalace,
+Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+Supply Raw Materials for Purchase,Dodávky suroviny pro nákup,
+Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky,
+"Download the Template, fill appropriate data and attach the modified file.
All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +496,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +385,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR modul
-DocType: SMS Center,SMS Center,SMS centrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Straightening,Rovnací
-DocType: BOM Replace Tool,New BOM,New BOM
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +132,There were no updates in the items selected for this digest.,Nebyly zjištěny žádné aktualizace ve vybraných položek pro tento digest.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Countergravity casting,Countergravity lití
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +28,Newsletter has already been sent,Newsletter již byla odeslána
-DocType: Lead,Request Type,Typ požadavku
-DocType: Leave Application,Reason,Důvod
-DocType: Purchase Invoice,The rate at which Bill Currency is converted into company's base currency,"Sazba, za kterou je Bill měny převeden do společnosti základní měny"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Broadcasting,Vysílání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +135,Execution,Provedení
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
-DocType: Serial No,Maintenance Status,Status Maintenance
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
-DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vyberte zaměstnance, pro kterého vytváříte hodnocení."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +90,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
-DocType: Customer,Individual,Individuální
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plán pro návštěvy údržby.
-DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprávy
-apps/erpnext/erpnext/config/selling.py +143,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
-sites/assets/js/form.min.js +261,Start,Start
-DocType: User,First Name,Křestní jméno
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,Nastavení je dokončeno. Aktualizuji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Full-mold casting,Lití Full-forma
-DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmínky
-DocType: Email Digest,Payments made during the digest period,Platby provedené v období digest
-DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
-DocType: Purchase Taxes and Charges,Valuation,Ocenění
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Nastavit jako výchozí
-,Purchase Order Trends,Nákupní objednávka trendy
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Přidělit listy za rok.
-DocType: Earning Type,Earning Type,Výdělek Type
-DocType: Email Digest,New Sales Orders,Nové Prodejní objednávky
-DocType: Bank Reconciliation,Bank Account,Bankovní účet
-DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
-DocType: Email Digest,Receivable / Payable account will be identified based on the field Master Type,Pohledávka / Závazek účet bude určen na základě hlavního pole typu
-DocType: Selling Settings,Default Territory,Výchozí Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Television,Televize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Gashing,Rozsekne
-DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
-DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
-apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},Vyhrazeno Warehouse potřebný pro živočišnou item {0} v řadě {1}
-DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
-DocType: Supplier,Mention if non-standard receivable account applicable,Zmínka v případě nestandardní pohledávky účet použitelná
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
-DocType: Sales Partner,Reseller,Reseller
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,"Prosím, zadejte společnost"
-DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
-,Production Orders in Progress,Zakázka na výrobu v Progress
-DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,"Auto-raise Material žádosti, pokud množství klesne pod úroveň re-pořadí, ve výchozím skladu"
-DocType: Journal Entry,Write Off Amount <=,Napište jednorázová částka <=
-DocType: Lead,Address & Contact,Adresa a kontakt
-apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
-DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,Vytvořte Stock Ledger záznamy při odeslání prodejní faktuře
-DocType: Newsletter List,Total Subscribers,Celkem Odběratelé
-DocType: Lead,Contact Name,Kontakt Jméno
-DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
-DocType: Salary Manager,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
-apps/erpnext/erpnext/templates/generators/item.html +21,No description given,No vzhledem k tomu popis
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Double housing,Double bydlení
-DocType: Item,"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Jednotka měření této položky (např Kg, Unit, No, pár)."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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/page/setup_wizard/install_fixtures.py +167,Leaves per Year,Listy za rok
-DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,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 +174,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
-DocType: Brand,Material Master Manager,Materiál Hlavní manažer
-DocType: Bulk Email,Message,Zpráva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +663,Pending Items {0} updated,Nevyřízené položky {0} Aktualizováno
-DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
-DocType: Backup Manager,Dropbox Access Key,Dropbox Access Key
-DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +342,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +465,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/accounts/utils.py +306,Annual,Roční
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
-DocType: Purchase Invoice,In Words will be visible once you save the Purchase Invoice.,"Ve slovech budou viditelné, jakmile uložíte o nákupu."
-DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
-DocType: Material Request Item,Min Order Qty,Min Objednané množství
-DocType: Lead,Do Not Contact,Nekontaktujte
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Software Developer,Software Developer
-DocType: Item,Minimum Order Qty,Minimální objednávka Množství
-DocType: Pricing Rule,Supplier Type,Dodavatel Type
-DocType: Item,Publish in Hub,Publikovat v Hub
-,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +482,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Material Request,Požadavek na materiál
-DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Wire brushing,Wire kartáčování
-DocType: Employee,Relation,Vztah
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
-DocType: Purchase Receipt Item,Rejected Quantity,Zamítnuto Množství
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Pole k dispozici v dodací list, cenovou nabídku, prodejní faktury odběratele"
-DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Je primárně Kontakt
-DocType: Notification Control,Notification Control,Oznámení Control
-DocType: Lead,Suggestions,Návrhy
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
-DocType: Supplier,Address HTML,Adresa HTML
-DocType: Lead,Mobile No.,Mobile No.
-DocType: Maintenance Schedule,Generate Schedule,Generování plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Hubbing,Hubbing
-DocType: Purchase Invoice Item,Expense Head,Náklady Head
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,Max 5 characters,Max 5 znaků
-DocType: Email Digest,New Quotations,Nové Citace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +194,Select Your Language,Zvolit jazyk
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
-DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
-apps/erpnext/erpnext/config/crm.py +80,Manage Sales Person Tree.,Správa obchodník strom.
-DocType: Item,Synced With Hub,Synchronizovány Hub
-DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +35,Item {0} must be Service Item,Položka {0} musí být Service Item
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
-DocType: DocType,Administrator,Správce
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser drilling,Laserové vrtání
-DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM
-DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
-DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Přidat / Upravit </a>"
-DocType: Employee,External Work History,Vnější práce History
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenční Chyba
-DocType: ToDo,Closed,Zavřeno
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
-DocType: Lead,Industry,Průmysl
-DocType: Employee,Job Profile,Job Profile
-DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Necking,Zúžení
-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/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +29,Item is updated,Položka je aktualizována
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +26,Global POS Setting {0} already created for company {1},Global POS nastavení {0} již vytvořený pro společnost {1}
-DocType: Comment,System Manager,Správce systému
-DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-DocType: Sales Invoice Item,Delivery Note,Dodací list
-DocType: Backup Manager,Allow Dropbox Access,Povolit přístup Dropbox
-DocType: Communication,Support Manager,Manažer podpory
-DocType: Sales Order Item,Reserved Warehouse,Vyhrazeno Warehouse
-apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
-DocType: Workstation,Rent Cost,Rent Cost
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vyberte měsíc a rok
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude faktura bude zaslán automaticky na určité datum"
-DocType: Employee,Company Email,Společnost E-mail
-DocType: Workflow State,Refresh,obnovit
-DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Všech souvisejících oblastech, jako je dovozní měně, přepočítací koeficient, dovoz celkem, dovoz celkovém součtu etc jsou k dispozici v dokladu o koupi, dodavatelů nabídky, faktury, objednávky apod"
-apps/erpnext/erpnext/stock/doctype/item/item.js +59,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,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +59,Total Order Considered,Celková objednávka Zvážil
-DocType: Sales Invoice Item,Discount (%),Sleva (%)
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +198,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
-DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Select Položka
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} status je zastavena
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
+Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
+Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
+"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+Settings for HR Module,Nastavení pro HR modul,
+SMS Center,SMS centrum,
+Straightening,Rovnacl,
+New BOM,New BOM,
+There were no updates in the items selected for this digest.,Nebyly zjištěny žádné aktualizace ve vybraných položek pro tento digest.
+Countergravity casting,Countergravity lita,
+Newsletter has already been sent,Newsletter již byla odeslána,
+Request Type,Typ požadavku,
+Reason,Důvod,
+The rate at which Bill Currency is converted into company's base currency,"Sazba, za kterou je Bill měny převeden do společnosti základní měny"
+Broadcasting,Vysílán$1,
+Execution,Proveden$1,
+The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
+Details of the operations carried out.,Podrobnosti o prováděných operací.
+Maintenance Status,Status Maintenance,
+From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
+Select the Employee for whom you are creating the Appraisal.,"Vyberte zaměstnance, pro kterého vytváříte hodnocení."
+Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
+Individual,Individuáln$1,
+Plan for maintenance visits.,Plán pro návštěvy údržby.
+Enter url parameter for message,Zadejte url parametr zprávy,
+Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
+Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej,
+Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
+Start,Start,
+First Name,Křestní jméno,
+Your setup is complete. Refreshing.,Nastavení je dokončeno. Aktualizuji.
+Full-mold casting,Lití Full-forma,
+Select Terms and Conditions,Vyberte Podmínky,
+Payments made during the digest period,Platby provedené v období digest,
+Sales Orders,Prodejní objednávky,
+Valuation,Oceněna,
+Set as Default,Nastavit jako výchoza,
+Purchase Order Trends,Nákupní objednávka trendy,
+Allocate leaves for the year.,Přidělit listy za rok.
+Earning Type,Výdělek Type,
+New Sales Orders,Nové Prodejní objednávky,
+Bank Account,Bankovní účet,
+Allow Negative Balance,Povolit záporný zůstatek,
+Receivable / Payable account will be identified based on the field Master Type,Pohledávka / Závazek účet bude určen na základě hlavního pole typu,
+Default Territory,Výchozí Territory,
+Television,Televize,
+Gashing,Rozsekne,
+Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
+Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
+Series List for this Transaction,Řada seznam pro tuto transakci,
+Reserved Warehouse required for stock Item {0} in row {1},Vyhrazeno Warehouse potřebný pro živočišnou item {0} v řadě {1}
+Is Opening Entry,Je vstupní otvor,
+Mention if non-standard receivable account applicable,Zmínka v případě nestandardní pohledávky účet použitelnr,
+For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním,
+Reseller,Reseller,
+Please enter Company,"Prosím, zadejte společnost"
+Against Sales Invoice Item,Proti položce vydané faktury,
+Production Orders in Progress,Zakázka na výrobu v Progress,
+Auto-raise Material Request if quantity goes below re-order level in default warehouse,"Auto-raise Material žádosti, pokud množství klesne pod úroveň re-pořadí, ve výchozím skladu"
+Write Off Amount <=,Napište jednorázová částka <=
+Address & Contact,Adresa a kontakt,
+Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
+Create Stock Ledger Entries when you submit a Sales Invoice,Vytvořte Stock Ledger záznamy při odeslání prodejní faktuře,
+Total Subscribers,Celkem Odběratele,
+Contact Name,Kontakt Jméno,
+SO Pending Qty,SO Pending Množstve,
+Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
+No description given,No vzhledem k tomu popis,
+Request for purchase.,Žádost o koupi.
+Double housing,Double bydlen$1,
+"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Jednotka měření této položky (např Kg, Unit, No, pár)."
+Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci,
+Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojováni,
+Leaves per Year,Listy za rok,
+Will be updated when batched.,Bude aktualizována při dávkově.
+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."
+Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
+Material Master Manager,Materiál Hlavní manažer,
+Message,Zpráva,
+Pending Items {0} updated,Nevyřízené položky {0} Aktualizováno,
+Item Website Specification,Položka webových stránek Specifikace,
+Dropbox Access Key,Dropbox Access Key,
+Reference No,Referenční číslo,
+Leave Blocked,Nechte Blokováno,
+Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+Annual,Ročnm,
+Stock Reconciliation Item,Reklamní Odsouhlasení Item,
+In Words will be visible once you save the Purchase Invoice.,"Ve slovech budou viditelné, jakmile uložíte o nákupu."
+Sales Invoice No,Prodejní faktuře e,
+Min Order Qty,Min Objednané množstve,
+Do Not Contact,Nekontaktujte,
+The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
+Software Developer,Software Developer,
+Minimum Order Qty,Minimální objednávka Množstvr,
+Supplier Type,Dodavatel Type,
+Publish in Hub,Publikovat v Hub,
+Terretory,Terretory,
+Item {0} is cancelled,Položka {0} je zrušen,
+Material Request,Požadavek na materiál,
+Update Clearance Date,Aktualizace Výprodej Datum,
+Wire brushing,Wire kartáčovánr,
+Relation,Vztah,
+Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
+Rejected Quantity,Zamítnuto Množstv$1,
+"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Pole k dispozici v dodací list, cenovou nabídku, prodejní faktury odběratele"
+SMS Sender Name,SMS Sender Name,
+Is Primary Contact,Je primárně Kontakt,
+Notification Control,Oznámení Control,
+Suggestions,Návrhy,
+Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
+Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
+Address HTML,Adresa HTML,
+Mobile No.,Mobile No.
+Generate Schedule,Generování plán,
+Hubbing,Hubbing,
+Expense Head,Náklady Head,
+Please select Charge Type first,"Prosím, vyberte druh tarifu první"
+Latest,Nejnovějše,
+Max 5 characters,Max 5 znake,
+New Quotations,Nové Citace,
+Select Your Language,Zvolit jazyk,
+The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího,
+Settings for Accounts,Nastavení účte,
+Manage Sales Person Tree.,Správa obchodník strom.
+Synced With Hub,Synchronizovány Hub,
+Variant Of,Varianta,
+Item {0} must be Service Item,Položka {0} musí být Service Item,
+Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
+Administrator,Správce,
+Laser drilling,Laserové vrtáne,
+New Stock UOM,Nových akcií UOM,
+Closing Account Head,Závěrečný účet hlava,
+"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer Group""> Přidat / Upravit </a>"
+External Work History,Vnější práce History,
+Circular Reference Error,Kruhové Referenční Chyba,
+Closed,Zavřeno,
+In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
+Industry,Průmysl,
+Job Profile,Job Profile,
+Newsletter,Newsletter,
+Hydroforming,Hydroforming,
+Necking,Zúženl,
+Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka,
+Item is updated,Položka je aktualizována,
+Global POS Setting {0} already created for company {1},Global POS nastavení {0} již vytvořený pro společnost {1}
+System Manager,Správce systému,
+Invoice Type,Typ faktury,
+Delivery Note,Dodací list,
+Allow Dropbox Access,Povolit přístup Dropbox,
+Support Manager,Manažer podpory,
+Reserved Warehouse,Vyhrazeno Warehouse,
+Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
+{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce,
+Rent Cost,Rent Cost,
+Please select month and year,Vyberte měsíc a rok,
+"Enter email id separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude faktura bude zaslán automaticky na určité datum"
+Company Email,Společnost E-mail,
+Refresh,obnovit,
+"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Všech souvisejících oblastech, jako je dovozní měně, přepočítací koeficient, dovoz celkem, dovoz celkovém součtu etc jsou k dispozici v dokladu o koupi, dodavatelů nabídky, faktury, objednávky apod"
+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,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
+Total Order Considered,Celková objednávka Zvážil,
+Discount (%),Sleva (%)
+"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
+Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
+Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
+"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
+Tax Rate,Tax Rate,
+Select Item,Select Položka,
+{0} {1} status is Stopped,{0} {1} status je zastavena,
+"Item: {0} managed batch-wise, can not be reconciled using \
Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +242,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Převést na non-Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
-DocType: Stock UOM Replace Utility,Current Stock UOM,Current Reklamní UOM
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
-DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jelikož jsou stávající skladové transakce za tuto položku, nelze změnit hodnoty ""Má pořadové číslo"", ""má Batch ne"", ""Je skladem"" a ""oceňování metoda"""
-apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,Vaše e-mailová adresa
-DocType: Email Digest,Income booked for the digest period,Příjmy žlutou kartu za období digest
-apps/erpnext/erpnext/config/setup.py +106,Supplier master.,Dodavatel master.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,"Prosím, viz příloha"
-DocType: Purchase Order,% Received,% Přijaté
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,Řezání vodním paprskem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,Setup již dokončen !!
-,Finished Goods,Hotové zboží
-DocType: Delivery Note,Instructions,Instrukce
-DocType: Quality Inspection,Inspected By,Zkontrolován
-DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
-DocType: Leave Application,Leave Approver Name,Nechte schvalovač Jméno
-,Schedule Date,Plán Datum
-DocType: Packed Item,Packed Item,Zabalená položka
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Existuje Náklady aktivity pro zaměstnance {0} proti Typ aktivity - {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Prosím, ne vytvářet účty pro zákazníky a dodavateli. Jsou vytvořeny přímo od zákazníka / dodavatele mistrů."
-DocType: Currency Exchange,Currency Exchange,Směnárna
-DocType: Purchase Invoice Item,Item Name,Název položky
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
-DocType: Employee,Widowed,Ovdovělý
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Položky, které je třeba požádat, které jsou ""Není skladem"" s ohledem na veškeré sklady na základě předpokládaného Množství a minimální Objednané množství"
-DocType: Workstation,Working Hours,Pracovní doba
-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.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
-DocType: Stock Entry,Purchase Return,Nákup Return
-,Purchase Register,Nákup Register
-DocType: Item,"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Výběr ""Ano"" umožní tato položka přijít na odběratele, dodací list"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,Zadejte prosím doklad o koupi No pokračovat
-DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
-DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Tube navlékání korálků
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +638,Make Maint. Schedule,Proveďte údržba. Plán
-DocType: Employee,Single,Jednolůžkový
-DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
-DocType: Purchase Invoice,Yearly,Ročně
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +217,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
-DocType: Sales Invoice Item,Sales Order,Prodejní objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Prodej Rate
-DocType: Purchase Order,Start date of current order's period,Datum období současného objednávky Začátek
-apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
-DocType: Delivery Note,% Installed,% Instalováno
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
-DocType: BOM,Item Desription,Položka Desription
-DocType: Buying Settings,Supplier Name,Dodavatel Name
-DocType: Account,Is Group,Is Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Tvarování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,Kotoučová
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č ' nesmí být menší než ""Od Případu č '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,Non Profit
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nezahájeno
-DocType: Lead,Channel Partner,Channel Partner
-DocType: Account,Old Parent,Staré nadřazené
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Přizpůsobte si úvodní text, který jede jako součást tohoto e-mailu. Každá transakce je samostatný úvodní text."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales manažer ve skupině Master
-apps/erpnext/erpnext/config/manufacturing.py +66,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
-DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
-DocType: SMS Log,Sent On,Poslán na
-DocType: Sales Order,Not Applicable,Nehodí se
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Shell molding,Shell lití
-DocType: Material Request Item,Required Date,Požadovaná data
-DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,"Prosím, zadejte kód položky."
-DocType: BOM,Costing,Rozpočet
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
-DocType: Employee,Health Concerns,Zdravotní Obavy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Unpaid,Nezaplacený
-DocType: Packing Slip,From Package No.,Od č balíčku
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
-DocType: Features Setup,Imports,Importy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Adhesive bonding,Lepení
-DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Účast rekord.
-DocType: Bank Reconciliation,Journal Entries,Zápisy do Deníku
-DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
-DocType: System Settings,Loading...,Nahrávám...
-DocType: DocField,Password,Heslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Fused deposition modeling,Nánosový modelování depozice
-DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
-DocType: Backup Manager,"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.","Poznámka: Zálohy a soubory nejsou odstraněny z Disku Google, budete muset odstranit ručně."
-DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
-DocType: Journal Entry,Accounts Payable,Účty za úplatu
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Přidat předplatitelé
-sites/assets/js/erpnext.min.js +2,""" does not exists",""" Neexistuje"
-DocType: Pricing Rule,Valid Upto,Valid aľ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,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.
-DocType: Email Digest,Open Tickets,Otevřené Vstupenky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
-DocType: Email Digest,Total amount of invoices received from suppliers during the digest period,Celková výše přijatých faktur od dodavatelů během období digest
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-DocType: Item,Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,"Dodací lhůta dnech je počet dní, o nichž je tato položka očekává ve skladu. Tento dnech je přitažené za vlasy v hmotné požadavku při výběru této položky."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Administrative Officer,Správní ředitel
-DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
-DocType: Item,"Select ""Yes"" if this item is used for some internal purpose in your company.","Zvolte ""Ano"", pokud tato položka se používá pro některé interní účely ve vaší firmě."
-DocType: Stock Entry,Difference Account,Rozdíl účtu
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +307,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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Cosmetics,Kosmetika
-DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
-DocType: Backup Manager,Email ids separated by commas.,E-mailové ID oddělené čárkami.
-DocType: Communication,Subject,Předmět
-DocType: Item,"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Zvolte ""Ano"", pokud je tato položka představuje nějakou práci, jako je vzdělávání, projektování, konzultace atd."
-DocType: Shipping Rule,Net Weight,Hmotnost
-DocType: Employee,Emergency Phone,Nouzový telefon
-DocType: Backup Manager,Google Drive Access Allowed,Google Drive Přístup povolen
-,Serial No Warranty Expiry,Pořadové č záruční lhůty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +634,Do you really want to STOP this Material Request?,Opravdu chcete zastavit tento materiál požadavek?
-DocType: Purchase Invoice Item,Item,Položka
-DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
-DocType: Account,Profit and Loss,Zisky a ztráty
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +310,Upcoming Calendar Events (max 10),Nadcházející Události v kalendáři (max 10)
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +101,New UOM must NOT be of type Whole Number,New UOM NESMÍ být typu celé číslo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou Ceník měna je převedena na společnosti základní měny"
-apps/erpnext/erpnext/setup/doctype/company/company.py +48,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
-DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
-DocType: BOM,Operating Cost,Provozní náklady
-,Gross Profit,Hrubý Zisk
-DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
-DocType: Company,Delete Company Transactions,Smazat transakcí Company
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,Položka {0} není Nákup položky
-apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
+Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána,
+Convert to non-Group,Převést na non-Group,
+Purchase Receipt must be submitted,Příjmka musí být odeslána,
+Current Stock UOM,Current Reklamní UOM,
+Batch (lot) of an Item.,Batch (lot) položky.
+Invoice Date,Datum Fakturace,
+"As there are existing stock transactions for this item, you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jelikož jsou stávající skladové transakce za tuto položku, nelze změnit hodnoty ""Má pořadové číslo"", ""má Batch ne"", ""Je skladem"" a ""oceňování metoda"""
+Your email address,Vaše e-mailová adresa,
+Income booked for the digest period,Příjmy žlutou kartu za období digest,
+Supplier master.,Dodavatel master.
+Please see attachment,"Prosím, viz příloha"
+% Received,% Přijatm,
+Water jet cutting,Řezání vodním paprskem,
+Setup Already Complete!!,Setup již dokončen !!
+Finished Goods,Hotové zbože,
+Instructions,Instrukce,
+Inspected By,Zkontrolován,
+Maintenance Type,Typ Maintenance,
+Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
+Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr,
+Leave Approver Name,Nechte schvalovač Jméno,
+Schedule Date,Plán Datum,
+Packed Item,Zabalená položka,
+Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
+Activity Cost exists for Employee {0} against Activity Type - {1},Existuje Náklady aktivity pro zaměstnance {0} proti Typ aktivity - {1}
+Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Prosím, ne vytvářet účty pro zákazníky a dodavateli. Jsou vytvořeny přímo od zákazníka / dodavatele mistrů."
+Currency Exchange,Směnárna,
+Item Name,Název položky,
+Credit Balance,Credit Balance,
+Widowed,Ovdověla,
+"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Položky, které je třeba požádat, které jsou ""Není skladem"" s ohledem na veškeré sklady na základě předpokládaného Množství a minimální Objednané množství"
+Working Hours,Pracovní doba,
+Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
+"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
+Purchase Return,Nákup Return,
+Purchase Register,Nákup Register,
+"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Výběr ""Ano"" umožní tato položka přijít na odběratele, dodací list"
+Please enter Purchase Receipt No to proceed,Zadejte prosím doklad o koupi No pokračovat,
+Applicable Charges,Použitelné Poplatky,
+Consumable Cost,Spotřební Cost,
+{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+Medical,Lékařsky,
+Reason for losing,Důvod ztráty,
+Tube beading,Tube navlékání korálky,
+Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
+Make Maint. Schedule,Proveďte údržba. Plán,
+Single,Jednolůžkovn,
+Cost of Goods Sold,Náklady na prodej zbožn,
+Yearly,Ročnn,
+Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+Sales Order,Prodejní objednávky,
+Avg. Selling Rate,Avg. Prodej Rate,
+Start date of current order's period,Datum období současného objednávky Začátek,
+Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
+Quantity and Rate,Množství a cena,
+% Installed,% Instalováno,
+Please enter company name first,"Prosím, zadejte nejprve název společnosti"
+Item Desription,Položka Desription,
+Supplier Name,Dodavatel Name,
+Is Group,Is Group,
+Thermoforming,Tvarovánn,
+Slitting,Kotoučovn,
+'To Case No.' cannot be less than 'From Case No.',"""DO Případu č ' nesmí být menší než ""Od Případu č '"
+Non Profit,Non Profit,
+Not Started,Nezahájeno,
+Channel Partner,Channel Partner,
+Old Parent,Staré nadřazent,
+Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Přizpůsobte si úvodní text, který jede jako součást tohoto e-mailu. Každá transakce je samostatný úvodní text."
+Sales Master Manager,Sales manažer ve skupině Master,
+Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
+Accounts Frozen Upto,Účty Frozen aa,
+Sent On,Poslán na,
+Not Applicable,Nehodí se,
+Holiday master.,Holiday master.
+Shell molding,Shell lita,
+Required Date,Požadovaná data,
+Billing Address,Fakturační adresa,
+Please enter Item Code.,"Prosím, zadejte kód položky."
+Costing,Rozpočet,
+"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
+Total Qty,Celkem Množstvy,
+Health Concerns,Zdravotní Obavy,
+Unpaid,Nezaplaceny,
+From Package No.,Od č balíčku,
+Securities and Deposits,Cenné papíry a vklady,
+Imports,Importy,
+Adhesive bonding,Lepeny,
+Description of a Job Opening,Popis jednoho volných pozic,
+Attendance record.,Účast rekord.
+Journal Entries,Zápisy do Deníku,
+Used for Production Plan,Používá se pro výrobní plán,
+Loading...,Nahrávám...
+Password,Heslo,
+Fused deposition modeling,Nánosový modelování depozice,
+Time Between Operations (in mins),Doba mezi operací (v min)
+"Note: Backups and files are not deleted from Google Drive, you will have to delete them manually.","Poznámka: Zálohy a soubory nejsou odstraněny z Disku Google, budete muset odstranit ručně."
+Buyer of Goods and Services.,Kupující zboží a služeb.
+Accounts Payable,Účty za úplatu,
+Add Subscribers,Přidat předplatitelu,
+""" does not exists",""" Neexistuje"
+Valid Upto,Valid a$1,
+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.
+Open Tickets,Otevřené Vstupenky,
+Direct Income,Přímý příjmy,
+Total amount of invoices received from suppliers during the digest period,Celková výše přijatých faktur od dodavatelů během období digest,
+"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
+Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,"Dodací lhůta dnech je počet dní, o nichž je tato položka očekává ve skladu. Tento dnech je přitažené za vlasy v hmotné požadavku při výběru této položky."
+Administrative Officer,Správní ředitel,
+Received Or Paid,Přijaté nebo placenl,
+"Select ""Yes"" if this item is used for some internal purpose in your company.","Zvolte ""Ano"", pokud tato položka se používá pro některé interní účely ve vaší firmě."
+Difference Account,Rozdíl účtu,
+Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+Additional Operating Cost,Další provozní náklady,
+Cosmetics,Kosmetika,
+Type,Typ,
+"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+Email ids separated by commas.,E-mailové ID oddělené čárkami.
+Subject,Předmět,
+"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Zvolte ""Ano"", pokud je tato položka představuje nějakou práci, jako je vzdělávání, projektování, konzultace atd."
+Net Weight,Hmotnost,
+Emergency Phone,Nouzový telefon,
+Google Drive Access Allowed,Google Drive Přístup povolen,
+Serial No Warranty Expiry,Pořadové č záruční lhůty,
+Do you really want to STOP this Material Request?,Opravdu chcete zastavit tento materiál požadavek?
+Item,Položka,
+Difference (Dr - Cr),Rozdíl (Dr - Cr)
+Profit and Loss,Zisky a ztráty,
+Upcoming Calendar Events (max 10),Nadcházející Události v kalendáři (max 10)
+New UOM must NOT be of type Whole Number,New UOM NESMÍ být typu celé číslo,
+Furniture and Fixture,Nábytek,
+Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou Ceník měna je převedena na společnosti základní měny"
+Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
+Default Customer Group,Výchozí Customer Group,
+"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
+Operating Cost,Provozní náklady,
+Gross Profit,Hrubý Zisk,
+Material Requirement,Materiál Požadavek,
+Delete Company Transactions,Smazat transakcí Company,
+Item {0} is not Purchase Item,Položka {0} není Nákup položky,
+"{0} is an invalid email address in 'Notification \
Email Address'","{0} je neplatná e-mailová adresa v ""Oznámení \
E-mailová adresa"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Celkem Billing Tento rok:
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
-DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
-DocType: Territory,For reference,Pro srovnání
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),Uzavření (Cr)
-DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
-DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
-DocType: Job Applicant,Thread HTML,Thread HTML
-DocType: Company,Ignore,Ignorovat
-DocType: Backup Manager,Enter Verification Code,Zadejte ověřovací kód
-apps/erpnext/erpnext/controllers/buying_controller.py +136,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
-DocType: Pricing Rule,Valid From,Platnost od
-DocType: Sales Invoice,Total Commission,Celkem Komise
-DocType: Pricing Rule,Sales Partner,Sales Partner
-DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+Total Billing This Year:,Celkem Billing Tento rok:
+Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatk$1,
+Supplier Invoice No,Dodavatelské faktury $1,
+For reference,Pro srovnán$1,
+Closing (Cr),Uzavření (Cr)
+Warranty Period (Days),Záruční doba (dny)
+Installation Note Item,Poznámka k instalaci bod,
+Thread HTML,Thread HTML,
+Ignore,Ignorovat,
+Enter Verification Code,Zadejte ověřovací kód,
+Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupend,
+Valid From,Platnost od,
+Total Commission,Celkem Komise,
+Sales Partner,Sales Partner,
+Purchase Receipt Required,Příjmka je vyžadována,
+"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Měsíční rozložení** vám pomůže váš rozpočet distribuovat do více měsíců, pokud Vaše podnikání ovlivňuje sezónnost.
Chcete-li distribuovat rozpočet pomocí tohoto rozdělení, nastavte toto ** měsíční rozložení ** v ** nákladovém středisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
-apps/erpnext/erpnext/config/accounts.py +79,Financial / accounting year.,Finanční / Účetní rok.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +172,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
-DocType: Email Digest,New Supplier Quotations,Nového dodavatele Citace
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,Ujistěte se prodejní objednávky
-DocType: Project Task,Project Task,Úkol Project
-,Lead Id,Olovo Id
-DocType: C-Form Invoice Detail,Grand Total,Celkem
-DocType: About Us Settings,Website Manager,Správce webu
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
-DocType: Warranty Claim,Resolution,Řešení
-DocType: Sales Order,Display all the individual items delivered with the main items,Zobrazit všechny jednotlivé položky dodané s hlavními položkami
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +67,Payable Account,Splatnost účtu
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
-DocType: Backup Manager,Sync with Google Drive,Synchronizace s Google Disku
-DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Předchozí
-DocType: Stock Entry,Sales Return,Sales Return
-DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
-apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
-DocType: Quotation,Quotation To,Nabídka k
-DocType: Lead,Middle Income,Středními příjmy
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/accounts/utils.py +186,Allocated amount can not be negative,Přidělená částka nemůže být záporná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Tumbling,Tumbling
-DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
-DocType: Event,Wednesday,Středa
-DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +197,Production Order is Mandatory,Výrobní zakázka je povinné
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +40,{0} {1} has a common territory {2},{0} {1} má společný území {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Proposal Writing,Návrh Psaní
-apps/erpnext/erpnext/config/setup.py +85,Masters,Masters
-apps/erpnext/erpnext/stock/stock_ledger.py +316,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
-DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
-DocType: Packing Slip Item,DN Detail,DN Detail
-DocType: Time Log,Billed,Fakturováno
-DocType: Batch,Batch Description,Popis Šarže
-DocType: Delivery Note,Time at which items were delivered from warehouse,"Čas, kdy byly předměty dodány od skladu"
-DocType: Sales Invoice,Sales Taxes and Charges,Prodej Daně a poplatky
-DocType: Employee,Organization Profile,Profil organizace
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosím, nastavení číslování série pro Účast přes Nastavení> Série číslování"
-DocType: Email Digest,New Enquiries,Nové Dotazy
-DocType: Employee,Reason for Resignation,Důvod rezignace
-apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Šablona pro hodnocení výkonu.
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
-apps/erpnext/erpnext/accounts/utils.py +50,{0} '{1}' not in Fiscal Year {2},{0} '{1}' není v fiskálním roce {2}
-DocType: Buying Settings,Settings for Buying Module,Nastavení pro nákup modul
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
-DocType: Buying Settings,Supplier Naming By,Dodavatel Pojmenování By
-DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +126,Please install dropbox python module,"Prosím, nainstalujte dropbox python modul"
-DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,Manažer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,Z příjemky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
-DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
-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
-sites/assets/js/form.min.js +253,To,na
-apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,Zadejte e-mailovou adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,End tube forming,Konec trubice tvořící
-DocType: Production Order Operation,In minutes,V minutách
-DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,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}
-DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
-DocType: Activity Cost,Activity Type,Druh činnosti
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Dodává Částka
-DocType: Sales Invoice,Packing List,Balení Seznam
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Publishing,Publikování
-DocType: Activity Cost,Projects User,Projekty uživatele
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
-DocType: Material Request,Material Transfer,Přesun materiálu
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Nastavení
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
-DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
-DocType: BOM Operation,Operation Time,Provozní doba
-sites/assets/js/list.min.js +5,More,Více
-DocType: Communication,Sales Manager,Manažer prodeje
-sites/assets/js/desk.min.js +555,Rename,Přejmenovat
-DocType: Purchase Invoice,Write Off Amount,Odepsat Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Bending,Ohýbání
-DocType: Leave Block List Allow,Allow User,Umožňuje uživateli
-DocType: Journal Entry,Bill No,Bill No
-DocType: Purchase Invoice,Quarterly,Čtvrtletně
-DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
-DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company měny)
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,"Prosím, zadejte podrobnosti položky"
-DocType: Purchase Receipt,Other Details,Další podrobnosti
-DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Straight shearing,Straight stříhání
-DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
-DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
-DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
-DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
-DocType: Hub Settings,Seller City,Prodejce City
-DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
-DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +23,Item {0} not found,Položka {0} nebyl nalezen
-DocType: Bin,Stock Value,Reklamní Value
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Množství spotřebované na jednotku
-DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
-DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
-DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +141,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti poukazu Type musí být jedním z prodejní objednávky, prodejní faktury nebo Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
-DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Zboží od dodavatelů.
-DocType: Communication,Open,Otevřít
-DocType: Lead,Campaign Name,Název kampaně
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +197,Please enter Delivery Note No or Sales Invoice No to proceed,"Prosím, zadejte dodacího listu nebo prodejní faktury č pokračovat"
-,Reserved,Rezervováno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you really want to UNSTOP,"Opravdu chcete, aby uvolnit"
-DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} není skladová položka
-DocType: Mode of Payment Account,Default Account,Výchozí účet
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
-DocType: Contact Us Settings,Address Title,Označení adresy
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +32,Please select weekly off day,"Prosím, vyberte týdenní off den"
-DocType: Production Order Operation,Planned End Time,Plánované End Time
-,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
-DocType: Backup Manager,Daily,Denně
-apps/erpnext/erpnext/accounts/doctype/account/account.py +79,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
-DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
-DocType: Employee,Cell Number,Číslo buňky
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +139,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/setup/page/setup_wizard/fixtures/industry_type.py +24,Energy,Energie
-DocType: Opportunity,Opportunity From,Příležitost Z
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +434,"Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. \
+No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy,
+Please select Company and Party Type first,Vyberte první společnost a Party Typ,
+Financial / accounting year.,Finanční / Účetní rok.
+"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
+New Supplier Quotations,Nového dodavatele Citace,
+Make Sales Order,Ujistěte se prodejní objednávky,
+Project Task,Úkol Project,
+Lead Id,Olovo Id,
+Grand Total,Celkem,
+Website Manager,Správce webu,
+Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončene,
+Resolution,Řešene,
+Display all the individual items delivered with the main items,Zobrazit všechny jednotlivé položky dodané s hlavními položkami,
+Payable Account,Splatnost účtu,
+Repeat Customers,Opakujte zákazníci,
+Sync with Google Drive,Synchronizace s Google Disku,
+Allocate,Přidělit,
+Previous,Předchoze,
+Sales Return,Sales Return,
+Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
+Salary components.,Mzdové složky.
+Database of potential customers.,Databáze potenciálních zákazníků.
+Customer database.,Databáze zákazníků.
+Quotation To,Nabídka k,
+Middle Income,Středními příjmy,
+Opening (Cr),Otvor (Cr)
+Allocated amount can not be negative,Přidělená částka nemůže být záporng,
+Tumbling,Tumbling,
+Billed Amt,Účtovaného Amt,
+A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
+Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
+Wednesday,Středa,
+Customer's Vendor,Prodejce zákazníka,
+Production Order is Mandatory,Výrobní zakázka je povinna,
+{0} {1} has a common territory {2},{0} {1} má společný území {2}
+Proposal Writing,Návrh Psans,
+Masters,Masters,
+Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
+Fiscal Year Company,Fiskální rok Společnosti,
+DN Detail,DN Detail,
+Billed,Fakturováno,
+Batch Description,Popis Šarže,
+Time at which items were delivered from warehouse,"Čas, kdy byly předměty dodány od skladu"
+Sales Taxes and Charges,Prodej Daně a poplatky,
+Organization Profile,Profil organizace,
+Please setup numbering series for Attendance via Setup > Numbering Series,"Prosím, nastavení číslování série pro Účast přes Nastavení> Série číslování"
+New Enquiries,Nové Dotazy,
+Reason for Resignation,Důvod rezignace,
+Template for performance appraisals.,Šablona pro hodnocení výkonu.
+Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti,
+{0} '{1}' not in Fiscal Year {2},{0} '{1}' není v fiskálním roce {2}
+Settings for Buying Module,Nastavení pro nákup modul,
+Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
+Supplier Naming By,Dodavatel Pojmenování By,
+Maintenance Schedule,Plán údržby,
+"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
+Please install dropbox python module,"Prosím, nainstalujte dropbox python modul"
+Passport Number,Číslo pasu,
+Manager,Manažer,
+From Purchase Receipt,Z příjemky,
+Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+Receiver Parameter,Přijímač parametr$1,
+'Based On' and 'Group By' can not be same,"""Založeno Na"" a ""Seskupeno Podle"", nemůže být stejné"
+Sales Person Targets,Obchodník cíle,
+To,na,
+Please enter email address,Zadejte e-mailovou adresu,
+End tube forming,Konec trubice tvoříce,
+In minutes,V minutách,
+Resolution Date,Rozlišení Datum,
+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}
+Customer Naming By,Zákazník Pojmenování By,
+Convert to Group,Převést do skupiny,
+Activity Type,Druh činnosti,
+Delivered Amount,Dodává Částka,
+Packing List,Balení Seznam,
+Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
+Publishing,Publikováne,
+Projects User,Projekty uživatele,
+Consumed,Spotřeba,
+{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury,
+Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky,
+Material Transfer,Přesun materiálu,
+Opening (Dr),Opening (Dr)
+Posting timestamp must be after {0},Časová značka zadání musí být po {0}
+Settings,Nastaveny,
+Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky,
+Actual Start Time,Skutečný čas začátku,
+Operation Time,Provozní doba,
+More,Více,
+Sales Manager,Manažer prodeje,
+Rename,Přejmenovat,
+Write Off Amount,Odepsat Částka,
+Bending,Ohýbány,
+Allow User,Umožňuje uživateli,
+Bill No,Bill No,
+Quarterly,Čtvrtletny,
+Delivery Note Required,Delivery Note Povinny,
+Basic Rate (Company Currency),Basic Rate (Company měny)
+Please enter item details,"Prosím, zadejte podrobnosti položky"
+Other Details,Další podrobnosti,
+Accounts,Účty,
+Marketing,Marketing,
+Straight shearing,Straight stříháni,
+To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
+Current Stock,Current skladem,
+Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky,
+Expenses Included In Valuation,Náklady ceně oceňovánm,
+Provide email id registered in company,Poskytnout e-mail id zapsané ve firmm,
+Seller City,Prodejce City,
+Next email will be sent on:,Další e-mail bude odeslán dne:
+Offer Letter Term,Nabídka Letter Term,
+Item {0} not found,Položka {0} nebyl nalezen,
+Stock Value,Reklamní Value,
+Tree Type,Tree Type,
+Qty Consumed Per Unit,Množství spotřebované na jednotku,
+Warranty Expiry Date,Záruka Datum vypršení platnosti,
+Quantity and Warehouse,Množství a sklad,
+Commission Rate (%),Výše provize (%)
+"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti poukazu Type musí být jedním z prodejní objednávky, prodejní faktury nebo Journal Entry"
+Biomachining,Biomachining,
+Aerospace,Aerospace,
+Welcome,Vítejte,
+Credit Card Entry,Vstup Kreditní karta,
+Task Subject,Úkol Předmět,
+Goods received from Suppliers.,Zboží od dodavatelů.
+Open,Otevřít,
+Campaign Name,Název kampant,
+Please enter Delivery Note No or Sales Invoice No to proceed,"Prosím, zadejte dodacího listu nebo prodejní faktury č pokračovat"
+Reserved,Rezervováno,
+Do you really want to UNSTOP,"Opravdu chcete, aby uvolnit"
+Supply Raw Materials,Dodávek surovin,
+The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
+Current Assets,Oběžná aktiva,
+{0} is not a stock Item,{0} není skladová položka,
+Default Account,Výchozí účet,
+Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova,
+Address Title,Označení adresy,
+Please select weekly off day,"Prosím, vyberte týdenní off den"
+Planned End Time,Plánované End Time,
+Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise,
+Daily,Denne,
+Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu,
+Customer's Purchase Order No,Zákazníka Objednávka No,
+Cell Number,Číslo buňky,
+Lost,Ztracene,
+You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+Energy,Energie,
+Opportunity From,Příležitost Z,
+Monthly salary statement.,Měsíční plat prohlášení.
+"Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. \
Pending Amount is {2}","Řádek č {0}: Částka nesmí být větší než Až do částky proti Expense nároku {1}. \
Až Částka je {2}"
-DocType: Item Group,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,New Account,Nový účet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
-apps/erpnext/erpnext/templates/pages/ticket.py +27,Please write something,Napište něco
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
-DocType: ToDo,High,Vysoké
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +364,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
-DocType: Opportunity,Maintenance,Údržba
-DocType: User,Male,Muž
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
-DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
-apps/erpnext/erpnext/config/crm.py +54,Sales campaigns.,Prodej kampaně.
-DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+Website Specifications,Webových stránek Specifikace,
+New Account,Nový účet,
+{0}: From {0} of type {1},{0}: Od {0} typu {1}
+Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinno,
+Please write something,Napište něco,
+Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
+High,Vysok$1,
+Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+Maintenance,Údržba,
+Male,Mua,
+Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+Item Attribute Value,Položka Hodnota atributu,
+Sales campaigns.,Prodej kampaně.
+"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
-#### Note
+#### Note,
The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
-#### Description of Columns
+#### Description of Columns,
1. Calculation Type:
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
-2. Account Head: The Account ledger under which this tax will be booked
+2. Account Head: The Account ledger under which this tax will be booked,
3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
4. Description: Description of the tax (that will be printed in invoices / quotes).
5. Rate: Tax rate.
@@ -707,208 +707,208 @@
7. Celkem: Kumulativní celková k tomuto bodu.
8. Zadejte Row: Je-li na základě ""předchozí řady Total"" můžete zvolit číslo řádku, která bude přijata jako základ pro tento výpočet (výchozí je předchozí řádek).
9. Je to poplatek v ceně do základní sazby ?: Pokud se to ověřit, znamená to, že tato daň nebude zobrazen pod tabulkou položky, ale budou zahrnuty do základní sazby v hlavním položce tabulky. To je užitečné, pokud chcete dát paušální cenu (včetně všech poplatků), ceny pro zákazníky."
-DocType: Serial No,Purchase Returned,Nákup Vráceno
-DocType: Employee,Bank A/C No.,"Č, bank. účtu"
-DocType: Email Digest,Scheduler Failed Events,Plánovač Nepodařilo Events
-DocType: Expense Claim,Project,Projekt
-DocType: Quality Inspection Reading,Reading 7,Čtení 7
-DocType: Address,Personal,Osobní
-DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
-apps/erpnext/erpnext/controllers/accounts_controller.py +255,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Biotechnology,Biotechnologie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Náklady Office údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Hemming,Hemming
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +64,Please enter Item first,"Prosím, nejdřív zadejte položku"
-DocType: Account,Liability,Odpovědnost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
-DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
-apps/erpnext/erpnext/stock/get_item_details.py +238,Price List not selected,Ceník není zvolen
-DocType: Employee,Family Background,Rodinné poměry
-DocType: Salary Manager,Send Email,Odeslat email
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,Nemáte oprávnění
-DocType: Company,Default Bank Account,Výchozí Bankovní účet
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,Nos
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,Moje Faktury
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Žádný zaměstnanec nalezeno
-DocType: Purchase Order,Stopped,Zastaveno
-DocType: SMS Center,All Customer Contact,Vše Kontakt Zákazník
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +32,Send Now,Odeslat nyní
-,Support Analytics,Podpora Analytics
-DocType: Item,Website Warehouse,Sklad pro web
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
-apps/erpnext/erpnext/config/accounts.py +159,C-Form records,C-Form záznamy
-DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Podpora dotazy ze strany zákazníků.
-DocType: Bin,Moving Average Rate,Klouzavý průměr
-DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
-DocType: Communication,Reference Name,Název reference
-DocType: Maintenance Visit,Completion Status,Dokončení Status
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Chcete-li sledovat značku v těchto dokumentech dodacího listu Opportunity, materiál Request, bod, objednávky, nákup poukazu, nakupují stvrzenka, cenovou nabídku, prodejní faktury, Sales BOM, prodejní objednávky, pořadové číslo"
-DocType: Production Order,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
-DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
-DocType: Salary Manager,Activity Log,Aktivita Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / ztráta
-apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
-DocType: Production Order,Item To Manufacture,Bod K výrobě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,Trvalé odlévání forem
-DocType: Sales Order Item,Projected Qty,Předpokládané množství
-DocType: Sales Invoice,Payment Due Date,Splatno dne
-DocType: Newsletter,Newsletter Manager,Newsletter Manažer
-DocType: Notification Control,Delivery Note Message,Delivery Note Message
-DocType: Expense Claim,Expenses,Výdaje
-,Purchase Receipt Trends,Doklad o koupi Trendy
-DocType: Appraisal,Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Research & Development,Výzkum a vývoj
-,Amount to Bill,Částka k Fakturaci
-DocType: Company,Registration Details,Registrace Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,Sázet
-DocType: Item Reorder,Re-Order Qty,Re-Order Množství
-DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +23,Scheduled to send to {0},Plánované poslat na {0}
-DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
-DocType: Sales Team,Incentives,Pobídky
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Hodnocení výkonu.
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +636,Make Maint. Visit,Proveďte údržba. Návštěva
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +68,Cannot carry forward {0},Nelze převést {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
-DocType: Account,Balance must be,Zůstatek musí být
-DocType: Hub Settings,Publish Pricing,Publikovat Ceník
-DocType: Email Digest,New Purchase Receipts,Nové Nákup Příjmy
-DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Nailing,Báječný
-,Available Qty,Množství k dispozici
-DocType: Purchase Taxes and Charges,On Previous Row Total,Na předchozí řady Celkem
-DocType: Salary Slip,Working Days,Pracovní dny
-DocType: Serial No,Incoming Rate,Příchozí Rate
-DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +409,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
-DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
-DocType: Job Applicant,Hold,Držet
-DocType: Employee,Date of Joining,Datum přistoupení
-DocType: Naming Series,Update Series,Řada Aktualizace
-DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
-DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobrazit Odběratelé
-DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
-,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Abrasive blasting,Abrazivní tryskání
-DocType: Employee,Ms,Paní
-apps/erpnext/erpnext/config/accounts.py +138,Currency exchange rate master.,Devizový kurz master.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +242,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
-DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +423,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.js +22,Set Status as Available,Nastavit stav as k dispozici
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vyberte první typ dokumentu
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +68,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: Salary Slip,Leave Encashment Amount,Nechte inkasa Částka
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Setting,Proveďte nové nastavení POS
-DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
-DocType: Bank Reconciliation,Total Amount,Celková částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Internet Publishing,Internet Publishing
-DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,Zůstatek Hodnota
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
-DocType: Purchase Receipt,Range,Rozsah
-DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
-DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +193,Item Variants {0} updated,Bod Varianty {0} aktualizováno
-DocType: Quality Inspection Reading,Reading 6,Čtení 6
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
-DocType: Address,Shop,Obchod
-DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
-DocType: Employee,Permanent Address Is,Trvalé bydliště je
-DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
-DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
-DocType: Item,Is Purchase Item,je Nákupní Položka
-DocType: Payment Reconciliation Payment,Purchase Invoice,Přijatá faktura
-DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
-DocType: Lead,Request for Information,Žádost o informace
-DocType: Payment Tool,Paid,Placený
-DocType: Salary Slip,Total in words,Celkem slovy
-DocType: Material Request Item,Lead Time Date,Lead Time data
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +127,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Zásilky zákazníkům.
-DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
-DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +390,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 +508,Select Item for Transfer,Vybrat položku pro převod
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
-DocType: Pricing Rule,Max Qty,Max Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,Chemický
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
-DocType: Salary Manager,Select Payroll Year and Month,Vyberte Payroll rok a měsíc
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte na příslušné skupiny (obvykle využití finančních prostředků> oběžných aktiv> bankovních účtů a vytvořit nový účet (kliknutím na Přidat dítě) typu "Bank"
-DocType: Workstation,Electricity Cost,Cena elektřiny
-DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
-DocType: Comment,Unsubscribed,Odhlášen z odběru
-DocType: Opportunity,Walk In,Vejít
-DocType: Item,Inspection Criteria,Inspekční Kritéria
-apps/erpnext/erpnext/config/accounts.py +96,Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +472,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,White,Bílá
-DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
-DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Picture,Připojit svůj obrázek
-DocType: Journal Entry,Total Amount in Words,Celková částka slovy
-DocType: Workflow State,Stop,Stop
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
-DocType: Purchase Order,% of materials billed against this Purchase Order.,% Materiálů fakturovaných proti této objednávce.
-apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
-DocType: Lead,Next Contact Date,Další Kontakt Datum
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +34,Opening Qty,Otevření POČET
-DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +163,Stock Options,Akciové opce
-DocType: Expense Claim,Expense Claim,Hrazení nákladů
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +164,Qty for {0},Množství pro {0}
-DocType: Leave Application,Leave Application,Leave Application
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Nechte přidělení nástroj
-DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
-DocType: Email Digest,Buying & Selling,Nákup a prodej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Trimming,Ořezávání
-DocType: Workstation,Net Hour Rate,Net Hour Rate
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
-DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
-DocType: POS Setting,Cash/Bank Account,Hotovostní / Bankovní účet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
-DocType: Delivery Note,Delivery To,Doručení do
-DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,"Row {0}: Party / Account does not match with \
+Purchase Returned,Nákup Vráceno,
+Bank A/C No.,"Č, bank. účtu"
+Scheduler Failed Events,Plánovač Nepodařilo Events,
+Project,Projekt,
+Reading 7,Čtení 7,
+Personal,Osobns,
+Expense Claim Type,Náklady na pojistná Type,
+Default settings for Shopping Cart,Výchozí nastavení Košík,
+"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
+Biotechnology,Biotechnologie,
+Office Maintenance Expenses,Náklady Office údržby,
+Hemming,Hemming,
+Please enter Item first,"Prosím, nejdřív zadejte položku"
+Liability,Odpovědnost,
+Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
+Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu,
+Price List not selected,Ceník není zvolen,
+Family Background,Rodinné poměry,
+Send Email,Odeslat email,
+No Permission,Nemáte oprávněnu,
+Default Bank Account,Výchozí Bankovní účet,
+"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
+Nos,Nos,
+Bank Reconciliation Detail,Bank Odsouhlasení Detail,
+My Invoices,Moje Faktury,
+No employee found,Žádný zaměstnanec nalezeno,
+Stopped,Zastaveno,
+All Customer Contact,Vše Kontakt Zákazník,
+Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
+Send Now,Odeslat nyns,
+Support Analytics,Podpora Analytics,
+Website Warehouse,Sklad pro web,
+"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
+Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5,
+C-Form records,C-Form záznamy,
+Email Digest Settings,Nastavení e-mailu Digest,
+Support queries from customers.,Podpora dotazy ze strany zákazníků.
+Moving Average Rate,Klouzavý průměr,
+Select Items,Vyberte položky,
+{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
+Reference Name,Název reference,
+Completion Status,Dokončení Status,
+"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Sales BOM, Sales Order, Serial No","Chcete-li sledovat značku v těchto dokumentech dodacího listu Opportunity, materiál Request, bod, objednávky, nákup poukazu, nakupují stvrzenka, cenovou nabídku, prodejní faktury, Sales BOM, prodejní objednávky, pořadové číslo"
+Target Warehouse,Target Warehouse,
+Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
+Import Attendance,Importovat Docházku,
+All Item Groups,Všechny skupiny položek,
+Activity Log,Aktivita Log,
+Net Profit / Loss,Čistý zisk / ztráta,
+Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
+Item To Manufacture,Bod K výrobm,
+Permanent mold casting,Trvalé odlévání forem,
+Projected Qty,Předpokládané množstvm,
+Payment Due Date,Splatno dne,
+Newsletter Manager,Newsletter Manažer,
+Delivery Note Message,Delivery Note Message,
+Expenses,Výdaje,
+Purchase Receipt Trends,Doklad o koupi Trendy,
+Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
+Research & Development,Výzkum a vývoj,
+Amount to Bill,Částka k Fakturaci,
+Registration Details,Registrace Podrobnosti,
+Staking,Sázet,
+Re-Order Qty,Re-Order Množstvj,
+Leave Block List Date,Nechte Block List Datum,
+Scheduled to send to {0},Plánované poslat na {0}
+Price or Discount,Cena nebo Sleva,
+Incentives,Pobídky,
+Performance appraisal.,Hodnocení výkonu.
+Project Value,Hodnota projektu,
+Make Maint. Visit,Proveďte údržba. Návštěva,
+Cannot carry forward {0},Nelze převést {0}
+"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+Balance must be,Zůstatek musí být,
+Publish Pricing,Publikovat Ceník,
+New Purchase Receipts,Nové Nákup Příjmy,
+Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajt,
+Nailing,Báječnt,
+Available Qty,Množství k dispozici,
+On Previous Row Total,Na předchozí řady Celkem,
+Working Days,Pracovní dny,
+Incoming Rate,Příchozí Rate,
+Gross Weight,Hrubá hmotnost,
+The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
+Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dnt,
+Hold,Držet,
+Date of Joining,Datum přistoupent,
+Update Series,Řada Aktualizace,
+Is Subcontracted,Subdodavatelům,
+Item Attribute Values,Položka Hodnoty atributt,
+View Subscribers,Zobrazit Odběratelt,
+Purchase Receipt,Příjemka,
+Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
+Abrasive blasting,Abrazivní tryskán$1,
+Ms,Pan$1,
+Currency exchange rate master.,Devizový kurz master.
+Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
+Plan material for sub-assemblies,Plán materiál pro podsestavy,
+BOM {0} must be active,BOM {0} musí být aktivny,
+Set Status as Available,Nastavit stav as k dispozici,
+Please select the document type first,Vyberte první typ dokumentu,
+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,
+Leave Encashment Amount,Nechte inkasa Částka,
+Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
+Make new POS Setting,Proveďte nové nastavení POS,
+Required Qty,Požadované množstvS,
+Total Amount,Celková částka,
+Internet Publishing,Internet Publishing,
+Production Orders,Výrobní Objednávky,
+Balance Value,Zůstatek Hodnota,
+Sales Price List,Sales Ceník,
+Publish to sync items,Publikování synchronizovat položky,
+Range,Rozsah,
+Default Payable Accounts,Výchozí úplatu účty,
+Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje,
+Item Barcode,Položka Barcode,
+Item Variants {0} updated,Bod Varianty {0} aktualizováno,
+Reading 6,Čtení 6,
+Purchase Invoice Advance,Záloha přijaté faktury,
+Shop,Obchod,
+Sync Now,Sync teS,
+Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
+Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
+Permanent Address Is,Trvalé bydliště je,
+Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
+The Brand,Brand,
+Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
+Exit Interview Details,Exit Rozhovor Podrobnosti,
+Is Purchase Item,je Nákupní Položka,
+Purchase Invoice,Přijatá faktura,
+Voucher Detail No,Voucher Detail No,
+Total Outgoing Value,Celková hodnota Odchozi,
+Request for Information,Žádost o informace,
+Paid,Placeni,
+Total in words,Celkem slovy,
+Lead Time Date,Lead Time data,
+Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
+Shipments to customers.,Zásilky zákazníkům.
+Purchase Order Item,Položka vydané objednávky,
+Indirect Income,Nepřímé příjmy,
+Address Line 1,Adresní řádek 1,
+Variance,Odchylka,
+Company Name,Název společnosti,
+Total Message(s),Celkem zpráv (y)
+Select Item for Transfer,Vybrat položku pro převod,
+Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
+Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích,
+Max Qty,Max Množstvh,
+Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem,
+Chemical,Chemickh,
+All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
+Select Payroll Year and Month,Vyberte Payroll rok a měsíc,
+"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte na příslušné skupiny (obvykle využití finančních prostředků> oběžných aktiv> bankovních účtů a vytvořit nový účet (kliknutím na Přidat dítě) typu "Bank"
+Electricity Cost,Cena elektřiny,
+Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin,
+Unsubscribed,Odhlášen z odběru,
+Walk In,Vejít,
+Inspection Criteria,Inspekční Kritéria,
+Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
+Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
+White,Bíl$1,
+All Lead (Open),Všechny Lead (Otevřeny)
+Get Advances Paid,Získejte zaplacené zálohy,
+Attach Your Picture,Připojit svůj obrázek,
+Total Amount in Words,Celková částka slovy,
+Stop,Stop,
+There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
+% of materials billed against this Purchase Order.,% Materiálů fakturovaných proti této objednávce.
+Order Type must be one of {0},Typ objednávky musí být jedním z {0}
+Next Contact Date,Další Kontakt Datum,
+Opening Qty,Otevření POČET,
+Holiday List Name,Jméno Holiday Seznam,
+Stock Options,Akciové opce,
+Expense Claim,Hrazení nákladm,
+Qty for {0},Množství pro {0}
+Leave Application,Leave Application,
+Leave Allocation Tool,Nechte přidělení nástroj,
+Leave Block List Dates,Nechte Block List termíny,
+Buying & Selling,Nákup a prodej,
+Trimming,Ořezávánn,
+Net Hour Rate,Net Hour Rate,
+Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi,
+Packing Slip Item,Balení Slip Item,
+Cash/Bank Account,Hotovostní / Bankovní účet,
+Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
+Delivery To,Doručení do,
+Get Sales Orders,Získat Prodejní objednávky,
+{0} can not be negative,{0} nemůže být negativno,
+"Row {0}: Party / Account does not match with \
Customer / Debit To in {1}","Row {0}: Party / Account neodpovídá \
Customer / debetní v {1}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Filing,Podání
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +67,Discount,Sleva
-DocType: Features Setup,Purchase Discounts,Nákup Slevy
-DocType: Stock Entry,This will override Difference Account in Item,To přepíše Difference účet v položce
-DocType: Workstation,Wages,Mzdy
-DocType: Time Log,Will be updated only if Time Log is 'Billable',"Bude aktualizována pouze v případě, Time Log je "Zúčtovatelná""
-DocType: Project,Internal,Interní
-DocType: Task,Urgent,Naléhavý
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Zadejte prosím platný řádek ID řádku tabulky {0} {1}
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +76,This Time Log conflicts with {0} for {1},To je v rozporu Time Log s {0} na {1}
-DocType: Sales BOM,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
+Filing,Podána,
+Discount,Sleva,
+Purchase Discounts,Nákup Slevy,
+This will override Difference Account in Item,To přepíše Difference účet v položce,
+Wages,Mzdy,
+Will be updated only if Time Log is 'Billable',"Bude aktualizována pouze v případě, Time Log je "Zúčtovatelná""
+Internal,Intern$1,
+Urgent,Naléhav$1,
+Please specify a valid Row ID for row {0} in table {1},Zadejte prosím platný řádek ID řádku tabulky {0} {1}
+This Time Log conflicts with {0} for {1},To je v rozporu Time Log s {0} na {1}
+"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
@@ -921,1105 +921,1105 @@
Například: Pokud prodáváte notebooky a batohy odděleně a mají speciální cenu, pokud zákazník koupí oba, pak Laptop + Backpack bude nový Sales BOM položky.
Poznámka: BOM = Bill of Materials"
-DocType: Item,Manufacturer,Výrobce
-DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
-DocType: Sales Order,PO Date,PO Datum
-DocType: Serial No,Sales Returned,Sales Vrácené
-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 +65,Selling Amount,Prodejní Částka
-apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,Čas Záznamy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,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 č
-DocType: Issue,Issue,Problém
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +30,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
-DocType: BOM Operation,Operation,Operace
-DocType: Lead,Organization Name,Název organizace
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,POS Setting required to make POS Entry,"POS Nastavení požadováno, aby POS položky"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,Standardní Nakupování
-DocType: GL Entry,Against,Proti
-DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
-DocType: Sales Partner,Implementation Partner,Implementačního partnera
-DocType: Purchase Invoice,Contact Info,Kontaktní informace
-DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Make Purchase Receipt,Proveďte doklad o koupi
-DocType: Item,Default Supplier,Výchozí Dodavatel
-DocType: Shipping Rule Condition,Shipping Rule Condition,Přepravní Pravidlo Podmínka
-DocType: Features Setup,Miscelleneous,Miscelleneous
-DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
-DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
-DocType: Sales BOM Item,Sales BOM Item,Sales BOM Item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Dr,Dr
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,"Item must be a purchase item, as it is present in one or many Active BOMs","Položka musí být nákup bod, protože je přítomna v jedné nebo mnoha Active kusovníky"
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
-DocType: Journal Entry Account,Against Purchase Invoice,Proti nákupní faktuře
-apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Chcete-li {0} | {1} {2}
-DocType: Time Log Batch,updated via Time Logs,aktualizovat přes čas Záznamy
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
-apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,Nyní můžete přidat položky do Vašeho košíku.
-DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +537,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
-DocType: Supplier,Default Currency,Výchozí měna
-DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
-DocType: Contact Us Settings,Address,Adresa
-DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} v žádném fiskálním roce. Pro více informací klikněte {2}.
-apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
-DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
-DocType: Upload Attendance,Attendance From Date,Účast Datum od
-DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,Doprava
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} musí být odeslaný
-DocType: SMS Center,Total Characters,Celkový počet znaků
-apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Příspěvek%
-DocType: Item,website page link,webové stránky odkaz na stránku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +191,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
-DocType: Sales Partner,Distributor,Distributor
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +53,Budget cannot be set for Group Cost Centers,Rozpočet není možno nastavit pro středisek Skupina nákladová
-,Ordered Items To Be Billed,Objednané zboží fakturovaných
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
-DocType: Global Defaults,Global Defaults,Globální Výchozí
-DocType: Salary Slip,Deductions,Odpočty
-DocType: Purchase Invoice,Start date of current invoice's period,Datum období současného faktury je Začátek
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,To Batch Time Log bylo účtováno.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Vytvořit příležitost
-DocType: Salary Slip,Leave Without Pay,Nechat bez nároku na mzdu
-DocType: Supplier,Communications,Komunikace
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Plánování kapacit Chyba
-DocType: Lead,Consultant,Konzultant
-DocType: Salary Slip,Earnings,Výdělek
-DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Nic požadovat
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Aktuální datum ukončení"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,Řízení
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typy činností pro Time listy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Investiční lití
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +45,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
-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."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivní
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Modrý
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
-DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +167,{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 +58,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
-DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
-DocType: Stock Settings,Default Item Group,Výchozí bod Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Laminated object manufacturing,Vrstvené objektu výrobní
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Databáze dodavatelů.
-DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +596,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Stretch forming,Stretch tváření
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +203,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
-apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové a jiné platové srážky.
-DocType: Lead,Lead,Olovo
-DocType: Email Digest,Payables,Závazky
-DocType: Account,Warehouse,Sklad
-,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
-DocType: Purchase Invoice Item,Net Rate,Čistá míra
-DocType: Backup Manager,Database Folder ID,číslo databázového adresára
-DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
-DocType: Holiday,Holiday,Dovolená
-DocType: Event,Saturday,Sobota
-DocType: Leave Control Panel,Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
-,Daily Time Log Summary,Denní doba prihlásenia - súhrn
-DocType: DocField,Label,Popisek
-DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
-DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
-DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
-DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,"""Položky"" nemůžou být prázdné"
-apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
-,Trial Balance,Trial Balance
-sites/assets/js/erpnext.min.js +2,"Grid ""","Grid """
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +145,Please select prefix first,"Prosím, vyberte první prefix"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Research,Výzkum
-DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
-DocType: Employee,User ID,User ID
-DocType: Communication,Sent,Odesláno
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
-DocType: Cost Center,Lft,LFT
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,"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"
-DocType: Sales Order,Delivery Status,Delivery Status
-DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,Zbytek světa
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
-,Budget Variance Report,Rozpočet Odchylka Report
-DocType: Salary Slip,Gross Pay,Hrubé mzdy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendy placené
-DocType: Stock Reconciliation,Difference Amount,Rozdíl Částka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nerozdělený zisk
-DocType: Purchase Order,Required raw materials issued to the supplier for producing a sub - contracted item.,Potřebné suroviny vydaných dodavateli pro výrobu sub - smluvně položka.
-DocType: BOM Item,Item Description,Položka Popis
-DocType: Payment Tool,Payment Mode,Způsob platby
-DocType: Purchase Invoice,Is Recurring,Je Opakující
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,Direct metal laser sintering,Přímý plechu laserem spékání
-DocType: Purchase Order,Supplied Items,Dodávané položky
-DocType: Production Order,Qty To Manufacture,Množství K výrobě
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu
-DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otevření
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
-,Employee Leave Balance,Zaměstnanec Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
-DocType: Sales Invoice,More Info,Více informací
-DocType: Address,Address Type,Typ adresy
-DocType: Purchase Receipt,Rejected Warehouse,Zamítnuto Warehouse
-DocType: GL Entry,Against Voucher,Proti poukazu
-DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,Položka {0} musí být Sales Item
-,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
-DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-DocType: Email Digest,New Stock Entries,Nových akcií Příspěvky
-apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,Malý
-DocType: Employee,Employee Number,Počet zaměstnanců
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
-DocType: Material Request,% Completed,% Dokončeno
-,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Green,Zelená
-DocType: Sales Order Item,Discount(%),Sleva (%)
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Celkem Dosažená
-DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +54,Contract,Smlouva
-DocType: Report,Disabled,Vypnuto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +523,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
-apps/erpnext/erpnext/controllers/selling_controller.py +171,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Agriculture,Zemědělství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +559,Your Products or Services,Vaše Produkty nebo Služby
-DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
-DocType: Purchase Invoice Item,Purchase Order,Vydaná objednávka
-DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
-sites/assets/js/form.min.js +180,Name is required,Jméno je vyžadováno
-DocType: Purchase Invoice,Recurring Type,Opakující se Typ
-DocType: Address,City/Town,Město / Město
-DocType: Serial No,Serial No Details,Serial No Podrobnosti
-DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"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/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
-apps/erpnext/erpnext/stock/get_item_details.py +137,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 +41,Capital Equipments,Kapitálové Vybavení
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"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."
-DocType: Hub Settings,Seller Website,Prodejce Website
-apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Production Order status is {0},Stav výrobní zakázka je {0}
-DocType: Appraisal Goal,Goal,Cíl
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,For Supplier,Pro Dodavatele
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
-DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +42,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
-DocType: DocType,Transaction,Transakce
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/erpnext/erpnext/config/projects.py +43,Tools,Nástroje
-DocType: Sales Taxes and Charges Template,Valid For Territories,Platí pro území
-DocType: Item,Website Item Groups,Webové stránky skupiny položek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Production order number is mandatory for stock entry purpose manufacture,Výrobní číslo objednávky je povinná pro legální vstup účelem výroby
-DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
-DocType: Applicable Territory,Applicable Territory,Použitelné Oblasti
-apps/erpnext/erpnext/stock/utils.py +162,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: Workstation,Workstation Name,Meno pracovnej stanice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
-DocType: Sales Partner,Target Distribution,Target Distribution
-sites/assets/js/desk.min.js +536,Comments,Komentáře
-DocType: Salary Slip,Bank Account No.,Bankovní účet č.
-DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +167,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
-DocType: Quality Inspection Reading,Reading 8,Čtení 8
-DocType: Sales Partner,Agent,Agent
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, můžete měli změnit "Distribuovat poplatků na základě""
-DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
-DocType: BOM Operation,Workstation,pracovna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +107,Hardware,Technické vybavení
-DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +47,Privilege Leave,Privilege Leave
-DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +169,You need to enable Shopping Cart,Musíte povolit Nákupní košík
-sites/assets/js/form.min.js +197,No Data,No Data
-DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
-DocType: Salary Slip,Earning,Získávání
-DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +75,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
-DocType: Backup Manager,Files Folder ID,ID složeky souborů
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +58,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +196,Item Variants {0} deleted,Bod Varianty {0} vypouští
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +127,You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce
-DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-DocType: Cost Center,old_parent,old_parent
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Zpravodaje ke kontaktům, vede."
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +368,Operations cannot be left blank.,Operace nemůže být prázdné.
-,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +99,Status updated to {0},Status aktualizován na {0}
-DocType: DocField,Description,Popis
-DocType: Authorization Rule,Average Discount,Průměrná sleva
-DocType: Backup Manager,Backup Manager,Správce zálohování
-DocType: Letter Head,Is Default,Je Výchozí
-DocType: Address,Utilities,Utilities
-DocType: Purchase Invoice Item,Accounting,Účetnictví
-DocType: Features Setup,Features Setup,Nastavení Funkcí
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,View Nabídka Dopis
-DocType: Sales BOM,Sales BOM,Sales BOM
-DocType: Communication,Communication,Komunikace
-DocType: Item,Is Service Item,Je Service Item
-DocType: Activity Cost,Projects,Projekty
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +30,Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
-DocType: BOM Operation,Operation Description,Operace Popis
-DocType: Item,Will also apply to variants,Bude se vztahovat i na varianty
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
-DocType: Quotation,Shopping Cart,Nákupní vozík
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
-DocType: Pricing Rule,Campaign,Kampaň
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
-DocType: Sales Invoice,Sales BOM Help,Sales BOM Help
-DocType: Purchase Invoice,Contact Person,Kontaktní osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávaný Datum Začátku"" nemůže být větší než ""Očekávanou Datum Konce"""
-DocType: Holiday List,Holidays,Prázdniny
-DocType: Sales Order Item,Planned Quantity,Plánované Množství
-DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
-DocType: Supplier Quotation,Get Terms and Conditions,Získejte Smluvní podmínky
-DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +165,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
-DocType: Email Digest,For Company,Pro Společnost
-apps/erpnext/erpnext/config/support.py +38,Communication log.,Komunikační protokol.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Nákup Částka
-DocType: Sales Invoice,Shipping Address Name,Přepravní Adresa Název
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
-DocType: Material Request,Terms and Conditions Content,Podmínky Content
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +506,cannot be greater than 100,nemůže být větší než 100
-DocType: Purchase Receipt Item,Discount %,Sleva%
-apps/erpnext/erpnext/stock/doctype/item/item.py +473,Item {0} is not a stock Item,Položka {0} není skladem
-DocType: Maintenance Visit,Unscheduled,Neplánovaná
-DocType: Employee,Owned,Vlastník
-DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
-,Purchase Invoice Trends,Trendy přijatách faktur
-DocType: Employee,Better Prospects,Lepší vyhlídky
-DocType: Appraisal,Goals,Cíle
-DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
-,Accounts Browser,Účty Browser
-DocType: GL Entry,GL Entry,Vstup GL
-DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
-,Batch-Wise Balance History,Batch-Wise Balance History
-DocType: Email Digest,To Do List,Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Apprentice,Učeň
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Negative Quantity is not allowed,Negativní množství není dovoleno
-DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Manufacturer,Výrobce,
+Purchase Receipt Item,Položka příjemky,
+PO Date,PO Datum,
+Sales Returned,Sales Vrácene,
+Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse,
+Selling Amount,Prodejní Částka,
+Time Logs,Čas Záznamy,
+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"
+Creation Document No,Tvorba dokument m,
+Issue,Problém,
+"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
+WIP Warehouse,WIP Warehouse,
+Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+Operation,Operace,
+Organization Name,Název organizace,
+POS Setting required to make POS Entry,"POS Nastavení požadováno, aby POS položky"
+Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
+Sales Expenses,Prodejní náklady,
+Standard Buying,Standardní Nakupovány,
+Against,Proti,
+Default Selling Cost Center,Výchozí Center Prodejní cena,
+Implementation Partner,Implementačního partnera,
+Contact Info,Kontaktní informace,
+Net Weight UOM,Hmotnost UOM,
+Make Purchase Receipt,Proveďte doklad o koupi,
+Default Supplier,Výchozí Dodavatel,
+Shipping Rule Condition,Přepravní Pravidlo Podmínka,
+Miscelleneous,Miscelleneous,
+Get Weekly Off Dates,Získejte týdenní Off termíny,
+End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájeny,
+Select company name first.,Vyberte název společnosti jako první.
+Sales BOM Item,Sales BOM Item,
+Dr,Dr,
+"Item must be a purchase item, as it is present in one or many Active BOMs","Položka musí být nákup bod, protože je přítomna v jedné nebo mnoha Active kusovníky"
+Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
+Against Purchase Invoice,Proti nákupní faktuře,
+To {0} | {1} {2},Chcete-li {0} | {1} {2}
+updated via Time Logs,aktualizovat přes čas Záznamy,
+Average Age,Průměrný věk,
+Go ahead and add something to your cart.,Nyní můžete přidat položky do Vašeho košíku.
+Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
+List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
+Default Currency,Výchozí měna,
+Enter designation of this Contact,Zadejte označení této Kontakt,
+Address,Adresa,
+From Employee,Od Zaměstnance,
+{0} {1} not in any Fiscal Year. For more details check {2}.,{0} {1} v žádném fiskálním roce. Pro více informací klikněte {2}.
+Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+Make Difference Entry,Učinit vstup Rozdíl,
+Attendance From Date,Účast Datum od,
+Key Performance Area,Key Performance Area,
+Transportation,Doprava,
+{0} {1} must be submitted,{0} {1} musí být odeslanl,
+Total Characters,Celkový počet znakl,
+Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+C-Form Invoice Detail,C-Form Faktura Detail,
+Payment Reconciliation Invoice,Platba Odsouhlasení faktury,
+Contribution %,Příspěvek%
+website page link,webové stránky odkaz na stránku,
+Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
+Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd,
+Distributor,Distributor,
+Shopping Cart Shipping Rule,Nákupní košík Shipping Rule,
+Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky,
+Budget cannot be set for Group Cost Centers,Rozpočet není možno nastavit pro středisek Skupina nákladovd,
+Ordered Items To Be Billed,Objednané zboží fakturovaných,
+Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
+Global Defaults,Globální Výchozy,
+Deductions,Odpočty,
+Start date of current invoice's period,Datum období současného faktury je Začátek,
+This Time Log Batch has been billed.,To Batch Time Log bylo účtováno.
+Create Opportunity,Vytvořit příležitost,
+Leave Without Pay,Nechat bez nároku na mzdu,
+Communications,Komunikace,
+Capacity Planning Error,Plánování kapacit Chyba,
+Consultant,Konzultant,
+Earnings,Výdělek,
+Sales Invoice Advance,Prodejní faktury Advance,
+Nothing to request,Nic požadovat,
+'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Aktuální datum ukončení"""
+Management,Řízeny,
+Types of activities for Time Sheets,Typy činností pro Time listy,
+Investment casting,Investiční lity,
+Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
+"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"""
+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."
+Active,Aktivn$1,
+Blue,Modr$1,
+Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
+UOMs,UOMs,
+{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
+Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
+UOM Conversion Factor,UOM Conversion Factor,
+Default Item Group,Výchozí bod Group,
+Laminated object manufacturing,Vrstvené objektu výrobnr,
+Supplier database.,Databáze dodavatelů.
+Balance Sheet,Rozvaha,
+Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+Stretch forming,Stretch tvářen$1,
+Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
+"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
+Tax and other salary deductions.,Daňové a jiné platové srážky.
+Lead,Olovo,
+Payables,Závazky,
+Warehouse,Sklad,
+Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci,
+Net Rate,Čistá míra,
+Database Folder ID,číslo databázového adresára,
+Purchase Invoice Item,Položka přijaté faktury,
+Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy,
+Holiday,Dovoleno,
+Saturday,Sobota,
+Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
+Daily Time Log Summary,Denní doba prihlásenia - súhrn,
+Label,Popisek,
+Unreconciled Payment Details,Smířit platbn,
+Current Fiscal Year,Aktuální fiskální rok,
+Disable Rounded Total,Zakázat Zaoblený Celkem,
+Call,Volánn,
+'Entries' cannot be empty,"""Položky"" nemůžou být prázdné"
+Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
+Trial Balance,Trial Balance,
+"Grid ""","Grid """
+Please select prefix first,"Prosím, vyberte první prefix"
+Research,Výzkum,
+Work Done,Odvedenou práci,
+User ID,User ID,
+Sent,Odesláno,
+View Ledger,View Ledger,
+Lft,LFT,
+Earliest,Nejstaršm,
+"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"
+Delivery Status,Delivery Status,
+Manufacture against Sales Order,Výroba na odběratele,
+Rest Of The World,Zbytek světa,
+The Item {0} cannot have Batch,Položka {0} nemůže mít dávku,
+Budget Variance Report,Rozpočet Odchylka Report,
+Gross Pay,Hrubé mzdy,
+Dividends Paid,Dividendy placens,
+Difference Amount,Rozdíl Částka,
+Retained Earnings,Nerozdělený zisk,
+Required raw materials issued to the supplier for producing a sub - contracted item.,Potřebné suroviny vydaných dodavateli pro výrobu sub - smluvně položka.
+Item Description,Položka Popis,
+Payment Mode,Způsob platby,
+Is Recurring,Je Opakujícs,
+Direct metal laser sintering,Přímý plechu laserem spékáns,
+Supplied Items,Dodávané položky,
+Qty To Manufacture,Množství K výrobs,
+Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu,
+Opportunity Item,Položka Příležitosti,
+Temporary Opening,Dočasné Otevřens,
+Cryorolling,Cryorolling,
+Employee Leave Balance,Zaměstnanec Leave Balance,
+Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
+More Info,Více informacy,
+Address Type,Typ adresy,
+Rejected Warehouse,Zamítnuto Warehouse,
+Against Voucher,Proti poukazu,
+Default Buying Cost Center,Výchozí Center Nákup Cost,
+Item {0} must be Sales Item,Položka {0} musí být Sales Item,
+Accounts Payable Summary,Splatné účty Shrnuty,
+Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+Get Outstanding Invoices,Získat neuhrazených faktur,
+Sales Order {0} is not valid,Prodejní objednávky {0} není platnr,
+New Stock Entries,Nových akcií Příspěvky,
+"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+Small,Mal$1,
+Employee Number,Počet zaměstnanc$1,
+Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
+% Completed,% Dokončeno,
+Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
+Account head {0} created,Hlava účtu {0} vytvořil,
+Green,Zelenl,
+Discount(%),Sleva (%)
+Total Achieved,Celkem Dosažena,
+Place of Issue,Místo vydána,
+Contract,Smlouva,
+Disabled,Vypnuto,
+UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
+Indirect Expenses,Nepřímé náklady,
+Row {0}: Qty is mandatory,Row {0}: Množství je povinny,
+Agriculture,Zemědělstvy,
+Your Products or Services,Vaše Produkty nebo Služby,
+Mode of Payment,Způsob platby,
+This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
+Purchase Order,Vydaná objednávka,
+Warehouse Contact Info,Sklad Kontaktní informace,
+Name is required,Jméno je vyžadováno,
+Recurring Type,Opakující se Typ,
+City/Town,Město / Město,
+Serial No Details,Serial No Podrobnosti,
+Item Tax Rate,Sazba daně položky,
+"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í"
+Delivery Note {0} is not submitted,Delivery Note {0} není předložena,
+Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item,
+Capital Equipments,Kapitálové Vybavena,
+"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."
+Seller Website,Prodejce Website,
+Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100,
+Production Order status is {0},Stav výrobní zakázka je {0}
+Goal,Cíl,
+For Supplier,Pro Dodavatele,
+Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
+Grand Total (Company Currency),Celkový součet (Měna společnosti)
+Total Outgoing,Celkem Odchoz$1,
+"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
+Transaction,Transakce,
+Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
+Tools,Nástroje,
+Valid For Territories,Platí pro územe,
+Website Item Groups,Webové stránky skupiny položek,
+Production order number is mandatory for stock entry purpose manufacture,Výrobní číslo objednávky je povinná pro legální vstup účelem výroby,
+Total (Company Currency),Total (Company měny)
+Applicable Territory,Použitelné Oblasti,
+Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou,
+Journal Entry,Zápis do deníku,
+Workstation Name,Meno pracovnej stanice,
+Email Digest:,E-mail Digest:
+BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+Target Distribution,Target Distribution,
+Comments,Komentáře,
+Bank Account No.,Bankovní účet č.
+This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem,
+Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
+Reading 8,Čtení 8,
+Agent,Agent,
+"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, můžete měli změnit "Distribuovat poplatků na základě""
+Taxes and Charges Calculation,Daně a poplatky výpočet,
+Workstation,pracovna stanica,
+Hardware,Technické vybavent,
+HR Manager,HR Manager,
+Privilege Leave,Privilege Leave,
+Supplier Invoice Date,Dodavatelské faktury Datum,
+You need to enable Shopping Cart,Musíte povolit Nákupní košík,
+No Data,No Data,
+Appraisal Template Goal,Posouzení Template Goal,
+Earning,Získávánt,
+Add or Deduct,Přidat nebo Odečíst,
+Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
+Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz,
+Files Folder ID,ID složeky souborz,
+Total Order Value,Celková hodnota objednávky,
+Item Variants {0} deleted,Bod Varianty {0} vypouštz,
+Food,Jídlo,
+Ageing Range 3,Stárnutí Rozsah 3,
+You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce,
+No of Visits,Počet návštěv,
+old_parent,old_parent,
+"Newsletters to contacts, leads.","Zpravodaje ke kontaktům, vede."
+Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
+Operations cannot be left blank.,Operace nemůže být prázdné.
+Delivered Items To Be Billed,Dodávaných výrobků fakturovaných,
+Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
+Status updated to {0},Status aktualizován na {0}
+Description,Popis,
+Average Discount,Průměrná sleva,
+Backup Manager,Správce zálohováns,
+Is Default,Je Výchozs,
+Utilities,Utilities,
+Accounting,Účetnictvs,
+Features Setup,Nastavení Funkcs,
+View Offer Letter,View Nabídka Dopis,
+Sales BOM,Sales BOM,
+Communication,Komunikace,
+Is Service Item,Je Service Item,
+Projects,Projekty,
+Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
+From {0} | {1} {2},Od {0} | {1} {2}
+Operation Description,Operace Popis,
+Will also apply to variants,Bude se vztahovat i na varianty,
+Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
+Shopping Cart,Nákupní vozík,
+Avg Daily Outgoing,Avg Daily Odchozk,
+Campaign,Kampak,
+Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
+Sales BOM Help,Sales BOM Help,
+Contact Person,Kontaktní osoba,
+'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávaný Datum Začátku"" nemůže být větší než ""Očekávanou Datum Konce"""
+Holidays,Prázdniny,
+Planned Quantity,Plánované Množstvy,
+Item Tax Amount,Částka Daně Položky,
+Get Terms and Conditions,Získejte Smluvní podmínky,
+Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
+Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+Max: {0},Max: {0}
+From Datetime,Od datetime,
+For Company,Pro Společnost,
+Communication log.,Komunikační protokol.
+Buying Amount,Nákup Částka,
+Shipping Address Name,Přepravní Adresa Název,
+Chart of Accounts,Diagram účta,
+Terms and Conditions Content,Podmínky Content,
+cannot be greater than 100,nemůže být větší než 100,
+Discount %,Sleva%
+Item {0} is not a stock Item,Položka {0} není skladem,
+Unscheduled,Neplánovanm,
+Owned,Vlastník,
+"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
+Purchase Invoice Trends,Trendy přijatách faktur,
+Better Prospects,Lepší vyhlídky,
+Goals,Cíle,
+Warranty / AMC Status,Záruka / AMC Status,
+Accounts Browser,Účty Browser,
+GL Entry,Vstup GL,
+Employee Settings,Nastavení zaměstnancr,
+Batch-Wise Balance History,Batch-Wise Balance History,
+To Do List,Do List,
+Apprentice,Učer,
+Negative Quantity is not allowed,Negativní množství není dovoleno,
+"Tax detail table fetched from item master as a string and stored in this field.
Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
Používá se daní a poplatků"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Lancing,Lancing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +147,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
-DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
-DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
-DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +578,We buy this Item,Vykupujeme tuto položku
-DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Flanging,Obrubování
-DocType: Bulk Email,Not Sent,Neodesláno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Explosive forming,Výbušné tváření
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
-DocType: Shipping Rule,Shipping Account,Přepravní účtu
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +41,Scheduled to send to {0} recipients,Plánované poslat na {0} příjemci
-DocType: Quality Inspection,Readings,Čtení
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Sub Assemblies,Podsestavy
-DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-DocType: Packing Slip,Packing Slip,Balení Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
-apps/erpnext/erpnext/config/setup.py +80,Setup SMS gateway settings,Nastavení Nastavení SMS brána
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,Import se nezdařil!
-sites/assets/js/erpnext.min.js +19,No address added yet.,Žádná adresa přidán dosud.
-DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +191,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
-DocType: Item,Inventory,Inventář
-DocType: Item,Sales Details,Prodejní Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Pinning,Připne
-DocType: Opportunity,With Items,S položkami
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,In Qty,V Množství
-DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
-DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
+Lancing,Lancing,
+Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
+"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
+"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
+Account Balance,Zůstatek na účtu,
+Type of document to rename.,Typ dokumentu přejmenovat.
+We buy this Item,Vykupujeme tuto položku,
+Billing,Fakturace,
+Flanging,Obrubovánu,
+Not Sent,Neodesláno,
+Explosive forming,Výbušné tvářenu,
+Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
+Shipping Account,Přepravní účtu,
+Scheduled to send to {0} recipients,Plánované poslat na {0} příjemci,
+Readings,Čtenu,
+Sub Assemblies,Podsestavy,
+To Value,Chcete-li hodnota,
+Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
+Packing Slip,Balení Slip,
+Office Rent,Pronájem kanceláře,
+Setup SMS gateway settings,Nastavení Nastavení SMS brána,
+Import Failed!,Import se nezdařil!
+No address added yet.,Žádná adresa přidán dosud.
+Workstation Working Hour,Pracovní stanice Pracovní Hour,
+Analyst,Analytik,
+Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+Inventory,Inventái,
+Sales Details,Prodejní Podrobnosti,
+Pinning,Připne,
+With Items,S položkami,
+In Qty,V Množstvi,
+Expense Claim Rejected,Uhrazení výdajů zamítnuto,
+"The date on which next invoice will be generated. It is generated on submit.
","Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
-DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +100,Government,Vláda
-DocType: Item,Re-order,Re objednávku
-DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +149,Total ({0}),Celkem ({0})
-DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
-DocType: Sales Invoice,Source,Zdroj
-DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-DocType: Purchase Order Item,"If Supplier Part Number exists for given Item, it gets stored here","Pokud dodavatel Kód existuje pro danou položku, dostane uloženy zde"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +175,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +403,Financial Year Start Date,Finanční rok Datum zahájení
-DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Countersinking,Zahlubování
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
-DocType: Material Request Item,Sales Order No,Prodejní objednávky No
-DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +47,Taken,Zaujatý
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +63,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
-DocType: Pricing Rule,For Price List,Pro Ceník
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +385,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
-DocType: Maintenance Schedule,Schedules,Plány
-DocType: Purchase Invoice Item,Net Amount,Čistá částka
-DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
-DocType: Period Closing Voucher,CoA Help,CoA Help
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +533,Error: {0} > {1},Chyba: {0}> {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
-DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,K dispozici šarže Množství ve skladu
-DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: Workflow State,Tasks,úkoly
-DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
-DocType: Event,Tuesday,Úterý
-DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
-,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
-DocType: UOM,UOM Name,UOM Name
-DocType: Top Bar Item,Target,Cíl
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Výše příspěvku
-DocType: Sales Invoice,Shipping Address,Shipping Address
-DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Master Značky
-DocType: ToDo,Due Date,Datum splatnosti
-DocType: Sales Invoice Item,Brand Name,Jméno značky
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Box,Krabice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +387,The Organization,Organizace
-DocType: Monthly Distribution,Monthly Distribution,Měsíční Distribution
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +66,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
-DocType: Production Plan Sales Order,Production Plan Sales Order,Výrobní program prodejní objednávky
-DocType: Sales Partner,Sales Partner Target,Sales Partner Target
-DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Notching,Vystřihování
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +44,Reserved warehouse required for stock item {0},Vyhrazeno sklad potřebný pro živočišnou položku {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty
-,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
-DocType: Address,Lead Name,Olovo Name
-,POS,POS
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0} musí být uvedeny pouze jednou
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
-DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +579,Manufacturing Quantity is mandatory,Výrobní množství je povinné
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +41,Amounts not reflected in bank,Částky nezohledněny v bance
-DocType: Quality Inspection Reading,Reading 4,Čtení 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +7,Centrifugal casting,Odstředivé lití
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Magnetic field-assisted finishing,Magnetické pole-assisted dokončování
-DocType: Company,Default Holiday List,Výchozí Holiday Seznam
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +227,Task is Mandatory if Time Log is against a project,"Úkol je povinné, pokud Time Log je proti projektu"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Závazky
-DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
-DocType: Opportunity,Contact Mobile No,Kontakt Mobil
-DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
-,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
-DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Značka Citace
-DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +291,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +193,You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,"Nelze zadat i dodací list č a prodejní faktury č Prosím, zadejte jednu."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
-DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
-DocType: SMS Center,Receiver List,Přijímač Seznam
-DocType: Payment Tool Detail,Payment Amount,Částka platby
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
-DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Selective laser sintering,Selektivní laserové spékání
-apps/erpnext/erpnext/stock/doctype/item/item.py +286,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +74,Import Successful!,Import byl úspěšný!
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
-DocType: Email Digest,Expenses Booked,Náklady rezervováno
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +168,Quantity must not be more than {0},Množství nesmí být větší než {0}
-DocType: Quotation Item,Quotation Item,Položka Nabídky
-DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dodavatel Type master.
-DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,Přidat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
-DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,"Úkol je povinné, pokud Náklady Reklamace je proti projektu"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
-DocType: Company,Default Payable Account,Výchozí Splatnost účtu
-DocType: Party Type,Contacts,Kontakty
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,Setup Complete
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Účtovaný
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,Reserved Množství
-DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Lidské zdroje
-DocType: Lead,Upper Income,Horní příjmů
-apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,Moje problémy
-DocType: BOM Item,BOM Item,BOM Item
-DocType: Appraisal,For Employee,Pro zaměstnance
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
-DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,Tisková kování
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
-DocType: Party Type,Default Price List,Výchozí Ceník
-DocType: Journal Entry,User Remark will be added to Auto Remark,Uživatel Poznámka budou přidány do Auto Poznámka
-DocType: Payment Reconciliation,Payments,Platby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Hot isostatic pressing,Izostatické lisování
-DocType: ToDo,Medium,Střední
-DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
-,Customer Credit Balance,Zákazník Credit Balance
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
-DocType: Quotation,Term Details,Termín Podrobnosti
-DocType: Manufacturing Settings,Capacity Planning For (Days),Plánování kapacit Pro (dny)
-DocType: Warranty Claim,Warranty Claim,Záruční reklamace
-,Lead Details,Olověné Podrobnosti
-DocType: Authorization Rule,Approving User,Schvalování Uživatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Forging,Kování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Plating,Pokovování
-DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
-DocType: Pricing Rule,Applicable For,Použitelné pro
-DocType: Bank Reconciliation,From Date,Od data
-DocType: Backup Manager,Validate,Potvrdit
-DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
-DocType: Sales Invoice,Packed Items,Zabalené položky
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Reklamační proti sériového čísla
-DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Nahradit konkrétní kusovník ve všech ostatních kusovníky, kde se používá. To nahradí původní odkaz kusovníku, aktualizujte náklady a regenerovat ""BOM explozi položku"" tabulku podle nového BOM"
-DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
-DocType: Employee,Permanent Address,Trvalé bydliště
-apps/erpnext/erpnext/stock/get_item_details.py +123,Item {0} must be a Service Item.,Položka {0} musí být služba položky.
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +158,Please select item code,"Prosím, vyberte položku kód"
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
-DocType: Territory,Territory Manager,Oblastní manažer
-DocType: Selling Settings,Selling Settings,Prodejní Nastavení
-apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,Položka nemůže být varianta varianty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +36,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
-,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +208,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
-DocType: Journal Entry,View Details,Zobrazit podrobnosti
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +160,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
-DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
-DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
-DocType: Upload Attendance,Get Template,Získat šablonu
-DocType: Address,Postal,Poštovní
-DocType: Email Digest,Total amount of invoices sent to the customer during the digest period,Celková částka faktury poslal k zákazníkovi v období digest
-DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Mining,Hornictví
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Resin casting,Resin lití
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +79,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
-DocType: Territory,Parent Territory,Parent Territory
-DocType: Quality Inspection Reading,Reading 2,Čtení 2
-DocType: Stock Entry,Material Receipt,Příjem materiálu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +570,Products,Výrobky
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +41,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
-DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
-DocType: Quotation,Order Type,Typ objednávky
-DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
-DocType: Payment Tool,Find Invoices to Match,Najít faktury zápas
-,Item-wise Sales Register,Item-moudrý Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Celkem Target
-DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +178,No Production Orders created,Žádné výrobní zakázky vytvořené
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
-DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
-DocType: Sales Invoice Item,Batch No,Č. šarže
-apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Hlavní
-DocType: DocPerm,Delete,Smazat
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Varianta
-sites/assets/js/desk.min.js +836,New {0},Nový: {0}
-DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
-DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +31,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
-DocType: Sales Invoice,Considered as an Opening Balance,Považována za počáteční zůstatek
-DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,Proveďte objednávky
-DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
-DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
-DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
-DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
-DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Žadatel o zaměstnání.
-DocType: Sales Invoice Item,Warehouse and Reference,Sklad a reference
-DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
-DocType: Country,Country,Země
-apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,Adresy
-DocType: Communication,Received,Přijato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Název nového účtu. Poznámka: Prosím, vytvářet účty pro zákazníky a dodavatele, které se automaticky vytvoří z zákazníkem a dodavatelem master"
-DocType: DocField,Attach Image,Připojit obrázek
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Ponechte prázdné, pokud žádná změna"
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pro výrobu.
-DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,BOM {0} musí být předloženy
-DocType: Authorization Control,Authorization Control,Autorizace Control
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Log pro úkoly.
-DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +52,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
-DocType: Employee,Salutation,Oslovení
-DocType: Offer Letter,Rejected,Zamítnuto
-DocType: Pricing Rule,Brand,Značka
-DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,% Dodáno
-apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
-DocType: Sales Order Item,Actual Qty,Skutečné Množství
-DocType: Quality Inspection Reading,Reading 10,Čtení 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +560,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
-DocType: Hub Settings,Hub Node,Hub Node
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Associate,Spolupracovník
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Položka {0} není serializovat položky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +573,"For 'Sales BOM' 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 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pro ""Sales BOM"" předměty, sklad, bude Serial No a Batch No považují z ""Obsah balení"" tabulky. Pokud Warehouse a Batch No jsou stejné u všech balení předměty pro každého ""Prodej BOM"" položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, hodnoty se budou zkopírovány do ""Obsah balení"" tabulky."
-DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
-DocType: Packing Slip,To Package No.,Balit No.
-DocType: DocType,System,Systém
-DocType: Warranty Claim,Issue Date,Datum vydání
-DocType: Activity Cost,Activity Cost,Náklady Aktivita
-DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Telecommunications,Telekomunikace
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
-DocType: Payment Tool,Make Payment Entry,Učinit vstup platby
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
-DocType: Backup Manager,Never,Nikdy
-,Sales Invoice Trends,Prodejní faktury Trendy
-DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
-DocType: Item,Allowance Percent,Allowance Procento
-DocType: SMS Settings,Message Parameter,Parametr zpráv
-DocType: Serial No,Delivery Document No,Dodávka dokument č
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Získat položky z Příjmového listu
-DocType: Serial No,Creation Date,Datum vytvoření
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +34,Item {0} appears multiple times in Price List {1},Položka {0} se objeví několikrát v Ceníku {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Dodavatel Nabídka Položka
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Proveďte platovou strukturu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Shearing,Stříhání
-DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/controllers/recurring_document.py +164,Period From and Period To dates mandatory for recurring %s,"Období od a období, na termíny povinných opakujících% s"
-DocType: Journal Entry Account,Against Expense Claim,Proti Expense nároku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Packaging and labeling,Balení a označování
-DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
-DocType: Sales Person,Parent Sales Person,Parent obchodník
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,"Payment against {0} {1} cannot be greater \
+Item Attribute,Položka Atribut,
+Government,Vláda,
+Re-order,Re objednávku,
+Services,Služby,
+Total ({0}),Celkem ({0})
+Parent Cost Center,Nadřazené Nákladové středisko,
+Source,Zdroj,
+Is Leave Without Pay,Je odejít bez Pay,
+"If Supplier Part Number exists for given Item, it gets stored here","Pokud dodavatel Kód existuje pro danou položku, dostane uloženy zde"
+No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy,
+Financial Year Start Date,Finanční rok Datum zahájeny,
+Total Experience,Celková zkušenost,
+Countersinking,Zahlubovány,
+Packing Slip(s) cancelled,Balení Slip (y) zrušeno,
+Freight and Forwarding Charges,Nákladní a Spediční Poplatky,
+Sales Order No,Prodejní objednávky No,
+Item Group Name,Položka Název skupiny,
+Taken,Zaujaty,
+Transfer Materials for Manufacture,Přenos Materiály pro výrobu,
+For Price List,Pro Ceník,
+Executive Search,Executive Search,
+"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
+Schedules,Plány,
+Net Amount,Čistá částka,
+BOM Detail No,BOM Detail No,
+CoA Help,CoA Help,
+Error: {0} > {1},Chyba: {0}> {1}
+Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
+Maintenance Visit,Maintenance Visit,
+Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory,
+Available Batch Qty at Warehouse,K dispozici šarže Množství ve skladu,
+Time Log Batch Detail,Time Log Batch Detail,
+Tasks,úkoly,
+Landed Cost Help,Přistálo Náklady Help,
+Tuesday,Útert,
+Block Holidays on important days.,Blokové Dovolená na významných dnů.
+Accounts Receivable Summary,Pohledávky Shrnute,
+Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance,
+UOM Name,UOM Name,
+Target,Cíl,
+Contribution Amount,Výše příspěvku,
+Shipping Address,Shipping Address,
+This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
+In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
+Brand master.,Master Značky,
+Due Date,Datum splatnosti,
+Brand Name,Jméno značky,
+Box,Krabice,
+The Organization,Organizace,
+Monthly Distribution,Měsíční Distribution,
+Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam,
+Production Plan Sales Order,Výrobní program prodejní objednávky,
+Sales Partner Target,Sales Partner Target,
+Pricing Rule,Ceny Pravidlo,
+Notching,Vystřihovány,
+Reserved warehouse required for stock item {0},Vyhrazeno sklad potřebný pro živočišnou položku {0}
+Bank Accounts,Bankovní účty,
+Bank Reconciliation Statement,Bank Odsouhlasení prohlášeny,
+Lead Name,Olovo Name,
+POS,POS,
+{0} must appear only once,{0} musí být uvedeny pouze jednou,
+Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
+Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
+No Items to pack,Žádné položky k baleny,
+From Value,Od hodnoty,
+Manufacturing Quantity is mandatory,Výrobní množství je povinny,
+Amounts not reflected in bank,Částky nezohledněny v bance,
+Reading 4,Čtení 4,
+Claims for company expense.,Nároky na náklady firmy.
+Centrifugal casting,Odstředivé litm,
+Magnetic field-assisted finishing,Magnetické pole-assisted dokončovánm,
+Default Holiday List,Výchozí Holiday Seznam,
+Task is Mandatory if Time Log is against a project,"Úkol je povinné, pokud Time Log je proti projektu"
+Stock Liabilities,Stock Závazky,
+Supplier Warehouse,Dodavatel Warehouse,
+Contact Mobile No,Kontakt Mobil,
+Select Sales Orders,Vyberte Prodejní objednávky,
+Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny,
+To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
+Make Quotation,Značka Citace,
+Dependent Task,Závislý Task,
+Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,"Nelze zadat i dodací list č a prodejní faktury č Prosím, zadejte jednu."
+Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
+Stop Birthday Reminders,Zastavit připomenutí narozenin,
+Receiver List,Přijímač Seznam,
+Payment Amount,Částka platby,
+Consumed Amount,Spotřebovaném množstvn,
+Salary Structure Deduction,Plat Struktura Odpočet,
+Selective laser sintering,Selektivní laserové spékánn,
+Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce,
+Import Successful!,Import byl úspěšný!
+Cost of Issued Items,Náklady na vydaných položek,
+Expenses Booked,Náklady rezervováno,
+Quantity must not be more than {0},Množství nesmí být větší než {0}
+Quotation Item,Položka Nabídky,
+Account Name,Název účtu,
+From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO,
+Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek,
+Supplier Type master.,Dodavatel Type master.
+Supplier Part Number,Dodavatel Číslo dílu,
+Add,Přidat,
+Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1,
+Credit Controller,Credit Controller,
+Vehicle Dispatch Date,Vozidlo Dispatch Datum,
+Task is mandatory if Expense Claim is against a Project,"Úkol je povinné, pokud Náklady Reklamace je proti projektu"
+Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena,
+Default Payable Account,Výchozí Splatnost účtu,
+Contacts,Kontakty,
+"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
+Setup Complete,Setup Complete,
+{0}% Billed,{0}% Účtovane,
+Reserved Qty,Reserved Množstve,
+Party Account,Party účtu,
+Human Resources,Lidské zdroje,
+Upper Income,Horní příjme,
+My Issues,Moje problémy,
+BOM Item,BOM Item,
+For Employee,Pro zaměstnance,
+Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporne,
+Total Amount Reimbursed,Celkové částky proplacene,
+Press fitting,Tisková kováne,
+Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
+Default Price List,Výchozí Ceník,
+User Remark will be added to Auto Remark,Uživatel Poznámka budou přidány do Auto Poznámka,
+Payments,Platby,
+Hot isostatic pressing,Izostatické lisovánk,
+Medium,Střednk,
+Budget Allocated,Přidělený Rozpočet,
+Customer Credit Balance,Zákazník Credit Balance,
+Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
+Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
+Term Details,Termín Podrobnosti,
+Capacity Planning For (Days),Plánování kapacit Pro (dny)
+Warranty Claim,Záruční reklamace,
+Lead Details,Olověné Podrobnosti,
+Approving User,Schvalování Uživatel,
+Forging,Kováne,
+Plating,Pokovováne,
+End date of current invoice's period,Datum ukončení doby aktuální faktury je,
+Applicable For,Použitelné pro,
+From Date,Od data,
+Validate,Potvrdit,
+Partially Completed,Částečně Dokončeno,
+Packed Items,Zabalené položky,
+Warranty Claim against Serial No.,Reklamační proti sériového čísla,
+"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Nahradit konkrétní kusovník ve všech ostatních kusovníky, kde se používá. To nahradí původní odkaz kusovníku, aktualizujte náklady a regenerovat ""BOM explozi položku"" tabulku podle nového BOM"
+Enable Shopping Cart,Povolit Nákupní košík,
+Permanent Address,Trvalé bydlištk,
+Item {0} must be a Service Item.,Položka {0} musí být služba položky.
+Please select item code,"Prosím, vyberte položku kód"
+Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
+Territory Manager,Oblastní manažer,
+Selling Settings,Prodejní Nastavenr,
+Item cannot be a variant of a variant,Položka nemůže být varianta varianty,
+Online Auctions,Aukce online,
+Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
+"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
+Marketing Expenses,Marketingové náklady,
+Item Shortage Report,Položka Nedostatek Report,
+"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry,
+View Details,Zobrazit podrobnosti,
+Single unit of an Item.,Single jednotka položky.
+Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
+Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob,
+Total Leaves Allocated,Celkem Leaves Přidělenb,
+Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
+Date Of Retirement,Datum odchodu do důchodu,
+Get Template,Získat šablonu,
+Postal,Poštovnu,
+Total amount of invoices sent to the customer during the digest period,Celková částka faktury poslal k zákazníkovi v období digest,
+Weightage,Weightage,
+Mining,Hornictvu,
+Resin casting,Resin litu,
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
+Parent Territory,Parent Territory,
+Reading 2,Čtení 2,
+Material Receipt,Příjem materiálu,
+Products,Výrobky,
+Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
+Next Contact By,Další Kontakt By,
+Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
+Order Type,Typ objednávky,
+Notification Email Address,Oznámení e-mailová adresa,
+Find Invoices to Match,Najít faktury zápas,
+Item-wise Sales Register,Item-moudrý Sales Register,
+"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
+Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
+Total Target,Celkem Target,
+Applicant for a Job,Žadatel o zaměstnánt,
+No Production Orders created,Žádné výrobní zakázky vytvořent,
+Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc,
+Reconciliation JSON,Odsouhlasení JSON,
+Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
+Batch No,Č. šarže,
+Main,Hlavne,
+Delete,Smazat,
+Variant,Varianta,
+New {0},Nový: {0}
+Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakc$1,
+Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony,
+Leave Encashed?,Ponechte zpeněžení?
+Opportunity From field is mandatory,Opportunity Ze hřiště je povinnk,
+Considered as an Opening Balance,Považována za počáteční zůstatek,
+Variants,Varianty,
+Make Purchase Order,Proveďte objednávky,
+Send To,Odeslat,
+There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+Contribution to Net Total,Příspěvek na celkových čistých,
+Customer's Item Code,Zákazníka Kód položky,
+Stock Reconciliation,Reklamní Odsouhlasenh,
+Territory Name,Území Name,
+Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat,
+Applicant for a Job.,Žadatel o zaměstnání.
+Warehouse and Reference,Sklad a reference,
+Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel,
+Country,Zeme,
+Addresses,Adresy,
+Received,Přijato,
+Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu,
+Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
+A condition for a Shipping Rule,Podmínka pro pravidla dopravy,
+"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Název nového účtu. Poznámka: Prosím, vytvářet účty pro zákazníky a dodavatele, které se automaticky vytvoří z zákazníkem a dodavatelem master"
+Attach Image,Připojit obrázek,
+The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
+Leave blank if no change,"Ponechte prázdné, pokud žádná změna"
+Time Logs for manufacturing.,Čas Protokoly pro výrobu.
+Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level,
+BOM {0} must be submitted,BOM {0} musí být předloženy,
+Authorization Control,Autorizace Control,
+Time Log for tasks.,Time Log pro úkoly.
+Actual Time and Cost,Skutečný Čas a Náklady,
+Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
+Salutation,Osloveno,
+Rejected,Zamítnuto,
+Brand,Značka,
+Will also apply for variants,Bude platit i pro varianty,
+% Delivered,% Dodáno,
+Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
+Actual Qty,Skutečné Množstv0,
+Reading 10,Čtení 10,
+"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
+Hub Node,Hub Node,
+You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
+Associate,Spolupracovník,
+Item {0} is not a serialized Item,Položka {0} není serializovat položky,
+"For 'Sales BOM' 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 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pro ""Sales BOM"" předměty, sklad, bude Serial No a Batch No považují z ""Obsah balení"" tabulky. Pokud Warehouse a Batch No jsou stejné u všech balení předměty pro každého ""Prodej BOM"" položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, hodnoty se budou zkopírovány do ""Obsah balení"" tabulky."
+Create Receiver List,Vytvořit přijímače seznam,
+Expired,Vypršela,
+To Package No.,Balit No.
+System,Systém,
+Issue Date,Datum vydánm,
+Activity Cost,Náklady Aktivita,
+Consumed Qty,Spotřeba Množstvm,
+Telecommunications,Telekomunikace,
+Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
+Make Payment Entry,Učinit vstup platby,
+Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
+Never,Nikdy,
+Sales Invoice Trends,Prodejní faktury Trendy,
+Apply / Approve Leaves,Použít / Schválit listy,
+Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
+Allowance Percent,Allowance Procento,
+Message Parameter,Parametr zpráv,
+Delivery Document No,Dodávka dokument o,
+Get Items From Purchase Receipts,Získat položky z Příjmového listu,
+Creation Date,Datum vytvořeno,
+Item {0} appears multiple times in Price List {1},Položka {0} se objeví několikrát v Ceníku {1}
+"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
+Supplier Quotation Item,Dodavatel Nabídka Položka,
+Make Salary Structure,Proveďte platovou strukturu,
+Shearing,Stříhána,
+Has Variants,Má varianty,
+Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
+Period From and Period To dates mandatory for recurring %s,"Období od a období, na termíny povinných opakujících% s"
+Against Expense Claim,Proti Expense nároku,
+Packaging and labeling,Balení a označovánu,
+Name of the Monthly Distribution,Název měsíční výplatou,
+Parent Sales Person,Parent obchodník,
+Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
+"Payment against {0} {1} cannot be greater \
than Outstanding Amount {2}","Platba na {0} {1} nemůže být větší \
než dlužná částka {2}"
-DocType: Backup Manager,Dropbox Access Secret,Dropbox Access Secret
-DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
-DocType: Item,Net Weight of each Item,Hmotnost každé položky
-DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
-DocType: Budget Detail,Fiscal Year,Fiskální rok
-DocType: Cost Center,Budget,Rozpočet
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dosažená
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,e.g. 5,např. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +195,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
-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/stock/doctype/serial_no/serial_no.py +70,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,"Částka, která má dodávat"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,Produkt nebo Služba
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,Výčepní
-DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},"Položka Šablona nemůže mít zásoby a varaiants. Prosím, odstraňte zásoby ze skladů {0}"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} vytvořil
-DocType: Journal Entry Account,Against Sales Order,Proti přijaté objednávce
-,Serial No Status,Serial No Status
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Tabulka Položka nemůže být prázdný
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,"Row {0}: To set {1} periodicity, difference between from and to date \
+Dropbox Access Secret,Dropbox Access Secret,
+Recurring Invoice,Opakující se faktury,
+Net Weight of each Item,Hmotnost každé položky,
+Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
+Fiscal Year,Fiskální rok,
+Budget,Rozpočet,
+Achieved,Dosaženk,
+Territory / Customer,Territory / Customer,
+e.g. 5,např. 5,
+Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
+Is Sales Item,Je Sales Item,
+Item Group Tree,Položka Group Tree,
+Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
+Maintenance Time,Údržba Time,
+Amount to Deliver,"Částka, která má dodávat"
+A Product or Service,Produkt nebo Služba,
+There were errors.,Byly tam chyby.
+Tapping,Výčepne,
+Current Value,Current Value,
+Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},"Položka Šablona nemůže mít zásoby a varaiants. Prosím, odstraňte zásoby ze skladů {0}"
+{0} created,{0} vytvořil,
+Against Sales Order,Proti přijaté objednávce,
+Serial No Status,Serial No Status,
+Item table can not be blank,Tabulka Položka nemůže být prázdnl,
+"Row {0}: To set {1} periodicity, difference between from and to date \
must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
musí být větší než nebo rovno {2}"
-DocType: Pricing Rule,Selling,Prodejní
-DocType: Employee,Salary Information,Vyjednávání o platu
-DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +186,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
-DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +275,Please enter Reference date,"Prosím, zadejte Referenční den"
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
-DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
-DocType: Material Request Item,Material Request Item,Materiál Žádost o bod
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny položek.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
-,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Red,Červená
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +237,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
-DocType: Account,Frozen,Zmražený
-,Open Production Orders,Otevřené výrobní zakázky
-DocType: Installation Note,Installation Time,Instalace Time
-apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +204,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investice
-DocType: Issue,Resolution Details,Rozlišení Podrobnosti
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Změna UOM za položku.
-DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
-DocType: Item Attribute,Attribute Name,Název atributu
-apps/erpnext/erpnext/controllers/selling_controller.py +256,Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
-DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +569,Group,Skupina
-DocType: Task,Expected Time (in hours),Předpokládaná doba (v hodinách)
-,Qty to Order,Množství k objednávce
-DocType: Sales Order,PO No,PO No
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
-DocType: Appraisal,For Employee Name,Pro jméno zaměstnance
-DocType: Holiday List,Clear Table,Clear Table
-DocType: Features Setup,Brands,Značky
-DocType: C-Form Invoice Detail,Invoice No,Faktura č
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +497,From Purchase Order,Z vydané objednávky
-apps/erpnext/erpnext/accounts/party.py +139,Please select company first.,Vyberte společnost jako první.
-DocType: Activity Cost,Costing Rate,Kalkulace Rate
-DocType: Journal Entry Account,Against Journal Entry,Proti položka deníku
-DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno
-DocType: Communication,Date,Datum
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +592,Sit tight while your system is being setup. This may take a few moments.,"Drž se, když váš systém je nastavení. To může trvat několik okamžiků."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Pár
-DocType: Bank Reconciliation Detail,Against Account,Proti účet
-DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
-DocType: Item,Has Batch No,Má číslo šarže
-DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
-DocType: Employee,Personal Details,Osobní data
-,Maintenance Schedules,Plány údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Embossing,Ražba
-,Quotation Trends,Uvozovky Trendy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,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 +243,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
-DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,Spojování
-DocType: Authorization Rule,Above Value,Výše uvedená hodnota
-,Pending Amount,Čeká Částka
-DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
-DocType: Serial No,Delivered,Dodává
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavení příchozí server pro úlohy e-mailovou id. (Např jobs@example.com)
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
-DocType: Journal Entry,Accounts Receivable,Pohledávky
-,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
-DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
-DocType: Custom Field,Custom,Zvyk
-DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Injection molding,Vstřikování
-DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
-DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
-DocType: HR Settings,HR Settings,Nastavení HR
-apps/frappe/frappe/config/setup.py +130,Printing,Tisk
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
-sites/assets/js/desk.min.js +684,and,a
-DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Sports,Sportovní
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
-DocType: Stock Entry,"Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.","Získejte rychlost oceňování a dostupných zásob u zdroje / cílové skladu na uvedeném Datum zveřejnění čase. Pokud se na pokračování položku, stiskněte toto tlačítko po zadání sériového čísla."
-apps/erpnext/erpnext/templates/includes/cart.js +288,Something went wrong.,Něco se pokazilo.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Unit,Jednotka
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +129,Please set Dropbox access keys in your site config,"Prosím, nastavení přístupových klíčů Dropbox ve vašem webu config"
-apps/erpnext/erpnext/stock/get_item_details.py +114,Please specify Company,"Uveďte prosím, firmu"
-,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,"Čas od nemůže být větší, než čas do"
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,Váš finanční rok končí
-DocType: POS Setting,Price List,Ceník
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
-apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,Nákladové Pohledávky
-DocType: Email Digest,Support,Podpora
-DocType: Authorization Rule,Approving Role,Schvalování roli
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +89,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
-DocType: Workstation,Wages per hour,Mzda za hodinu
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +43,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
-apps/erpnext/erpnext/config/setup.py +53,"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
-DocType: Purchase Receipt,LR No,LR No
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +51,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
-DocType: Salary Slip,Deduction,Dedukce
-DocType: Address Template,Address Template,Šablona adresy
-DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
-DocType: Project,% Tasks Completed,% splněných úkolů
-DocType: Project,Gross Margin,Hrubá marže
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,zakázané uživatelské
-DocType: Opportunity,Quotation,Nabídka
-DocType: Salary Slip,Total Deduction,Celkem Odpočet
-apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,Hey! Jděte do toho a přidejte adresu
-DocType: Quotation,Maintenance User,Údržba uživatele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Náklady Aktualizováno
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,"Jste si jisti, že chcete ODZASTAVIT"
-DocType: Employee,Date of Birth,Datum narození
-DocType: Salary Manager,Salary Manager,Plat Správce
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,Bod {0} již byla vrácena
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
-DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address
-DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
-DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
-DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Job Description,Popis Práce
-DocType: Purchase Order Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
-apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +34,Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty
-DocType: Features Setup,To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumenty šarže nos <br> <b> Preferovaná Industry: Chemikálie etc </ b>
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Coating,Nátěr
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
-DocType: Expense Claim,Approver,Schvalovatel
-,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
-DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
-DocType: Salary Slip Deduction,Depends on LWP,Závisí na LWP
-DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +201,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Shipments,Zásilky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Dip molding,Dip lití
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +591,Setting Up,Nastavení
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +90,Make Debit Note,Proveďte dluhu
-DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
-DocType: Pricing Rule,Supplier,Dodavatel
-DocType: C-Form,Quarter,Čtvrtletí
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Různé výdaje
-DocType: Global Defaults,Default Company,Výchozí Company
-apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
-apps/erpnext/erpnext/controllers/accounts_controller.py +285,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
-DocType: Employee,Bank Name,Název banky
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Nad
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,Uživatel {0} je zakázána
-DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
-DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail se nepodařilo odeslat pro zdravotně postižené uživatele
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,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 +95,"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 +305,{0} is mandatory for Item {1},{0} je povinná k položce {1}
-DocType: Currency Exchange,From Currency,Od Měny
-DocType: DocField,Name,Jméno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +61,Last Sales Order Date,Poslední prodejní objednávky Datum
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +90,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in system,Částky nejsou zohledněny v systému
-DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Production might not be able to finish by the Expected Delivery Date.,Výroba nemusí být schopen dokončit očekávanou Termín dodání.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +19,Set as Stopped,Nastavit jako Zastaveno
-DocType: POS Setting,Taxes and Charges,Daně a poplatky
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dokončeno
-DocType: Web Form,Select DocType,Zvolte DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Broaching,Protahování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Banking,Bankovnictví
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +48,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +276,New Cost Center,Nové Nákladové Středisko
-DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
-DocType: Quality Inspection,In Process,V procesu
-DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
-DocType: Purchase Receipt,Detailed Breakup of the totals,Podrobný rozpadu součty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
-DocType: Account,Fixed Asset,Základní Jmění
-DocType: Time Log Batch,Total Billing Amount,Celková částka fakturace
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Pohledávky účtu
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +140,No Updates For,Žádné aktualizace pro
-,Stock Balance,Reklamní Balance
-DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +259,Time Logs created:,Čas Záznamy vytvořil:
-DocType: Company,If Yearly Budget Exceeded,Pokud Roční rozpočet překročen
-DocType: Item,Weight UOM,Hmotnostní jedn.
-DocType: Employee,Blood Group,Krevní Skupina
-DocType: Purchase Invoice Item,Page Break,Zalomení stránky
-DocType: Production Order Operation,Pending,Až do
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kancelářské Vybavení
-DocType: Purchase Invoice Item,Qty,Množství
-DocType: Fiscal Year,Companies,Společnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +23,Electronics,Elektronika
-DocType: Email Digest,"Balances of Accounts of type ""Bank"" or ""Cash""","Zůstatky na účtech typu ""banka"" nebo ""Cash"""
-DocType: Shipping Rule,"Specify a list of Territories, for which, this Shipping Rule is valid","Zadejte seznam území, pro které tato Shipping pravidlo platí"
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Z plánu údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +51,Full-time,Na plný úvazek
-DocType: Company,Country Settings,Nastavení Země
-DocType: Employee,Contact Details,Kontaktní údaje
-DocType: C-Form,Received Date,Datum přijetí
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu v prodeji daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
-DocType: Backup Manager,Upload Backups to Google Drive,Nahrát zálohy na Disk Google
-DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
-DocType: Offer Letter Term,Offer Term,Nabídka Term
-DocType: Quality Inspection,Quality Manager,Manažer kvality
-DocType: Job Applicant,Job Opening,Job Zahájení
-DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +164,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
-DocType: Delivery Note,Date on which lorry started from your warehouse,"Datum, kdy nákladní automobil začal ze svého skladu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Technology,Technologie
-DocType: Purchase Order,Supplier (vendor) name as entered in supplier master,"Dodavatel (prodávající), název, jak je uvedena v dodavatelských master"
-DocType: Offer Letter,Offer Letter,Nabídka Letter
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Celkové fakturované Amt
-DocType: Time Log,To Time,Chcete-li čas
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +236,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
-DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
-apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,Ceník {0} je zakázána
-DocType: Manufacturing Settings,Allow Overtime,Povolit Přesčasy
-apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,Prodejní objednávky {0} je zastaven
-DocType: Email Digest,New Leads,Nové vede
-DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění Rate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,"Advance paid against {0} {1} cannot be greater \
+Selling,Prodejnu,
+Salary Information,Vyjednávání o platu,
+Name and Employee ID,Jméno a ID zaměstnance,
+Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum,
+Website Item Group,Website Item Group,
+Duties and Taxes,Odvody a danu,
+Please enter Reference date,"Prosím, zadejte Referenční den"
+Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
+Supplied Qty,Dodávané Množstvd,
+Material Request Item,Materiál Žádost o bod,
+Tree of Item Groups.,Strom skupiny položek.
+Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge,
+Item-wise Purchase History,Item-moudrý Historie nákupe,
+Red,Červene,
+Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+Frozen,Zmraženy,
+Open Production Orders,Otevřené výrobní zakázky,
+Installation Time,Instalace Time,
+Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost,
+Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly,
+Investments,Investice,
+Resolution Details,Rozlišení Podrobnosti,
+Change UOM for an Item.,Změna UOM za položku.
+Acceptance Criteria,Kritéria přijetu,
+Attribute Name,Název atributu,
+Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
+Show In Website,Show pro webové stránky,
+Group,Skupina,
+Expected Time (in hours),Předpokládaná doba (v hodinách)
+Qty to Order,Množství k objednávce,
+PO No,PO No,
+Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
+For Employee Name,Pro jméno zaměstnance,
+Clear Table,Clear Table,
+Brands,Značky,
+Invoice No,Faktura e,
+From Purchase Order,Z vydané objednávky,
+Please select company first.,Vyberte společnost jako první.
+Costing Rate,Kalkulace Rate,
+Against Journal Entry,Proti položka deníku,
+Resignation Letter Date,Rezignace Letter Datum,
+Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
+Not Set,Není nastaveno,
+Date,Datum,
+Repeat Customer Revenue,Repeat Customer Příjmy,
+Sit tight while your system is being setup. This may take a few moments.,"Drž se, když váš systém je nastavení. To může trvat několik okamžiků."
+{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
+Pair,Pár,
+Against Account,Proti účet,
+Actual Date,Skutečné datum,
+Has Batch No,Má číslo šarže,
+Excise Page Number,Spotřební Číslo stránky,
+Personal Details,Osobní data,
+Maintenance Schedules,Plány údržby,
+Embossing,Ražba,
+Quotation Trends,Uvozovky Trendy,
+Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
+Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
+Shipping Amount,Přepravní Částka,
+Joining,Spojována,
+Above Value,Výše uvedená hodnota,
+Pending Amount,Čeká Částka,
+Conversion Factor,Konverzní faktor,
+Delivered,Dodáva,
+Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavení příchozí server pro úlohy e-mailovou id. (Např jobs@example.com)
+The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
+Accounts Receivable,Pohledávky,
+Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics,
+This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
+Custom,Zvyk,
+Use Multi-Level BOM,Použijte Multi-Level BOM,
+Injection molding,Vstřikovánk,
+Include Reconciled Entries,Zahrnout odsouhlasené zápisy,
+Tree of finanial accounts.,Strom finanial účtů.
+Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
+Distribute Charges Based On,Distribuovat poplatků na základ$1,
+Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
+HR Settings,Nastavení HR,
+Printing,Tisk,
+Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
+The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
+and,a,
+Leave Block List Allow,Nechte Block List Povolit,
+Sports,Sportovna,
+Total Actual,Celkem Aktuálna,
+"Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.","Získejte rychlost oceňování a dostupných zásob u zdroje / cílové skladu na uvedeném Datum zveřejnění čase. Pokud se na pokračování položku, stiskněte toto tlačítko po zadání sériového čísla."
+Something went wrong.,Něco se pokazilo.
+Unit,Jednotka,
+Please set Dropbox access keys in your site config,"Prosím, nastavení přístupových klíčů Dropbox ve vašem webu config"
+Please specify Company,"Uveďte prosím, firmu"
+Customer Acquisition and Loyalty,Zákazník Akvizice a loajality,
+From Time cannot be greater than To Time,"Čas od nemůže být větší, než čas do"
+Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
+Your financial year ends on,Váš finanční rok končk,
+Price List,Ceník,
+{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
+Expense Claims,Nákladové Pohledávky,
+Support,Podpora,
+Approving Role,Schvalování roli,
+Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
+Wages per hour,Mzda za hodinu,
+Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
+"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
+LR No,LR No,
+UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
+Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
+Deduction,Dedukce,
+Address Template,Šablona adresy,
+Classification of Customers by region,Rozdělení zákazníků podle kraje,
+% Tasks Completed,% splněných úkole,
+Gross Margin,Hrubá marže,
+Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+disabled user,zakázané uživatelska,
+Quotation,Nabídka,
+Total Deduction,Celkem Odpočet,
+Hey! Go ahead and add an address,Hey! Jděte do toho a přidejte adresu,
+Maintenance User,Údržba uživatele,
+Cost Updated,Náklady Aktualizováno,
+Are you sure you want to UNSTOP,"Jste si jisti, že chcete ODZASTAVIT"
+Date of Birth,Datum narozene,
+Salary Manager,Plat Správce,
+Item {0} has already been returned,Bod {0} již byla vrácena,
+**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
+Customer / Lead Address,Zákazník / Lead Address,
+Actual Operation Time,Aktuální Provozní doba,
+Applicable To (User),Vztahující se na (Uživatel)
+Deduct,Odečíst,
+Job Description,Popis Práce,
+Qty as per Stock UOM,Množství podle Stock nerozpuštěných,
+Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty,
+To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumenty šarže nos <br> <b> Preferovaná Industry: Chemikálie etc </ b>
+Coating,Nátěr,
+"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
+"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
+Approver,Schvalovatel,
+SO Qty,SO Množstvl,
+"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+Calculate Total Score,Vypočítat Celková skóre,
+Depends on LWP,Závisí na LWP,
+Manufacturing Manager,Výrobní ředitel,
+Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
+Shipments,Zásilky,
+Dip molding,Dip lity,
+Time Log Status must be Submitted.,Time Log Status musí být předloženy.
+Setting Up,Nastavenu,
+Make Debit Note,Proveďte dluhu,
+In Words (Company Currency),Slovy (měna společnosti)
+Supplier,Dodavatel,
+Quarter,Čtvrtletl,
+Miscellaneous Expenses,Různé výdaje,
+Default Company,Výchozí Company,
+Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob,
+"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
+Bank Name,Název banky,
+-Above,-Nad,
+User {0} is disabled,Uživatel {0} je zakázána,
+Total Leave Days,Celkový počet dnů dovoleny,
+Note: Email will not be sent to disabled users,Poznámka: E-mail se nepodařilo odeslat pro zdravotně postižené uživatele,
+Select Company...,Vyberte společnost ...
+Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
+"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
+{0} is mandatory for Item {1},{0} je povinná k položce {1}
+From Currency,Od Měny,
+Name,Jméno,
+"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+Last Sales Order Date,Poslední prodejní objednávky Datum,
+Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+Amounts not reflected in system,Částky nejsou zohledněny v systému,
+Rate (Company Currency),Cena (Měna Společnosti)
+Others,Ostatn$1,
+Production might not be able to finish by the Expected Delivery Date.,Výroba nemusí být schopen dokončit očekávanou Termín dodání.
+Set as Stopped,Nastavit jako Zastaveno,
+Taxes and Charges,Daně a poplatky,
+"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
+Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
+Completed,Dokončeno,
+Select DocType,Zvolte DocType,
+Broaching,Protahováno,
+Banking,Bankovnictvo,
+Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
+New Cost Center,Nové Nákladové Středisko,
+Ordered Quantity,Objednané množstvo,
+"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
+In Process,V procesu,
+Itemwise Discount,Itemwise Sleva,
+Detailed Breakup of the totals,Podrobný rozpadu součty,
+{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
+Fixed Asset,Základní Jměne,
+Total Billing Amount,Celková částka fakturace,
+Receivable Account,Pohledávky účtu,
+No Updates For,Žádné aktualizace pro,
+Stock Balance,Reklamní Balance,
+Expense Claim Detail,Detail úhrady výdaje,
+Time Logs created:,Čas Záznamy vytvořil:
+If Yearly Budget Exceeded,Pokud Roční rozpočet překročen,
+Weight UOM,Hmotnostní jedn.
+Blood Group,Krevní Skupina,
+Page Break,Zalomení stránky,
+Pending,Až do,
+Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
+Office Equipments,Kancelářské Vybaveni,
+Qty,Množstvi,
+Companies,Společnosti,
+Electronics,Elektronika,
+"Balances of Accounts of type ""Bank"" or ""Cash""","Zůstatky na účtech typu ""banka"" nebo ""Cash"""
+"Specify a list of Territories, for which, this Shipping Rule is valid","Zadejte seznam území, pro které tato Shipping pravidlo platí"
+Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order,
+From Maintenance Schedule,Z plánu údržby,
+Full-time,Na plný úvazek,
+Country Settings,Nastavení Zemr,
+Contact Details,Kontaktní údaje,
+Received Date,Datum přijetr,
+"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu v prodeji daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
+Upload Backups to Google Drive,Nahrát zálohy na Disk Google,
+Total Incoming Value,Celková hodnota Příchoze,
+Purchase Price List,Nákupní Ceník,
+Offer Term,Nabídka Term,
+Quality Manager,Manažer kvality,
+Job Opening,Job Zahájene,
+Payment Reconciliation,Platba Odsouhlasene,
+Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
+Date on which lorry started from your warehouse,"Datum, kdy nákladní automobil začal ze svého skladu"
+Technology,Technologie,
+Supplier (vendor) name as entered in supplier master,"Dodavatel (prodávající), název, jak je uvedena v dodavatelských master"
+Offer Letter,Nabídka Letter,
+Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
+Total Invoiced Amt,Celkové fakturované Amt,
+To Time,Chcete-li čas,
+"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
+Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet,
+BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+Completed Qty,Dokončené Množstv$1,
+"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
+Price List {0} is disabled,Ceník {0} je zakázána,
+Allow Overtime,Povolit Přesčasy,
+Sales Order {0} is stopped,Prodejní objednávky {0} je zastaven,
+New Leads,Nové vede,
+Current Valuation Rate,Aktuální ocenění Rate,
+"Advance paid against {0} {1} cannot be greater \
than Grand Total {2}","Vyplacena záloha na {0} {1} nemůže být větší \
než Celkový součet {2}"
-DocType: Opportunity,Lost Reason,Ztracené Důvod
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,Svařování
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,Je zapotřebí nové Reklamní UOM
-DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,Všechny položky již byly fakturovány
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +280,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
-DocType: Project,External,Externí
-DocType: Features Setup,Item Serial Nos,Položka sériových čísel
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +8,Not Received,Neobdržel
-DocType: Branch,Branch,Větev
-DocType: Sales Invoice,Customer (Receivable) Account,Customer (pohledávka) Account
-DocType: Bin,Actual Quantity,Skutečné Množství
-DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-DocType: Shopping Cart Settings,Price Lists,Ceníky
-DocType: Purchase Invoice,Considered as Opening Balance,Považován za počáteční zůstatek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +513,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Compression molding,Lisování
-DocType: Leave Block List Date,Block Date,Block Datum
-DocType: Sales Order,Not Delivered,Ne vyhlášeno
-,Bank Clearance Summary,Souhrn bankovního zúčtování
-apps/erpnext/erpnext/config/setup.py +75,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kód položky> Položka Group> Brand
-DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
-DocType: Event,Friday,Pátek
-DocType: Time Log,Costing Amount,Kalkulace Částka
-DocType: Salary Manager,Submit Salary Slip,Odeslat výplatní pásce
-DocType: Salary Structure,Monthly Earning & Deduction,Měsíčního výdělku a dedukce
-apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
-DocType: Supplier,Address & Contacts,Adresa a kontakty
-DocType: SMS Log,Sender Name,Jméno odesílatele
-DocType: Page,Title,Titulek
-sites/assets/js/list.min.js +92,Customize,Přizpůsobit
-DocType: POS Setting,[Select],[Vybrat]
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
-DocType: Company,For Reference Only.,Pouze orientační.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},Neplatný {0}: {1}
-DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
-DocType: Manufacturing Settings,Capacity Planning,Plánování kapacit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Datum od"" je povinné"
-DocType: Journal Entry,Reference Number,Referenční číslo
-DocType: Employee,Employment Details,Informace o zaměstnání
-DocType: Employee,New Workplace,Nové pracoviště
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastavit jako Zavřeno
-apps/erpnext/erpnext/stock/get_item_details.py +104,No Item with Barcode {0},No Položka s čárovým kódem {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
-DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,"Máte-li prodejní tým a prodej Partners (obchodních partnerů), které mohou být označeny a udržovat svůj příspěvek v prodejní činnosti"
-DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
-apps/erpnext/erpnext/setup/doctype/company/company.py +71,Stores,Obchody
-DocType: Time Log,Projects Manager,Správce projektů
-DocType: Serial No,Delivery Time,Dodací lhůta
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
-DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
-DocType: Leave Block List,Allow Users,Povolit uživatele
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +199,Operation is Mandatory,Provoz je Povinné
-DocType: Purchase Order,Recurring,Opakující se
-DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
-DocType: Rename Tool,Rename Tool,Přejmenování
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +11,Update Cost,Aktualizace Cost
-DocType: Item Reorder,Item Reorder,Položka Reorder
-DocType: Address,Check to make primary address,Zaškrtněte pro vytvoření primární adresy
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +507,Transfer Material,Přenos materiálu
-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: 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
-DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,Add Taxes,Přidejte daně
-,Financial Analytics,Finanční Analýza
-DocType: Quality Inspection,Verified By,Verified By
-DocType: Address,Subsidiary,Dceřiný
-apps/erpnext/erpnext/setup/doctype/company/company.py +37,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
-DocType: Quality Inspection,Purchase Receipt No,Číslo příjmky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: Salary Manager,Create Salary Slip,Vytvořit výplatní pásce
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +44,Expected balance as per bank,Očekávaný zůstatek podle banky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,Leštění
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
-DocType: Appraisal,Employee,Zaměstnanec
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importovat e-maily z
-DocType: Features Setup,After Sale Installations,Po prodeji instalací
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je plně fakturováno
-DocType: Workstation Working Hour,End Time,End Time
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,Seskupit podle Poukazu
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
-DocType: Sales Invoice,Mass Mailing,Hromadné emaily
-DocType: Page,Standard,Standard
-DocType: Rename Tool,File to Rename,Soubor přejmenovat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +175,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +246,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +183,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
-DocType: Email Digest,Payments Received,Přijaté platby
-DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Definovat rozpočtu na tento nákladového střediska. Chcete-li nastavit rozpočtu akce, viz <a href = ""#!List / Company ""> Společnost Mistr </a>"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Size,Velikost
-DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-DocType: Email Digest,Calendar Events,Kalendář akcí
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +108,Pharmaceutical,Farmaceutické
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
-DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
-DocType: Purchase Invoice,Credit To,Kredit:
-DocType: Employee Education,Post Graduate,Postgraduální
-DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Poznámka: Zálohy a soubory nejsou odstraněny z Dropbox, budete muset odstranit ručně."
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Plán údržby Detail
-DocType: Quality Inspection Reading,Reading 9,Čtení 9
-DocType: Buying Settings,Buying Settings,Nákup Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,Mass dokončovací
-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
-apps/erpnext/erpnext/config/selling.py +153,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavení příchozí server pro prodej e-mailovou id. (Např sales@example.com)
-DocType: Warranty Claim,Raised By,Vznesené
-DocType: Payment Tool,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +725,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +14,Google Drive,Google Drive
-sites/assets/js/list.min.js +22,Draft,Návrh
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +45,Compensatory Off,Vyrovnávací Off
-DocType: Quality Inspection Reading,Accepted,Přijato
-DocType: User,Female,Žena
-apps/erpnext/erpnext/setup/doctype/company/company.js +19,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: Print Settings,Modern,Moderní
-DocType: Communication,Replied,Odpovězeno
-DocType: Payment Tool,Total Payment Amount,Celková Částka platby
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +136,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než Plánované Množství ({2}), ve Výrobní Objednávce {3}"
-DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
-DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
-DocType: Stock Entry,For Quantity,Pro Množství
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} není odesláno
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Žádosti o položky.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
-DocType: Email Digest,New Communications,Nová komunikace
-DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kompletní nastavení
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +124,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
-DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
-apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,Newsletter adresář
-DocType: Delivery Note,Transporter Name,Přepravce Název
-DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Měrná jednotka
-DocType: Fiscal Year,Year End Date,Datum Konce Roku
-DocType: Task Depends On,Task Depends On,Úkol je závislá na
-DocType: Lead,Opportunity,Příležitost
-DocType: Salary Structure Earning,Salary Structure Earning,Plat Struktura Zisk
-,Completed Production Orders,Dokončené Výrobní zakázky
-DocType: Operation,Default Workstation,Výchozí Workstation
-DocType: Email Digest,Inventory & Support,Zásoby a podpora
-DocType: Notification Control,Expense Claim Approved Message,Zpráva o schválení úhrady výdajů
-DocType: Email Digest,How frequently?,Jak často?
-DocType: Purchase Receipt,Get Current Stock,Získejte aktuální stav
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,Proveďte Instalace Poznámka
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
-DocType: Production Order,Actual End Date,Skutečné datum ukončení
-DocType: Authorization Rule,Applicable To (Role),Vztahující se na (Role)
-DocType: Stock Entry,Purpose,Účel
-DocType: Item,Will also apply for variants unless overrridden,"Bude platit i pro varianty, pokud nebude přepsáno"
-DocType: Purchase Invoice,Advances,Zálohy
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na
-DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
-DocType: Campaign,Campaign-.####,Kampaň-.####
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Make Invoice,Proveďte faktury
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Piercing,Pronikavý
-DocType: Customer,Your Customer's TAX registration numbers (if applicable) or any general information,DIČ Vašeho zákazníka (pokud má) nebo jakékoli obecné informace
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
-DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Photochemical machining,Fotochemický obrábění
-DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+Lost Reason,Ztracené Důvod,
+Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
+Welding,SvařovánM,
+New Stock UOM is required,Je zapotřebí nové Reklamní UOM,
+Sample Size,Velikost vzorku,
+All items have already been invoiced,Všechny položky již byly fakturovány,
+Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
+Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
+External,Externl,
+Item Serial Nos,Položka sériových čísel,
+Not Received,Neobdržel,
+Branch,Větev,
+Customer (Receivable) Account,Customer (pohledávka) Account,
+Actual Quantity,Skutečné Množstvl,
+example: Next Day Shipping,Příklad: Next Day Shipping,
+Serial No {0} not found,Pořadové číslo {0} nebyl nalezen,
+Price Lists,Ceníky,
+Considered as Opening Balance,Považován za počáteční zůstatek,
+Your Customers,Vaši Zákazníci,
+Compression molding,Lisovánl,
+Block Date,Block Datum,
+Not Delivered,Ne vyhlášeno,
+Bank Clearance Summary,Souhrn bankovního zúčtovánl,
+"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
+Item Code > Item Group > Brand,Kód položky> Položka Group> Brand,
+Appraisal Goal,Posouzení Goal,
+Friday,Pátek,
+Costing Amount,Kalkulace Částka,
+Submit Salary Slip,Odeslat výplatní pásce,
+Monthly Earning & Deduction,Měsíčního výdělku a dedukce,
+Maxiumm discount for Item {0} is {1}%,Maxiumm sleva na položky {0} {1}%
+Address & Contacts,Adresa a kontakty,
+Sender Name,Jméno odesílatele,
+Title,Titulek,
+Customize,Přizpůsobit,
+[Select],[Vybrat]
+Make Sales Invoice,Proveďte prodejní faktuře,
+For Reference Only.,Pouze orientační.
+Invalid {0}: {1},Neplatný {0}: {1}
+Advance Amount,Záloha ve výši,
+Capacity Planning,Plánování kapacit,
+'From Date' is required,"""Datum od"" je povinné"
+Reference Number,Referenční číslo,
+Employment Details,Informace o zaměstnáno,
+New Workplace,Nové pracovišto,
+Set as Closed,Nastavit jako Zavřeno,
+No Item with Barcode {0},No Položka s čárovým kódem {0}
+Case No. cannot be 0,Případ č nemůže být 0,
+If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity,"Máte-li prodejní tým a prodej Partners (obchodních partnerů), které mohou být označeny a udržovat svůj příspěvek v prodejní činnosti"
+Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky,
+Stores,Obchody,
+Projects Manager,Správce projekty,
+Delivery Time,Dodací lhůta,
+Ageing Based On,Stárnutí dle,
+End of Life,Konec životnosti,
+Travel,Cestovány,
+Allow Users,Povolit uživatele,
+Operation is Mandatory,Provoz je Povinny,
+Recurring,Opakující se,
+Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
+Rename Tool,Přejmenovánt,
+Update Cost,Aktualizace Cost,
+Item Reorder,Položka Reorder,
+Check to make primary address,Zaškrtněte pro vytvoření primární adresy,
+Transfer Material,Přenos materiálu,
+"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."
+Price List Currency,Ceník Měna,
+User must always select,Uživatel musí vždy vybrat,
+Allow Negative Stock,Povolit Negativní Sklad,
+Installation Note,Poznámka k instalaci,
+Add Taxes,Přidejte dana,
+Financial Analytics,Finanční Analýza,
+Verified By,Verified By,
+Subsidiary,Dceřina,
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
+Purchase Receipt No,Číslo příjmky,
+Earnest Money,Earnest Money,
+Create Salary Slip,Vytvořit výplatní pásce,
+Expected balance as per bank,Očekávaný zůstatek podle banky,
+Buffing,Leštěny,
+Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
+Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
+Employee,Zaměstnanec,
+Import Email From,Importovat e-maily z,
+After Sale Installations,Po prodeji instalacc,
+{0} {1} is fully billed,{0} {1} je plně fakturováno,
+End Time,End Time,
+Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
+Group by Voucher,Seskupit podle Poukazu,
+Required On,Povinné On,
+Mass Mailing,Hromadné emaily,
+Standard,Standard,
+File to Rename,Soubor přejmenovat,
+Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky,
+Payments Received,Přijaté platby,
+"Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Definovat rozpočtu na tento nákladového střediska. Chcete-li nastavit rozpočtu akce, viz <a href = ""#!List / Company ""> Společnost Mistr </a>"
+Size,Velikost,
+Expense Claim Approved,Uhrazení výdajů schváleno,
+Calendar Events,Kalendář akct,
+Pharmaceutical,Farmaceutickt,
+Cost of Purchased Items,Náklady na zakoupené zbožt,
+Sales Order Required,Prodejní objednávky Povinnt,
+Create Customer,Vytvořit zákazníka,
+Credit To,Kredit:
+Post Graduate,Postgraduáln$1,
+"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Poznámka: Zálohy a soubory nejsou odstraněny z Dropbox, budete muset odstranit ručně."
+Maintenance Schedule Detail,Plán údržby Detail,
+Reading 9,Čtení 9,
+Buying Settings,Nákup Nastavenl,
+Mass finishing,Mass dokončovacl,
+BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce,
+Attendance To Date,Účast na data,
+Setup incoming server for sales email id. (e.g. sales@example.com),Nastavení příchozí server pro prodej e-mailovou id. (Např sales@example.com)
+Raised By,Vznesent,
+Payment Account,Platební účet,
+Please specify Company to proceed,Uveďte prosím společnost pokračovat,
+Google Drive,Google Drive,
+Draft,Návrh,
+Compensatory Off,Vyrovnávací Off,
+Accepted,Přijato,
+Female,Žena,
+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."
+Modern,Moderno,
+Replied,Odpovězeno,
+Total Payment Amount,Celková Částka platby,
+{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než Plánované Množství ({2}), ve Výrobní Objednávce {3}"
+Shipping Rule Label,Přepravní Pravidlo Label,
+Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+Test,Test,
+You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
+Previous Work Experience,Předchozí pracovní zkušenosti,
+For Quantity,Pro Množstvi,
+Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
+{0} {1} is not submitted,{0} {1} není odesláno,
+Requests for items.,Žádosti o položky.
+Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
+New Communications,Nová komunikace,
+Terms and Conditions1,Podmínky a podmínek1,
+Complete Setup,Kompletní nastavene,
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
+Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
+Project Status,Stav projektu,
+Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
+Newsletter Mailing List,Newsletter adresáv,
+Transporter Name,Přepravce Název,
+Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
+Total Absent,Celkem Absent,
+Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka,
+Unit of Measure,Měrná jednotka,
+Year End Date,Datum Konce Roku,
+Task Depends On,Úkol je závislá na,
+Opportunity,Příležitost,
+Salary Structure Earning,Plat Struktura Zisk,
+Completed Production Orders,Dokončené Výrobní zakázky,
+Default Workstation,Výchozí Workstation,
+Inventory & Support,Zásoby a podpora,
+Expense Claim Approved Message,Zpráva o schválení úhrady výdajt,
+How frequently?,Jak často?
+Get Current Stock,Získejte aktuální stav,
+Make Installation Note,Proveďte Instalace Poznámka,
+Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+Actual End Date,Skutečné datum ukončen$1,
+Applicable To (Role),Vztahující se na (Role)
+Purpose,Účel,
+Will also apply for variants unless overrridden,"Bude platit i pro varianty, pokud nebude přepsáno"
+Advances,Zálohy,
+Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na,
+No of Requested SMS,Počet žádaným SMS,
+Campaign-.####,Kampaň-.####
+Make Invoice,Proveďte faktury,
+Piercing,Pronikavy,
+Your Customer's TAX registration numbers (if applicable) or any general information,DIČ Vašeho zákazníka (pokud má) nebo jakékoli obecné informace,
+Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojovány,
+A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
+Has Child Node,Má děti Node,
+{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
+"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
+This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext,
+Ageing Range 1,Stárnutí Rozsah 1,
+Photochemical machining,Fotochemický obráběnt,
+"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
-#### Note
+#### Note,
The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
-#### Description of Columns
+#### Description of Columns,
1. Calculation Type:
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
-2. Account Head: The Account ledger under which this tax will be booked
+2. Account Head: The Account ledger under which this tax will be booked,
3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
4. Description: Description of the tax (that will be printed in invoices / quotes).
5. Rate: Tax rate.
@@ -2048,162 +2048,162 @@
8. Zadejte Row: Je-li na základě ""předchozí řady Total"" můžete zvolit číslo řádku, která bude přijata jako základ pro tento výpočet (výchozí je předchozí řádek).
9. Zvažte daň či poplatek za: V této části můžete nastavit, zda daň / poplatek je pouze pro ocenění (není součástí celkem), nebo pouze pro celkem (není přidanou hodnotu do položky), nebo pro obojí.
10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
-DocType: Note,Note,Poznámka
-DocType: Email Digest,New Material Requests,Nové žádosti Materiál
-DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
-DocType: Email Account,Email Ids,Email IDS
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,Nastavit jako nezastavěnou
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,To Leave Aplikace je čeká na schválení. Pouze Leave schvalovač aktualizovat stav.
-DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
-apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
-DocType: Journal Entry,Credit Note,Dobropis
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +206,Completed Qty cannot be more than {0} for operation {1},Dokončené množství nemůže být více než {0} pro provoz {1}
-DocType: Features Setup,Quality,Kvalita
-DocType: Contact Us Settings,Introduction,Úvod
-DocType: Warranty Claim,Service Address,Servisní adresy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
-DocType: Stock Entry,Manufacture,Výroba
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Dodávka Vezměte prosím na vědomí první
-DocType: Shopping Cart Taxes and Charges Master,Tax Master,Tax Mistr
-DocType: Opportunity,Customer / Lead Name,Zákazník / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +61,Clearance Date not mentioned,Výprodej Datum není uvedeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +66,Production,Výroba
-DocType: Item,Allow Production Order,Povolit výrobní objednávky
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
-DocType: Installation Note Item,Installed Qty,Instalované množství
-DocType: Lead,Fax,Fax
-DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,Vloženo
-DocType: Salary Structure,Total Earning,Celkem Zisk
-DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace větev master.
-DocType: Purchase Invoice,Will be calculated automatically when you enter the details,"Bude vypočtena automaticky, když zadáte detaily"
-DocType: Delivery Note,Transporter lorry number,Transporter číslo nákladní auto
-DocType: Sales Order,Billing Status,Status Fakturace
-DocType: Backup Manager,Backup Right Now,Zálohovat hned
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90 Nad
-DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
-DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +20,Payment Type,Typ platby
-DocType: Salary Manager,Select Employees,Vybrat Zaměstnanci
-DocType: Bank Reconciliation,To Date,To Date
-DocType: Opportunity,Potential Sales Deal,Potenciální prodej
-sites/assets/js/form.min.js +286,Details,Podrobnosti
-DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
-DocType: Email Digest,Payments Made,Platby provedené
-DocType: Employee,Emergency Contact,Kontakt v nouzi
-DocType: Item,Quality Parameters,Parametry kvality
-DocType: Target Detail,Target Amount,Cílová částka
-DocType: Shopping Cart Settings,Shopping Cart Settings,Nákupní košík Nastavení
-DocType: Journal Entry,Accounting Entries,Účetní záznamy
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicitní záznam. Zkontrolujte autorizační pravidlo {0}
-DocType: Purchase Order,Ref SQ,Ref SQ
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Nahradit položky / kusovníky ve všech kusovníků
-DocType: Purchase Order Item,Received Qty,Přijaté Množství
-DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
-DocType: Sales BOM,Parent Item,Nadřazená položka
-DocType: Account,Account Type,Typ účtu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +222,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
-,To Produce,K výrobě
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
-DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
-DocType: Bin,Reserved Quantity,Vyhrazeno Množství
-DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
-DocType: Party Type,Parent Party Type,Parent Type Party
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Cutting,Výstřižek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flattening,Zploštění
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,Zálohy budou nahrány na
-DocType: Account,Income Account,Účet příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,Lití
-DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
-DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
-DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
-DocType: Cost Center,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
-DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
-DocType: Upload Attendance,Upload HTML,Nahrát HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Total advance ({0}) against Order {1} cannot be greater \
+Note,Poznámka,
+New Material Requests,Nové žádosti Materiál,
+Recd Quantity,Recd Množstva,
+Email Ids,Email IDS,
+Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
+Set as Unstopped,Nastavit jako nezastavěnou,
+Stock Entry {0} is not submitted,Sklad Entry {0} není předložena,
+Bank / Cash Account,Bank / Peněžní účet,
+This Leave Application is pending approval. Only the Leave Approver can update status.,To Leave Aplikace je čeká na schválení. Pouze Leave schvalovač aktualizovat stav.
+Hide Currency Symbol,Skrýt symbol měny,
+"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
+Credit Note,Dobropis,
+Completed Qty cannot be more than {0} for operation {1},Dokončené množství nemůže být více než {0} pro provoz {1}
+Quality,Kvalita,
+Introduction,Úvod,
+Service Address,Servisní adresy,
+Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
+Manufacture,Výroba,
+Please Delivery Note first,Dodávka Vezměte prosím na vědomí prvna,
+Tax Master,Tax Mistr,
+Customer / Lead Name,Zákazník / Lead Name,
+Clearance Date not mentioned,Výprodej Datum není uvedeno,
+Production,Výroba,
+Allow Production Order,Povolit výrobní objednávky,
+Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
+Total(Qty),Total (ks)
+Installed Qty,Instalované množstvx,
+Fax,Fax,
+Parenttype,Parenttype,
+Submitted,Vloženo,
+Total Earning,Celkem Zisk,
+Time at which materials were received,"Čas, kdy bylo přijato materiály"
+Organization branch master.,Organizace větev master.
+Will be calculated automatically when you enter the details,"Bude vypočtena automaticky, když zadáte detaily"
+Transporter lorry number,Transporter číslo nákladní auto,
+Billing Status,Status Fakturace,
+Backup Right Now,Zálohovat hned,
+Utility Expenses,Utility Náklady,
+90-Above,90 Nad,
+Default Buying Price List,Výchozí Nákup Ceník,
+Sales Order Message,Prodejní objednávky Message,
+"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
+Payment Type,Typ platby,
+Select Employees,Vybrat Zaměstnanci,
+To Date,To Date,
+Potential Sales Deal,Potenciální prodej,
+Details,Podrobnosti,
+Total Taxes and Charges,Celkem Daně a poplatky,
+Payments Made,Platby provedeny,
+Emergency Contact,Kontakt v nouzi,
+Quality Parameters,Parametry kvality,
+Target Amount,Cílová částka,
+Shopping Cart Settings,Nákupní košík Nastaveny,
+Accounting Entries,Účetní záznamy,
+Duplicate Entry. Please check Authorization Rule {0},Duplicitní záznam. Zkontrolujte autorizační pravidlo {0}
+Ref SQ,Ref SQ,
+Replace Item / BOM in all BOMs,Nahradit položky / kusovníky ve všech kusovníkQ,
+Received Qty,Přijaté MnožstvQ,
+Serial No / Batch,Výrobní číslo / Batch,
+Parent Item,Nadřazená položka,
+Account Type,Typ účtu,
+Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+To Produce,K výrob$1,
+"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
+Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
+Reserved Quantity,Vyhrazeno Množstvy,
+Purchase Receipt Items,Položky příjemky,
+Parent Party Type,Parent Type Party,
+Cutting,Výstřižek,
+Flattening,Zploštěny,
+Backups will be uploaded to,Zálohy budou nahrány na,
+Income Account,Účet příjmy,
+Molding,Lity,
+Current Qty,Aktuální Množstvy,
+"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
+Key Responsibility Area,Key Odpovědnost Area,
+Material Request Type,Materiál Typ požadavku,
+Documents,Dokumenty,
+Ref,Ref,
+Cost Center,Nákladové středisko,
+Voucher #,Voucher #
+Purchase Order Message,Zprávy vydané objenávky,
+Upload HTML,Nahrát HTML,
+"Total advance ({0}) against Order {1} cannot be greater \
than the Grand Total ({2})","Celkem předem ({0}) na objednávku {1} nemůže být větší než \
celkovém součtu ({2})"
-DocType: Employee,Relieving Date,Uvolnění Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
-DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laser engineered net shaping,Laser technicky čisté tvarování
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"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.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
-apps/erpnext/erpnext/config/selling.py +158,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
-DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +331,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 +679,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
-DocType: Global Defaults,For automatic exchange rates go to jsonrates.com and signup for an API key,U automatických směnných kurzů jít do jsonrates.com a zaregistrovat pro klíč API
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
-DocType: Company,Stock Settings,Stock Nastavení
-DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +166,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
-apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Jméno Nového Nákladového Střediska
-DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
-apps/erpnext/erpnext/utilities/doctype/address/address.py +67,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No default šablony adresy nalezeno. Prosím, vytvořte nový z Nastavení> Tisk a značky> Adresa šablonu."
-DocType: Appraisal,HR User,HR User
-DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Problémy
-apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},Stav musí být jedním z {0}
-DocType: Sales Invoice,Debit To,Debetní K
-DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,Extra Velké
-,Profit and Loss Statement,Výkaz zisků a ztrát
-DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Pressing,Stisknutí
-DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
-,Sales Browser,Sales Browser
-DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: Dalším {0} # {1} existuje proti akciové vstupu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,Místní
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +142,Large,Velký
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +18,No employee found!,Žádný zaměstnanec našel!
-DocType: C-Form Invoice Detail,Territory,Území
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +162,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
-DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Polishing,Leštění
-DocType: Production Order Operation,Planned Start Time,Plánované Start Time
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Přidělené
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row{0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type Party Party a je použitelná pouze na pohledávky / závazky účet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {0} is cancelled,Nabídka {0} je zrušena
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
-DocType: Sales Partner,Targets,Cíle
-DocType: Price List,Price List Master,Ceník Master
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
-,S.O. No.,SO Ne.
-DocType: Production Order Operation,Make Time Log,Udělejte si čas Přihlásit
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +162,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Electro-chemical grinding,Electro-chemické broušení
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
-DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-sites/assets/js/list.min.js +23,Cancelled,Zrušeno
-DocType: Employee Education,Graduate,Absolvent
-DocType: Leave Block List,Block Days,Blokové dny
-DocType: Journal Entry,Excise Entry,Spotřební Entry
-DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+Relieving Date,Uvolnění Datum,
+"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
+Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupeno,
+Class / Percentage,Třída / Procento,
+Head of Marketing and Sales,Vedoucí marketingu a prodeje,
+Income Tax,Daň z příjmo,
+Laser engineered net shaping,Laser technicky čisté tvarováno,
+"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.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
+Track Leads by Industry Type.,Trasa vede od průmyslu typu.
+Item Supplier,Položka Dodavatel,
+Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+For automatic exchange rates go to jsonrates.com and signup for an API key,U automatických směnných kurzů jít do jsonrates.com a zaregistrovat pro klíč API,
+All Addresses.,Všechny adresy.
+Stock Settings,Stock Nastavene,
+Bio,Biografie,
+"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
+Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
+New Cost Center Name,Jméno Nového Nákladového Střediska,
+Leave Control Panel,Nechte Ovládací panely,
+No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No default šablony adresy nalezeno. Prosím, vytvořte nový z Nastavení> Tisk a značky> Adresa šablonu."
+HR User,HR User,
+Taxes and Charges Deducted,Daně a odečtenr,
+Issues,Problémy,
+Status must be one of {0},Stav musí být jedním z {0}
+Debit To,Debetní K,
+Required only for sample item.,Požadováno pouze pro položku vzorku.
+Actual Qty After Transaction,Skutečné Množství Po transakci,
+Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
+Extra Large,Extra Velkt,
+Profit and Loss Statement,Výkaz zisků a ztrát,
+Cheque Number,Šek číslo,
+Pressing,Stisknutt,
+Payment Tool Detail,Detail platební nástroj,
+Sales Browser,Sales Browser,
+Total Credit,Celkový Credit,
+Warning: Another {0} # {1} exists against stock entry {2},Upozornění: Dalším {0} # {1} existuje proti akciové vstupu {2}
+Local,Místn$1,
+Loans and Advances (Assets),Úvěrů a půjček (aktiva)
+Debtors,Dlužníci,
+Large,Velki,
+No employee found!,Žádný zaměstnanec našel!
+Territory,Územ$1,
+Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+Default Valuation Method,Výchozí metoda oceněne,
+Polishing,Leštěne,
+Planned Start Time,Plánované Start Time,
+Allocated,Přidělene,
+Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
+Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou,
+Row{0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type Party Party a je použitelná pouze na pohledávky / závazky účet,
+Quotation {0} is cancelled,Nabídka {0} je zrušena,
+Total Outstanding Amount,Celková dlužná částka,
+Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
+Targets,Cíle,
+Price List Master,Ceník Master,
+All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
+S.O. No.,SO Ne.
+Make Time Log,Udělejte si čas Přihlásit,
+Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
+Computers,Počítače,
+Electro-chemical grinding,Electro-chemické broušene,
+This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
+Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
+Ignore Pricing Rule,Ignorovat Ceny pravidlo,
+Cancelled,Zrušeno,
+Graduate,Absolvent,
+Block Days,Blokové dny,
+Excise Entry,Spotřební Entry,
+"Standard Terms and Conditions that can be added to Sales and Purchases.
Examples:
@@ -2228,1172 +2228,1172 @@
1. Podmínky přepravy, v případě potřeby.
1. Způsoby řešení sporů, náhrady škody, odpovědnosti za škodu, atd
1. Adresa a kontakt na vaši společnost."
-DocType: Attendance,Leave Type,Leave Type
-apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
-DocType: Account,Accounts User,Uživatel Účtů
-DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se faktury, zrušte zaškrtnutí zastavit opakované nebo dát správné datum ukončení"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
-DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
-apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +38,Maximum {0} rows allowed,Maximálně {0} řádků povoleno
-DocType: C-Form Invoice Detail,Net Total,Net Total
-DocType: Bin,FCFS Rate,FCFS Rate
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fakturace (Prodejní Faktura)
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Dlužné částky
-DocType: Project Task,Working,Pracovní
-DocType: Stock Ledger Entry,Stock Queue (FIFO),Sklad fronty (FIFO)
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vyberte Time Protokoly.
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},{0} nepatří do Společnosti {1}
-,Requested Qty,Požadované množství
-DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
-DocType: Maintenance Visit,Purposes,Cíle
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electrochemical machining,Elektrochemické obrábění
-,Requested,Požadované
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +62,No Remarks,Žádné poznámky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +11,Overdue,Zpožděný
-DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
-DocType: Monthly Distribution,Distribution Name,Distribuce Name
-DocType: Features Setup,Sales and Purchase,Prodej a nákup
-DocType: Pricing Rule,Price / Discount,Cena / Sleva
-DocType: Purchase Order Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou zákazník měny je převeden na společnosti základní měny"
-DocType: Purchase Invoice,Discount Amount (Company Currency),Částka slevy (Company Měna)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} byl úspěšně odhlášen z tohoto seznamu.
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company měny)
-apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Správa Territory strom.
-DocType: Payment Reconciliation Payment,Sales Invoice,Prodejní faktury
-DocType: Journal Entry Account,Party Balance,Balance Party
-DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
-DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
-DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
-DocType: Item,Item will be saved by this name in the data base.,Bod budou uloženy pod tímto jménem v databázi.
-DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
-DocType: Purchase Invoice,Half-yearly,Pololetní
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
-DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,Účetní položka na skladě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,Ražení
-DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,Bod {0} neexistuje
-DocType: Item,"Selecting ""Yes"" will allow you to make a Production Order for this item.","Výběrem ""Yes"" vám umožní, aby se výrobní zakázku pro tuto položku."
-DocType: Sales Invoice,Customer Address,Zákazník Address
-DocType: Purchase Invoice,Total,Celkem
-DocType: Backup Manager,System for managing Backups,Systém pro správu zálohování
-DocType: Account,Root Type,Root Type
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Spiknutí
-DocType: Item Group,Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky
-DocType: BOM,Item UOM,Položka UOM
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +165,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
-DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Extra Small,Extra Malé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,Spray tváření
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,Účet {0} je zmrazen
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
-apps/erpnext/erpnext/config/setup.py +116,Address master.,Adresa master.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
-DocType: Stock Entry,Subcontract,Subdodávka
-DocType: Production Planning Tool,Get Items From Sales Orders,Získat položky z Prodejní Objednávky
-DocType: Production Order Operation,Actual End Time,Aktuální End Time
-DocType: Production Planning Tool,Download Materials Required,Ke stažení potřebné materiály:
-DocType: Item,Manufacturer Part Number,Typové označení
-DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a náklady
-DocType: Bin,Bin,Popelnice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Nosing,Zaoblená hrana
-DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
-DocType: Account,Company,Společnost
-DocType: Account,Expense Account,Účtet nákladů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +146,Colour,Barevné
-DocType: Maintenance Visit,Scheduled,Plánované
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
-DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
-DocType: Address,Check to make Shipping Address,Zaškrtněte pro vytvoření doručovací adresy
-apps/erpnext/erpnext/stock/get_item_details.py +253,Price List Currency not selected,Ceníková Měna není zvolena
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-DocType: Pricing Rule,Applicability,Použitelnost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
-DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
-DocType: Installation Note Item,Against Document No,Proti dokumentu č
-apps/erpnext/erpnext/config/selling.py +93,Manage Sales Partners.,Správa prodejních partnerů.
-DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/controllers/recurring_document.py +160,Please select {0},"Prosím, vyberte {0}"
-DocType: C-Form,C-Form No,C-Form No
-DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +90,Researcher,Výzkumník
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +87,Update,Aktualizovat
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +75,Please save the Newsletter before sending,Uložte Newsletter před odesláním
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Jméno nebo e-mail je povinné
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Vstupní kontrola jakosti.
-DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Root Type is mandatory,Root Type je povinné
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Serial No {0} created,Pořadové číslo {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Vibratory finishing,Vibrační dokončovací
-DocType: Item,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
-DocType: Journal Entry Account,Against Purchase Order,Proti vydané objednávce
-DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
-DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +160,Probationary Period,Zkušební doba
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
-DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
-sites/assets/js/erpnext.min.js +43,Pay,Platit
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
-DocType: SMS Settings,SMS Gateway URL,SMS brána URL
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Grinding,Broušení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink wrapping,Zmenšit balení
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +123,Please enter relieving date.,Zadejte zmírnění datum.
-apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +237,Serial No {0} status must be 'Available' to Deliver,"Pořadové číslo {0} status musí být ""k dispozici"" doručovat"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Název je povinný.
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +37,Newspaper Publishers,Vydavatelé novin
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Smelting,Tavba rudy
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,"Jste Leave schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
-DocType: Attendance,Attendance Date,Účast Datum
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
-DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
-DocType: Purchase Receipt Item,Accepted Warehouse,Schválené Sklad
-DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
-DocType: Item,Valuation Method,Ocenění Method
-DocType: Sales Invoice,Sales Team,Prodejní tým
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Duplicate entry,Duplicitní záznam
-DocType: Serial No,Under Warranty,V rámci záruky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +425,[Error],[Chyba]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
-,Employee Birthday,Narozeniny zaměstnance
-DocType: GL Entry,Debit Amt,Debetní Amt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Venture Capital,Venture Capital
-DocType: UOM,Must be Whole Number,Musí být celé číslo
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
-DocType: Pricing Rule,Discount Percentage,Sleva v procentech
-DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
-apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,Objednávky
-DocType: Leave Control Panel,Employee Type,Type zaměstnanců
-DocType: Employee Leave Approver,Leave Approver,Nechte schvalovač
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,Zužování
-DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
-,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
-DocType: Pricing Rule,Purchase Manager,Vedoucí nákupu
-DocType: Payment Tool,Payment Tool,Platebního nástroje
-DocType: Target Detail,Target Detail,Target Detail
-DocType: Sales Order,% of materials billed against this Sales Order,% Materiálů fakturovaných proti tomuto odběrateli
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Období Uzávěrka Entry
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
-DocType: Email Digest,Payments received during the digest period,Platby přijaté během období digest
-DocType: Customer,Credit Limit,Úvěrový limit
-DocType: Features Setup,To enable <b>Point of Sale</b> features,Chcete-li povolit <b> Point of Sale </ b> funkce
-DocType: Purchase Receipt,LR Date,LR Datum
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
-DocType: GL Entry,Voucher No,Voucher No
-DocType: Leave Allocation,Leave Allocation,Nechte Allocation
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,"Musí být nastavena ""Aktualizace Skladu"" pro prodejní faktury {0}"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,Materiál Žádosti {0} vytvořené
-apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,Šablona podmínek nebo smlouvy.
-DocType: Employee,Feedback,Zpětná vazba
-apps/erpnext/erpnext/accounts/party.py +192,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Abrasive jet machining,Brusné jet obrábění
-DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
-DocType: Website Settings,Website Settings,Nastavení www stránky
-DocType: Activity Cost,Billing Rate,Fakturace Rate
-,Qty to Deliver,Množství k dodání
-DocType: Monthly Distribution Percentage,Month,Měsíc
-,Stock Analytics,Stock Analytics
-DocType: Installation Note Item,Against Document Detail No,Proti Detail dokumentu č
-DocType: Quality Inspection,Outgoing,Vycházející
-DocType: Material Request,Requested For,Požadovaných pro
-DocType: Quotation Item,Against Doctype,Proti DOCTYPE
-DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Root account can not be deleted,Root účet nemůže být smazán
-DocType: GL Entry,Credit Amt,Credit Amt
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +72,Show Stock Entries,Zobrazit Stock Příspěvky
-DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +273,Reference #{0} dated {1},Reference # {0} ze dne {1}
-DocType: Pricing Rule,Item Code,Kód položky
-DocType: Supplier,Material Manager,Materiál Správce
-DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
-DocType: Time Log,Costing Rate (per hour),Kalkulace Rate (za hodinu)
-DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-DocType: Journal Entry,User Remark,Uživatel Poznámka
-apps/erpnext/erpnext/config/accounts.py +117,Point-of-Sale Setting,Nastavení Místa Prodeje
-DocType: Lead,Market Segment,Segment trhu
-DocType: Communication,Phone,Telefon
-DocType: Purchase Invoice,Supplier (Payable) Account,Dodavatel (za poplatek) Account
-DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +192,Closing (Dr),Uzavření (Dr)
-DocType: Contact,Passive,Pasivní
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +242,Serial No {0} not in stock,Pořadové číslo {0} není skladem
-apps/erpnext/erpnext/config/selling.py +122,Tax template for selling transactions.,Daňové šablona na prodej transakce.
-DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Zkontrolujte, zda potřebujete automatické opakující faktury. Po odeslání jakékoliv prodejní fakturu, opakující se část bude viditelný."
-DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} must be 'Submitted',"Time Log {0} musí být ""Odesláno"""
-DocType: Stock Settings,Default Stock UOM,Výchozí Skladem UOM
-DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
-DocType: Employee Education,School/University,Škola / University
-DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
-,Billed Amount,Fakturovaná částka
-DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
-DocType: Purchase Invoice,Total Amount To Pay,Celková částka k Zaplatit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-DocType: Event,Groups,Skupiny
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,Seskupit podle účtu
-DocType: Sales Order,Fully Delivered,Plně Dodáno
-DocType: Lead,Lower Income,S nižšími příjmy
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Účet hlavu pod odpovědnosti, ve kterém se bude Zisk / ztráta rezervovali"
-DocType: Payment Tool,Against Vouchers,Proti Poukázky
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Rychlá pomoc
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
-DocType: Features Setup,Sales Extras,Prodejní Extras
-apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-DocType: Leave Allocation,Carry Forwarded Leaves,Carry Předáno listy
-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"""
-,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
-DocType: Warranty Claim,From Company,Od Společnosti
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Minute,Minuta
-DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
-DocType: Backup Manager,Upload Backups to Dropbox,Nahrát zálohy na Dropbox
-,Qty to Receive,Množství pro příjem
-DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,Konverzní faktor nemůže být ve zlomcích
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,Budete ho používat k přihlášení
-DocType: Sales Partner,Retailer,Maloobchodník
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
-apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Nabídka {0} není typu {1}
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
-DocType: Sales Order,% Delivered,% Dodáno
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Proveďte výplatní pásce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Uvolnit
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
-apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignorovat:
-apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} není možné zakoupit pomocí Nákupní košík
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Počáteční stav Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nelze schválit dovolenou si nejste oprávněna schvalovat listy na blok Termíny
-DocType: Appraisal,Appraisal,Ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Lost-foam casting,Lost-pěna lití
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Drawing,Výkres
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
-DocType: Hub Settings,Seller Email,Prodávající E-mail
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
-DocType: Workstation Working Hour,Start Time,Start Time
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +183,Select Quantity,Zvolte množství
-DocType: Sales Taxes and Charges Template,"Specify a list of Territories, for which, this Taxes Master is valid","Zadejte seznam území, pro které tato Daně Master je platný"
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +41,Message Sent,Zpráva byla odeslána
-DocType: Production Plan Sales Order,SO Date,SO Datum
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou Ceník měna je převeden na zákazníka základní měny"
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
-DocType: BOM Operation,Hour Rate,Hour Rate
-DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,Z nabídky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,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 +25,Account {0} does not exists,Účet {0} neexistuje
-DocType: Purchase Receipt Item,Purchase Order Item No,Číslo položky vydané objednávky
-DocType: System Settings,System Settings,Nastavení systému
-DocType: Project,Project Type,Typ projektu
-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á.
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Náklady na různých aktivit
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +93,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
-DocType: Item,Inspection Required,Kontrola Povinné
-DocType: Purchase Invoice Item,PR Detail,PR Detail
-DocType: Sales Order,Fully Billed,Plně Fakturovaný
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
-DocType: Serial No,Is Cancelled,Je Zrušeno
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,Moje dodávky
-DocType: Journal Entry,Bill Date,Bill Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
-DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
-DocType: Communication,Recipients,Příjemci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Screwing,Šroubování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Knurling,Vroubkování
-DocType: Expense Claim,Approval Status,Stav schválení
-DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +38,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +128,Wire Transfer,Bankovní převod
-apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
-DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
-sites/assets/js/report.min.js +107,From Date must be before To Date,Datum od musí být dříve než datum do
-DocType: Sales Order,Recurring Order,Opakující se objednávky
-DocType: Company,Default Income Account,Účet Default příjmů
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
-DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +189,Welcome to ERPNext,Vítejte na ERPNext
-DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet
-DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá
-DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
-DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} je vloženo více než jednou v tabulce Varianty Položky
-,Projected,Plánovaná
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Note: Reference Date exceeds allowed credit days by {0} days for {1} {2},Poznámka: Odkaz Datum překračuje povolené úvěrové dnů od {0} dní na {1} {2}
-apps/erpnext/erpnext/controllers/status_updater.py +96,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
-DocType: Notification Control,Quotation Message,Zpráva Nabídky
-DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +23,POS Setting {0} already created for user: {1} and company {2},POS nastavení {0} již vytvořili pro uživatele: {1} a společnost {2}
-DocType: Journal Entry,Remark,Poznámka
-DocType: Purchase Receipt Item,Rate and Amount,Tempo a rozsah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Boring,Nudný
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +680,From Sales Order,Z přijaté objednávky
-DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
-DocType: Sales Order,Not Billed,Ne Účtovaný
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
-sites/assets/js/erpnext.min.js +20,No contacts added yet.,Žádné kontakty přidán dosud.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Neaktivní
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +43,Against Invoice Posting Date,Proti faktury Datum zveřejnění
-DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
-DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
-DocType: POS Setting,Write Off Account,Odepsat účet
-DocType: Purchase Invoice,Discount Amount,Částka slevy
-DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-DocType: Email Digest,Expenses booked for the digest period,Náklady rezervované pro období digest
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,např. DPH
-DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
-DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hot metal gas forming,Tváření Hot metal plyn
-DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
-DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
-DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,"Procentuální změna v množství, aby mohla při přijímání nebo poskytování této položky."
-DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,Nákupní košík daně a poplatky Mistr
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Přejděte na příslušné skupiny (obvykle zdrojem finančních prostředků> krátkodobých závazků> daní a poplatků a vytvořit nový účet (kliknutím na Přidat dítě) typu "daně" a to nemluvím o daňovou sazbu.
-,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +113,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Laser cutting,Laserové řezání
-DocType: Event,Monday,Pondělí
-DocType: Journal Entry,Stock Entry,Reklamní Entry
-DocType: Account,Payable,Splatný
-DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
-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 +68,Gross Profit %,Hrubý Zisk %
-DocType: Appraisal Goal,Weightage (%),Weightage (%)
-DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
-DocType: Newsletter,Newsletter List,Newsletter Seznam
-DocType: Salary Manager,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Zkontrolujte, zda chcete poslat výplatní pásku za poštou na každého zaměstnance při předkládání výplatní pásku"
-DocType: Lead,Address Desc,Popis adresy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,"Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být ""Odpovědnost"" typ účtu, protože tento Reklamní Usmíření je Entry Otevření"
-apps/erpnext/erpnext/stock/doctype/item/item.js +215,"Variants can not be created manually, add item attributes in the template item","Varianty nelze vytvořit ručně, přidejte atributy položku v položce šablony"
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
-DocType: Page,All,Vše
-DocType: Stock Entry Detail,Source Warehouse,Zdroj Warehouse
-DocType: Installation Note,Installation Date,Datum instalace
-DocType: Employee,Confirmation Date,Potvrzení Datum
-DocType: C-Form,Total Invoiced Amount,Celkem Fakturovaná částka
-DocType: Communication,Sales User,Uživatel prodeje
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +421,Set,Nastavit
-DocType: Item,Warehouse-wise Reorder Levels,Změna Úrovně dle skladu
-DocType: Lead,Lead Owner,Olovo Majitel
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +241,Warehouse is required,Je zapotřebí Warehouse
-DocType: Employee,Marital Status,Rodinný stav
-DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
-DocType: Time Log,Will be updated when billed.,Bude aktualizována při účtovány.
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
-DocType: Sales Invoice,Against Income Account,Proti účet příjmů
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% vyhlášeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,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
-DocType: Territory,Territory Targets,Území Cíle
-DocType: Delivery Note,Transporter Info,Transporter Info
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
-DocType: POS Setting,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Superfinishing,Superfinišování
-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.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Přidat / Upravit </a>"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
-apps/erpnext/erpnext/accounts/utils.py +235,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
-DocType: Purchase Invoice,Terms,Podmínky
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +235,Create New,Vytvořit nový
-DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
-,Item-wise Sales History,Item-moudrý Sales History
-DocType: Expense Claim,Total Sanctioned Amount,Celková částka potrestána
-,Purchase Analytics,Nákup Analytika
-DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
-DocType: Expense Claim,Task,Úkol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Shaving,Holení
-DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
-,Stock Ledger,Reklamní Ledger
-DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +368,"To set reorder level, item must be a Purchase Item","Chcete-li nastavit úroveň Objednací, položka musí být Nákup položky"
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Poznámky
-DocType: Opportunity,From,Od
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +192,Select a group node first.,Vyberte první uzel skupinu.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Fill the form and save it,Vyplňte formulář a uložte jej
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Facing,Obložení
-DocType: Leave Application,Leave Balance Before Application,Nechte zůstatek před aplikací
-DocType: SMS Center,Send SMS,Pošlete SMS
-DocType: Company,Default Letter Head,Výchozí hlavičkový
-DocType: Time Log,Billable,Zúčtovatelná
-DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
-DocType: Account,Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,Změna pořadí Množství
-DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
-DocType: Sales Invoice,Write Off,Odepsat
-DocType: Time Log,Operation ID,Provoz ID
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
-DocType: Task,depends_on,záleží na
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +81,Opportunity Lost,Příležitost Ztracena
-DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Sleva Pole bude k dispozici v objednávce, doklad o koupi, nákupní faktury"
-DocType: Report,Report Type,Typ výpisu
-apps/frappe/frappe/core/doctype/user/user.js +136,Loading,Nahrávám
-DocType: BOM Replace Tool,BOM Replace Tool,BOM Nahradit Tool
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
-apps/erpnext/erpnext/accounts/party.py +196,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Pokud se zapojit do výrobní činnosti. Umožňuje Položka ""se vyrábí"""
-DocType: Sales Invoice,Rounded Total,Zaoblený Total
-DocType: Sales BOM,List items that form the package.,"Seznam položek, které tvoří balíček."
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
-DocType: Serial No,Out of AMC,Out of AMC
-DocType: Purchase Order Item,Material Request Detail No,Materiál Poptávka Detail No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Hard turning,Hard soustružení
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +165,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/setup.py +91,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam své daňové hlavy (např DPH, spotřební daň, měli by mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou si můžete upravit a přidat další později."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
-DocType: Item,Supplier Items,Dodavatele položky
-apps/erpnext/erpnext/stock/doctype/item/item.py +165,Please enter atleast one attribute row in Item Variants table,Zadejte prosím aspoň jeden atribut řádek položky Varianty tabulku
-DocType: Opportunity,Opportunity Type,Typ Příležitosti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nová společnost
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +50,Cost Center is required for 'Profit and Loss' account {0},"Nákladové středisko je vyžadováno pro účet ""výkaz zisku a ztrát"" {0}"
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +16,Transactions can only be deleted by the creator of the Company,Transakce mohou být vymazány pouze tvůrce Společnosti
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nesprávný počet hlavní knihy záznamů nalezen. Pravděpodobně jste zvolili nesprávný účet v transakci.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Chcete-li vytvořit si účet v bance
-DocType: Hub Settings,Publish Availability,Publikování Dostupnost
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
-,Stock Ageing,Reklamní Stárnutí
-DocType: Purchase Receipt,Automatically updated from BOM table,Automaticky aktualizována z BOM tabulky
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled, {0} '{1}' je zakázána
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +282,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+Leave Type,Leave Type,
+Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
+Accounts User,Uživatel Účt$1,
+"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se faktury, zrušte zaškrtnutí zastavit opakované nebo dát správné datum ukončení"
+Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen,
+If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
+Maximum {0} rows allowed,Maximálně {0} řádků povoleno,
+Net Total,Net Total,
+FCFS Rate,FCFS Rate,
+Billing (Sales Invoice),Fakturace (Prodejní Faktura)
+Outstanding Amount,Dlužné částky,
+Working,Pracovny,
+Stock Queue (FIFO),Sklad fronty (FIFO)
+Please select Time Logs.,Vyberte Time Protokoly.
+{0} does not belong to Company {1},{0} nepatří do Společnosti {1}
+Requested Qty,Požadované množstv$1,
+Scrap %,Scrap%
+"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
+Purposes,Cíle,
+"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
+Electrochemical machining,Elektrochemické obráběny,
+Requested,Požadovany,
+No Remarks,Žádné poznámky,
+Overdue,Zpožděny,
+Stock Received But Not Billed,Sklad nepřijali Účtovany,
+Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet,
+Distribution Name,Distribuce Name,
+Sales and Purchase,Prodej a nákup,
+Price / Discount,Cena / Sleva,
+Material Request No,Materiál Poptávka No,
+Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou zákazník měny je převeden na společnosti základní měny"
+Discount Amount (Company Currency),Částka slevy (Company Měna)
+{0} has been successfully unsubscribed from this list.,{0} byl úspěšně odhlášen z tohoto seznamu.
+Net Rate (Company Currency),Čistý Rate (Company měny)
+Manage Territory Tree.,Správa Territory strom.
+Sales Invoice,Prodejní faktury,
+Party Balance,Balance Party,
+Time Log Batch,Time Log Batch,
+Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
+Default Receivable Account,Výchozí pohledávek účtu,
+Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritériu,
+Item will be saved by this name in the data base.,Bod budou uloženy pod tímto jménem v databázi.
+Material Transfer for Manufacture,Materiál Přenos: Výroba,
+Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
+Half-yearly,Pololetn$1,
+Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
+Get Relevant Entries,Získat příslušné zápisy,
+Accounting Entry for Stock,Účetní položka na sklady,
+Coining,Raženy,
+Sales Team1,Sales Team1,
+Item {0} does not exist,Bod {0} neexistuje,
+"Selecting ""Yes"" will allow you to make a Production Order for this item.","Výběrem ""Yes"" vám umožní, aby se výrobní zakázku pro tuto položku."
+Customer Address,Zákazník Address,
+Total,Celkem,
+System for managing Backups,Systém pro správu zálohováns,
+Root Type,Root Type,
+Plot,Spiknuts,
+Show this slideshow at the top of the page,Zobrazit tuto prezentaci v horní části stránky,
+Item UOM,Položka UOM,
+Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
+Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
+Quality Inspection,Kontrola kvality,
+Extra Small,Extra Maly,
+Spray forming,Spray tvářeny,
+Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množstvy,
+Account {0} is frozen,Účet {0} je zmrazen,
+Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
+Address master.,Adresa master.
+"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
+PL or BS,PL nebo BS,
+Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100,
+Minimum Inventory Level,Minimální úroveň zásob,
+Subcontract,Subdodávka,
+Get Items From Sales Orders,Získat položky z Prodejní Objednávky,
+Actual End Time,Aktuální End Time,
+Download Materials Required,Ke stažení potřebné materiály:
+Manufacturer Part Number,Typové označeny,
+Estimated Time and Cost,Odhadovná doba a náklady,
+Bin,Popelnice,
+Nosing,Zaoblená hrana,
+No of Sent SMS,Počet odeslaných SMS,
+Company,Společnost,
+Expense Account,Účtet náklady,
+Software,Software,
+Colour,Barevny,
+Scheduled,Plánovany,
+Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
+Valuation Rate,Ocenění Rate,
+Check to make Shipping Address,Zaškrtněte pro vytvoření doručovací adresy,
+Price List Currency not selected,Ceníková Měna není zvolena,
+Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
+Applicability,Použitelnost,
+Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+Project Start Date,Datum zahájení projektu,
+Until,Dokud,
+Rename Log,Přejmenovat Přihlásit,
+Against Document No,Proti dokumentu u,
+Manage Sales Partners.,Správa prodejních partnerů.
+Inspection Type,Kontrola Type,
+Please select {0},"Prosím, vyberte {0}"
+C-Form No,C-Form No,
+Exploded_items,Exploded_items,
+Researcher,Výzkumník,
+Update,Aktualizovat,
+Please save the Newsletter before sending,Uložte Newsletter před odesláním,
+Name or Email is mandatory,Jméno nebo e-mail je povinno,
+Incoming quality inspection.,Vstupní kontrola jakosti.
+Exit,Východ,
+Root Type is mandatory,Root Type je povinnd,
+Serial No {0} created,Pořadové číslo {0} vytvořil,
+Vibratory finishing,Vibrační dokončovacd,
+"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
+Against Purchase Order,Proti vydané objednávce,
+You can enter any date manually,Můžete zadat datum ručne,
+Advertisement,Reklama,
+Probationary Period,Zkušební doba,
+Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci,
+Expense Approver,Schvalovatel výdaje,
+Purchase Receipt Item Supplied,Doklad o koupi Item Dodávane,
+Pay,Platit,
+To Datetime,Chcete-li datetime,
+SMS Gateway URL,SMS brána URL,
+Grinding,Broušene,
+Shrink wrapping,Zmenšit balene,
+Supplier > Supplier Type,Dodavatel> Dodavatel Type,
+Please enter relieving date.,Zadejte zmírnění datum.
+Amt,Amt,
+Serial No {0} status must be 'Available' to Deliver,"Pořadové číslo {0} status musí být ""k dispozici"" doručovat"
+Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
+Address Title is mandatory.,Adresa Název je povinný.
+Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
+Newspaper Publishers,Vydavatelé novin,
+Select Fiscal Year,Vyberte Fiskální rok,
+Smelting,Tavba rudy,
+You are the Leave Approver for this record. Please Update the 'Status' and Save,"Jste Leave schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
+Reorder Level,Změna pořadí Level,
+Attendance Date,Účast Datum,
+Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
+Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu,
+Preferred Shipping Address,Preferovaná dodací adresa,
+Accepted Warehouse,Schválené Sklad,
+Posting Date,Datum zveřejněnu,
+Valuation Method,Ocenění Method,
+Sales Team,Prodejní tým,
+Duplicate entry,Duplicitní záznam,
+Under Warranty,V rámci záruky,
+[Error],[Chyba]
+In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
+Employee Birthday,Narozeniny zaměstnance,
+Debit Amt,Debetní Amt,
+Venture Capital,Venture Capital,
+Must be Whole Number,Musí být celé číslo,
+New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
+Serial No {0} does not exist,Pořadové číslo {0} neexistuje,
+Discount Percentage,Sleva v procentech,
+Invoice Number,Číslo faktury,
+Orders,Objednávky,
+Employee Type,Type zaměstnance,
+Leave Approver,Nechte schvalovae,
+Swaging,Zužováne,
+"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
+Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky,
+Purchase Manager,Vedoucí nákupu,
+Payment Tool,Platebního nástroje,
+Target Detail,Target Detail,
+% of materials billed against this Sales Order,% Materiálů fakturovaných proti tomuto odběrateli,
+Period Closing Entry,Období Uzávěrka Entry,
+Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny,
+Depreciation,Znehodnoceny,
+Supplier(s),Dodavatel (é)
+Payments received during the digest period,Platby přijaté během období digest,
+Credit Limit,Úvěrový limit,
+To enable <b>Point of Sale</b> features,Chcete-li povolit <b> Point of Sale </ b> funkce,
+LR Date,LR Datum,
+Select type of transaction,Vyberte typ transakce,
+Voucher No,Voucher No,
+Leave Allocation,Nechte Allocation,
+'Update Stock' for Sales Invoice {0} must be set,"Musí být nastavena ""Aktualizace Skladu"" pro prodejní faktury {0}"
+Material Requests {0} created,Materiál Žádosti {0} vytvořen$1,
+Template of terms or contract.,Šablona podmínek nebo smlouvy.
+Feedback,Zpětná vazba,
+Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+Abrasive jet machining,Brusné jet obráběny,
+Freeze Stock Entries,Freeze Stock Příspěvky,
+Website Settings,Nastavení www stránky,
+Billing Rate,Fakturace Rate,
+Qty to Deliver,Množství k dodány,
+Month,Měsíc,
+Stock Analytics,Stock Analytics,
+Against Document Detail No,Proti Detail dokumentu y,
+Outgoing,Vycházejícy,
+Requested For,Požadovaných pro,
+Against Doctype,Proti DOCTYPE,
+Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu,
+Root account can not be deleted,Root účet nemůže být smazán,
+Credit Amt,Credit Amt,
+Show Stock Entries,Zobrazit Stock Příspěvky,
+Work-in-Progress Warehouse,Work-in-Progress sklad,
+Reference #{0} dated {1},Reference # {0} ze dne {1}
+Item Code,Kód položky,
+Material Manager,Materiál Správce,
+Create Production Orders,Vytvoření výrobní zakázky,
+Costing Rate (per hour),Kalkulace Rate (za hodinu)
+Warranty / AMC Details,Záruka / AMC Podrobnosti,
+User Remark,Uživatel Poznámka,
+Point-of-Sale Setting,Nastavení Místa Prodeje,
+Market Segment,Segment trhu,
+Phone,Telefon,
+Supplier (Payable) Account,Dodavatel (za poplatek) Account,
+Employee Internal Work History,Interní historie práce zaměstnance,
+Closing (Dr),Uzavření (Dr)
+Passive,Pasivnm,
+Serial No {0} not in stock,Pořadové číslo {0} není skladem,
+Tax template for selling transactions.,Daňové šablona na prodej transakce.
+Write Off Outstanding Amount,Odepsat dlužné částky,
+"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Zkontrolujte, zda potřebujete automatické opakující faktury. Po odeslání jakékoliv prodejní fakturu, opakující se část bude viditelný."
+Accounts Manager,Accounts Manager,
+Time Log {0} must be 'Submitted',"Time Log {0} musí být ""Odesláno"""
+Default Stock UOM,Výchozí Skladem UOM,
+Create Material Requests,Vytvořit Žádosti materiálu,
+School/University,Škola / University,
+Available Qty at Warehouse,Množství k dispozici na skladu,
+Billed Amount,Fakturovaná částka,
+Bank Reconciliation,Bank OdsouhlasenM,
+Total Amount To Pay,Celková částka k Zaplatit,
+Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena,
+Groups,Skupiny,
+Group by Account,Seskupit podle účtu,
+Fully Delivered,Plně Dodáno,
+Lower Income,S nižšími příjmy,
+"The account head under Liability, in which Profit/Loss will be booked","Účet hlavu pod odpovědnosti, ve kterém se bude Zisk / ztráta rezervovali"
+Against Vouchers,Proti Poukázky,
+Quick Help,Rychlá pomoc,
+Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
+Sales Extras,Prodejní Extras,
+{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
+Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+Carry Forwarded Leaves,Carry Předáno listy,
+'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
+Stock Projected Qty,Reklamní Plánovaná POČET,
+Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+From Company,Od Společnosti,
+Value or Qty,Hodnota nebo Množstvi,
+Minute,Minuta,
+Purchase Taxes and Charges,Nákup Daně a poplatky,
+Upload Backups to Dropbox,Nahrát zálohy na Dropbox,
+Qty to Receive,Množství pro příjem,
+Leave Block List Allowed,Nechte Block List povolena,
+Conversion factor cannot be in fractions,Konverzní faktor nemůže být ve zlomcích,
+You will use it to Login,Budete ho používat k přihlášeni,
+Retailer,Maloobchodník,
+All Supplier Types,Všechny typy Dodavatele,
+Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
+Quotation {0} not of type {1},Nabídka {0} není typu {1}
+Maintenance Schedule Item,Plán údržby Item,
+% Delivered,% Dodáno,
+Bank Overdraft Account,Kontokorentní úvěr na účtu,
+Make Salary Slip,Proveďte výplatní pásce,
+Unstop,Uvolnit,
+Secured Loans,Zajištěné úvěry,
+Ignored:,Ignorovat:
+{0} cannot be purchased using Shopping Cart,{0} není možné zakoupit pomocí Nákupní košík,
+Awesome Products,Skvělé produkty,
+Opening Balance Equity,Počáteční stav Equity,
+Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nelze schválit dovolenou si nejste oprávněna schvalovat listy na blok Termíny,
+Appraisal,Oceněnk,
+Lost-foam casting,Lost-pěna litk,
+Drawing,Výkres,
+Date is repeated,Datum se opakuje,
+Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
+Seller Email,Prodávající E-mail,
+Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
+Start Time,Start Time,
+Select Quantity,Zvolte množstve,
+"Specify a list of Territories, for which, this Taxes Master is valid","Zadejte seznam území, pro které tato Daně Master je platný"
+Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na,
+Message Sent,Zpráva byla odeslána,
+SO Date,SO Datum,
+Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou Ceník měna je převeden na zákazníka základní měny"
+Net Amount (Company Currency),Čistá částka (Company Měna)
+Hour Rate,Hour Rate,
+Item Naming By,Položka Pojmenování By,
+From Quotation,Z nabídky,
+Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
+Material Transferred for Manufacturing,Materiál Přenesená pro výrobu,
+Account {0} does not exists,Účet {0} neexistuje,
+Purchase Order Item No,Číslo položky vydané objednávky,
+System Settings,Nastavení systému,
+Project Type,Typ projektu,
+Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
+Cost of various activities,Náklady na různých aktivit,
+Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
+Inspection Required,Kontrola Povinnl,
+PR Detail,PR Detail,
+Fully Billed,Plně Fakturovanl,
+Cash In Hand,Pokladní hotovost,
+The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
+Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účto,
+Is Cancelled,Je Zrušeno,
+My Shipments,Moje dodávky,
+Bill Date,Bill Datum,
+"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
+Supplier Details,Dodavatele Podrobnosti,
+Recipients,Příjemci,
+Screwing,Šroubováni,
+Knurling,Vroubkováni,
+Approval Status,Stav schváleni,
+Publish Items to Hub,Publikování položky do Hub,
+From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
+Wire Transfer,Bankovní převod,
+Please select Bank Account,"Prosím, vyberte bankovní účet"
+Create and Send Newsletters,Vytvoření a odeslání Zpravodaje,
+From Date must be before To Date,Datum od musí být dříve než datum do,
+Recurring Order,Opakující se objednávky,
+Default Income Account,Účet Default příjme,
+Customer Group / Customer,Zákazník Group / Customer,
+Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
+Welcome to ERPNext,Vítejte na ERPNext,
+Voucher Detail Number,Voucher Detail Počet,
+From Customer,Od Zákazníka,
+Calls,Volt,
+Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
+Stock UOM,Reklamní UOM,
+Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána,
+{0} {1} is entered more than once in Item Variants table,{0} {1} je vloženo více než jednou v tabulce Varianty Položky,
+Projected,PlánovanM,
+Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
+Note: Reference Date exceeds allowed credit days by {0} days for {1} {2},Poznámka: Odkaz Datum překračuje povolené úvěrové dnů od {0} dní na {1} {2}
+Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0,
+Quotation Message,Zpráva Nabídky,
+Opening Date,Datum otevřen0,
+POS Setting {0} already created for user: {1} and company {2},POS nastavení {0} již vytvořili pro uživatele: {1} a společnost {2}
+Remark,Poznámka,
+Rate and Amount,Tempo a rozsah,
+Boring,Nudna,
+From Sales Order,Z přijaté objednávky,
+Parent Website Route,nadřazená cesta internetové stránky,
+Not Billed,Ne Účtovana,
+Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti,
+No contacts added yet.,Žádné kontakty přidán dosud.
+Not active,Neaktivna,
+Against Invoice Posting Date,Proti faktury Datum zveřejněna,
+Landed Cost Voucher Amount,Přistál Náklady Voucher Částka,
+Batched for Billing,Zarazeno pro fakturaci,
+Bills raised by Suppliers.,Směnky vznesené dodavately,
+Write Off Account,Odepsat účet,
+Discount Amount,Částka slevy,
+Warranty Period (in days),Záruční doba (ve dnech)
+Expenses booked for the digest period,Náklady rezervované pro období digest,
+e.g. VAT,např. DPH,
+Journal Entry Account,Zápis do deníku Účet,
+Quotation Series,Číselná řada nabídek,
+"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
+Hot metal gas forming,Tváření Hot metal plyn,
+Sales Order Date,Prodejní objednávky Datum,
+Delivered Qty,Dodává Množstvn,
+Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinnn,
+Percentage variation in quantity to be allowed while receiving or delivering this item.,"Procentuální změna v množství, aby mohla při přijímání nebo poskytování této položky."
+Shopping Cart Taxes and Charges Master,Nákupní košík daně a poplatky Mistr,
+"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Přejděte na příslušné skupiny (obvykle zdrojem finančních prostředků> krátkodobých závazků> daní a poplatků a vytvořit nový účet (kliknutím na Přidat dítě) typu "daně" a to nemluvím o daňovou sazbu.
+Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury,
+Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
+Laser cutting,Laserové řezány,
+Monday,Ponděly,
+Stock Entry,Reklamní Entry,
+Payable,Splatny,
+Arrear Amount,Nedoplatek Částka,
+New Customers,Noví zákazníci,
+Gross Profit %,Hrubý Zisk %
+Weightage (%),Weightage (%)
+Clearance Date,Výprodej Datum,
+Newsletter List,Newsletter Seznam,
+Check if you want to send salary slip in mail to each employee while submitting salary slip,"Zkontrolujte, zda chcete poslat výplatní pásku za poštou na každého zaměstnance při předkládání výplatní pásku"
+Address Desc,Popis adresy,
+Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena,
+"Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být ""Odpovědnost"" typ účtu, protože tento Reklamní Usmíření je Entry Otevření"
+"Variants can not be created manually, add item attributes in the template item","Varianty nelze vytvořit ručně, přidejte atributy položku v položce šablony"
+Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
+All,Vše,
+Source Warehouse,Zdroj Warehouse,
+Installation Date,Datum instalace,
+Confirmation Date,Potvrzení Datum,
+Total Invoiced Amount,Celkem Fakturovaná částka,
+Sales User,Uživatel prodeje,
+Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množstve,
+Set,Nastavit,
+Warehouse-wise Reorder Levels,Změna Úrovně dle skladu,
+Lead Owner,Olovo Majitel,
+Warehouse is required,Je zapotřebí Warehouse,
+Marital Status,Rodinný stav,
+Auto Material Request,Auto materiálu Poptávka,
+Will be updated when billed.,Bude aktualizována při účtovány.
+Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejn$1,
+Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+Against Income Account,Proti účet příjmo,
+{0}% Delivered,{0}% vyhlášeno,
+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).
+Monthly Distribution Percentage,Měsíční Distribution Procento,
+Territory Targets,Území Cíle,
+Transporter Info,Transporter Info,
+Purchase Order Item Supplied,Dodané položky vydané objednávky,
+Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
+Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
+Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive,
+Update Stock,Aktualizace skladem,
+Superfinishing,Superfinišováne,
+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.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
+BOM Rate,BOM Rate,
+"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Přidat / Upravit </a>"
+Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
+Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojeny,
+Terms,Podmínky,
+Create New,Vytvořit novy,
+Purchase Order Required,Vydaná objednávka je vyžadována,
+Item-wise Sales History,Item-moudrý Sales History,
+Total Sanctioned Amount,Celková částka potrestána,
+Purchase Analytics,Nákup Analytika,
+Delivery Note Item,Delivery Note Item,
+Task,Úkol,
+Shaving,Holeny,
+Reference Row #,Referenční Row #
+Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
+This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
+Stock Ledger,Reklamní Ledger,
+Salary Slip Deduction,Plat Slip Odpočet,
+"To set reorder level, item must be a Purchase Item","Chcete-li nastavit úroveň Objednací, položka musí být Nákup položky"
+Notes,Poznámky,
+From,Od,
+Select a group node first.,Vyberte první uzel skupinu.
+Purpose must be one of {0},Cíl musí být jedním z {0}
+Fill the form and save it,Vyplňte formulář a uložte jej,
+Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
+Facing,ObloženS,
+Leave Balance Before Application,Nechte zůstatek před aplikacS,
+Send SMS,Pošlete SMS,
+Default Letter Head,Výchozí hlavičkovS,
+Billable,ZúčtovatelnS,
+This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul,
+Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
+Reorder Qty,Změna pořadí Množstvu,
+Stock Adjustment Account,Reklamní Nastavení účtu,
+Write Off,Odepsat,
+Operation ID,Provoz ID,
+"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
+{0}: From {1},{0}: Z {1}
+depends_on,záleží na,
+Opportunity Lost,Příležitost Ztracena,
+"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Sleva Pole bude k dispozici v objednávce, doklad o koupi, nákupní faktury"
+Report Type,Typ výpisu,
+Loading,Nahrávám,
+BOM Replace Tool,BOM Nahradit Tool,
+Country wise default Address Templates,Země moudrý výchozí adresa Templates,
+Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Pokud se zapojit do výrobní činnosti. Umožňuje Položka ""se vyrábí"""
+Rounded Total,Zaoblený Total,
+List items that form the package.,"Seznam položek, které tvoří balíček."
+Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
+Out of AMC,Out of AMC,
+Material Request Detail No,Materiál Poptávka Detail No,
+Hard turning,Hard soustruženC,
+Make Maintenance Visit,Proveďte návštěv údržby,
+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"
+Default Cash Account,Výchozí Peněžní účet,
+Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
+Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam své daňové hlavy (např DPH, spotřební daň, měli by mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou si můžete upravit a přidat další později."
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky,
+Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total,
+{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
+Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+"Note: If payment is not made against any reference, make Journal Entry manually.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
+Supplier Items,Dodavatele položky,
+Please enter atleast one attribute row in Item Variants table,Zadejte prosím aspoň jeden atribut řádek položky Varianty tabulku,
+Opportunity Type,Typ Příležitosti,
+New Company,Nová společnost,
+Cost Center is required for 'Profit and Loss' account {0},"Nákladové středisko je vyžadováno pro účet ""výkaz zisku a ztrát"" {0}"
+Transactions can only be deleted by the creator of the Company,Transakce mohou být vymazány pouze tvůrce Společnosti,
+Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nesprávný počet hlavní knihy záznamů nalezen. Pravděpodobně jste zvolili nesprávný účet v transakci.
+To create a Bank Account,Chcete-li vytvořit si účet v bance,
+Publish Availability,Publikování Dostupnost,
+Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
+Stock Ageing,Reklamní Stárnuty,
+Automatically updated from BOM table,Automaticky aktualizována z BOM tabulky,
+{0} '{1}' is disabled, {0} '{1}' je zakázána,
+Set as Open,Nastavit jako Otevřít,
+Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
+"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
Available Qty: {4}, Transfer Qty: {5}","Row {0}: Množství nejsou dostupné iv skladu {1} na {2} {3}.
Dispozici Množství: {4}, transfer Množství: {5}"
-DocType: Backup Manager,Sync with Dropbox,Synchronizace s Dropbox
-DocType: Event,Sunday,Neděle
-DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +412,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Responsibilities,Odpovědnost
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Šablona
-DocType: Sales Person,Sales Person Name,Prodej Osoba Name
-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
-DocType: Pricing Rule,Item Group,Položka Group
-DocType: Task,Actual Start Date (via Time Logs),Skutečné datum Start (přes Time Záznamy)
-DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
-DocType: Sales Order,Partly Billed,Částečně Účtovaný
-DocType: Item,Default BOM,Výchozí BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Decambering,Decambering
-apps/erpnext/erpnext/setup/doctype/company/company.js +17,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
-DocType: Time Log Batch,Total Hours,Celkem hodin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Automobilový
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Listy typu {0} již přidělené pro zaměstnance {1} pro fiskální rok {0}
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Položka je povinná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,Kovové vstřikování
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,Z Dodacího Listu
-DocType: Time Log,From Time,Času od
-DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} status je OdZastaveno
-DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,Moření
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,Lití do písku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Electroplating,Electroplating
-DocType: Purchase Invoice Item,Rate,Rychlost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Intern,Internovat
-DocType: Newsletter,A Lead with this email id should exist,Lead s touto e-mailovou id by měla již existovat
-DocType: Stock Entry,From BOM,Od BOM
-DocType: Time Log,Billing Rate (per hour),Účtování Rate (za hodinu)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +226,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
-DocType: Salary Structure,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +237,"Multiple Price Rule exists with same criteria, please resolve \
+Sync with Dropbox,Synchronizace s Dropbox,
+Sunday,Neděle,
+Contribution (%),Příspěvek (%)
+Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+Responsibilities,Odpovědnost,
+Template,Šablona,
+Sales Person Name,Prodej Osoba Name,
+Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce,
+Item Group,Položka Group,
+Actual Start Date (via Time Logs),Skutečné datum Start (přes Time Záznamy)
+Before reconciliation,Před smířen$1,
+To {0},Chcete-li {0}
+Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
+Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+Partly Billed,Částečně ÚčtovanM,
+Default BOM,Výchozí BOM,
+Decambering,Decambering,
+Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzenM,
+Total Outstanding Amt,Celkem Vynikající Amt,
+Total Hours,Celkem hodin,
+Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+Automotive,Automobilov$1,
+Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Listy typu {0} již přidělené pro zaměstnance {1} pro fiskální rok {0}
+Item is required,Položka je povinnu,
+Metal injection molding,Kovové vstřikovánu,
+From Delivery Note,Z Dodacího Listu,
+From Time,Času od,
+Custom Message,Custom Message,
+Investment Banking,Investiční bankovnictvu,
+"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
+Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního,
+{0} {1} status is Unstopped,{0} {1} status je OdZastaveno,
+Price List Exchange Rate,Katalogová cena Exchange Rate,
+Pickling,Mořeno,
+Sand casting,Lití do písku,
+Electroplating,Electroplating,
+Rate,Rychlost,
+Intern,Internovat,
+A Lead with this email id should exist,Lead s touto e-mailovou id by měla již existovat,
+From BOM,Od BOM,
+Billing Rate (per hour),Účtování Rate (za hodinu)
+Basic,Základny,
+Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny,
+Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno,
+"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
+Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
+Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narozena,
+Salary Structure,Plat struktura,
+"Multiple Price Rule exists with same criteria, please resolve \
conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
konflikt přiřazením prioritu. Cena Pravidla: {0}"
-DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +511,Issue Material,Vydání Material
-DocType: Material Request Item,For Warehouse,Pro Sklad
-DocType: Employee,Offer Date,Nabídka Date
-DocType: Hub Settings,Access Token,Přístupový Token
-DocType: Sales Invoice Item,Serial No,Výrobní číslo
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
-DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
-DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
-DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Máte-li dlouhé formáty tisku, tato funkce může být použita k rozdělení stránku se bude tisknout na více stránek se všemi záhlaví a zápatí na každé straně"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Hobbing,Odvalovací
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,Všechny území
-DocType: Party Type,Party Type Name,Typ Party Name
-DocType: Purchase Invoice,Items,Položky
-DocType: Fiscal Year,Year Name,Jméno roku
-DocType: Salary Manager,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
-DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-DocType: Purchase Order Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Finishing & industrial finishing,Povrchová úprava a průmyslového zpracování
-DocType: Issue,Opening Time,Otevírací doba
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Drilling,Vrtání
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Blow molding,Vyfukování
-DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
-apps/erpnext/erpnext/stock/doctype/item/item.js +65,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
-DocType: Account,Purchase User,Nákup Uživatel
-DocType: Sales Order,Customer's Purchase Order Number,Zákazníka Objednávka číslo
-DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Hammering,Vyklepání
-DocType: Web Page,Slideshow,Promítání obrázků
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
-DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
-DocType: Journal Entry,Print Heading,Tisk záhlaví
-DocType: Quotation,Maintenance Manager,Správce údržby
-DocType: Workflow State,Search,Hledat
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,"""Dny od posledního Objednávky"" musí být větší nebo rovny nule"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,Pájení
-DocType: C-Form,Amended From,Platném znění
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,Surovina
-DocType: Leave Application,Follow via Email,Sledovat e-mailem
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +146,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +421,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-DocType: Leave Allocation,Carry Forward,Převádět
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
-DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
-,Produced,Produkoval
-DocType: Issue,Raised By (Email),Vznesené (e-mail)
-DocType: Email Digest,General,Obecný
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,Připojit Hlavičkový
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +244,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
-DocType: Journal Entry,Bank Entry,Bank Entry
-DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
-DocType: Blog Post,Blog Post,Příspěvek blogu
-apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,Přidat do košíku
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
-apps/erpnext/erpnext/config/accounts.py +133,Enable / disable currencies.,Povolit / zakázat měny.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,Entertainment & Leisure
-DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
-DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Celkem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,Hodina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +133,"Serialized Item {0} cannot be updated \
+Bank,Banka,
+Airline,Letecká linka,
+Issue Material,Vydání Material,
+For Warehouse,Pro Sklad,
+Offer Date,Nabídka Date,
+Access Token,Přístupový Token,
+Serial No,Výrobní číslo,
+Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
+Is Fixed Asset Item,Je dlouhodobého majetku Item,
+Including items for sub assemblies,Včetně položek pro podsestav,
+"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Máte-li dlouhé formáty tisku, tato funkce může být použita k rozdělení stránku se bude tisknout na více stránek se všemi záhlaví a zápatí na každé straně"
+Hobbing,Odvalovace,
+All Territories,Všechny územe,
+Party Type Name,Typ Party Name,
+Items,Položky,
+Year Name,Jméno roku,
+Process Payroll,Proces Payroll,
+There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+Sales Partner Name,Sales Partner Name,
+Image View,Image View,
+Finishing & industrial finishing,Povrchová úprava a průmyslového zpracováne,
+Opening Time,Otevírací doba,
+From and To dates required,Data OD a DO jsou vyžadována,
+Securities & Commodity Exchanges,Cenné papíry a komoditních burzách,
+Calculate Based On,Vypočítat založené na,
+Drilling,Vrtáne,
+Blow molding,Vyfukováne,
+Valuation and Total,Oceňování a Total,
+This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
+Purchase User,Nákup Uživatel,
+Customer's Purchase Order Number,Zákazníka Objednávka číslo,
+Customize the Notification,Přizpůsobit oznámenl,
+Hammering,Vyklepánl,
+Slideshow,Promítání obrázkl,
+Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán,
+Shipping Rule,Přepravní Pravidlo,
+Print Heading,Tisk záhlavl,
+Maintenance Manager,Správce údržby,
+Search,Hledat,
+Total cannot be zero,Celkem nemůže být nula,
+'Days Since Last Order' must be greater than or equal to zero,"""Dny od posledního Objednávky"" musí být větší nebo rovny nule"
+Brazing,Pájena,
+Amended From,Platném zněna,
+Raw Material,Surovina,
+Follow via Email,Sledovat e-mailem,
+Tax Amount After Discount Amount,Částka daně po slevě Částka,
+Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinn$1,
+No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+Carry Forward,Převádět,
+Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy,
+Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
+Produced,Produkoval,
+Raised By (Email),Vznesené (e-mail)
+General,Obecn$1,
+Attach Letterhead,Připojit Hlavičkov$1,
+Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
+Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
+Bank Entry,Bank Entry,
+Applicable To (Designation),Vztahující se na (označení)
+Blog Post,Příspěvek blogu,
+Add to Cart,Přidat do košíku,
+Group By,Seskupit podle,
+Enable / disable currencies.,Povolit / zakázat měny.
+Postal Expenses,Poštovní náklady,
+Total(Amt),Total (Amt)
+Entertainment & Leisure,Entertainment & Leisure,
+The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
+Item Serial No,Položka Výrobní číslo,
+{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu,
+Total Present,Celkem Present,
+Hour,Hodina,
+"Serialized Item {0} cannot be updated \
using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,Přeneste materiál Dodavateli
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
-DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,Vytvořit Citace
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
-DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
-DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
-DocType: Features Setup,Point of Sale,Místo Prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Curling,Metaná
-DocType: Account,Tax,Daň
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +34,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Refining,Rafinace
-DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
-DocType: Quality Inspection,Report Date,Datum Reportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Routing,Směrování
-DocType: C-Form,Invoices,Faktury
-DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} příjemci
-DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,Účtet nákladů je povinný
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
-DocType: Item,A new variant (Item) will be created for each attribute value combination,Nová varianta (položka) se vytvoří pro každou kombinaci hodnoty atributu
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
-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.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
-DocType: Pricing Rule,Customer Group,Zákazník Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
-DocType: Item,Website Description,Popis webu
-DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-,Sales Register,Sales Register
-DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
-DocType: Address,Plant,Rostlina
-apps/frappe/frappe/desk/moduleview.py +64,Setup,Nastavení
-apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Cold rolling,Válcování za studena
-DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,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: POS Setting,POS Setting,POS Nastavení
-DocType: Packing Slip,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
-DocType: DocField,Image,Obrázek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +220,Make Excise Invoice,Proveďte Spotřební faktury
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Proveďte dodacím listem
-DocType: Communication,Other,Ostatní
-DocType: C-Form,C-Form,C-Form
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,Provoz ID není nastaveno
-DocType: Production Order,Planned Start Date,Plánované datum zahájení
-DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-DocType: Leave Type,Is Encash,Je inkasovat
-DocType: Purchase Invoice,Mobile No,Mobile No
-DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
-DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
-apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
-DocType: Project,Expected End Date,Očekávané datum ukončení
-DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +366,Commercial,Obchodní
-DocType: Cost Center,Distribution Id,Distribuce Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Všechny výrobky nebo služby.
-DocType: Purchase Invoice,Supplier Address,Dodavatel Address
-DocType: Contact Us Settings,Address Line 2,Adresní řádek 2
-DocType: ToDo,Reference,reference
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,Perforující
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,Out Množství
-apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,Série je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,Finanční služby
-DocType: Opportunity,Sales,Prodej
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Cr,Cr
-DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Sawing,Řezání
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Laminating,Laminování
-DocType: Item Reorder,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +567,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
-DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,Spékání
-DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
-DocType: Naming Series,Setup Series,Řada Setup
-DocType: Supplier,Contact HTML,Kontakt HTML
-DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
-DocType: Payment Reconciliation,Maximum Amount,Maximální částka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak Ceny pravidlo platí?
-DocType: Quality Inspection,Delivery Note No,Dodacího listu
-DocType: Company,Retail,Maloobchodní
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,Zákazník {0} neexistuje
-DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Crushing,Zdrcující
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
-DocType: Upload Attendance,Download Template,Stáhnout šablonu
-DocType: GL Entry,Remarks,Poznámky
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
-DocType: Journal Entry,Write Off Based On,Odepsat založené na
-DocType: Features Setup,POS View,Zobrazení POS
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Continuous casting,Kontinuální lití
-sites/assets/js/erpnext.min.js +6,Please specify a,Uveďte prosím
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Proveďte nákupní faktury
-DocType: Offer Letter,Awaiting Response,Čeká odpověď
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Cold sizing,Cold velikosti
-DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +257,Region,Kraj
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
-DocType: Holiday List,Weekly Off,Týdenní Off
-DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +13,Dropbox,Dropbox
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
-apps/erpnext/erpnext/accounts/utils.py +243,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
-DocType: Serial No,Creation Time,Čas vytvoření
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Celkový příjem
-,Monthly Attendance Sheet,Měsíční Účast Sheet
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,Nebyl nalezen žádný záznam
-apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinná k položce {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,Účet {0} je neaktivní
-DocType: GL Entry,Is Advance,Je Zálohová
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
-apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
-DocType: Sales Team,Contact No.,Kontakt Číslo
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
-DocType: Workflow State,Time,Čas
-DocType: Features Setup,Sales Discounts,Prodejní Slevy
-DocType: Hub Settings,Seller Country,Prodejce Country
-DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
-DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
-apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,Specifikace
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodej Daně a poplatky šablony
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,Oblečení a doplňky
-DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Povinný, pokud skladem, je ""Ano"". Také výchozí sklad, kde je vyhrazeno množství nastavena od odběratele."
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,Číslo objednávky
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Přidat dítě
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,Je nutná konverzní faktor
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +32,Serial #,Serial #
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provize z prodeje
-DocType: Offer Letter Term,Value / Description,Hodnota / Popis
-,Customers Not Buying Since Long Time,Zákazníci nekupujete Po dlouhou dobu
-DocType: Production Order,Expected Delivery Date,Očekávané datum dodání
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Bulging,Vyboulený
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Evaporative-pattern casting,Lití Evaporative-pattern
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +176,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +34,Age,Věk
-DocType: Time Log,Billing Amount,Fakturace Částka
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
-apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +144,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
-DocType: Sales Invoice,Posting Time,Čas zadání
-DocType: Sales Order,% Amount Billed,% Fakturované částky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonní Náklady
-DocType: Sales Partner,Logo,Logo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} sériová čísla potřebné k položce {0}. Pouze {0} vyplněno.
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
-apps/erpnext/erpnext/stock/get_item_details.py +108,No Item with Serial No {0},No Položka s Serial č {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Přímé náklady
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +645,Do you really want to UNSTOP this Material Request?,Opravdu chcete uvolnit tento materiál požadavek?
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
-DocType: Maintenance Visit,Breakdown,Rozbor
-DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +33,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Honing,Honování
-DocType: Serial No,"Only Serial Nos with status ""Available"" can be delivered.","Serial pouze Nos se statusem ""K dispozici"" může být dodán."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +53,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +94,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
-DocType: Feed,Full Name,Celé jméno/název
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +188,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
-apps/erpnext/erpnext/accounts/general_ledger.py +91,Debit and Credit not equal for this voucher. Difference is {0}.,Debetní a kreditní nerovná této voucheru. Rozdíl je {0}.
-,Transferred Qty,Přenesená Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Planning,Plánování
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Udělejte si čas Log Batch
-DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +577,We sell this Item,Nabízíme k prodeji tuto položku
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Supplier Id,Dodavatel Id
-DocType: Journal Entry,Cash Entry,Cash Entry
-DocType: Sales Partner,Contact Desc,Kontakt Popis
-apps/erpnext/erpnext/stock/doctype/item/item.py +190,Item Variants {0} created,Bod Varianty {0} vytvořil
-apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
-DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
-DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
-DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Quarrying,Těžba
-DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +153,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
-apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
-DocType: Newsletter,Test Email Id,Testovací Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Abbreviation,Zkratka Company
-DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Pokud se budete řídit kontroly jakosti. Umožňuje položky QA požadovány, a QA No v dokladu o koupi"
-DocType: GL Entry,Party Type,Typ Party
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
-DocType: Item Attribute Value,Abbreviation,Zkratka
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Rotational molding,Rotační tváření
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plat master šablona.
-DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
-DocType: Payment Tool,Set Matching Amounts,Nastavit Odpovídající Částky
-DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
-,Sales Funnel,Prodej Nálevka
-apps/erpnext/erpnext/shopping_cart/utils.py +34,Cart,Vozík
-,Qty to Transfer,Množství pro přenos
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
-DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
-,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',"{0} {1} status je ""Zastaveno"""
-DocType: Account,Temporary,Dočasný
-DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
-DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,Sekretářka
-DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
-apps/erpnext/erpnext/config/setup.py +96,Item master.,Master Item.
-DocType: Pricing Rule,Buying,Nákupy
-DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,To Batch Time Log byla zrušena.
-DocType: Purchase Invoice,Apply Discount On,Použít Sleva na
-DocType: Salary Slip Earning,Salary Slip Earning,Plat Slip Zisk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Věřitelé
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
-,Item-wise Price List Rate,Item-moudrý Ceník Rate
-DocType: Purchase Order Item,Supplier Quotation,Dodavatel Nabídka
-DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,Žehlení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
-DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
-apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
-DocType: Letter Head,Letter Head,Záhlaví
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Shrink fitting,Zmenšit kování
-DocType: Email Digest,Income / Expense,Výnosy / náklady
-DocType: Employee,Personal Email,Osobní e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Celkový rozptyl
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Brokerage,Makléřská
-DocType: Production Order Operation,"in Minutes
+Transfer Material to Supplier,Přeneste materiál Dodavateli,
+New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
+Lead Type,Lead Type,
+Create Quotation,Vytvořit Citace,
+All these items have already been invoiced,Všechny tyto položky již byly fakturovány,
+Can be approved by {0},Může být schválena {0}
+Shipping Rule Conditions,Přepravní Článek Podmínky,
+The new BOM after replacement,Nový BOM po výměny,
+Point of Sale,Místo Prodeje,
+Curling,Metany,
+Tax,Day,
+Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
+Refining,Rafinace,
+Production Planning Tool,Plánování výroby Tool,
+Report Date,Datum Reportu,
+Routing,Směrováne,
+Invoices,Faktury,
+Job Title,Název pozice,
+{0} Recipients,{0} příjemci,
+Item Groups in Details,Položka skupiny v detailech,
+Expense Account is mandatory,Účtet nákladů je povinne,
+Start Point-of-Sale (POS),Start Point-of-Sale (POS)
+A new variant (Item) will be created for each attribute value combination,Nová varianta (položka) se vytvoří pro každou kombinaci hodnoty atributu,
+Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
+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.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
+Customer Group,Zákazník Group,
+Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
+Website Description,Popis webu,
+AMC Expiry Date,AMC Datum vypršení platnosti,
+Sales Register,Sales Register,
+Quotation Lost Reason,Důvod ztráty nabídky,
+Plant,Rostlina,
+Setup,Nastavenu,
+There is nothing to edit.,Není nic upravovat.
+Cold rolling,Válcování za studena,
+Customer Group Name,Zákazník Group Name,
+Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+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"
+Against Voucher Type,Proti poukazu typu,
+POS Setting,POS Nastavenu,
+Get Items,Získat položky,
+Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+Image,Obrázek,
+Make Excise Invoice,Proveďte Spotřební faktury,
+Make Packing Slip,Proveďte dodacím listem,
+Other,Ostatnk,
+C-Form,C-Form,
+Operation ID not set,Provoz ID není nastaveno,
+Planned Start Date,Plánované datum zahájenk,
+Creation Document Type,Tvorba Typ dokumentu,
+Is Encash,Je inkasovat,
+Mobile No,Mobile No,
+Make Journal Entry,Proveďte položka deníku,
+New Leaves Allocated,Nové Listy Přidělenk,
+Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku,
+Expected End Date,Očekávané datum ukončenk,
+Appraisal Template Title,Posouzení Template Název,
+Commercial,Obchodnk,
+Distribution Id,Distribuce Id,
+Awesome Services,Skvělé služby,
+All Products or Services.,Všechny výrobky nebo služby.
+Supplier Address,Dodavatel Address,
+Address Line 2,Adresní řádek 2,
+Reference,reference,
+Perforating,Perforujícs,
+Out Qty,Out Množstvs,
+Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej,
+Series is mandatory,Série je povinns,
+Financial Services,Finanční služby,
+Sales,Prodej,
+Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+Cr,Cr,
+Default Receivable Accounts,Výchozí pohledávka účty,
+Sawing,Řezánr,
+Laminating,Laminovánr,
+Transfer,Převod,
+Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+Applicable To (Employee),Vztahující se na (Employee)
+Sintering,SpékánZ,
+Pay To / Recd From,Platit K / Recd Z,
+Setup Series,Řada Setup,
+Contact HTML,Kontakt HTML,
+Purchase Receipts,Příjmky,
+Maximum Amount,Maximální částka,
+How Pricing Rule is applied?,Jak Ceny pravidlo platí?
+Delivery Note No,Dodacího listu,
+Retail,Maloobchodnu,
+Customer {0} does not exist,Zákazník {0} neexistuje,
+Absent,Nepřítomnu,
+Crushing,Zdrcujícu,
+Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony,
+Download Template,Stáhnout šablonu,
+Remarks,Poznámky,
+Raw Material Item Code,Surovina Kód položky,
+Write Off Based On,Odepsat založené na,
+POS View,Zobrazení POS,
+Installation record for a Serial No.,Instalace rekord pro sériové číslo,
+Continuous casting,Kontinuální litu,
+Please specify a,Uveďte prosím,
+Make Purchase Invoice,Proveďte nákupní faktury,
+Awaiting Response,Čeká odpověu,
+Cold sizing,Cold velikosti,
+Earning & Deduction,Výdělek a dedukce,
+Account {0} cannot be a Group,Účet {0} nemůže být skupina,
+Region,Kraj,
+Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
+Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno,
+Weekly Off,Týdenní Off,
+"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
+Dropbox,Dropbox,
+Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
+Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
+Creation Time,Čas vytvořenm,
+Total Revenue,Celkový příjem,
+Monthly Attendance Sheet,Měsíční Účast Sheet,
+No record found,Nebyl nalezen žádný záznam,
+{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinná k položce {2}
+Account {0} is inactive,Účet {0} je neaktivn$1,
+Is Advance,Je Zálohov$1,
+Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinn$1,
+Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+Contact No.,Kontakt Číslo,
+'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
+Time,Čas,
+Sales Discounts,Prodejní Slevy,
+Seller Country,Prodejce Country,
+Authorization Rule,Autorizační pravidlo,
+Terms and Conditions Details,Podmínky podrobnosti,
+Specifications,Specifikace,
+Sales Taxes and Charges Template,Prodej Daně a poplatky šablony,
+Apparel & Accessories,Oblečení a doplňky,
+"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Povinný, pokud skladem, je ""Ano"". Také výchozí sklad, kde je vyhrazeno množství nastavena od odběratele."
+Number of Order,Číslo objednávky,
+HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
+Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného,
+Add Child,Přidat díto,
+Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky,
+Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
+Conversion Factor is required,Je nutná konverzní faktor,
+Serial #,Serial #
+Commission on Sales,Provize z prodeje,
+Value / Description,Hodnota / Popis,
+Customers Not Buying Since Long Time,Zákazníci nekupujete Po dlouhou dobu,
+Expected Delivery Date,Očekávané datum dodáne,
+Bulging,Vyboulene,
+Evaporative-pattern casting,Lití Evaporative-pattern,
+Entertainment Expenses,Výdaje na reprezentaci,
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky,
+Age,Věk,
+Billing Amount,Fakturace Částka,
+Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
+Applications for leave.,Žádosti o dovolenou.
+Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán,
+Legal Expenses,Výdaje na právní služby,
+"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
+Posting Time,Čas zadány,
+% Amount Billed,% Fakturované částky,
+Telephone Expenses,Telefonní Náklady,
+Logo,Logo,
+{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} sériová čísla potřebné k položce {0}. Pouze {0} vyplněno.
+Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
+No Item with Serial No {0},No Položka s Serial č {0}
+Direct Expenses,Přímé náklady,
+Do you really want to UNSTOP this Material Request?,Opravdu chcete uvolnit tento materiál požadavek?
+New Customer Revenue,Nový zákazník Příjmy,
+Travel Expenses,Cestovní výdaje,
+Breakdown,Rozbor,
+Cheque Date,Šek Datum,
+Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
+Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
+Honing,Honován$1,
+"Only Serial Nos with status ""Available"" can be delivered.","Serial pouze Nos se statusem ""K dispozici"" může být dodán."
+Probation,Zkouška,
+Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+Full Name,Celé jméno/název,
+Clinching,Clinching,
+Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+Total Paid Amount,Celkem uhrazené částky,
+Debit and Credit not equal for this voucher. Difference is {0}.,Debetní a kreditní nerovná této voucheru. Rozdíl je {0}.
+Transferred Qty,Přenesená Množstvh,
+Planning,Plánovánh,
+Make Time Log Batch,Udělejte si čas Log Batch,
+Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
+We sell this Item,Nabízíme k prodeji tuto položku,
+Supplier Id,Dodavatel Id,
+Cash Entry,Cash Entry,
+Contact Desc,Kontakt Popis,
+Item Variants {0} created,Bod Varianty {0} vytvořil,
+"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
+Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
+Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
+Default Supplier Type,Výchozí typ Dodavatel,
+Quarrying,Těžba,
+Total Operating Cost,Celkové provozní náklady,
+Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát,
+All Contacts.,Všechny kontakty.
+Test Email Id,Testovací Email Id,
+Company Abbreviation,Zkratka Company,
+If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Pokud se budete řídit kontroly jakosti. Umožňuje položky QA požadovány, a QA No v dokladu o koupi"
+Party Type,Typ Party,
+Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod,
+Abbreviation,Zkratka,
+Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity,
+Rotational molding,Rotační tvářeny,
+Salary template master.,Plat master šablona.
+Max Days Leave Allowed,Max Days Leave povolena,
+Set Matching Amounts,Nastavit Odpovídající Částky,
+Taxes and Charges Added,Daně a poplatky přidana,
+Sales Funnel,Prodej Nálevka,
+Cart,Vozík,
+Qty to Transfer,Množství pro přenos,
+Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka,
+Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby,
+Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise,
+All Customer Groups,Všechny skupiny zákazníka,
+{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
+Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje,
+Price List Rate (Company Currency),Ceník Rate (Company měny)
+{0} {1} status is 'Stopped',"{0} {1} status je ""Zastaveno"""
+Temporary,Dočasna,
+Preferred Billing Address,Preferovaná Fakturační Adresa,
+Percentage Allocation,Procento přidělena,
+Secretary,Sekretářka,
+Distinct unit of an Item,Samostatnou jednotku z položky,
+Item master.,Master Item.
+Buying,Nákupy,
+Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
+This Time Log Batch has been cancelled.,To Batch Time Log byla zrušena.
+Apply Discount On,Použít Sleva na,
+Salary Slip Earning,Plat Slip Zisk,
+Creditors,Věřitela,
+Item Wise Tax Detail,Položka Wise Tax Detail,
+Item-wise Price List Rate,Item-moudrý Ceník Rate,
+Supplier Quotation,Dodavatel Nabídka,
+In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
+Ironing,Žehlenn,
+{0} {1} is stopped,{0} {1} je zastaven,
+Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+Add to calendar on this date,Přidat do kalendáře k tomuto datu,
+Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
+Customer is required,Je nutná zákazník,
+Letter Head,Záhlavk,
+Shrink fitting,Zmenšit kovánk,
+Income / Expense,Výnosy / náklady,
+Personal Email,Osobní e-mail,
+Total Variance,Celkový rozptyl,
+"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
+Brokerage,Makléřsks,
+"in Minutes,
Updated via 'Time Log'","v minutách
aktualizovat přes ""Time Log"""
-DocType: Customer,From Lead,Od Leadu
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Planing,Hoblování
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Selling,Standardní prodejní
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
-DocType: Serial No,Out of Warranty,Out of záruky
-DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
-DocType: Purchase Invoice Item,Project Name,Název projektu
-DocType: Workflow State,Edit,Upravit
-DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
-DocType: Email Digest,New Support Tickets,Nová podpora Vstupenky
-DocType: Features Setup,Item Batch Nos,Položka Batch Nos
-DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
-DocType: BOM Item,BOM No,BOM No
-DocType: Contact Us Settings,Pincode,PSČ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +147,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
-DocType: Item,Moving Average,Klouzavý průměr
-DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +21,New Stock UOM must be different from current stock UOM,New Sklad UOM musí být odlišný od běžného akciové nerozpuštěných
-DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +32,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
-DocType: Production Order,Operation Cost,Provozní náklady
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Chcete-li přiřadit tento problém vyřešit, použijte tlačítko ""Přiřadit"" v postranním panelu."
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"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.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,Against Invoice,Na základě faktury
-apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskální rok: {0} neexistuje
-DocType: Currency Exchange,To Currency,Chcete-li měny
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Druhy výdajů nároku.
-DocType: Item,Taxes,Daně
-DocType: Project,Default Cost Center,Výchozí Center Náklady
-DocType: Purchase Invoice,End Date,Datum ukončení
-DocType: Employee,Internal Work History,Vnitřní práce History
-DocType: DocField,Column Break,Zalomení sloupce
-DocType: Event,Thursday,Čtvrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Turning,Turning
-DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
-DocType: Account,Expense,Výdaj
-DocType: Sales Invoice,Exhibition,Výstava
-apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +28,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
-DocType: Company,Domain,Doména
-,Sales Order Trends,Prodejní objednávky Trendy
-DocType: Employee,Held On,Které se konalo dne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +24,Production Item,Výrobní položka
-,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,Rate (%),Rate (%)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year End Date,Finanční rok Datum ukončení
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,"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/stock/doctype/material_request/material_request.js +502,Make Supplier Quotation,Vytvořit nabídku dodavatele
-DocType: Quality Inspection,Incoming,Přicházející
-DocType: Item,Name and Description,Jméno a popis
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Výchozí Měrná jednotka nelze změnit, přímo, protože jste již nějaké transakce (y) s jiným nerozpuštěných. Chcete-li změnit výchozí UOM, použijte ""UOM Nahradit Utility"" nástroj pod Stock modulu."
-DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Credit To account must be a liability account,Připsat na účet musí být účet závazek
-DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},Poznámka: {0}
-,Delivery Note Trends,Dodací list Trendy
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
-apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
-DocType: GL Entry,Party,Strana
-DocType: Sales Order,Delivery Date,Dodávka Datum
-DocType: DocField,Currency,Měna
-DocType: Opportunity,Opportunity Date,Příležitost Datum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +10,To Bill,Billa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,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
-DocType: Address,Shipping,Lodní
-DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
-DocType: Department,Leave Block List,Nechte Block List
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
-DocType: Accounts Settings,Accounts Settings,Nastavení účtu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Továrna a strojní zařízení
-DocType: Item,You can enter the minimum quantity of this item to be ordered.,Můžete zadat minimální množství této položky do objednávky.
-DocType: Sales Partner,Partner's Website,Partnera Website
-DocType: Opportunity,To Discuss,K projednání
-DocType: SMS Settings,SMS Settings,Nastavení SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Dočasné Účty
-DocType: Payment Tool,Column Break 1,Zalomení sloupce 1
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Černá
-DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
-DocType: Account,Auditor,Auditor
-DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvořte nabídku Letter
-DocType: DocField,Fold,Fold
-DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
-DocType: Pricing Rule,Disable,Zakázat
-DocType: Project Task,Pending Review,Čeká Review
-sites/assets/js/desk.min.js +558,Please specify,Prosím specifikujte
-DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +65,Customer Id,Zákazník Id
-DocType: Page,Page Name,Název stránky
-DocType: Purchase Invoice,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Úprava vřetena
-DocType: Material Request,% of materials ordered against this Material Request,% Materiálů objednáno proti tomuto požadavku Materiál
-DocType: BOM,Last Purchase Rate,Last Cena při platbě
-DocType: Account,Asset,Majetek
-DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""MC""","např ""MC """
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +75,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
-,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
-DocType: System Settings,Time Zone,Časové pásmo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Sklad {0} neexistuje
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
-DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stapling,Sešívání
-DocType: Customer,Customer Details,Podrobnosti zákazníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Shaping,Tvarování
-DocType: Employee,Reports to,Zprávy
-DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
-DocType: Sales Invoice,Paid Amount,Uhrazené částky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
-,Available Stock for Packing Items,K dispozici skladem pro balení položek
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Reserved Warehouse is missing in Sales Order,Reserved Warehouse chybí odběratele
-DocType: Item Variant,Item Variant,Položka Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +71,"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/page/setup_wizard/install_fixtures.py +71,Quality Management,Řízení kvality
-DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
-DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +46,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Upozornění: prodejní objednávky {0} již existuje proti stejnému číslo objednávky
-DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
-DocType: Notification Control,Purchase,Nákup
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Stav {0} {1} je nyní {2}
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,Zůstatek Množství
-DocType: Item Group,Parent Item Group,Parent Item Group
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} na {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,Nákladové středisko
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Sklady.
-DocType: Purchase Order,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
-DocType: Employee,Employment Type,Typ zaměstnání
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
-DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
-DocType: Employee,Notice (days),Oznámení (dny)
-DocType: Page,Yes,Ano
-DocType: Cost Center,Material User,Materiál Uživatel
-DocType: Employee,Encashment Date,Inkaso Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +147,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
-DocType: Account,Stock Adjustment,Reklamní Nastavení
-DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Nový {0} Název
-apps/erpnext/erpnext/controllers/recurring_document.py +126,Please find attached {0} #{1},V příloze naleznete {0} # {1}
-DocType: Global Defaults,jsonrates.com API Key,jsonrates.com API Key
-DocType: Job Applicant,Applicant Name,Žadatel Název
-DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
-sites/assets/js/desk.min.js +536,Created By,Vytvořeno (kým)
-DocType: Serial No,Under AMC,Podle AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
-apps/erpnext/erpnext/config/selling.py +65,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
-DocType: BOM Replace Tool,Current BOM,Aktuální BOM
-sites/assets/js/erpnext.min.js +5,Add Serial No,Přidat Sériové číslo
-DocType: Production Order,Warehouses,Sklady
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,Group Node
-DocType: Payment Reconciliation,Minimum Amount,Minimální částka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,Dokončení aktualizace zboží
-DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Automatické nastavení. Pokud je tato položka má varianty, pak to nemůže být zvolen do prodejních objednávek atd"
-DocType: Workstation,per hour,za hodinu
-apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},Série {0} jsou již použity v {1}
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
-DocType: Company,Distribution,Distribuce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,Odeslání
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
-DocType: Account,Receivable,Pohledávky
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
-DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
-DocType: Material Request,Material Issue,Material Issue
-DocType: Hub Settings,Seller Description,Prodejce Popis
-DocType: Item,Is Stock Item,Je skladem
-DocType: Shopping Cart Price List,Shopping Cart Price List,Nákupní košík Ceník
-DocType: Employee Education,Qualification,Kvalifikace
-DocType: Item Price,Item Price,Položka Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +47,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +35,Motion Picture & Video,Motion Picture & Video
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
-DocType: Company,Default Settings,Výchozí nastavení
-DocType: Warehouse,Warehouse Name,Název Skladu
-DocType: Naming Series,Select Transaction,Vybrat Transaction
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
-DocType: Journal Entry,Write Off Entry,Odepsat Vstup
-DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
-DocType: Journal Entry,eg. Cheque Number,např. číslo šeku
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +25,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Sklad UOM Nahradit Utility
-DocType: POS Setting,Terms and Conditions,Podmínky
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
-DocType: Leave Block List,Applies to Company,Platí pro firmy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
-DocType: Purchase Invoice,In Words,Slovy
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +204,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +107,Please enter sales order in the above table,"Prosím, zadejte prodejní objednávky v tabulce výše"
-DocType: Project Task,View Task,Zobrazit Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,Váš finanční rok začíná
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
-DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
-DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +35,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row{0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type Party Party a je nutné pro pohledávky / závazky na účtu {1}
-DocType: Salary Slip,Salary Slip,Plat Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Leštění
-DocType: Features Setup,To enable <b>Point of Sale</b> view,Chcete-li povolit <b> Point of Sale </ b> Zobrazit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
-DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
-DocType: Salary Slip,Payment Days,Platební dny
-DocType: BOM,Manage cost of operations,Správa nákladů na provoz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +86,Make Credit Note,Proveďte dobropis
-DocType: Features Setup,Item Advanced,Položka Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Hot rolling,Válcování
-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.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
-apps/erpnext/erpnext/config/setup.py +101,Customer master.,Master zákazníků.
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globální nastavení
-DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
-DocType: Salary Slip,Net Pay,Net Pay
-DocType: Account,Account,Účet
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
-,Requested Items To Be Transferred,Požadované položky mají být převedeny
-DocType: Purchase Invoice,Recurring Id,Opakující se Id
-DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Sick Leave,Zdravotní dovolená
-DocType: Email Digest,Email Digest,Email Digest
-DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Department Stores,Obchodní domy
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +39,System Balance,System Balance
-DocType: Workflow,Is Active,Je Aktivní
-apps/erpnext/erpnext/controllers/stock_controller.py +70,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Uložte dokument jako první.
-DocType: Account,Chargeable,Vyměřovací
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Linishing,Linishing
-DocType: Company,Change Abbreviation,Změna Zkratky
-DocType: Workflow State,Primary,Primární
-DocType: Expense Claim Detail,Expense Date,Datum výdaje
-DocType: Item,Max Discount (%),Max sleva (%)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +60,Last Order Amount,Poslední částka objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Blasting,Odstřel
-DocType: Company,Warn,Varovat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +82,Item valuation updated,Ocenění Item aktualizováno
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
-DocType: BOM,Manufacturing User,Výroba Uživatel
-DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +239,Total valuation ({0}) for manufactured or repacked item(s) can not be less than total valuation of raw materials ({1}),Ocenění Total ({0}) pro vyrobené nebo zabalil položku (y) nesmí být menší než celková ocenění surovin ({1})
-DocType: Email Digest,New Projects,Nové projekty
-DocType: Communication,Series,Série
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
-DocType: Appraisal,Appraisal Template,Posouzení Template
-DocType: Communication,Email,Email
-DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Business Development Manager
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období
-,General Ledger,Hlavní Účetní Kniha
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobrazit Vodítka
-DocType: Item Attribute Value,Attribute Value,Hodnota atributu
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
-,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +216,Please select {0} first,"Prosím, nejprve vyberte {0} "
-DocType: Features Setup,To get Item Group in details table,Chcete-li získat položku Group v tabulce Rozpis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Redrawing,Překreslení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Etching,Lept
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +55,Commission,Provize
-apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,Nejste oprávnění odpovědět na tento lístek.
-DocType: Address Template,"<h4>Default Template</h4>
+From Lead,Od Leadu,
+Orders released for production.,Objednávky uvolněna pro výrobu.
+Select Fiscal Year...,Vyberte fiskálního roku ...
+Name Token,Jméno Token,
+Planing,Hoblovánn,
+Standard Selling,Standardní prodejnn,
+Atleast one warehouse is mandatory,Alespoň jeden sklad je povinnn,
+Out of Warranty,Out of záruky,
+Replace,Vyměnit,
+{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
+Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
+Project Name,Název projektu,
+Edit,Upravit,
+If Income or Expense,Pokud je výnos nebo náklad,
+New Support Tickets,Nová podpora Vstupenky,
+Item Batch Nos,Položka Batch Nos,
+Stock Value Difference,Reklamní Value Rozdíl,
+Payment Reconciliation Payment,Platba Odsouhlasení Platba,
+Tax Assets,Daňové Aktiva,
+BOM No,BOM No,
+Pincode,PSu,
+Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz,
+Moving Average,Klouzavý průměr,
+The BOM which will be replaced,"BOM, který bude nahrazen"
+New Stock UOM must be different from current stock UOM,New Sklad UOM musí být odlišný od běžného akciové nerozpuštěných,
+Debit,Debet,
+Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
+Operation Cost,Provozní náklady,
+Upload attendance from a .csv file,Nahrajte účast ze souboru CSV,
+Outstanding Amt,Vynikající Amt,
+Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
+"To assign this issue, use the ""Assign"" button in the sidebar.","Chcete-li přiřadit tento problém vyřešit, použijte tlačítko ""Přiřadit"" v postranním panelu."
+Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
+"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.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
+Against Invoice,Na základě faktury,
+Fiscal Year: {0} does not exists,Fiskální rok: {0} neexistuje,
+To Currency,Chcete-li měny,
+Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
+Types of Expense Claim.,Druhy výdajů nároku.
+Taxes,Dany,
+Default Cost Center,Výchozí Center Náklady,
+End Date,Datum ukončeny,
+Internal Work History,Vnitřní práce History,
+Column Break,Zalomení sloupce,
+Thursday,Čtvrtek,
+Private Equity,Private Equity,
+Turning,Turning,
+Customer Feedback,Zpětná vazba od zákazníky,
+Expense,Výdaj,
+Exhibition,Výstava,
+Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
+Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
+"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
+Domain,Doména,
+Sales Order Trends,Prodejní objednávky Trendy,
+Held On,Které se konalo dne,
+Production Item,Výrobní položka,
+Employee Information,Informace o zaměstnanci,
+Rate (%),Rate (%)
+Financial Year End Date,Finanční rok Datum ukončen$1,
+"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
+Make Supplier Quotation,Vytvořit nabídku dodavatele,
+Incoming,Přicházejíce,
+Name and Description,Jméno a popis,
+"Default Unit of Measure can not be changed directly because you have already made some transaction(s) with another UOM. To change default UOM, use 'UOM Replace Utility' tool under Stock module.","Výchozí Měrná jednotka nelze změnit, přímo, protože jste již nějaké transakce (y) s jiným nerozpuštěných. Chcete-li změnit výchozí UOM, použijte ""UOM Nahradit Utility"" nástroj pod Stock modulu."
+Materials Required (Exploded),Potřebný materiál (Rozložený)
+Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
+Casual Leave,Casual Leave,
+Credit To account must be a liability account,Připsat na účet musí být účet závazek,
+Batch ID,Šarže ID,
+Note: {0},Poznámka: {0}
+Delivery Note Trends,Dodací list Trendy,
+{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
+Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakca,
+Party,Strana,
+Delivery Date,Dodávka Datum,
+Currency,Měna,
+Opportunity Date,Příležitost Datum,
+To Bill,Billa,
+Piecework,Úkolová práce,
+Avg. Buying Rate,Avg. Nákup Rate,
+Actual Time in Hours (via Timesheet),Skutečná doba (v hodinách)
+History In Company,Historie ve Společnosti,
+Shipping,Lodni,
+Stock Ledger Entry,Reklamní Ledger Entry,
+Leave Block List,Nechte Block List,
+Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdni,
+Accounts Settings,Nastavení účtu,
+Plant and Machinery,Továrna a strojní zařízeni,
+You can enter the minimum quantity of this item to be ordered.,Můžete zadat minimální množství této položky do objednávky.
+Partner's Website,Partnera Website,
+To Discuss,K projednáne,
+SMS Settings,Nastavení SMS,
+Temporary Accounts,Dočasné Účty,
+Column Break 1,Zalomení sloupce 1,
+Black,Černe,
+BOM Explosion Item,BOM Explosion Item,
+Auditor,Auditor,
+End date of current order's period,Datum ukončení doby aktuální objednávky,
+Make Offer Letter,Vytvořte nabídku Letter,
+Fold,Fold,
+Production Order Operation,Výrobní zakázka Operace,
+Disable,Zakázat,
+Pending Review,Čeká Review,
+Please specify,Prosím specifikujte,
+Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
+Customer Id,Zákazník Id,
+Page Name,Název stránky,
+Exchange Rate,Exchange Rate,
+Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena,
+Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
+Spindle finishing,Úprava vřetena,
+% of materials ordered against this Material Request,% Materiálů objednáno proti tomuto požadavku Materiál,
+Last Purchase Rate,Last Cena při platba,
+Asset,Majetek,
+Task ID,Task ID,
+"e.g. ""MC""","např ""MC """
+Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
+Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce,
+Time Zone,Časové pásmo,
+Warehouse {0} does not exist,Sklad {0} neexistuje,
+Register For ERPNext Hub,Registrace pro ERPNext Hub,
+Monthly Distribution Percentages,Měsíční Distribuční Procenta,
+The selected item cannot have Batch,Vybraná položka nemůže mít dávku,
+% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu,
+Stapling,Sešíváne,
+Customer Details,Podrobnosti zákazníke,
+Shaping,Tvarováne,
+Reports to,Zprávy,
+Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos,
+Paid Amount,Uhrazené částky,
+Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
+Available Stock for Packing Items,K dispozici skladem pro balení položek,
+Reserved Warehouse is missing in Sales Order,Reserved Warehouse chybí odběratele,
+Item Variant,Položka Variant,
+Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
+"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"""
+Quality Management,Řízení kvality,
+Filter based on customer,Filtr dle zákazníka,
+Against Voucher No,Proti poukaz y,
+Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
+Warning: Sales Order {0} already exists against same Purchase Order number,Upozornění: prodejní objednávky {0} již existuje proti stejnému číslo objednávky,
+Employee External Work History,Zaměstnanec vnější práce History,
+Purchase,Nákup,
+Status of {0} {1} is now {2},Stav {0} {1} je nyní {2}
+Balance Qty,Zůstatek Množstvp,
+Parent Item Group,Parent Item Group,
+{0} for {1},{0} na {1}
+Cost Centers,Nákladové středisko,
+Warehouses.,Sklady.
+Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
+Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
+Employment Type,Typ zaměstnánk,
+Fixed Assets,Dlouhodobý majetek,
+Default Expense Account,Výchozí výdajového účtu,
+Notice (days),Oznámení (dny)
+Yes,Ano,
+Material User,Materiál Uživatel,
+Encashment Date,Inkaso Datum,
+Electroforming,Electroforming,
+"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
+Stock Adjustment,Reklamní Nastaveny,
+Planned Operating Cost,Plánované provozní náklady,
+New {0} Name,Nový {0} Název,
+Please find attached {0} #{1},V příloze naleznete {0} # {1}
+jsonrates.com API Key,jsonrates.com API Key,
+Applicant Name,Žadatel Název,
+Customer / Item Name,Zákazník / Název zbožy,
+Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
+Created By,Vytvořeno (kým)
+Under AMC,Podle AMC,
+Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu,
+Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
+Current BOM,Aktuální BOM,
+Add Serial No,Přidat Sériové číslo,
+Warehouses,Sklady,
+Print and Stationary,Print a StacionárnM,
+Group Node,Group Node,
+Minimum Amount,Minimální částka,
+Update Finished Goods,Dokončení aktualizace zbožM,
+"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Automatické nastavení. Pokud je tato položka má varianty, pak to nemůže být zvolen do prodejních objednávek atd"
+per hour,za hodinu,
+Series {0} already used in {1},Série {0} jsou již použity v {1}
+Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
+Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
+Distribution,Distribuce,
+Project Manager,Project Manager,
+Dispatch,Odesláne,
+Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
+Receivable,Pohledávky,
+Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
+Supplier Reference,Dodavatel Označen$1,
+"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
+Material Issue,Material Issue,
+Seller Description,Prodejce Popis,
+Is Stock Item,Je skladem,
+Shopping Cart Price List,Nákupní košík Ceník,
+Qualification,Kvalifikace,
+Item Price,Položka Cena,
+Soap & Detergent,Soap & Detergent,
+Motion Picture & Video,Motion Picture & Video,
+Ordered,Objednáno,
+Default Settings,Výchozí nastavene,
+Warehouse Name,Název Skladu,
+Select Transaction,Vybrat Transaction,
+Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel,
+Write Off Entry,Odepsat Vstup,
+Rate Of Materials Based On,Hodnotit materiálů na bázi,
+Support Analtyics,Podpora Analtyics,
+eg. Cheque Number,např. číslo šeku,
+Company is missing in warehouses {0},Společnost chybí ve skladech {0}
+Stock UOM Replace Utility,Sklad UOM Nahradit Utility,
+Terms and Conditions,Podmínky,
+To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
+"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
+Applies to Company,Platí pro firmy,
+Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
+In Words,Slovy,
+Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
+Material Request For Warehouse,Materiál Request For Warehouse,
+For Production,Pro Výrobu,
+Please enter sales order in the above table,"Prosím, zadejte prodejní objednávky v tabulce výše"
+View Task,Zobrazit Task,
+Your financial year begins on,Váš finanční rok začínk,
+Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
+Get Advances Received,Získat přijaté zálohy,
+Add/Remove Recipients,Přidat / Odebrat příjemce,
+Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
+"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
+Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
+Shortage Qty,Nedostatek Množstv$1,
+Row{0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type Party Party a je nutné pro pohledávky / závazky na účtu {1}
+Salary Slip,Plat Slip,
+Burnishing,Leštěnp,
+To enable <b>Point of Sale</b> view,Chcete-li povolit <b> Point of Sale </ b> Zobrazit,
+'To Date' is required,"""Datum DO"" je povinné"
+"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
+Sales Order Item,Prodejní objednávky Item,
+Payment Days,Platební dny,
+Manage cost of operations,Správa nákladů na provoz,
+Make Credit Note,Proveďte dobropis,
+Item Advanced,Položka Advanced,
+Hot rolling,Válcovánm,
+"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.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
+Customer master.,Master zákazníků.
+Global Settings,Globální nastaveny,
+Employee Education,Vzdělávání zaměstnancy,
+Net Pay,Net Pay,
+Account,Účet,
+Serial No {0} has already been received,Pořadové číslo {0} již obdržel,
+Requested Items To Be Transferred,Požadované položky mají být převedeny,
+Recurring Id,Opakující se Id,
+Sales Team Details,Podrobnosti prodejní tým,
+Total Claimed Amount,Celkem žalované částky,
+Potential opportunities for selling.,Potenciální příležitosti pro prodej.
+Sick Leave,Zdravotní dovolent,
+Email Digest,Email Digest,
+Billing Address Name,Jméno Fakturační adresy,
+Department Stores,Obchodní domy,
+System Balance,System Balance,
+Is Active,Je Aktivnt,
+No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady,
+Save the document first.,Uložte dokument jako první.
+Chargeable,Vyměřovacg,
+Linishing,Linishing,
+Change Abbreviation,Změna Zkratky,
+Primary,Primárng,
+Expense Date,Datum výdaje,
+Max Discount (%),Max sleva (%)
+Last Order Amount,Poslední částka objednávky,
+Blasting,Odstřel,
+Warn,Varovat,
+Item valuation updated,Ocenění Item aktualizováno,
+"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
+Manufacturing User,Výroba Uživatel,
+Raw Materials Supplied,Dodává suroviny,
+Total valuation ({0}) for manufactured or repacked item(s) can not be less than total valuation of raw materials ({1}),Ocenění Total ({0}) pro vyrobené nebo zabalil položku (y) nesmí být menší než celková ocenění surovin ({1})
+New Projects,Nové projekty,
+Series,Série,
+Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
+Appraisal Template,Posouzení Template,
+Email,Email,
+Item Classification,Položka Klasifikace,
+Business Development Manager,Business Development Manager,
+Maintenance Visit Purpose,Maintenance Visit Účel,
+Period,Obdobe,
+General Ledger,Hlavní Účetní Kniha,
+View Leads,Zobrazit Vodítka,
+Attribute Value,Hodnota atributu,
+"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
+Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level,
+Please select {0} first,"Prosím, nejprve vyberte {0} "
+To get Item Group in details table,Chcete-li získat položku Group v tabulce Rozpis,
+Redrawing,Překreslens,
+Etching,Lept,
+Commission,Provize,
+You are not allowed to reply to this ticket.,Nejste oprávnění odpovědět na tento lístek.
+"<h4>Default Template</h4>
<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
<pre><code>{{ address_line1 }}<br>
{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
@@ -3416,486 +3416,485 @@
{% v případě, fax%} Fax: {{fax}} & lt; br & gt; {% endif -%}
{%, pokud email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%}
</ code> </ pre>"
-DocType: Salary Slip Deduction,Default Amount,Výchozí částka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Sklad nebyl nalezen v systému
-DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
-DocType: Party Account,col_break1,col_break1
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit Zásoby Starší Vic jak` by měla být menší než %d dnů.
-,Project wise Stock Tracking,Sledování zboží dle projektu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +176,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
-DocType: Item Customer Detail,Ref Code,Ref Code
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Zaměstnanecké záznamy.
-DocType: HR Settings,Payroll Settings,Nastavení Mzdové
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
-DocType: Email Digest,New Purchase Orders,Nové vydané objednávky
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
-DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +476,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
-DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
-DocType: Warranty Claim,Resolved By,Vyřešena
-DocType: Appraisal,Start Date,Datum zahájení
-sites/assets/js/desk.min.js +512,Value,Hodnota
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
-DocType: Purchase Invoice Item,Price List Rate,Ceník Rate
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,Dodává Pořadové číslo {0} nemůže být smazán
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Zobrazit ""Skladem"" nebo ""Není skladem"" na základě skladem k dispozici v tomto skladu."
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
-DocType: Time Log,Hours,Hodiny
-DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Rolling,Rolling
-DocType: ToDo,Priority,Priorita
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +168,"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","Nelze smazat sériové číslo {0} na skladě. Nejprve odstraňte ze skladu, a pak smažte."
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
-DocType: Backup Manager,Dropbox Access Allowed,Dropbox Přístup povolen
-DocType: Backup Manager,Weekly,Týdenní
-DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
-DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Produkty budou rozděleny dle hmotnosti věku ve výchozím vyhledávání. Více váha věku, bude vyšší výrobek objeví v seznamu."
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
-DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
-DocType: Workstation,Operating Costs,Provozní náklady
-DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/templates/includes/footer_extension.html +9,Stay Updated,Zůstaňte Aktualizováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +376,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +66,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Electron beam machining,Paprsek obrábění Electron
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +160,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavní zprávy
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +73,Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
-DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,Přidat / Upravit ceny
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,Diagram nákladových středisek
-,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,Moje objednávky
-DocType: Price List,Price List Name,Ceník Jméno
-DocType: Time Log,For Manufacturing,Pro výrobu
-DocType: BOM,Manufacturing,Výroba
-,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
-DocType: Account,Income,Příjem
-,Setup Wizard,Průvodce nastavením
-DocType: Industry Type,Industry Type,Typ Průmyslu
-apps/erpnext/erpnext/templates/includes/cart.js +264,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
-DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,Die lití
-DocType: Email Alert,Reference Date,Referenční data
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
-DocType: Email Digest,User Specific,Uživatel Specifické
-DocType: Budget Detail,Budget Detail,Detail Rozpočtu
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +73,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
-DocType: Communication,Status,Stav
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +36,Stock UOM updated for Item {0},Sklad UOM aktualizovaný k bodu {0}
-DocType: Company History,Year,Rok
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +69,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +34,Time Log {0} already billed,Time Log {0} již účtoval
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezajištěných úvěrů
-DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Položka {0} s Serial č {1} je již nainstalován
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +10,You can start by selecting backup frequency and granting access for sync,Můžete začít výběrem frekvence zálohování a poskytnutím přístupu pro synchronizaci
-DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Celkem uhrazeno Amt
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
-DocType: Purchase Receipt Item,Received and Accepted,Přijaté a Přijato
-DocType: Item Attribute,"Lower the number, higher the priority in the Item Code suffix that will be created for this Item Attribute for the Item Variant","Nižší číslo, vyšší prioritu v položce kódu příponu, který bude vytvořen pro tuto položku atribut výtisku Variant"
-,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
-DocType: Naming Series,Help HTML,Nápověda HTML
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
-apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
-DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,Vaši Dodavatelé
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +58,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
-DocType: Purchase Invoice,Contact,Kontakt
-DocType: Features Setup,Exports,Vývoz
-DocType: Lead,Converted,Převedené
-DocType: Item,Has Serial No,Má Sériové číslo
-DocType: Employee,Date of Issue,Datum vydání
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
-DocType: Issue,Content Type,Typ obsahu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Computer,Počítač
-DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +63,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
-DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
-DocType: Purchase Receipt,Date on which lorry started from supplier warehouse,"Ode dne, kdy začal nákladního vozidla od dodavatele skladu"
-DocType: Cost Center,Budgets,Rozpočty
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualizováno
-DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it do?,Co to dělá?
-DocType: Delivery Note,To Warehouse,Do skladu
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
-,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
-DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
-DocType: Purchase Taxes and Charges,Account Head,Účet Head
-DocType: Price List,"Specify a list of Territories, for which, this Price List is valid","Zadejte seznam území, pro které tato Ceník je platný"
-apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +106,Electrical,Elektrický
-DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',Rozdíl Účet povinné pro účely '{0}'
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Peening,Peening
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
-DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
-DocType: Item,Customer Code,Code zákazníků
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +203,Birthday Reminder for {0},Narozeninová připomínka pro {0}
-DocType: Item,Default Purchase Account in which cost of the item will be debited.,"Default Nákup účet, na němž se bude zatížen náklady na položky."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Lapping,Zabrušovací
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Počet dnů od poslední objednávky
-DocType: Buying Settings,Naming Series,Číselné řady
-DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
-DocType: User,Enabled,Zapnuto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +22,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importovat Odběratelé
-DocType: Target Detail,Target Qty,Target Množství
-DocType: Attendance,Present,Současnost
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
-DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
-DocType: Email Digest,Income Booked,Rezervováno příjmů
-DocType: Authorization Rule,Based On,Založeno na
-,Ordered Qty,Objednáno Množství
-DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generování výplatních páskách
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} není platné id emailu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
-DocType: ToDo,Low,Nízké
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Spinning,Spinning
-DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +55,Please set {0},Prosím nastavte {0}
-DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
-DocType: Employee,Health Details,Zdravotní Podrobnosti
-DocType: Offer Letter,Offer Letter Terms,Nabídka Letter Podmínky
-DocType: Features Setup,To track any installation or commissioning related work after sales,Chcete-li sledovat jakékoli zařízení nebo uvedení do provozu souvisejících s prací po prodeji
-DocType: Project,Estimated Costing,Odhadovaná kalkulace
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Zápis do deníku Detail No
-DocType: Employee External Work History,Salary,Plat
-DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
-DocType: Salary Manager,Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérií
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizovány
-DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
-DocType: Sales Invoice,Existing Customer,Stávající zákazník
-DocType: Email Digest,Receivables,Pohledávky
-DocType: Quality Inspection Reading,Reading 5,Čtení 5
-DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude objednávka bude zaslán automaticky na určité datum"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je zapotřebí Název kampaně
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,Zaokrouhleno
-DocType: Maintenance Visit,Maintenance Date,Datum údržby
-DocType: Purchase Receipt Item,Rejected Serial No,Zamítnuto Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Deep drawing,Hluboké tažení
-apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Prosím, vyberte položku, kde ""je skladem"", je ""Ne"" a ""Je Sales Item"" ""Ano"" a není tam žádný jiný Sales BOM"
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +167,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
-apps/erpnext/erpnext/stock/doctype/item/item.js +46,Show Balance,Show Balance
-DocType: Item,"Example: ABCD.#####
+Default Amount,Výchozí částka,
+Warehouse not found in the system,Sklad nebyl nalezen v systému,
+Quality Inspection Reading,Kvalita Kontrola Reading,
+col_break1,col_break1,
+`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit Zásoby Starší Vic jak` by měla být menší než %d dnů.
+Project wise Stock Tracking,Sledování zboží dle projektu,
+Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
+Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
+Ref Code,Ref Code,
+Employee records.,Zaměstnanecké záznamy.
+Payroll Settings,Nastavení Mzdov$1,
+Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
+New Purchase Orders,Nové vydané objednávky,
+Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko,
+C-Form Applicable,C-Form Použitelny,
+UOM Conversion Detail,UOM konverze Detail,
+Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
+Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku,
+Get Outstanding Vouchers,Získejte Vynikající poukazy,
+Resolved By,Vyřešena,
+Start Date,Datum zahájenu,
+Value,Hodnota,
+Allocate leaves for a period.,Přidělit listy dobu.
+Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet,
+Price List Rate,Ceník Rate,
+Delivered Serial No {0} cannot be deleted,Dodává Pořadové číslo {0} nemůže být smazán,
+"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Zobrazit ""Skladem"" nebo ""Není skladem"" na základě skladem k dispozici v tomto skladu."
+Bill of Materials (BOM),Bill of Materials (BOM)
+Hours,Hodiny,
+Expected Start Date,Očekávané datum zahájeny,
+Rolling,Rolling,
+Priority,Priorita,
+"Cannot delete Serial No {0} in stock. First remove from stock, then delete.","Nelze smazat sériové číslo {0} na skladě. Nejprve odstraňte ze skladu, a pak smažte."
+Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku,
+Dropbox Access Allowed,Dropbox Přístup povolen,
+Weekly,Týdennu,
+Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi,
+Fully Completed,Plně Dokončeno,
+"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Produkty budou rozděleny dle hmotnosti věku ve výchozím vyhledávání. Více váha věku, bude vyšší výrobek objeví v seznamu."
+{0}% Complete,{0}% Hotovo,
+Educational Qualification,Vzdělávací Kvalifikace,
+Operating Costs,Provozní náklady,
+Employee Leave Approver,Zaměstnanec Leave schvalovao,
+Stay Updated,Zůstaňte Aktualizováno,
+Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
+Electron beam machining,Paprsek obrábění Electron,
+Purchase Master Manager,Nákup Hlavní manažer,
+Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy,
+Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
+Main Reports,Hlavní zprávy,
+Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno,
+To date cannot be before from date,K dnešnímu dni nemůže být dříve od data,
+Prevdoc DocType,Prevdoc DOCTYPE,
+Add / Edit Prices,Přidat / Upravit ceny,
+Chart of Cost Centers,Diagram nákladových středisek,
+Requested Items To Be Ordered,Požadované položky je třeba objednat,
+My Orders,Moje objednávky,
+Price List Name,Ceník Jméno,
+For Manufacturing,Pro výrobu,
+Manufacturing,Výroba,
+Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
+Income,Příjem,
+Setup Wizard,Průvodce nastavením,
+Industry Type,Typ Průmyslu,
+Something went wrong!,Něco se pokazilo!
+Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku,
+Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána,
+Completion Date,Dokončení Datum,
+Amount (Company Currency),Částka (Měna Společnosti)
+Die casting,Die lita,
+Reference Date,Referenční data,
+Organization unit (department) master.,Organizace jednotka (departement) master.
+Please enter valid mobile nos,Zadejte platné mobilní nos,
+User Specific,Uživatel Specificks,
+Budget Detail,Detail Rozpočtu,
+Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
+Status,Stav,
+Stock UOM updated for Item {0},Sklad UOM aktualizovaný k bodu {0}
+Year,Rok,
+Please Update SMS Settings,Aktualizujte prosím nastavení SMS,
+Time Log {0} already billed,Time Log {0} již účtoval,
+Unsecured Loans,Nezajištěných úvěrk,
+Cost Center Name,Jméno nákladového střediska,
+Item {0} with Serial No {1} is already installed,Položka {0} s Serial č {1} je již nainstalován,
+You can start by selecting backup frequency and granting access for sync,Můžete začít výběrem frekvence zálohování a poskytnutím přístupu pro synchronizaci,
+Scheduled Date,Plánované datum,
+Total Paid Amt,Celkem uhrazeno Amt,
+Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv,
+Received and Accepted,Přijaté a Přijato,
+"Lower the number, higher the priority in the Item Code suffix that will be created for this Item Attribute for the Item Variant","Nižší číslo, vyšší prioritu v položce kódu příponu, který bude vytvořen pro tuto položku atribut výtisku Variant"
+Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti,
+Employee can not be changed,Zaměstnanec nemůže být změněn,
+You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+Help HTML,Nápověda HTML,
+Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
+Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
+Your Suppliers,Vaši Dodavatel$1,
+Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
+Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
+Contact,Kontakt,
+Exports,Vývoz,
+Converted,Převedent,
+Has Serial No,Má Sériové číslo,
+Date of Issue,Datum vydánt,
+{0}: From {0} for {1},{0}: Od {0} do {1}
+Content Type,Typ obsahu,
+Computer,Počítau,
+List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
+Item: {0} does not exist in the system,Položka: {0} neexistuje v systému,
+You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmraženu,
+Get Unreconciled Entries,Získat smířit záznamu,
+Date on which lorry started from supplier warehouse,"Ode dne, kdy začal nákladního vozidla od dodavatele skladu"
+Budgets,Rozpočty,
+Updated,Aktualizováno,
+Emergency Contact Details,Nouzové kontaktní údaje,
+What does it do?,Co to dělá?
+To Warehouse,Do skladu,
+Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
+Average Commission Rate,Průměrná cena Komise,
+'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
+Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data,
+Pricing Rule Help,Ceny Pravidlo Help,
+Account Head,Účet Head,
+"Specify a list of Territories, for which, this Price List is valid","Zadejte seznam území, pro které tato Ceník je platný"
+Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek,
+Electrical,Elektrickk,
+Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
+Difference Account mandatory for purpose '{0}',Rozdíl Účet povinné pro účely '{0}'
+User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
+Peening,Peening,
+From Warranty Claim,Od reklamačnímu,
+Default Source Warehouse,Výchozí zdroj Warehouse,
+Customer Code,Code zákazníkg,
+Birthday Reminder for {0},Narozeninová připomínka pro {0}
+Default Purchase Account in which cost of the item will be debited.,"Default Nákup účet, na němž se bude zatížen náklady na položky."
+Lapping,Zabrušovacy,
+Days Since Last Order,Počet dnů od poslední objednávky,
+Naming Series,Číselné řady,
+Leave Block List Name,Nechte Jméno Block List,
+Enabled,Zapnuto,
+Stock Assets,Stock Aktiva,
+Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
+Import Subscribers,Importovat Odběratelt,
+Target Qty,Target Množstvt,
+Present,Současnost,
+Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy,
+Sales Invoice Message,Prodejní faktury Message,
+Income Booked,Rezervováno příjmt,
+Based On,Založeno na,
+Ordered Qty,Objednáno Množstvt,
+Stock Frozen Upto,Reklamní Frozen at,
+Project activity / task.,Projektová činnost / úkol.
+Generate Salary Slips,Generování výplatních páskách,
+{0} is not a valid email id,{0} není platné id emailu,
+"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
+Discount must be less than 100,Sleva musí být menší než 100,
+Low,Nízk0,
+Spinning,Spinning,
+Landed Cost Voucher,Přistálo Náklady Voucher,
+Please set {0},Prosím nastavte {0}
+Repeat on Day of Month,Opakujte na den v měsíci,
+Health Details,Zdravotní Podrobnosti,
+Offer Letter Terms,Nabídka Letter Podmínky,
+To track any installation or commissioning related work after sales,Chcete-li sledovat jakékoli zařízení nebo uvedení do provozu souvisejících s prací po prodeji,
+Estimated Costing,Odhadovaná kalkulace,
+Journal Entry Detail No,Zápis do deníku Detail No,
+Salary,Plat,
+Delivery Document Type,Dodávka Typ dokumentu,
+Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérii,
+{0} Items synced,{0} položky synchronizovány,
+Partly Delivered,Částečně vyhlášeno,
+Existing Customer,Stávající zákazník,
+Receivables,Pohledávky,
+Reading 5,Čtení 5,
+"Enter email id separated by commas, order will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude objednávka bude zaslán automaticky na určité datum"
+Campaign Name is required,Je zapotřebí Název kampano,
+Rounded Off,Zaokrouhleno,
+Maintenance Date,Datum údržby,
+Rejected Serial No,Zamítnuto Serial No,
+Deep drawing,Hluboké taženo,
+"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Prosím, vyberte položku, kde ""je skladem"", je ""Ne"" a ""Je Sales Item"" ""Ano"" a není tam žádný jiný Sales BOM"
+New Newsletter,New Newsletter,
+Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
+Show Balance,Show Balance,
+"Example: ABCD.#####
If 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.","Příklad:. ABCD #####
Je-li série nastavuje a pořadové číslo není uvedeno v transakcích, bude vytvořen poté automaticky sériové číslo na základě této série. Pokud chcete vždy výslovně uvést pořadová čísla pro tuto položku. ponechte prázdné."
-DocType: Upload Attendance,Upload Attendance,Nahrát Návštěvnost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
-DocType: Journal Entry Account,Amount,Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Riveting,Nýtování
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
-,Sales Analytics,Prodejní Analytics
-DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
-DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
-apps/erpnext/erpnext/templates/includes/cart.js +286,You need to be logged in to view your cart.,Musíte být přihlášen k zobrazení košíku.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +200,New Account Name,Nový název účtu
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
-DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +68,Customer Service,Služby zákazníkům
-DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Nabídka kandidát Job.
-DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Položka {0} musí být skladem
-apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je vyžadováno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Vakuové tváření
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
-DocType: Contact Us Settings,City,Město
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,Ultrazvukové obrábění
-apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
-DocType: Naming Series,Update Series Number,Aktualizace Series Number
-DocType: Account,Equity,Hodnota majetku
-DocType: Task,Closing Date,Uzávěrka Datum
-DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +79,Engineer,Inženýr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
-DocType: Sales Partner,Partner Type,Partner Type
-DocType: Purchase Taxes and Charges,Actual,Aktuální
-DocType: Purchase Order,% of materials received against this Purchase Order,% materiálů přijatých proti této objednávce
-DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
-DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
-DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +242,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
-DocType: Quotation Item,Against Docname,Proti Docname
-DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
-DocType: BOM,Raw Material Cost,Cena surovin
-DocType: Item Reorder,Re-Order Level,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.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
-sites/assets/js/list.min.js +160,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,Part-time
-DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
-DocType: Employee,Cheque,Šek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Report Type is mandatory,Report Type je povinné
-DocType: Item,Serial Number Series,Sériové číslo Series
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Retail & Wholesale,Maloobchod a velkoobchod
-DocType: Issue,First Responded On,Prvně odpovězeno dne
-DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +349,The First User: You,První Uživatel: Vy
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Successfully Reconciled,Úspěšně smířeni
-DocType: Production Order,Planned End Date,Plánované datum ukončení
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná částka
-DocType: Attendance,Attendance,Účast
-DocType: Page,No,Ne
-DocType: BOM,Materials,Materiály
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +663,Make Delivery,Proveďte Dodávka
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +261,Posting date and posting time is mandatory,Datum a čas zadání je povinný
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
-,Item Prices,Ceny Položek
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
-DocType: Period Closing Voucher,Period Closing Voucher,Období Uzávěrka Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Ceník master.
-DocType: Task,Review Date,Review Datum
-DocType: DocPerm,Level,Úroveň
-DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro Oznámení"", které nejsou uvedeny na opakující se %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,Frézování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,Okusování
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Consulting,Consulting
-DocType: Customer Group,Parent Customer Group,Parent Customer Group
-sites/assets/js/erpnext.min.js +45,Change,Změna
-DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Purchase Order {0} is 'Stopped',Vydaná objednávka {0} je 'Zastavena'
-DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +391,"e.g. ""My Company LLC""","např ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Notice Period,Výpovědní Lhůta
-DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
-DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
-DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
-DocType: Journal Entry Account,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Stamping,Lisování
-DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
-DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
-DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-DocType: Item,Default Warehouse,Výchozí Warehouse
-DocType: Task,Actual End Date (via Time Logs),Skutečné Datum ukončení (přes Time Záznamy)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
-DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
-apps/erpnext/erpnext/controllers/buying_controller.py +70,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
-DocType: User,Last Name,Příjmení
-DocType: Web Page,Left,Vlevo
-DocType: Event,All Day,Celý den
-DocType: Communication,Support Team,Tým podpory
-DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
-DocType: Contact Us Settings,State,Stav
-DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,Zůstatek
-DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků)
-DocType: User,Gender,Pohlaví
-DocType: Journal Entry,Debit Note,Debit Note
-DocType: Stock Entry,As per Stock UOM,Podle Stock nerozpuštěných
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Neuplynula
-DocType: Journal Entry,Total Debit,Celkem Debit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Prodej Osoba
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +496,Unstop Purchase Order,Uvolnit Objednávka
-DocType: Sales Invoice,Cold Calling,Cold Calling
-DocType: SMS Parameter,SMS Parameter,SMS parametrů
-DocType: Maintenance Schedule Item,Half Yearly,Pololetní
-DocType: Lead,Blog Subscriber,Blog Subscriber
-DocType: Email Digest,Income Year to Date,Rok příjmů do dneška
-apps/erpnext/erpnext/config/setup.py +58,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
-DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +543,Unstop Material Request,Uvolnit materiálu Poptávka
-DocType: Workflow State,User,Uživatel
-DocType: Opportunity Item,Basic Rate,Basic Rate
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +122,Set as Lost,Nastavit jako Lost
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +57,Stock balances updated,Stock zůstatky aktualizováno
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},Nelze vrátit více než {0} položky {1}
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovních hodin.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} již byla odeslána
-,Items To Be Requested,Položky se budou vyžadovat
-DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
-DocType: Company,Company Info,Společnost info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Seaming,Sešívání
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
-DocType: Production Planning Tool,Filter based on item,Filtr dle položek
-DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
-DocType: Attendance,Employee Name,Jméno zaměstnance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit To account must be a liability account,"Debetní Chcete-li v úvahu, musí být účet závazek"
-DocType: Sales Invoice,Rounded Total (Company Currency),Zaoblený Total (Company Měna)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
-DocType: Purchase Common,Purchase Common,Nákup Common
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,Od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Zaclonění
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Zaměstnanecké benefity
-DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +224,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
-DocType: Production Order,Manufactured Qty,Vyrobeno Množství
-DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
-DocType: DocField,Default,Výchozí
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Výběrem ""Yes"" umožní tato položka se objeví v objednávce, a doklad o zaplacení."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} odběratelé z přidané
-DocType: Maintenance Schedule,Schedule,Plán
-DocType: Account,Parent Account,Nadřazený účet
-DocType: Serial No,Available,K dispozici
-DocType: Quality Inspection Reading,Reading 3,Čtení 3
-,Hub,Hub
-DocType: GL Entry,Voucher Type,Voucher Type
-DocType: Expense Claim,Approved,Schválený
-DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
-DocType: Employee,Education,Vzdělání
-DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
-DocType: Employee,Current Address Is,Aktuální adresa je
-DocType: Address,Office,Kancelář
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +227,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
-DocType: Account,Stock,Sklad
-DocType: Employee,Current Address,Aktuální adresa
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
-DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
-DocType: Employee,Contract End Date,Smlouva Datum ukončení
-DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
-apps/erpnext/erpnext/templates/includes/cart.js +284,Price List not configured.,Ceník není nakonfigurován.
-DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
-DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +558,From Supplier Quotation,Z nabídky dodavatele
-DocType: Deduction Type,Deduction Type,Odpočet Type
-DocType: Attendance,Half Day,Půl den
-DocType: Serial No,Not Available,Není k dispozici
-DocType: Pricing Rule,Min Qty,Min Množství
-DocType: GL Entry,Transaction Date,Transakce Datum
-DocType: Production Plan Item,Planned Qty,Plánované Množství
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +92,Total Tax,Total Tax
-DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
-DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
-DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
-DocType: Production Order,Actual Start Date,Skutečné datum zahájení
-DocType: Sales Order,% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,Záznam pohybu položka.
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter seznamu účastníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Morticing,Dlabačky
-DocType: Email Account,Service,Služba
-DocType: Hub Settings,Hub Settings,Nastavení Hub
-DocType: Project,Gross Margin %,Hrubá Marže %
-DocType: BOM,With Operations,S operacemi
-,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +120,Next,Další
-DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
-DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electropolishing,Elektrolytické
-DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-DocType: Email Digest,New Delivery Notes,Nové dodací listy
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +30,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
-apps/erpnext/erpnext/templates/pages/tickets.py +34,Please write something in subject and message!,"Prosím, napište něco do předmětu zprávy a poselství!"
-apps/erpnext/erpnext/config/accounts.py +143,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +190,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Platba Částka nesmí být vyšší než dlužná částka
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log není zúčtovatelné
-apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
-DocType: System Settings,Localization,Lokalizace
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +74,Net pay cannot be negative,Net plat nemůže být záporný
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +70,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
-DocType: SMS Settings,Static Parameters,Statické parametry
-DocType: Purchase Order,Advance Paid,Vyplacené zálohy
-DocType: Item,Item Tax,Daň Položky
-DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Krátkodobé závazky
-apps/erpnext/erpnext/config/crm.py +43,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
-DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +53,Actual Qty is mandatory,Skutečné Množství je povinné
-DocType: Item,"Select ""Yes"" if you are maintaining stock of this item in your Inventory.","Zvolte ""Ano"", pokud se udržuje zásoby této položky ve vašem inventáři."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +415,Item {0} does not exist in {1} {2},Bod {0} neexistuje v {1} {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cross-rolling,Cross-válcování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +127,Credit Card,Kreditní karta
-DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
-DocType: Purchase Invoice,Next Date,Další data
-DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Machining,Obrábění
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
-DocType: Hub Settings,Seller Name,Prodejce Name
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
-DocType: Item Group,General Settings,Obecné nastavení
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Z měny a měny nemůže být stejné
-DocType: Stock Entry,Repack,Přebalit
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +480,Attach Logo,Připojit Logo
-DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
-DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Root cannot be edited.,Root nelze upravovat.
-apps/erpnext/erpnext/accounts/utils.py +188,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
-DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
-DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Základní kapitál
-DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vyberte soubor csv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Designer,Návrhář
-apps/erpnext/erpnext/config/selling.py +116,Terms and Conditions Template,Podmínky Template
-DocType: Serial No,Delivery Details,Zasílání
-DocType: Party Type,Allow Children,Povolit děti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +362,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
-DocType: Purchase Invoice Item,Discount %,Sleva%
-,Item-wise Purchase Register,Item-moudrý Nákup Register
-DocType: Batch,Expiry Date,Datum vypršení platnosti
-,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
-DocType: Supplier,Credit Days,Úvěrové dny
-DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +496,Get Items from BOM,Získat předměty z BOM
-DocType: Item,Lead Time Days,Dodací lhůta dny
-DocType: Backup Manager,Send Notifications To,Odeslat upozornění
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
-DocType: Employee,Reason for Leaving,Důvod Leaving
-DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
-DocType: GL Entry,Is Opening,Se otevírá
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Account {0} does not exist,Účet {0} neexistuje
-DocType: Account,Cash,V hotovosti
-DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}
+Upload Attendance,Nahrát Návštěvnost,
+BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinnt,
+Ageing Range 2,Stárnutí rozsah 2,
+Amount,Částka,
+Riveting,Nýtovánt,
+BOM replaced,BOM nahradil,
+Sales Analytics,Prodejní Analytics,
+Manufacturing Settings,Výrobní nastavent,
+Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr,
+Stock Entry Detail,Reklamní Entry Detail,
+You need to be logged in to view your cart.,Musíte být přihlášen k zobrazení košíku.
+New Account Name,Nový název účtu,
+Raw Materials Supplied Cost,Dodává se nákladů na suroviny,
+Settings for Selling Module,Nastavení pro prodej Module,
+Customer Service,Služby zákazníkům,
+Item Customer Detail,Položka Detail Zákazník,
+Offer candidate a Job.,Nabídka kandidát Job.
+Prompt for Email on Submission of,Výzva pro e-mail na předkládánm,
+Item {0} must be a stock Item,Položka {0} musí být skladem,
+Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
+{0} is required,{0} je vyžadováno,
+Vacuum molding,Vakuové tvářeno,
+Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum,
+City,Město,
+Ultrasonic machining,Ultrazvukové obráběno,
+Item {0} must be a Sales Item,Bod {0} musí být prodejní položky,
+Update Series Number,Aktualizace Series Number,
+Equity,Hodnota majetku,
+Closing Date,Uzávěrka Datum,
+Produced Quantity,Produkoval Množstvo,
+Engineer,Inženýr,
+Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+Partner Type,Partner Type,
+Actual,Aktuálne,
+% of materials received against this Purchase Order,% materiálů přijatých proti této objednávce,
+Customerwise Discount,Sleva podle zákazníka,
+Against Expense Account,Proti výdajového účtu,
+Production Order,Výrobní Objednávka,
+Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána,
+Against Docname,Proti Docname,
+All Employee (Active),Všichni zaměstnanci (Aktivní)
+View Now,Zobrazit nyn$1,
+Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
+Raw Material Cost,Cena surovin,
+Re-Order Level,Re-Order Level,
+Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
+Gantt Chart,Pruhový diagram,
+Part-time,Part-time,
+Applicable Holiday List,Použitelný Seznam Svátkm,
+Cheque,Šek,
+Series Updated,Řada Aktualizováno,
+Report Type is mandatory,Report Type je povinnm,
+Serial Number Series,Sériové číslo Series,
+Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
+Retail & Wholesale,Maloobchod a velkoobchod,
+First Responded On,Prvně odpovězeno dne,
+Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách,
+The First User: You,První Uživatel: Vy,
+Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
+Successfully Reconciled,Úspěšně smířeni,
+Planned End Date,Plánované datum ukončeni,
+Where items are stored.,"Tam, kde jsou uloženy předměty."
+Invoiced Amount,Fakturovaná částka,
+Attendance,Účast,
+No,Ne,
+Materials,Materiály,
+"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
+Make Delivery,Proveďte Dodávka,
+Posting date and posting time is mandatory,Datum a čas zadání je povinna,
+Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
+Item Prices,Ceny Položek,
+In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
+Period Closing Voucher,Období Uzávěrka Voucher,
+Price List master.,Ceník master.
+Review Date,Review Datum,
+Level,Úrovem,
+On Net Total,On Net Celkem,
+Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky,
+No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj,
+'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro Oznámení"", které nejsou uvedeny na opakující se %s"
+Milling,Frézovány,
+Nibbling,Okusovány,
+Administrative Expenses,Administrativní náklady,
+Consulting,Consulting,
+Parent Customer Group,Parent Customer Group,
+Change,Změna,
+Contact Email,Kontaktní e-mail,
+Purchase Order {0} is 'Stopped',Vydaná objednávka {0} je 'Zastavena'
+Score Earned,Skóre Zasloužen$1,
+"e.g. ""My Company LLC""","např ""My Company LLC """
+Notice Period,Výpovědní Lhůta,
+Voucher ID,Voucher ID,
+This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
+Gross Weight UOM,Hrubá Hmotnost UOM,
+Receivables / Payables,Pohledávky / Závazky,
+Against Sales Invoice,Proti prodejní faktuře,
+Stamping,LisovánM,
+Landed Cost Item,Přistálo nákladovou položkou,
+Show zero values,Ukázat nulové hodnoty,
+Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin,
+Receivable / Payable Account,Pohledávky / závazky účet,
+Against Sales Order Item,Proti položce přijaté objednávky,
+Default Warehouse,Výchozí Warehouse,
+Actual End Date (via Time Logs),Skutečné Datum ukončení (přes Time Záznamy)
+Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
+Print Without Amount,Tisknout bez Částka,
+Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
+Last Name,Příjmeno,
+Left,Vlevo,
+All Day,Celý den,
+Support Team,Tým podpory,
+Total Score (Out of 5),Celkové skóre (Out of 5)
+State,Stav,
+Batch,Šarže,
+Balance,Zůstatek,
+Gender,Pohlave,
+Debit Note,Debit Note,
+As per Stock UOM,Podle Stock nerozpuštěných,
+Not Expired,Neuplynula,
+Total Debit,Celkem Debit,
+Sales Person,Prodej Osoba,
+Unstop Purchase Order,Uvolnit Objednávka,
+Cold Calling,Cold Calling,
+SMS Parameter,SMS parametre,
+Half Yearly,Pololetne,
+Blog Subscriber,Blog Subscriber,
+Income Year to Date,Rok příjmů do dneška,
+Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
+"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
+Total Advance,Total Advance,
+Unstop Material Request,Uvolnit materiálu Poptávka,
+User,Uživatel,
+Basic Rate,Basic Rate,
+Set as Lost,Nastavit jako Lost,
+Stock balances updated,Stock zůstatky aktualizováno,
+Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu,
+Cannot return more than {0} for Item {1},Nelze vrátit více než {0} položky {1}
+Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovních hodin.
+{0} {1} has already been submitted,{0} {1} již byla odeslána,
+Items To Be Requested,Položky se budou vyžadovat,
+Get Last Purchase Rate,Získejte posledního nákupu Cena,
+Company Info,Společnost info,
+Seaming,Sešívána,
+"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
+Application of Funds (Assets),Aplikace fondů (aktiv)
+Filter based on item,Filtr dle položek,
+Year Start Date,Datum Zahájení Roku,
+Employee Name,Jméno zaměstnance,
+Debit To account must be a liability account,"Debetní Chcete-li v úvahu, musí být účet závazek"
+Rounded Total (Company Currency),Zaoblený Total (Company Měna)
+Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+Purchase Common,Nákup Common,
+{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
+Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
+From Opportunity,Od Opportunity,
+Blanking,Zacloněny,
+Employee Benefits,Zaměstnanecké benefity,
+Is POS,Je POS,
+Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+Manufactured Qty,Vyrobeno Množstv$1,
+Accepted Quantity,Schválené Množstv$1,
+Bills raised to Customers.,Směnky vznesené zákazníkům.
+Default,Výchozu,
+Project Id,ID projektu,
+"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Výběrem ""Yes"" umožní tato položka se objeví v objednávce, a doklad o zaplacení."
+{0} subscribers added,{0} odběratelé z přidann,
+Schedule,Plán,
+Parent Account,Nadřazený účet,
+Available,K dispozici,
+Reading 3,Čtení 3,
+Hub,Hub,
+Voucher Type,Voucher Type,
+Approved,Schválenn,
+Price,Cena,
+Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
+Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém obdoby,
+Education,Vzdělány,
+Campaign Naming By,Kampaň Pojmenování By,
+Current Address Is,Aktuální adresa je,
+Office,Kanceláy,
+Standard Reports,Standardní výpisy,
+Accounting journal entries.,Zápisy v účetním deníku.
+Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+To create a Tax Account,Chcete-li vytvořit daňovém účtu,
+Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+Stock,Sklad,
+Current Address,Aktuální adresa,
+"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
+Purchase / Manufacture Details,Nákup / Výroba Podrobnosti,
+Contract End Date,Smlouva Datum ukončeni,
+Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt,
+Price List not configured.,Ceník není nakonfigurován.
+Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
+Document Type,Typ dokumentu,
+From Supplier Quotation,Z nabídky dodavatele,
+Deduction Type,Odpočet Type,
+Half Day,Půl den,
+Not Available,Není k dispozici,
+Min Qty,Min Množstvu,
+Transaction Date,Transakce Datum,
+Planned Qty,Plánované Množstvu,
+Total Tax,Total Tax,
+Default Target Warehouse,Výchozí Target Warehouse,
+Net Total (Company Currency),Net Total (Company Měna)
+Purchase Receipt Message,Zpráva příjemky,
+Actual Start Date,Skutečné datum zahájeny,
+% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli,
+Record item movement.,Záznam pohybu položka.
+Newsletter List Subscriber,Newsletter seznamu účastníky,
+Morticing,Dlabačky,
+Service,Služba,
+Hub Settings,Nastavení Hub,
+Gross Margin %,Hrubá Marže %
+With Operations,S operacemi,
+Monthly Salary Register,Měsíční plat Register,
+Next,Dalši,
+If different than customer address,Pokud se liší od adresy zákazníka,
+BOM Operation,BOM Operation,
+Electropolishing,Elektrolyticki,
+On Previous Row Amount,Na předchozí řady Částka,
+New Delivery Notes,Nové dodací listy,
+Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
+Please write something in subject and message!,"Prosím, napište něco do předmětu zprávy a poselství!"
+"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
+Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Platba Částka nesmí být vyšší než dlužná částka,
+Time Log is not billable,Time Log není zúčtovatelna,
+"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
+Localization,Lokalizace,
+Net pay cannot be negative,Net plat nemůže být záporne,
+Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručne,
+Static Parameters,Statické parametry,
+Advance Paid,Vyplacené zálohy,
+Item Tax,Daň Položky,
+Employees Email Id,Zaměstnanci Email Id,
+Current Liabilities,Krátkodobé závazky,
+Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům,
+Consider Tax or Charge for,Zvažte daň či poplatek za,
+Actual Qty is mandatory,Skutečné Množství je povinne,
+"Select ""Yes"" if you are maintaining stock of this item in your Inventory.","Zvolte ""Ano"", pokud se udržuje zásoby této položky ve vašem inventáři."
+Item {0} does not exist in {1} {2},Bod {0} neexistuje v {1} {2}
+Cross-rolling,Cross-válcována,
+Credit Card,Kreditní karta,
+Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena,
+Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
+Next Date,Další data,
+Major/Optional Subjects,Hlavní / Volitelné předměty,
+Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
+Machining,Obráběn$1,
+"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
+Seller Name,Prodejce Name,
+Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
+General Settings,Obecné nastavent,
+From Currency and To Currency cannot be same,Z měny a měny nemůže být stejnt,
+Repack,Přebalit,
+You must Save the form before proceeding,Musíte Uložte formulář před pokračováním,
+Attach Logo,Připojit Logo,
+Commission Rate,Výše provize,
+Block leave applications by department.,Aplikace Block dovolené podle oddělení.
+Actual Operating Cost,Skutečné provozní náklady,
+Root cannot be edited.,Root nelze upravovat.
+Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted,
+Allow Production on Holidays,Povolit Výrobu při dovolend,
+Customer's Purchase Order Date,Zákazníka Objednávka Datum,
+Capital Stock,Základní kapitál,
+Package Weight Details,Hmotnost balení Podrobnosti,
+Please select a csv file,Vyberte soubor csv,
+Designer,Návrhád,
+Terms and Conditions Template,Podmínky Template,
+Delivery Details,Zasílánd,
+Allow Children,Povolit děti,
+Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+Discount %,Sleva%
+Item-wise Purchase Register,Item-moudrý Nákup Register,
+Expiry Date,Datum vypršení platnosti,
+Supplier Addresses and Contacts,Dodavatel Adresy a kontakty,
+Please select Category first,Nejdřív vyberte kategorii,
+Project master.,Master Project.
+Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
+Credit Days,Úvěrové dny,
+Is Carry Forward,Je převádět,
+Get Items from BOM,Získat předměty z BOM,
+Lead Time Days,Dodací lhůta dny,
+Send Notifications To,Odeslat upozorněny,
+Ref Date,Ref Datum,
+Reason for Leaving,Důvod Leaving,
+Sanctioned Amount,Sankcionována Částka,
+Is Opening,Se otevíry,
+Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+Account {0} does not exist,Účet {0} neexistuje,
+Cash,V hotovosti,
+Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
+Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 923bf88..57afee8 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,29 +1,29 @@
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +153,'Opening','Åbning'
-DocType: Lead,Lead,Bly
-apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
-DocType: Timesheet,% Amount Billed,% Beløb Billed
-DocType: Purchase Order,% Billed,% Billed
-,Lead Id,Bly Id
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.py +87,{0} {1} created,{0} {1} creado
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +237,'Total','Total'
-DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,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,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
-DocType: Pricing Rule,Selling,Selling
-DocType: Sales Order,% Delivered,% Leveres
-DocType: Lead,Lead Owner,Bly Owner
-apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-apps/erpnext/erpnext/controllers/accounts_controller.py +377, or ,o
-DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
-DocType: SMS Center,All Lead (Open),Alle Bly (Open)
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-,Lead Details,Bly Detaljer
-DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-,Lead Name,Bly navn
-DocType: Vehicle Service,Half Yearly,Halvdelen Årlig
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
+'Opening','Åbning'
+Lead,Bly,
+Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+% Amount Billed,% Beløb Billed,
+% Billed,% Billed,
+Lead Id,Bly Id,
+{0} {1} created,{0} {1} creado,
+'Total','Total'
+Selling Settings,Salg af indstillinger,
+Selling Amount,Selling Beløb,
+Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+Default Selling Cost Center,Standard Selling Cost center,
+90-Above,90-Above,
+Selling,Selling,
+% Delivered,% Leveres,
+Lead Owner,Bly Owner,
+{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+ or ,o,
+% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order,
+All Lead (Open),Alle Bly (Open)
+Get Updates,Hent opdateringer,
+'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+Standard Selling,Standard Selling,
+Lead Details,Bly Detaljer,
+Settings for Selling Module,Indstillinger for Selling modul,
+Lead Name,Bly navn,
+Half Yearly,Halvdelen Årlig,
+"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index f0654b9..863de02 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Gælder hvis virksomheden er SpA, SApA eller SRL",
Applicable if the company is a limited liability company,"Gælder, hvis virksomheden er et aktieselskab",
Applicable if the company is an Individual or a Proprietorship,"Gælder, hvis virksomheden er et individ eller et ejerskab",
-Applicant,Ansøger,
-Applicant Type,Ansøgertype,
Application of Funds (Assets),Anvendelse af midler (aktiver),
Application period cannot be across two allocation records,Ansøgningsperioden kan ikke være på tværs af to tildelingsregistre,
Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Liste over tilgængelige aktionærer med folio numre,
Loading Payment System,Indlæser betalingssystem,
Loan,Lån,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0},
-Loan Application,Låneansøgning,
-Loan Management,Lånestyring,
-Loan Repayment,Tilbagebetaling af lån,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Lånets startdato og låneperiode er obligatorisk for at gemme fakturadiskontering,
Loans (Liabilities),Lån (passiver),
Loans and Advances (Assets),Udlån (aktiver),
@@ -1611,7 +1605,6 @@
Monday,Mandag,
Monthly,Månedlig,
Monthly Distribution,Månedlig distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig tilbagebetaling beløb kan ikke være større end Lånebeløb,
More,Mere,
More Information,Mere information,
More than one selection for {0} not allowed,Mere end et valg for {0} er ikke tilladt,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Betal {0} {1},
Payable,betales,
Payable Account,Betales konto,
-Payable Amount,Betalbart beløb,
Payment,Betaling,
Payment Cancelled. Please check your GoCardless Account for more details,Betaling annulleret. Tjek venligst din GoCardless-konto for flere detaljer,
Payment Confirmation,Betalingsbekræftelse,
-Payment Date,Betalingsdato,
Payment Days,Betalingsdage,
Payment Document,Betaling dokument,
Payment Due Date,Sidste betalingsdato,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Indtast venligst købskvittering først,
Please enter Receipt Document,Indtast Kvittering Dokument,
Please enter Reference date,Indtast referencedato,
-Please enter Repayment Periods,Indtast venligst Tilbagebetalingstid,
Please enter Reqd by Date,Indtast venligst Reqd by Date,
Please enter Woocommerce Server URL,Indtast venligst Woocommerce Server URL,
Please enter Write Off Account,Indtast venligst Skriv Off konto,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Indtast overordnet omkostningssted,
Please enter quantity for Item {0},Indtast mængde for vare {0},
Please enter relieving date.,Indtast lindre dato.,
-Please enter repayment Amount,Indtast tilbagebetaling Beløb,
Please enter valid Financial Year Start and End Dates,Indtast venligst det gyldige regnskabsårs start- og slutdatoer,
Please enter valid email address,Indtast venligst en gyldig e-mailadresse,
Please enter {0} first,Indtast venligst {0} først,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Prisfastsættelsesregler er yderligere filtreret på mængden.,
Primary Address Details,Primær adresseoplysninger,
Primary Contact Details,Primær kontaktoplysninger,
-Principal Amount,hovedstol,
Print Format,Udskriftsformat,
Print IRS 1099 Forms,Udskriv IRS 1099-formularer,
Print Report Card,Udskriv rapportkort,
@@ -2550,7 +2538,6 @@
Sample Collection,Prøveopsamling,
Sample quantity {0} cannot be more than received quantity {1},Prøvekvantitet {0} kan ikke være mere end modtaget mængde {1},
Sanctioned,sanktioneret,
-Sanctioned Amount,Sanktioneret beløb,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bevilliget beløb kan ikke være større end udlægsbeløbet i række {0}.,
Sand,Sand,
Saturday,Lørdag,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} har allerede en overordnet procedure {1}.,
API,API,
Annual,Årligt,
-Approved,godkendt,
Change,Ændring,
Contact Email,Kontakt e-mail,
Export Type,Eksporttype,
@@ -3571,7 +3557,6 @@
Account Value,Kontoværdi,
Account is mandatory to get payment entries,Konto er obligatorisk for at få betalingsposter,
Account is not set for the dashboard chart {0},Konto er ikke indstillet til betjeningspanelet {0},
-Account {0} does not belong to company {1},Konto {0} tilhører ikke virksomheden {1},
Account {0} does not exists in the dashboard chart {1},Konto {0} findes ikke i kontrolpanelet {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> er kapital Arbejde pågår og kan ikke opdateres af journalindtastning,
Account: {0} is not permitted under Payment Entry,Konto: {0} er ikke tilladt under betalingsindtastning,
@@ -3582,7 +3567,6 @@
Activity,Aktivitet,
Add / Manage Email Accounts.,Tilføj / Håndter e-mail-konti.,
Add Child,Tilføj ny,
-Add Loan Security,Tilføj lånesikkerhed,
Add Multiple,Tilføj flere,
Add Participants,Tilføj deltagerne,
Add to Featured Item,Føj til den valgte vare,
@@ -3593,15 +3577,12 @@
Address Line 1,Adresse,
Addresses,Adresser,
Admission End Date should be greater than Admission Start Date.,Indgangssluttedato skal være større end startdato for optagelse.,
-Against Loan,Mod lån,
-Against Loan:,Mod lån:,
All,Alle,
All bank transactions have been created,Alle banktransaktioner er oprettet,
All the depreciations has been booked,Alle afskrivninger er booket,
Allocation Expired!,Tildeling udløbet!,
Allow Resetting Service Level Agreement from Support Settings.,Tillad nulstilling af serviceniveauaftale fra supportindstillinger.,
Amount of {0} is required for Loan closure,Der kræves et beløb på {0} til lukning af lånet,
-Amount paid cannot be zero,Det betalte beløb kan ikke være nul,
Applied Coupon Code,Anvendt kuponkode,
Apply Coupon Code,Anvend kuponkode,
Appointment Booking,Udnævnelsesreservation,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Kan ikke beregne ankomsttid, da driveradressen mangler.",
Cannot Optimize Route as Driver Address is Missing.,"Kan ikke optimere ruten, da driveradressen mangler.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Kan ikke udføre opgave {0}, da dens afhængige opgave {1} ikke er komplet / annulleret.",
-Cannot create loan until application is approved,"Kan ikke oprette lån, før ansøgningen er godkendt",
Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",Kan ikke overbillede for vare {0} i række {1} mere end {2}. For at tillade overfakturering skal du angive kvote i Kontoindstillinger,
"Capacity Planning Error, planned start time can not be same as end time","Kapacitetsplanlægningsfejl, planlagt starttid kan ikke være det samme som sluttid",
@@ -3812,20 +3792,9 @@
Less Than Amount,Mindre end beløb,
Liabilities,passiver,
Loading...,Indlæser ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Lånebeløb overstiger det maksimale lånebeløb på {0} pr. Foreslået værdipapirer,
Loan Applications from customers and employees.,Låneansøgninger fra kunder og ansatte.,
-Loan Disbursement,Udbetaling af lån,
Loan Processes,Låneprocesser,
-Loan Security,Lånesikkerhed,
-Loan Security Pledge,Lånesikkerheds pantsætning,
-Loan Security Pledge Created : {0},Lånesikkerhedslove oprettet: {0},
-Loan Security Price,Lånesikkerhedspris,
-Loan Security Price overlapping with {0},"Lånesikkerhedspris, der overlapper med {0}",
-Loan Security Unpledge,Unpedge-lånesikkerhed,
-Loan Security Value,Lånesikkerhedsværdi,
Loan Type for interest and penalty rates,Lånetype til renter og sanktioner,
-Loan amount cannot be greater than {0},Lånebeløbet kan ikke være større end {0},
-Loan is mandatory,Lån er obligatorisk,
Loans,lån,
Loans provided to customers and employees.,Lån ydet til kunder og ansatte.,
Location,Lokation,
@@ -3894,7 +3863,6 @@
Pay,Betale,
Payment Document Type,Betalingsdokumenttype,
Payment Name,Betalingsnavn,
-Penalty Amount,Straffebeløb,
Pending,Afventer,
Performance,Ydeevne,
Period based On,Periode baseret på,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Log ind som Marketplace-bruger for at redigere denne vare.,
Please login as a Marketplace User to report this item.,Log ind som Marketplace-bruger for at rapportere denne vare.,
Please select <b>Template Type</b> to download template,Vælg <b>skabelontype for</b> at downloade skabelon,
-Please select Applicant Type first,Vælg først ansøgertype,
Please select Customer first,Vælg først kunde,
Please select Item Code first,Vælg først varekode,
-Please select Loan Type for company {0},Vælg lånetype for firmaet {0},
Please select a Delivery Note,Vælg en leveringsnotat,
Please select a Sales Person for item: {0},Vælg en salgsperson for varen: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Vælg venligst en anden betalingsmetode. Stripe understøtter ikke transaktioner i valuta '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Opret en standard bankkonto for firmaet {0},
Please specify,Angiv venligst,
Please specify a {0},Angiv en {0},lead
-Pledge Status,Pantstatus,
-Pledge Time,Pantetid,
Printing,Udskrivning,
Priority,Prioritet,
Priority has been changed to {0}.,Prioritet er ændret til {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Behandler XML-filer,
Profitability,Rentabilitet,
Project,Sag,
-Proposed Pledges are mandatory for secured Loans,Foreslåede løfter er obligatoriske for sikrede lån,
Provide the academic year and set the starting and ending date.,"Angiv studieåret, og angiv start- og slutdato.",
Public token is missing for this bank,Der mangler en offentlig token til denne bank,
Publish,Offentliggøre,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Købskvittering har ingen varer, som Beholdningsprøve er aktiveret til.",
Purchase Return,Indkøb Return,
Qty of Finished Goods Item,Antal færdige varer,
-Qty or Amount is mandatroy for loan security,Antal eller beløb er mandatroy for lån sikkerhed,
Quality Inspection required for Item {0} to submit,Kvalitetskontrol kræves for at indsende vare {0},
Quantity to Manufacture,Mængde til fremstilling,
Quantity to Manufacture can not be zero for the operation {0},Mængde til fremstilling kan ikke være nul for handlingen {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Fritagelsesdato skal være større end eller lig med tiltrædelsesdato,
Rename,Omdøb,
Rename Not Allowed,Omdøb ikke tilladt,
-Repayment Method is mandatory for term loans,Tilbagebetalingsmetode er obligatorisk for kortfristede lån,
-Repayment Start Date is mandatory for term loans,Startdato for tilbagebetaling er obligatorisk for kortfristede lån,
Report Item,Rapporter element,
Report this Item,Rapporter denne vare,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Reserveret antal til underentreprise: Mængde af råvarer til fremstilling af underentrepriser.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Række ({0}): {1} er allerede nedsat i {2},
Rows Added in {0},Rækker tilføjet i {0},
Rows Removed in {0},Rækker blev fjernet i {0},
-Sanctioned Amount limit crossed for {0} {1},"Sanktioneret beløb, der er overskredet for {0} {1}",
-Sanctioned Loan Amount already exists for {0} against company {1},Sanktioneret lånebeløb findes allerede for {0} mod selskab {1},
Save,Gem,
Save Item,Gem vare,
Saved Items,Gemte varer,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Bruger {0} er deaktiveret,
Users and Permissions,Brugere og tilladelser,
Vacancies cannot be lower than the current openings,Ledige stillinger kan ikke være lavere end de nuværende åbninger,
-Valid From Time must be lesser than Valid Upto Time.,Gyldig fra tid skal være mindre end gyldig indtil tid.,
Valuation Rate required for Item {0} at row {1},Værdiansættelsesgrad krævet for vare {0} i række {1},
Values Out Of Sync,Værdier ude af synkronisering,
Vehicle Type is required if Mode of Transport is Road,"Køretøjstype er påkrævet, hvis transportform er vej",
@@ -4211,7 +4168,6 @@
Add to Cart,Føj til indkøbsvogn,
Days Since Last Order,Dage siden sidste ordre,
In Stock,På lager,
-Loan Amount is mandatory,Lånebeløb er obligatorisk,
Mode Of Payment,Betalingsmåde,
No students Found,Ingen studerende fundet,
Not in Stock,Ikke på lager,
@@ -4240,7 +4196,6 @@
Group by,Sortér efter,
In stock,På lager,
Item name,Varenavn,
-Loan amount is mandatory,Lånebeløb er obligatorisk,
Minimum Qty,Minimum antal,
More details,Flere detaljer,
Nature of Supplies,Forsyningens art,
@@ -4409,9 +4364,6 @@
Total Completed Qty,I alt afsluttet antal,
Qty to Manufacture,Antal at producere,
Repay From Salary can be selected only for term loans,Tilbagebetaling fra løn kan kun vælges til løbetidslån,
-No valid Loan Security Price found for {0},Der blev ikke fundet nogen gyldig lånesikkerhedspris for {0},
-Loan Account and Payment Account cannot be same,Lånekonto og betalingskonto kan ikke være den samme,
-Loan Security Pledge can only be created for secured loans,Lånsikkerhedspant kan kun oprettes for sikrede lån,
Social Media Campaigns,Sociale mediekampagner,
From Date can not be greater than To Date,Fra dato kan ikke være større end til dato,
Please set a Customer linked to the Patient,"Indstil en kunde, der er knyttet til patienten",
@@ -6437,7 +6389,6 @@
HR User,HR-bruger,
Appointment Letter,Aftalerbrev,
Job Applicant,Ansøger,
-Applicant Name,Ansøgernavn,
Appointment Date,Udnævnelsesdato,
Appointment Letter Template,Aftalebrevskabelon,
Body,Legeme,
@@ -7059,99 +7010,12 @@
Sync in Progress,Synkronisering i gang,
Hub Seller Name,Hub Sælger Navn,
Custom Data,Brugerdefinerede data,
-Member,Medlem,
-Partially Disbursed,Delvist udbetalt,
-Loan Closure Requested,Anmodet om lukning,
Repay From Salary,Tilbagebetale fra Løn,
-Loan Details,Lånedetaljer,
-Loan Type,Lånetype,
-Loan Amount,Lånebeløb,
-Is Secured Loan,Er sikret lån,
-Rate of Interest (%) / Year,Rente (%) / år,
-Disbursement Date,Udbetaling Dato,
-Disbursed Amount,Udbetalt beløb,
-Is Term Loan,Er terminlån,
-Repayment Method,tilbagebetaling Metode,
-Repay Fixed Amount per Period,Tilbagebetale fast beløb pr Periode,
-Repay Over Number of Periods,Tilbagebetale over antallet af perioder,
-Repayment Period in Months,Tilbagebetaling Periode i måneder,
-Monthly Repayment Amount,Månedlige ydelse Beløb,
-Repayment Start Date,Tilbagebetaling Startdato,
-Loan Security Details,Detaljer om lånesikkerhed,
-Maximum Loan Value,Maksimal låneværdi,
-Account Info,Kontooplysninger,
-Loan Account,Lånekonto,
-Interest Income Account,Renter Indkomst konto,
-Penalty Income Account,Penalty Income Account,
-Repayment Schedule,tilbagebetaling Schedule,
-Total Payable Amount,Samlet Betales Beløb,
-Total Principal Paid,Total betalt hovedstol,
-Total Interest Payable,Samlet Renteudgifter,
-Total Amount Paid,Samlede beløb betalt,
-Loan Manager,Låneadministrator,
-Loan Info,Låneinformation,
-Rate of Interest,Rentesats,
-Proposed Pledges,Foreslåede løfter,
-Maximum Loan Amount,Maksimalt lånebeløb,
-Repayment Info,tilbagebetaling Info,
-Total Payable Interest,Samlet Betales Renter,
-Against Loan ,Mod lån,
-Loan Interest Accrual,Periodisering af lånerenter,
-Amounts,Beløb,
-Pending Principal Amount,Afventende hovedbeløb,
-Payable Principal Amount,Betalbart hovedbeløb,
-Paid Principal Amount,Betalt hovedbeløb,
-Paid Interest Amount,Betalt rentebeløb,
-Process Loan Interest Accrual,Proceslån Renter Periodisering,
-Repayment Schedule Name,Navn på tilbagebetalingsplan,
Regular Payment,Regelmæssig betaling,
Loan Closure,Lånelukning,
-Payment Details,Betalingsoplysninger,
-Interest Payable,Rentebetaling,
-Amount Paid,Beløb betalt,
-Principal Amount Paid,Hovedbeløb betalt,
-Repayment Details,Detaljer om tilbagebetaling,
-Loan Repayment Detail,Detaljer om tilbagebetaling af lån,
-Loan Security Name,Lånesikkerhedsnavn,
-Unit Of Measure,Måleenhed,
-Loan Security Code,Lånesikkerhedskode,
-Loan Security Type,Lånesikkerhedstype,
-Haircut %,Hårklip%,
-Loan Details,Lånedetaljer,
-Unpledged,ubelånte,
-Pledged,pantsat,
-Partially Pledged,Delvist pantsat,
-Securities,Værdipapirer,
-Total Security Value,Samlet sikkerhedsværdi,
-Loan Security Shortfall,Lånesikkerhedsunderskud,
-Loan ,Lån,
-Shortfall Time,Mangel på tid,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Mangel på beløb,
-Security Value ,Sikkerhedsværdi,
-Process Loan Security Shortfall,Proceslånsikkerhedsunderskud,
-Loan To Value Ratio,Udlån til værdiforhold,
-Unpledge Time,Unpedge-tid,
-Loan Name,Lånenavn,
Rate of Interest (%) Yearly,Rente (%) Årlig,
-Penalty Interest Rate (%) Per Day,Straffesats (%) pr. Dag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Straffesats opkræves dagligt for det verserende rentebeløb i tilfælde af forsinket tilbagebetaling,
-Grace Period in Days,Nådeperiode i dage,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Antal dage fra forfaldsdato, indtil bøden ikke opkræves i tilfælde af forsinkelse i tilbagebetaling af lån",
-Pledge,Løfte,
-Post Haircut Amount,Efter hårklipmængde,
-Process Type,Process Type,
-Update Time,Opdateringstid,
-Proposed Pledge,Foreslået løfte,
-Total Payment,Samlet betaling,
-Balance Loan Amount,Balance Lånebeløb,
-Is Accrued,Er periodiseret,
Salary Slip Loan,Salary Slip Lån,
Loan Repayment Entry,Indlån til tilbagebetaling af lån,
-Sanctioned Loan Amount,Sanktioneret lånebeløb,
-Sanctioned Amount Limit,Sanktioneret beløbsgrænse,
-Unpledge,Unpledge,
-Haircut,Klipning,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generer Schedule,
Schedules,Tidsplaner,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Sagen vil være tilgængelig på hjemmesiden for disse brugere,
Copied From,Kopieret fra,
Start and End Dates,Start- og slutdato,
-Actual Time (in Hours),Faktisk tid (i timer),
+Actual Time in Hours (via Timesheet),Faktisk tid (i timer),
Costing and Billing,Omkostningsberegning og fakturering,
-Total Costing Amount (via Timesheets),Samlet Omkostningsbeløb (via tidsskemaer),
-Total Expense Claim (via Expense Claims),Udlæg ialt (via Udlæg),
+Total Costing Amount (via Timesheet),Samlet Omkostningsbeløb (via tidsskemaer),
+Total Expense Claim (via Expense Claim),Udlæg ialt (via Udlæg),
Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura),
Total Sales Amount (via Sales Order),Samlet Salgsbeløb (via salgsordre),
-Total Billable Amount (via Timesheets),Samlet fakturerbart beløb (via timesheets),
-Total Billed Amount (via Sales Invoices),Samlet faktureret beløb (via salgsfakturaer),
-Total Consumed Material Cost (via Stock Entry),Samlet forbrugt materialeomkostning (via lagerindtastning),
+Total Billable Amount (via Timesheet),Samlet fakturerbart beløb (via timesheets),
+Total Billed Amount (via Sales Invoice),Samlet faktureret beløb (via salgsfakturaer),
+Total Consumed Material Cost (via Stock Entry),Samlet forbrugt materialeomkostning (via lagerindtastning),
Gross Margin,Gross Margin,
Gross Margin %,Gross Margin%,
Monitor Progress,Monitor Progress,
@@ -7521,12 +7385,10 @@
Dependencies,Afhængigheder,
Dependent Tasks,Afhængige opgaver,
Depends on Tasks,Afhænger af opgaver,
-Actual Start Date (via Time Sheet),Faktisk startdato (via Tidsregistreringen),
-Actual Time (in hours),Faktisk tid (i timer),
-Actual End Date (via Time Sheet),Faktisk Slutdato (via Tidsregistreringen),
-Total Costing Amount (via Time Sheet),Totale omkostninger (via tidsregistrering),
+Actual Start Date (via Timesheet),Faktisk startdato (via Tidsregistreringen),
+Actual Time in Hours (via Timesheet),Faktisk tid (i timer),
+Actual End Date (via Timesheet),Faktisk Slutdato (via Tidsregistreringen),
Total Expense Claim (via Expense Claim),Udlæg ialt (via Udlæg),
-Total Billing Amount (via Time Sheet),Faktureret beløb i alt (via Tidsregistrering),
Review Date,Anmeldelse Dato,
Closing Date,Closing Dato,
Task Depends On,Opgave afhænger af,
@@ -7887,7 +7749,6 @@
Update Series,Opdatering Series,
Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.,
Prefix,Præfiks,
-Current Value,Aktuel værdi,
This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks,
Update Series Number,Opdatering Series Number,
Quotation Lost Reason,Tilbud afvist - årsag,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level,
Lead Details,Emnedetaljer,
Lead Owner Efficiency,Lederegenskaber Effektivitet,
-Loan Repayment and Closure,Tilbagebetaling og lukning af lån,
-Loan Security Status,Lånesikkerhedsstatus,
Lost Opportunity,Mistet mulighed,
Maintenance Schedules,Vedligeholdelsesplaner,
Material Requests for which Supplier Quotations are not created,Materialeanmodninger under hvilke leverandørtilbud ikke er oprettet,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Måltællinger: {0},
Payment Account is mandatory,Betalingskonto er obligatorisk,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Hvis dette er markeret, trækkes hele beløbet fra skattepligtig indkomst inden beregning af indkomstskat uden nogen erklæring eller bevisafgivelse.",
-Disbursement Details,Udbetalingsoplysninger,
Material Request Warehouse,Materialeanmodningslager,
Select warehouse for material requests,Vælg lager til materialeanmodninger,
Transfer Materials For Warehouse {0},Overfør materiale til lager {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Tilbagebetal ikke-krævet beløb fra løn,
Deduction from salary,Fradrag fra løn,
Expired Leaves,Udløbne blade,
-Reference No,referencenummer,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Hårklippeprocent er den procentvise forskel mellem markedsværdien af lånesikkerheden og den værdi, der tilskrives lånets sikkerhed, når den anvendes som sikkerhed for dette lån.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Loan To Value Ratio udtrykker forholdet mellem lånebeløbet og værdien af den pantsatte sikkerhed. Et lånesikkerhedsmangel udløses, hvis dette falder under den specificerede værdi for et lån",
If this is not checked the loan by default will be considered as a Demand Loan,"Hvis dette ikke er markeret, vil lånet som standard blive betragtet som et behovslån",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Denne konto bruges til at booke tilbagebetaling af lån fra låntager og også udbetale lån til låntager,
This account is capital account which is used to allocate capital for loan disbursal account ,"Denne konto er en kapitalkonto, der bruges til at allokere kapital til udbetaling af lånekonto",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Handling {0} tilhører ikke arbejdsordren {1},
Print UOM after Quantity,Udskriv UOM efter antal,
Set default {0} account for perpetual inventory for non stock items,"Indstil standard {0} -konto for evigvarende beholdning for varer, der ikke er på lager",
-Loan Security {0} added multiple times,Lånesikkerhed {0} tilføjet flere gange,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Lånepapirer med forskellige LTV-forhold kan ikke pantsættes mod et lån,
-Qty or Amount is mandatory for loan security!,Antal eller beløb er obligatorisk for lånesikkerhed!,
-Only submittted unpledge requests can be approved,Kun indsendte anmodninger om ikke-pant kan godkendes,
-Interest Amount or Principal Amount is mandatory,Rentebeløb eller hovedbeløb er obligatorisk,
-Disbursed Amount cannot be greater than {0},Udbetalt beløb kan ikke være større end {0},
-Row {0}: Loan Security {1} added multiple times,Række {0}: Lånesikkerhed {1} tilføjet flere gange,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,"Række nr. {0}: Underordnet vare bør ikke være en produktpakke. Fjern element {1}, og gem",
Credit limit reached for customer {0},Kreditgrænse nået for kunde {0},
Could not auto create Customer due to the following missing mandatory field(s):,Kunne ikke automatisk oprette kunde på grund af følgende manglende obligatoriske felter:,
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 57556f3..5f0a8dc 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -158,7 +158,7 @@
Aerospace,Luft- und Raumfahrt,
Against,Zu,
Against Account,Gegenkonto,
-Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen",
+Against Journal Entry {0} does not have any unmatched {1} entry,Buchungssatz {0} hat keinen offenen Eintrag auf der {1}-Seite,
Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Buchungssatz"" {0} ist bereits mit einem anderen Beleg abgeglichen",
Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1},
Against Voucher,Gegenbeleg,
@@ -209,10 +209,10 @@
Amount of TDS Deducted,Betrag der abgezogenen TDS,
Amount should not be less than zero.,Betrag sollte nicht kleiner als Null sein.,
Amount to Bill,Rechnungsbetrag,
-Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3},
-Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2},
-Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3},
-Amount {0} {1} {2} {3},Menge {0} {1} {2} {3},
+Amount {0} {1} against {2} {3},Betrag {0} {1} gegen {2} {3},
+Amount {0} {1} deducted against {2},Betrag {0} {1} abgezogen gegen {2},
+Amount {0} {1} transferred from {2} to {3},Betrag {0} {1} wurde von {2} zu {3} transferiert,
+Amount {0} {1} {2} {3},Betrag {0} {1} {2} {3},
Amt,Menge,
"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen,
An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Ein Semester mit ""Semesterjahr""'{0} und ""Semesternamen"" {1} ist bereits vorhanden. Bitte ändern Sie diese entsprechend und versuchen Sie es erneut.",
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Anwendbar, wenn das Unternehmen SpA, SApA oder SRL ist",
Applicable if the company is a limited liability company,"Anwendbar, wenn die Gesellschaft eine Gesellschaft mit beschränkter Haftung ist",
Applicable if the company is an Individual or a Proprietorship,"Anwendbar, wenn das Unternehmen eine Einzelperson oder ein Eigentum ist",
-Applicant,Antragsteller,
-Applicant Type,Bewerbertyp,
Application of Funds (Assets),Mittelverwendung (Aktiva),
Application period cannot be across two allocation records,Der Bewerbungszeitraum kann nicht über zwei Zuordnungssätze liegen,
Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen,
@@ -281,7 +279,7 @@
Asset Received But Not Billed,"Vermögenswert erhalten, aber nicht in Rechnung gestellt",
Asset Value Adjustment,Anpassung Vermögenswert,
"Asset cannot be cancelled, as it is already {0}","Vermögenswert kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist",
-Asset scrapped via Journal Entry {0},Vermögenswert über Journaleintrag {0} entsorgt,
+Asset scrapped via Journal Entry {0},Vermögenswert über Buchungssatz {0} entsorgt,
"Asset {0} cannot be scrapped, as it is already {1}",Anlagewert-{0} ist bereits entsorgt {1},
Asset {0} does not belong to company {1},Vermögenswert {0} gehört nicht zu Unternehmen {1}.,
Asset {0} must be submitted,Vermögenswert {0} muss eingereicht werden.,
@@ -442,7 +440,7 @@
"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden.",
"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden.",
"Can not mark Inpatient Record Discharged, there are Unbilled Invoices {0}","Kann den entlassenen Krankenhauskatheter nicht markieren, es gibt keine fakturierten Rechnungen {0}",
-Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden,
+Can only make payment against unbilled {0},Zahlung kann nur zu einem noch nicht abgerechneten Beleg vom Typ {0} erstellt werden,
Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf vorherige Zeilensumme"" oder ""auf vorherigen Zeilenbetrag"" ist",
"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kann die Bewertungsmethode nicht ändern, da es Transaktionen gegen einige Posten gibt, für die es keine eigene Bewertungsmethode gibt",
Can't create standard criteria. Please rename the criteria,Kann keine Standardkriterien erstellen. Bitte benennen Sie die Kriterien um,
@@ -450,7 +448,7 @@
Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags,
Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs,
Cancel Subscription,Abonnement beenden,
-Cancel the journal entry {0} first,Brechen Sie zuerst den Journaleintrag {0} ab,
+Cancel the journal entry {0} first,Brechen Sie zuerst den Buchungssatz {0} ab,
Canceled,Abgebrochen,
"Cannot Submit, Employees left to mark attendance","Kann nicht übergeben werden, Mitarbeiter sind zur Teilnahme zugelassen",
Cannot be a fixed asset item as Stock Ledger is created.,"Kann keine Anlageposition sein, wenn das Stock Ledger erstellt wird.",
@@ -475,9 +473,11 @@
Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.,
Cannot find active Leave Period,Aktive Abwesenheitszeit kann nicht gefunden werden,
Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über den Auftrag bestellte Stückzahl {1}",
+Cannot pay to Customer without any negative outstanding invoice,"Es kann nicht an den Kunden gezahlt werden, ohne dass eine Gutschrift vorhanden ist",
Cannot promote Employee with status Left,Mitarbeiter mit Status "Links" kann nicht gefördert werden,
+Cannot receive from Supplier without any negative outstanding invoice,"Es kann nicht vom Lieferanten empfangen werden, ohne dass eine Gutschrift vorhanden ist",
Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist",
-Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden",
+Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf „Bezogen auf Betrag der vorhergenden Zeile“ oder auf „Bezogen auf Gesamtbetrag der vorhergenden Zeilen“ gesetzt werden",
Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Auftrag dazu existiert.",
Cannot set authorization on basis of Discount for {0},Genehmigung kann nicht auf der Basis des Rabattes für {0} festgelegt werden,
Cannot set multiple Item Defaults for a company.,Es können nicht mehrere Artikelstandards für ein Unternehmen festgelegt werden.,
@@ -514,7 +514,7 @@
Changing Customer Group for the selected Customer is not allowed.,Die Änderung der Kundengruppe für den ausgewählten Kunden ist nicht zulässig.,
Chapter,Gruppe,
Chapter information.,Gruppeninformation,
-Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden",
+Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount,"Kosten für den Typ „Tatsächlich“ in Zeile {0} können nicht in den Artikelpreis oder den bezahlen Betrag einfließen",
Chargeble,Belastung,
Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert,
"Charges will be distributed proportionately based on item qty or amount, as per your selection",Die Kosten werden gemäß Ihrer Wahl anteilig verteilt basierend auf Artikelmenge oder -preis,
@@ -650,14 +650,14 @@
Create Disbursement Entry,Auszahlungsbeleg erstellen,
Create Employee,Mitarbeiter anlegen,
Create Employee Records,Erstellen Sie Mitarbeiterdaten,
-"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten",
+"Create Employee records to manage leaves, expense claims and payroll","Legen Sie Mitarbeiterstammdaten an, um Urlaub, Auslagen und Gehälter zu verwalten",
Create Fee Schedule,Gebührenverzeichnis erstellen,
Create Fees,Gebühren anlegen,
Create Inter Company Journal Entry,Erstellen Sie einen Inter Company Journal Eintrag,
Create Invoice,Rechnung erstellen,
Create Invoices,Rechnungen erstellen,
Create Job Card,Jobkarte erstellen,
-Create Journal Entry,Journaleintrag erstellen,
+Create Journal Entry,Buchungssatz erstellen,
Create Lead,Lead erstellen,
Create Leads,Leads erstellen,
Create Maintenance Visit,Wartungsbesuch anlegen,
@@ -837,7 +837,7 @@
Diff Qty,Diff Menge,
Difference Account,Differenzkonto,
"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist",
-Difference Amount,Differenzmenge,
+Difference Amount,Differenzbetrag,
Difference Amount must be zero,Differenzbetrag muss Null sein,
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.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist.",
Direct Expenses,Direkte Aufwendungen,
@@ -993,8 +993,8 @@
Expense Account,Aufwandskonto,
Expense Claim,Auslagenabrechnung,
Expense Claim for Vehicle Log {0},Auslagenabrechnung für Fahrtenbuch {0},
-Expense Claim {0} already exists for the Vehicle Log,Auslagenabrechnung {0} existiert bereits für das Fahrzeug Log,
-Expense Claims,Aufwandsabrechnungen,
+Expense Claim {0} already exists for the Vehicle Log,Auslagenabrechnung {0} existiert bereits für das Fahrtenbuch,
+Expense Claims,Auslagenabrechnungen,
Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0},
Expenses,Aufwendungen,
Expenses Included In Asset Valuation,"Aufwendungen, die in der Vermögensbewertung enthalten sind",
@@ -1033,7 +1033,7 @@
Fields,Felder,
Fill the form and save it,Formular ausfüllen und speichern,
Filter Employees By (Optional),Mitarbeiter filtern nach (optional),
-"Filter Fields Row #{0}: Fieldname <b>{1}</b> must be of type ""Link"" or ""Table MultiSelect""",Filterfelder Zeile # {0}: Feldname <b>{1}</b> muss vom Typ "Link" oder "Tabelle MultiSelect" sein,
+"Filter Fields Row #{0}: Fieldname <b>{1}</b> must be of type ""Link"" or ""Table MultiSelect""",Filterfelder Zeile {0}: Feldname <b>{1}</b> muss vom Typ "Link" oder "Tabelle MultiSelect" sein,
Filter Total Zero Qty,Gesamtmenge filtern,
Finance Book,Finanzbuch,
Financial / accounting year.,Finanz-/Rechnungsjahr,
@@ -1309,6 +1309,7 @@
Invalid GSTIN! First 2 digits of GSTIN should match with State number {0}.,Ungültige GSTIN! Die ersten beiden Ziffern von GSTIN sollten mit der Statusnummer {0} übereinstimmen.,
Invalid GSTIN! The input you've entered doesn't match the format of GSTIN.,Ungültige GSTIN! Die von Ihnen eingegebene Eingabe stimmt nicht mit dem Format von GSTIN überein.,
Invalid Posting Time,Ungültige Buchungszeit,
+Invalid Purchase Invoice,Ungültige Einkaufsrechnung,
Invalid attribute {0} {1},Ungültiges Attribut {0} {1},
Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein.,
Invalid reference {0} {1},Ungültige Referenz {0} {1},
@@ -1477,10 +1478,6 @@
List of available Shareholders with folio numbers,Liste der verfügbaren Aktionäre mit Folio-Nummern,
Loading Payment System,Zahlungssystem wird geladen,
Loan,Darlehen,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht höher als der Maximalbetrag {0} sein,
-Loan Application,Kreditantrag,
-Loan Management,Darlehensverwaltung,
-Loan Repayment,Darlehensrückzahlung,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,"Das Ausleihbeginndatum und die Ausleihdauer sind obligatorisch, um die Rechnungsdiskontierung zu speichern",
Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten),
Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva),
@@ -1618,7 +1615,6 @@
Monday,Montag,
Monthly,Monatlich,
Monthly Distribution,Monatsbezogene Verteilung,
-Monthly Repayment Amount cannot be greater than Loan Amount,Monatlicher Rückzahlungsbetrag kann nicht größer sein als Darlehensbetrag,
More,Weiter,
More Information,Mehr Informationen,
More than one selection for {0} not allowed,Mehr als eine Auswahl für {0} ist nicht zulässig,
@@ -1776,7 +1772,7 @@
Office Equipments,Büroausstattung,
Office Maintenance Expenses,Büro-Wartungskosten,
Office Rent,Büromiete,
-On Hold,In Wartestellung,
+On Hold,Auf Eis gelegt,
On Net Total,Auf Nettosumme,
One customer can be part of only single Loyalty Program.,Ein Kunde kann Teil eines einzigen Treueprogramms sein.,
Online Auctions,Online-Auktionen,
@@ -1866,7 +1862,7 @@
Packing Slip(s) cancelled,Packzettel storniert,
Paid,Bezahlt,
Paid Amount,Gezahlter Betrag,
-Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0},
+Paid Amount cannot be greater than total negative outstanding amount {0},"Der gezahlte Betrag darf nicht größer sein als der gesamte, negative, ausstehende Betrag {0}",
Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + ausgebuchter Betrag darf nicht größer der Gesamtsumme sein,
Paid and Not Delivered,Bezahlt und nicht ausgeliefert,
Parameter,Parameter,
@@ -1893,11 +1889,9 @@
Pay {0} {1},Bezahle {0} {1},
Payable,Zahlbar,
Payable Account,Verbindlichkeiten-Konto,
-Payable Amount,Bezahlbarer Betrag,
Payment,Bezahlung,
Payment Cancelled. Please check your GoCardless Account for more details,Zahlung abgebrochen. Bitte überprüfen Sie Ihr GoCardless Konto für weitere Details,
Payment Confirmation,Zahlungsbestätigung,
-Payment Date,Zahlungsdatum,
Payment Days,Zahlungsziel,
Payment Document,Zahlungsbeleg,
Payment Due Date,Zahlungsstichtag,
@@ -1920,7 +1914,7 @@
Payment Terms Template,Vorlage Zahlungsbedingungen,
Payment Terms based on conditions,Zahlungsbedingungen basieren auf Bedingungen,
Payment Type,Zahlungsart,
-"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss eine der Receive sein, Pay und interne Übertragung",
+"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss entweder 'Empfangen', 'Zahlen' oder 'Interner Transfer' sein",
Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein,
Payment of {0} from {1} to {2},Zahlung von {0} von {1} an {2},
Payment request {0} created,Zahlungsaufforderung {0} erstellt,
@@ -1991,7 +1985,6 @@
Please enter Purchase Receipt first,Bitte zuerst Kaufbeleg eingeben,
Please enter Receipt Document,Bitte geben Sie Eingangsbeleg,
Please enter Reference date,Bitte den Stichtag eingeben,
-Please enter Repayment Periods,Bitte geben Sie Laufzeiten,
Please enter Reqd by Date,Bitte geben Sie Requd by Date ein,
Please enter Woocommerce Server URL,Bitte geben Sie die Woocommerce Server URL ein,
Please enter Write Off Account,Bitte Abschreibungskonto eingeben,
@@ -2003,7 +1996,6 @@
Please enter parent cost center,Bitte übergeordnete Kostenstelle eingeben,
Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben,
Please enter relieving date.,Bitte Freistellungsdatum eingeben.,
-Please enter repayment Amount,Bitte geben Sie Rückzahlungsbetrag,
Please enter valid Financial Year Start and End Dates,Bitte geben Sie für das Geschäftsjahr einen gültigen Start- und Endtermin an.,
Please enter valid email address,Bitte geben Sie eine gültige Email Adresse an,
Please enter {0} first,Bitte geben Sie zuerst {0} ein,
@@ -2166,7 +2158,6 @@
Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.,
Primary Address Details,Primäre Adressendetails,
Primary Contact Details,Primäre Kontaktdaten,
-Principal Amount,Nennbetrag,
Print Format,Druckformat,
Print IRS 1099 Forms,Drucken Sie IRS 1099-Formulare,
Print Report Card,Berichtskarte drucken,
@@ -2305,9 +2296,9 @@
Read the ERPNext Manual,Lesen Sie das ERPNext-Handbuch,
Reading Uploaded File,Hochgeladene Datei lesen,
Real Estate,Immobilien,
-Reason For Putting On Hold,Grund für das Halten,
-Reason for Hold,Grund für das Halten,
-Reason for hold: ,Grund für das Halten:,
+Reason For Putting On Hold,Grund für das auf Eis legen,
+Reason for Hold,Grund für das auf Eis legen,
+Reason for hold: ,Grund für das auf Eis legen:,
Receipt,Kaufbeleg,
Receipt document must be submitted,Eingangsbeleg muss vorgelegt werden,
Receivable,Forderung,
@@ -2327,18 +2318,20 @@
Reference,Referenz,
Reference #{0} dated {1},Referenz #{0} vom {1},
Reference Date,Referenzdatum,
-Reference Doctype must be one of {0},Referenz Doctype muss man von {0},
+Reference Doctype must be one of {0},Referenz-Typ muss eine von {0} sein,
Reference Document,Referenzdokument,
Reference Document Type,Referenz-Dokumententyp,
Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0},
-Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft,
-Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde",
+Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum sind Pflichtfelder,
+Reference No is mandatory if you entered Reference Date,"Referenznummer ist ein Pflichtfeld, wenn ein Referenzdatum eingegeben wurde",
Reference No.,Referenznummer.,
Reference Number,Referenznummer,
Reference Owner,Referenz Besitzer,
Reference Type,Referenz-Typ,
"Reference: {0}, Item Code: {1} and Customer: {2}","Referenz: {0}, Item Code: {1} und Kunde: {2}",
References,Referenzen,
+References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount.,"Die Referenzen {0} vom Typ {1} hatten keinen ausstehenden Betrag mehr, bevor die Zahlung gebucht wurde. Jetzt haben sie einen negativen ausstehenden Betrag.",
+If this is undesirable please cancel the corresponding Payment Entry.,"Falls dies nicht erwünscht ist, stornieren Sie bitte die entsprechende Zahlung.",
Refresh Token,Aktualisieren Token,
Region,Region,
Register,Neu registrieren,
@@ -2417,7 +2410,7 @@
Return / Credit Note,Return / Gutschrift,
Return / Debit Note,Return / Lastschrift,
Returns,Retouren,
-Reverse Journal Entry,Journaleintrag umkehren,
+Reverse Journal Entry,Buchungssatz umkehren,
Review Invitation Sent,Einladung überprüfen gesendet,
Review and Action,Überprüfung und Aktion,
Role,Rolle,
@@ -2430,63 +2423,64 @@
Round Off,Abschliessen,
Rounded Total,Gerundete Gesamtsumme,
Route,Route,
-Row # {0}: ,Zeile # {0}:,
-Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2},
-Row # {0}: Cannot return more than {1} for Item {2},Zeile # {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden,
-Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Die Rate kann nicht größer sein als die Rate, die in {1} {2}",
-Row # {0}: Serial No is mandatory,Zeile # {0}: Seriennummer ist zwingend erforderlich,
-Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein,
-Row #{0} (Payment Table): Amount must be negative,Zeilennr. {0} (Zahlungstabelle): Betrag muss negativ sein,
-Row #{0} (Payment Table): Amount must be positive,Zeile # {0} (Zahlungstabelle): Betrag muss positiv sein,
-Row #{0}: Account {1} does not belong to company {2},Zeile # {0}: Konto {1} gehört nicht zur Unternehmen {2},
-Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Zeile # {0}: Zugeordneter Betrag darf nicht größer als ausstehender Betrag sein.,
-"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Zeile Nr. {0}: Vermögenswert {1} kann nicht vorgelegt werden, es ist bereits {2}",
-Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Zeilennr. {0}: Die Rate kann nicht festgelegt werden, wenn der Betrag für Artikel {1} höher als der Rechnungsbetrag ist.",
-Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Räumungsdatum {1} kann nicht vor dem Scheck Datum sein {2},
-Row #{0}: Duplicate entry in References {1} {2},Zeile # {0}: Eintrag in Referenzen {1} {2} duplizieren,
-Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein,
-Row #{0}: Item added,Zeile # {0}: Element hinzugefügt,
-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,
-Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist",
-Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben,
-Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben,
-Row #{0}: Qty increased by 1,Zeile # {0}: Menge um 1 erhöht,
-Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein,
-Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: Referenzdokumenttyp muss einer der Kostenansprüche oder des Journaleintrags sein,
-"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein",
-Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden,
-Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1},
-Row #{0}: Reqd by Date cannot be before Transaction Date,Zeilennr. {0}: Erforderlich nach Datum darf nicht vor dem Transaktionsdatum liegen,
-Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen,
-Row #{0}: Status must be {1} for Invoice Discounting {2},Zeile # {0}: Status muss {1} für Rechnungsrabatt {2} sein,
-"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","Zeile # {0}: Der Batch {1} hat nur {2} Menge. Bitte wähle eine andere Charge aus, die {3} Menge zur Verfügung hat oder die Zeile in mehrere Zeilen aufteilt, um aus mehreren Chargen zu liefern / auszutauschen",
-Row #{0}: Timings conflicts with row {1},Zeile #{0}: Timing-Konflikte mit Zeile {1},
-Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kann für Artikel nicht negativ sein {2},
-Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2},
+Row # {0}: ,Zeile {0}:,
+Row # {0}: Batch No must be same as {1} {2},Zeile {0}: Chargennummer muss dieselbe sein wie {1} {2},
+Row # {0}: Cannot return more than {1} for Item {2},Zeile {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden,
+Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Zeile {0}: Die Rate kann nicht größer sein als die Rate, die in {1} {2}",
+Row # {0}: Serial No is mandatory,Zeile {0}: Seriennummer ist zwingend erforderlich,
+Row # {0}: Serial No {1} does not match with {2} {3},Zeile {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein,
+Row #{0} (Payment Table): Amount must be negative,Zeile {0} (Zahlungstabelle): Betrag muss negativ sein,
+Row #{0} (Payment Table): Amount must be positive,Zeile {0} (Zahlungstabelle): Betrag muss positiv sein,
+Row #{0}: Account {1} does not belong to company {2},Zeile {0}: Konto {1} gehört nicht zur Unternehmen {2},
+Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Zeile {0}: Zugeordneter Betrag darf nicht größer als ausstehender Betrag sein.,
+"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Zeile {0}: Vermögenswert {1} kann nicht vorgelegt werden, es ist bereits {2}",
+Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Zeile {0}: Die Rate kann nicht festgelegt werden, wenn der Betrag für Artikel {1} höher als der Rechnungsbetrag ist.",
+Row #{0}: Cannot allocate more than {1} against payment term {2},Zeile {0}: Es kann nicht mehr als {1} zu Zahlungsbedingung {2} zugeordnet werden,
+Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Zeile {0}: Räumungsdatum {1} kann nicht vor dem Scheck Datum sein {2},
+Row #{0}: Duplicate entry in References {1} {2},Referenz {1} {2} in Zeile {0} kommt doppelt vor,
+Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Zeile {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein,
+Row #{0}: Item added,Zeile {0}: Element hinzugefügt,
+Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Zeile {0}: Buchungssatz {1} betrifft nicht Konto {2} oder bereits mit einem anderen Beleg verrechnet,
+Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile {0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist",
+Row #{0}: Please set reorder quantity,Zeile {0}: Bitte Nachbestellmenge angeben,
+Row #{0}: Please specify Serial No for Item {1},Zeile {0}: Bitte Seriennummer für Artikel {1} angeben,
+Row #{0}: Qty increased by 1,Zeile {0}: Menge um 1 erhöht,
+Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile {0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein,
+Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Zeile {0}: Referenzdokumenttyp muss entweder 'Auslagenabrechnung' oder 'Buchungssatz' sein,
+"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Zeile {0}: Referenzdokumenttyp muss eine der Bestellung, Eingangsrechnung oder Buchungssatz sein",
+Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile {0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden,
+Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Zeile {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1},
+Row #{0}: Reqd by Date cannot be before Transaction Date,Zeile {0}: Erforderlich nach Datum darf nicht vor dem Transaktionsdatum liegen,
+Row #{0}: Set Supplier for item {1},Zeile {0}: Lieferanten für Artikel {1} einstellen,
+Row #{0}: Status must be {1} for Invoice Discounting {2},Zeile {0}: Status muss {1} für Rechnungsrabatt {2} sein,
+"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","Zeile {0}: Der Batch {1} hat nur {2} Menge. Bitte wähle eine andere Charge aus, die {3} Menge zur Verfügung hat oder die Zeile in mehrere Zeilen aufteilt, um aus mehreren Chargen zu liefern / auszutauschen",
+Row #{0}: Timings conflicts with row {1},Zeile {0}: Timing-Konflikte mit Zeile {1},
+Row #{0}: {1} can not be negative for item {2},Zeile {0}: {1} kann für Artikel nicht negativ sein {2},
+Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile {0}: Der Betrag kann nicht größer als der ausstehende Betrag der Auslagenabrechnung {1} sein. Der ausstehende Betrag ist {2},
Row {0} : Operation is required against the raw material item {1},Zeile {0}: Vorgang ist für die Rohmaterialposition {1} erforderlich,
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},
Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Zeile {0} # Artikel {1} kann nicht mehr als {2} gegen Bestellung {3} übertragen werden.,
-Row {0}# Paid Amount cannot be greater than requested advance amount,Zeile Nr. {0}: Bezahlter Betrag darf nicht größer sein als der geforderte Anzahlungsbetrag,
-Row {0}: Activity Type is mandatory.,Row {0}: Leistungsart ist obligatorisch.,
-Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit,
-Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden,
+Row {0}# Paid Amount cannot be greater than requested advance amount,Zeile {0}: Bezahlter Betrag darf nicht größer sein als der geforderte Anzahlungsbetrag,
+Row {0}: Activity Type is mandatory.,Zeile {0}: Leistungsart ist obligatorisch.,
+Row {0}: Advance against Customer must be credit,Zeile {0}: Voraus gegen Kunde muss Kredit,
+Row {0}: Advance against Supplier must be debit,Zeile {0}: Voraus gegen Lieferant muss belasten werden,
Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Zeile {0}: Zugewiesener Betrag {1} muss kleiner oder gleich der Zahlungsmenge {2} sein,
Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein,
Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1},
Row {0}: Bill of Materials not found for the Item {1},Zeile {0}: Bill of Materials nicht für den Artikel gefunden {1},
-Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich,
+Row {0}: Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor ist zwingend erfoderlich,
Row {0}: Cost center is required for an item {1},Zeile {0}: Kostenstelle ist für einen Eintrag {1} erforderlich,
Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden,
Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Zeile {0}: Währung der Stückliste # {1} sollte der gewählten Währung entsprechen {2},
Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden,
Row {0}: Depreciation Start Date is required,Zeile {0}: Das Abschreibungsstartdatum ist erforderlich,
-Row {0}: Enter location for the asset item {1},Zeile Nr. {0}: Geben Sie den Speicherort für das Vermögenswert {1} ein.,
+Row {0}: Enter location for the asset item {1},Zeile {0}: Geben Sie einen Ort für den Vermögenswert {1} ein.,
Row {0}: Exchange Rate is mandatory,Zeile {0}: Wechselkurs ist erforderlich,
Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Zeile {0}: Erwarteter Wert nach Nutzungsdauer muss kleiner als Brutto Kaufbetrag sein,
-Row {0}: From Time and To Time is mandatory.,Row {0}: Von Zeit und zu Zeit ist obligatorisch.,
+Row {0}: From Time and To Time is mandatory.,Zeile {0}: Von Zeit und zu Zeit ist obligatorisch.,
Row {0}: From Time and To Time of {1} is overlapping with {2},Zeile {0}: Zeitüberlappung in {1} mit {2},
Row {0}: From time must be less than to time,Zeile {0}: Von Zeit zu Zeit muss kleiner sein,
-Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss größer als Null sein.,
+Row {0}: Hours value must be greater than zero.,Zeile {0}: Stunden-Wert muss größer als Null sein.,
Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1},
Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Partei / Konto stimmt nicht mit {1} / {2} in {3} {4} überein,
Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Partei-Typ und Partei sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich,
@@ -2557,7 +2551,6 @@
Sample Collection,Mustersammlung,
Sample quantity {0} cannot be more than received quantity {1},Die Beispielmenge {0} darf nicht mehr als die empfangene Menge {1} sein,
Sanctioned,sanktionierte,
-Sanctioned Amount,Genehmigter Betrag,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.,
Sand,Sand,
Saturday,Samstag,
@@ -2882,7 +2875,7 @@
Supplier Id,Lieferanten-ID,
Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung,
Supplier Invoice No,Lieferantenrechnungsnr.,
-Supplier Invoice No exists in Purchase Invoice {0},Lieferantenrechnung existiert in Kauf Rechnung {0},
+Supplier Invoice No exists in Purchase Invoice {0},Die Rechnungsnummer des Lieferanten wurde bereits in Eingangsrechnung {0} verwendet,
Supplier Name,Lieferantenname,
Supplier Part No,Lieferant Teile-Nr,
Supplier Quotation,Lieferantenangebot,
@@ -2942,7 +2935,7 @@
Templates of supplier scorecard criteria.,Vorlagen der Lieferanten-Scorecard-Kriterien.,
Templates of supplier scorecard variables.,Vorlagen der Lieferanten-Scorecard-Variablen.,
Templates of supplier standings.,Vorlagen der Lieferantenwertung.,
-Temporarily on Hold,Vorübergehend in der Warteschleife,
+Temporarily on Hold,Vorübergehend auf Eis gelegt,
Temporary,Temporär,
Temporary Accounts,Temporäre Konten,
Temporary Opening,Temporäre Eröffnungskonten,
@@ -3058,7 +3051,7 @@
To date can not be equal or less than from date,Bis heute kann nicht gleich oder weniger als von Datum sein,
To date can not be less than from date,Bis heute kann nicht weniger als von Datum sein,
To date can not greater than employee's relieving date,Bis heute kann nicht mehr als Entlastungsdatum des Mitarbeiters sein,
-"To filter based on Party, select Party Type first","Bitte Partei-Typ wählen um nach Partei zu filtern",
+"To filter based on Party, select Party Type first",Bitte Partei-Typ wählen um nach Partei zu filtern,
"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Um ERPNext bestmöglich zu nutzen, empfehlen wir Ihnen, sich die Zeit zu nehmen diese Hilfevideos anzusehen.",
"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein",
To make Customer based incentive schemes.,Um Kunden basierte Anreizsysteme zu machen.,
@@ -3084,7 +3077,7 @@
Total Collected: {0},Gesammelt gesammelt: {0},
Total Commission,Gesamtprovision,
Total Contribution Amount: {0},Gesamtbeitragsbetrag: {0},
-Total Credit/ Debit Amount should be same as linked Journal Entry,Der Gesamtkreditbetrag sollte identisch mit dem verknüpften Journaleintrag sein,
+Total Credit/ Debit Amount should be same as linked Journal Entry,Der Gesamtkreditbetrag sollte identisch mit dem verknüpften Buchungssatz sein,
Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0},
Total Deduction,Gesamtabzug,
Total Invoiced Amount,Gesamtrechnungsbetrag,
@@ -3417,7 +3410,7 @@
{0} is not in Optional Holiday List,{0} befindet sich nicht in der optionalen Feiertagsliste,
{0} is not in a valid Payroll Period,{0} befindet sich nicht in einer gültigen Abrechnungsperiode,
{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt das Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden.",
-{0} is on hold till {1},{0} ist zurückgestellt bis {1},
+{0} is on hold till {1},{0} ist auf Eis gelegt bis {1},
{0} item found.,{0} Artikel gefunden.,
{0} items found.,{0} Artikel gefunden.,
{0} items in progress,{0} Elemente in Bearbeitung,
@@ -3437,6 +3430,8 @@
{0} variants created.,{0} Varianten erstellt.,
{0} {1} created,{0} {1} erstellt,
{0} {1} does not exist,{0} {1} existiert nicht,
+{0} {1} has already been fully paid.,{0} {1} wurde bereits vollständig bezahlt.,
+{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts.,"{0} {1} wurde bereits teilweise bezahlt. Bitte nutzen Sie den Button 'Ausstehende Rechnungen aufrufen', um die aktuell ausstehenden Beträge zu erhalten.",
{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.,
{0} {1} has not been submitted so the action cannot be completed,"{0} {1} sind nicht gebucht, deshalb kann die Aktion nicht abgeschlossen werden",
"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} ist mit {2} verbunden, aber das Gegenkonto ist {3}",
@@ -3448,9 +3443,10 @@
{0} {1} is frozen,{0} {1} ist gesperrt,
{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt,
{0} {1} is not active,{0} {1} ist nicht aktiv,
-{0} {1} is not associated with {2} {3},{0} {1} ist nicht mit {2} {3} verknüpft,
+{0} {1} is not associated with {2} {3},{0} {1} gehört nicht zu {2} {3},
{0} {1} is not present in the parent company,{0} {1} ist in der Muttergesellschaft nicht vorhanden,
{0} {1} is not submitted,{0} {1} wurde nicht übertragen,
+{0} {1} is on hold,{0} {1} liegt derzeit auf Eis,
{0} {1} is {2},{0} {1} ist {2},
{0} {1} must be submitted,{0} {1} muss vorgelegt werden,
{0} {1} not in any active Fiscal Year.,{0} {1} nicht in einem aktiven Geschäftsjahr.,
@@ -3548,7 +3544,6 @@
{0} already has a Parent Procedure {1}.,{0} hat bereits eine übergeordnete Prozedur {1}.,
API,API,
Annual,Jährlich,
-Approved,Genehmigt,
Change,Ändern,
Contact Email,Kontakt-E-Mail,
Export Type,Exporttyp,
@@ -3578,10 +3573,9 @@
Account Value,Kontostand,
Account is mandatory to get payment entries,"Das Konto ist obligatorisch, um Zahlungseinträge zu erhalten",
Account is not set for the dashboard chart {0},Konto ist nicht für das Dashboard-Diagramm {0} festgelegt.,
-Account {0} does not belong to company {1},Konto {0} gehört nicht zu Firma {1},
Account {0} does not exists in the dashboard chart {1},Konto {0} ist im Dashboard-Diagramm {1} nicht vorhanden,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> ist in Bearbeitung und kann von Journal Entry nicht aktualisiert werden,
-Account: {0} is not permitted under Payment Entry,Konto: {0} ist unter Zahlungseingang nicht zulässig,
+Account: {0} is not permitted under Payment Entry,Konto {0} kann nicht in Zahlung verwendet werden,
Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}.,Die Buchhaltungsdimension <b>{0}</b> ist für das Bilanzkonto <b>{1}</b> erforderlich.,
Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}.,Die Buchhaltungsdimension <b>{0}</b> ist für das Konto {1} "Gewinn und Verlust" erforderlich.,
Accounting Masters,Accounting Masters,
@@ -3589,7 +3583,6 @@
Activity,Aktivität,
Add / Manage Email Accounts.,Hinzufügen/Verwalten von E-Mail-Konten,
Add Child,Unterpunkt hinzufügen,
-Add Loan Security,Darlehenssicherheit hinzufügen,
Add Multiple,Mehrere hinzufügen,
Add Participants,Teilnehmer hinzufügen,
Add to Featured Item,Zum empfohlenen Artikel hinzufügen,
@@ -3600,15 +3593,12 @@
Address Line 1,Adresse Zeile 1,
Addresses,Adressen,
Admission End Date should be greater than Admission Start Date.,Das Enddatum der Zulassung sollte größer sein als das Startdatum der Zulassung.,
-Against Loan,Gegen Darlehen,
-Against Loan:,Gegen Darlehen:,
All,Alle,
All bank transactions have been created,Alle Bankgeschäfte wurden angelegt,
All the depreciations has been booked,Alle Abschreibungen wurden gebucht,
Allocation Expired!,Zuteilung abgelaufen!,
Allow Resetting Service Level Agreement from Support Settings.,Zurücksetzen des Service Level Agreements in den Support-Einstellungen zulassen.,
Amount of {0} is required for Loan closure,Für den Kreditabschluss ist ein Betrag von {0} erforderlich,
-Amount paid cannot be zero,Der gezahlte Betrag darf nicht Null sein,
Applied Coupon Code,Angewandter Gutscheincode,
Apply Coupon Code,Gutscheincode anwenden,
Appointment Booking,Terminreservierung,
@@ -3645,6 +3635,8 @@
Blue,Blau,
Book,Buchen,
Book Appointment,Einen Termin verabreden,
+Book Advance Payments as Liability option is chosen. Paid From account changed from {0} to {1}.,"Die Option 'Anzahlungen als Verbindlichkeit buchen' ist aktiviert. Das Ausgangskonto wurde von {0} auf {1} geändert.",
+Book Advance Payments in Separate Party Account,Anzahlungen als Verbindlichkeit buchen,
Brand,Marke,
Browse,Durchsuchen,
Call Connected,Anruf verbunden,
@@ -3656,7 +3648,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Die Ankunftszeit kann nicht berechnet werden, da die Adresse des Fahrers fehlt.",
Cannot Optimize Route as Driver Address is Missing.,"Route kann nicht optimiert werden, da die Fahreradresse fehlt.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Aufgabe {0} kann nicht abgeschlossen werden, da die abhängige Aufgabe {1} nicht abgeschlossen / abgebrochen wurde.",
-Cannot create loan until application is approved,"Darlehen kann erst erstellt werden, wenn der Antrag genehmigt wurde",
Cannot find a matching Item. Please select some other value for {0}.,Ein passender Artikel kann nicht gefunden werden. Bitte einen anderen Wert für {0} auswählen.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Artikel {0} in Zeile {1} kann nicht mehr als {2} in Rechnung gestellt werden. Um eine Überberechnung zuzulassen, legen Sie die Überberechnung in den Kontoeinstellungen fest",
"Capacity Planning Error, planned start time can not be same as end time","Kapazitätsplanungsfehler, die geplante Startzeit darf nicht mit der Endzeit übereinstimmen",
@@ -3819,20 +3810,9 @@
Less Than Amount,Weniger als der Betrag,
Liabilities,Verbindlichkeiten,
Loading...,Laden ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Der Darlehensbetrag übersteigt den maximalen Darlehensbetrag von {0} gemäß den vorgeschlagenen Wertpapieren,
Loan Applications from customers and employees.,Kreditanträge von Kunden und Mitarbeitern.,
-Loan Disbursement,Kreditauszahlung,
Loan Processes,Darlehensprozesse,
-Loan Security,Kreditsicherheit,
-Loan Security Pledge,Kreditsicherheitsversprechen,
-Loan Security Pledge Created : {0},Kreditsicherheitsversprechen Erstellt: {0},
-Loan Security Price,Kreditsicherheitspreis,
-Loan Security Price overlapping with {0},Kreditsicherheitspreis überschneidet sich mit {0},
-Loan Security Unpledge,Kreditsicherheit nicht verpfändet,
-Loan Security Value,Kreditsicherheitswert,
Loan Type for interest and penalty rates,Darlehensart für Zins- und Strafzinssätze,
-Loan amount cannot be greater than {0},Der Darlehensbetrag darf nicht größer als {0} sein.,
-Loan is mandatory,Darlehen ist obligatorisch,
Loans,Kredite,
Loans provided to customers and employees.,Kredite an Kunden und Mitarbeiter.,
Location,Ort,
@@ -3866,10 +3846,12 @@
No description,Keine Beschreibung,
No issue has been raised by the caller.,Der Anrufer hat kein Problem angesprochen.,
No items to publish,Keine Artikel zu veröffentlichen,
+No outstanding {0} found for the {1} {2} which qualify the filters you have specified.,"Für {1} {2} wurden kein ausstehender Beleg vom Typ {0} gefunden, der den angegebenen Filtern entspricht.",
No outstanding invoices found,Keine offenen Rechnungen gefunden,
No outstanding invoices found for the {0} {1} which qualify the filters you have specified.,"Für {0} {1} wurden keine ausstehenden Rechnungen gefunden, die die von Ihnen angegebenen Filter qualifizieren.",
No outstanding invoices require exchange rate revaluation,Keine ausstehenden Rechnungen erfordern eine Neubewertung des Wechselkurses,
No reviews yet,Noch keine Bewertungen,
+No Stock Available Currently,Derzeit kein Lagerbestand verfügbar,
No views yet,Noch keine Ansichten,
Non stock items,Nicht vorrätige Artikel,
Not Allowed,Nicht Erlaubt,
@@ -3901,7 +3883,6 @@
Pay,Zahlen,
Payment Document Type,Zahlungsbelegart,
Payment Name,Zahlungsname,
-Penalty Amount,Strafbetrag,
Pending,Ausstehend,
Performance,Performance,
Period based On,Zeitraum basierend auf,
@@ -3923,10 +3904,8 @@
Please login as a Marketplace User to edit this item.,"Bitte melden Sie sich als Marketplace-Benutzer an, um diesen Artikel zu bearbeiten.",
Please login as a Marketplace User to report this item.,"Bitte melden Sie sich als Marketplace-Benutzer an, um diesen Artikel zu melden.",
Please select <b>Template Type</b> to download template,"Bitte wählen Sie <b>Vorlagentyp</b> , um die Vorlage herunterzuladen",
-Please select Applicant Type first,Bitte wählen Sie zuerst den Antragstellertyp aus,
Please select Customer first,Bitte wählen Sie zuerst den Kunden aus,
Please select Item Code first,Bitte wählen Sie zuerst den Artikelcode,
-Please select Loan Type for company {0},Bitte wählen Sie Darlehensart für Firma {0},
Please select a Delivery Note,Bitte wählen Sie einen Lieferschein,
Please select a Sales Person for item: {0},Bitte wählen Sie einen Verkäufer für den Artikel: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Bitte wählen Sie eine andere Zahlungsmethode. Stripe unterstützt keine Transaktionen in der Währung '{0}',
@@ -3942,8 +3921,6 @@
Please setup a default bank account for company {0},Bitte richten Sie ein Standard-Bankkonto für das Unternehmen {0} ein.,
Please specify,Bitte angeben,
Please specify a {0},Bitte geben Sie eine {0} an,lead
-Pledge Status,Verpfändungsstatus,
-Pledge Time,Verpfändungszeit,
Printing,Druck,
Priority,Priorität,
Priority has been changed to {0}.,Die Priorität wurde in {0} geändert.,
@@ -3951,7 +3928,6 @@
Processing XML Files,XML-Dateien verarbeiten,
Profitability,Rentabilität,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Vorgeschlagene Zusagen sind für gesicherte Kredite obligatorisch,
Provide the academic year and set the starting and ending date.,Geben Sie das akademische Jahr an und legen Sie das Start- und Enddatum fest.,
Public token is missing for this bank,Für diese Bank fehlt ein öffentlicher Token,
Publish,Veröffentlichen,
@@ -3961,13 +3937,12 @@
Publish Your First Items,Veröffentlichen Sie Ihre ersten Artikel,
Publish {0} Items,{0} Elemente veröffentlichen,
Published Items,Veröffentlichte Artikel,
-Purchase Invoice cannot be made against an existing asset {0},Kaufrechnung kann nicht für ein vorhandenes Asset erstellt werden {0},
-Purchase Invoices,Rechnungen kaufen,
+Purchase Invoice cannot be made against an existing asset {0},Eingangsrechnung kann nicht für ein vorhandenes Asset erstellt werden {0},
+Purchase Invoices,Eingangsrechnungen,
Purchase Orders,Kauforder,
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Der Kaufbeleg enthält keinen Artikel, für den die Option "Probe aufbewahren" aktiviert ist.",
Purchase Return,Warenrücksendung,
Qty of Finished Goods Item,Menge des Fertigerzeugnisses,
-Qty or Amount is mandatroy for loan security,Menge oder Betrag ist ein Mandat für die Kreditsicherheit,
Quality Inspection required for Item {0} to submit,"Qualitätsprüfung erforderlich, damit Artikel {0} eingereicht werden kann",
Quantity to Manufacture,Menge zu fertigen,
Quantity to Manufacture can not be zero for the operation {0},Die herzustellende Menge darf für den Vorgang {0} nicht Null sein.,
@@ -3988,8 +3963,6 @@
Relieving Date must be greater than or equal to Date of Joining,Das Ablösungsdatum muss größer oder gleich dem Beitrittsdatum sein,
Rename,Umbenennen,
Rename Not Allowed,Umbenennen nicht erlaubt,
-Repayment Method is mandatory for term loans,Die Rückzahlungsmethode ist für befristete Darlehen obligatorisch,
-Repayment Start Date is mandatory for term loans,Das Startdatum der Rückzahlung ist für befristete Darlehen obligatorisch,
Report Item,Artikel melden,
Report this Item,Melden Sie diesen Artikel an,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Reservierte Menge für Lohnbearbeiter: Rohstoffmenge für Lohnbearbeiter.,
@@ -4001,20 +3974,20 @@
Room,Zimmer,
Room Type,Zimmertyp,
Row # ,Zeile #,
-Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same,Zeile # {0}: Akzeptiertes Lager und Lieferantenlager können nicht identisch sein,
-Row #{0}: Cannot delete item {1} which has already been billed.,Zeile # {0}: Der bereits abgerechnete Artikel {1} kann nicht gelöscht werden.,
-Row #{0}: Cannot delete item {1} which has already been delivered,"Zeile # {0}: Element {1}, das bereits geliefert wurde, kann nicht gelöscht werden",
-Row #{0}: Cannot delete item {1} which has already been received,"Zeile # {0}: Element {1}, das bereits empfangen wurde, kann nicht gelöscht werden",
-Row #{0}: Cannot delete item {1} which has work order assigned to it.,"Zeile # {0}: Element {1}, dem ein Arbeitsauftrag zugewiesen wurde, kann nicht gelöscht werden.",
-Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order.,"Zeile # {0}: Artikel {1}, der der Bestellung des Kunden zugeordnet ist, kann nicht gelöscht werden.",
-Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor,"Zeile # {0}: Supplier Warehouse kann nicht ausgewählt werden, während Rohstoffe an Subunternehmer geliefert werden",
-Row #{0}: Cost Center {1} does not belong to company {2},Zeile # {0}: Kostenstelle {1} gehört nicht zu Firma {2},
-Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}.,Zeile # {0}: Vorgang {1} ist für {2} Fertigwarenmenge im Fertigungsauftrag {3} nicht abgeschlossen. Bitte aktualisieren Sie den Betriebsstatus über die Jobkarte {4}.,
-Row #{0}: Payment document is required to complete the transaction,"Zeile # {0}: Der Zahlungsbeleg ist erforderlich, um die Transaktion abzuschließen",
-Row #{0}: Serial No {1} does not belong to Batch {2},Zeile # {0}: Seriennummer {1} gehört nicht zu Charge {2},
-Row #{0}: Service End Date cannot be before Invoice Posting Date,Zeile # {0}: Das Service-Enddatum darf nicht vor dem Rechnungsbuchungsdatum liegen,
-Row #{0}: Service Start Date cannot be greater than Service End Date,Zeile # {0}: Das Servicestartdatum darf nicht höher als das Serviceenddatum sein,
-Row #{0}: Service Start and End Date is required for deferred accounting,Zeile # {0}: Das Start- und Enddatum des Service ist für die aufgeschobene Abrechnung erforderlich,
+Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same,Zeile {0}: Akzeptiertes Lager und Lieferantenlager können nicht identisch sein,
+Row #{0}: Cannot delete item {1} which has already been billed.,Zeile {0}: Der bereits abgerechnete Artikel {1} kann nicht gelöscht werden.,
+Row #{0}: Cannot delete item {1} which has already been delivered,"Zeile {0}: Element {1}, das bereits geliefert wurde, kann nicht gelöscht werden",
+Row #{0}: Cannot delete item {1} which has already been received,"Zeile {0}: Element {1}, das bereits empfangen wurde, kann nicht gelöscht werden",
+Row #{0}: Cannot delete item {1} which has work order assigned to it.,"Zeile {0}: Element {1}, dem ein Arbeitsauftrag zugewiesen wurde, kann nicht gelöscht werden.",
+Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order.,"Zeile {0}: Artikel {1}, der der Bestellung des Kunden zugeordnet ist, kann nicht gelöscht werden.",
+Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor,"Zeile {0}: Supplier Warehouse kann nicht ausgewählt werden, während Rohstoffe an Subunternehmer geliefert werden",
+Row #{0}: Cost Center {1} does not belong to company {2},Zeile {0}: Kostenstelle {1} gehört nicht zu Firma {2},
+Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}.,Zeile {0}: Vorgang {1} ist für {2} Fertigwarenmenge im Fertigungsauftrag {3} nicht abgeschlossen. Bitte aktualisieren Sie den Betriebsstatus über die Jobkarte {4}.,
+Row #{0}: Payment document is required to complete the transaction,"Zeile {0}: Der Zahlungsbeleg ist erforderlich, um die Transaktion abzuschließen",
+Row #{0}: Serial No {1} does not belong to Batch {2},Zeile {0}: Seriennummer {1} gehört nicht zu Charge {2},
+Row #{0}: Service End Date cannot be before Invoice Posting Date,Zeile {0}: Das Service-Enddatum darf nicht vor dem Rechnungsbuchungsdatum liegen,
+Row #{0}: Service Start Date cannot be greater than Service End Date,Zeile {0}: Das Servicestartdatum darf nicht höher als das Serviceenddatum sein,
+Row #{0}: Service Start and End Date is required for deferred accounting,Zeile {0}: Das Start- und Enddatum des Service ist für die aufgeschobene Abrechnung erforderlich,
Row {0}: Invalid Item Tax Template for item {1},Zeile {0}: Ungültige Artikelsteuervorlage für Artikel {1},
Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Zeile {0}: Menge für {4} in Lager {1} zum Buchungszeitpunkt des Eintrags nicht verfügbar ({2} {3}),
Row {0}: user has not applied the rule {1} on the item {2},Zeile {0}: Der Nutzer hat die Regel {1} nicht auf das Element {2} angewendet.,
@@ -4022,8 +3995,6 @@
Row({0}): {1} is already discounted in {2},Zeile ({0}): {1} ist bereits in {2} abgezinst.,
Rows Added in {0},Zeilen hinzugefügt in {0},
Rows Removed in {0},Zeilen in {0} entfernt,
-Sanctioned Amount limit crossed for {0} {1},Sanktionsbetrag für {0} {1} überschritten,
-Sanctioned Loan Amount already exists for {0} against company {1},Der genehmigte Darlehensbetrag für {0} gegen das Unternehmen {1} ist bereits vorhanden.,
Save,speichern,
Save Item,Artikel speichern,
Saved Items,Gespeicherte Objekte,
@@ -4142,7 +4113,6 @@
User {0} is disabled,Benutzer {0} ist deaktiviert,
Users and Permissions,Benutzer und Berechtigungen,
Vacancies cannot be lower than the current openings,Die offenen Stellen können nicht niedriger sein als die aktuellen Stellenangebote,
-Valid From Time must be lesser than Valid Upto Time.,Gültig ab Zeit muss kleiner sein als gültig bis Zeit.,
Valuation Rate required for Item {0} at row {1},Bewertungssatz für Position {0} in Zeile {1} erforderlich,
Values Out Of Sync,Werte nicht synchron,
Vehicle Type is required if Mode of Transport is Road,"Der Fahrzeugtyp ist erforderlich, wenn der Verkehrsträger Straße ist",
@@ -4218,7 +4188,6 @@
Add to Cart,in den Warenkorb legen,
Days Since Last Order,Tage seit der letzten Bestellung,
In Stock,Auf Lager,
-Loan Amount is mandatory,Der Darlehensbetrag ist obligatorisch,
Mode Of Payment,Zahlungsart,
No students Found,Keine Schüler gefunden,
Not in Stock,Nicht lagernd,
@@ -4245,7 +4214,6 @@
Group by,Gruppieren nach,
In stock,Auf Lager,
Item name,Artikelname,
-Loan amount is mandatory,Der Darlehensbetrag ist obligatorisch,
Minimum Qty,Mindestmenge,
More details,Weitere Details,
Nature of Supplies,Art der Lieferungen,
@@ -4281,7 +4249,7 @@
Cards,Karten,
Percentage,Prozentsatz,
Failed to setup defaults for country {0}. Please contact support@erpnext.com,Fehler beim Einrichten der Standardeinstellungen für Land {0}. Bitte wenden Sie sich an support@erpnext.com,
-Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it.,Zeile # {0}: Element {1} ist kein serialisiertes / gestapeltes Element. Es kann keine Seriennummer / Chargennummer dagegen haben.,
+Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it.,Zeile {0}: Element {1} ist kein serialisiertes / gestapeltes Element. Es kann keine Seriennummer / Chargennummer dagegen haben.,
Please set {0},Bitte {0} setzen,
Please set {0},Bitte setzen Sie {0},supplier
Draft,Entwurf,"docstatus,=,0"
@@ -4364,11 +4332,11 @@
Income Tax Slab: {0} is disabled,Einkommensteuerplatte: {0} ist deaktiviert,
Income Tax Slab must be effective on or before Payroll Period Start Date: {0},Die Einkommensteuerplatte muss am oder vor dem Startdatum der Abrechnungsperiode wirksam sein: {0},
No leave record found for employee {0} on {1},Für Mitarbeiter {0} auf {1} wurde kein Urlaubsdatensatz gefunden,
-Row {0}: {1} is required in the expenses table to book an expense claim.,"Zeile {0}: {1} in der Spesenabrechnung ist erforderlich, um eine Spesenabrechnung zu buchen.",
+Row {0}: {1} is required in the expenses table to book an expense claim.,"Zeile {0}: {1} in der Tabelle der Auslagen ist erforderlich, um eine Auslagenabrechnung zu buchen.",
Set the default account for the {0} {1},Legen Sie das Standardkonto für {0} {1} fest,
(Half Day),(Halber Tag),
Income Tax Slab,Einkommensteuerplatte,
-Row #{0}: Cannot set amount or formula for Salary Component {1} with Variable Based On Taxable Salary,Zeile # {0}: Betrag oder Formel für Gehaltskomponente {1} mit Variable basierend auf steuerpflichtigem Gehalt kann nicht festgelegt werden,
+Row #{0}: Cannot set amount or formula for Salary Component {1} with Variable Based On Taxable Salary,Zeile {0}: Betrag oder Formel für Gehaltskomponente {1} mit Variable basierend auf steuerpflichtigem Gehalt kann nicht festgelegt werden,
Row #{}: {} of {} should be {}. Please modify the account or select a different account.,Zeile # {}: {} von {} sollte {} sein. Bitte ändern Sie das Konto oder wählen Sie ein anderes Konto aus.,
Row #{}: Please asign task to a member.,Zeile # {}: Bitte weisen Sie einem Mitglied eine Aufgabe zu.,
Process Failed,Prozess fehlgeschlagen,
@@ -4377,10 +4345,11 @@
Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same,Zeile {0}: Lieferlager ({1}) und Kundenlager ({2}) können nicht identisch sein,
Row {0}: Due Date in the Payment Terms table cannot be before Posting Date,Zeile {0}: Fälligkeitsdatum in der Tabelle "Zahlungsbedingungen" darf nicht vor dem Buchungsdatum liegen,
Cannot find {} for item {}. Please set the same in Item Master or Stock Settings.,{} Für Element {} kann nicht gefunden werden. Bitte stellen Sie dasselbe in den Artikelstamm- oder Lagereinstellungen ein.,
-Row #{0}: The batch {1} has already expired.,Zeile # {0}: Der Stapel {1} ist bereits abgelaufen.,
+Row #{0}: The batch {1} has already expired.,Zeile {0}: Der Stapel {1} ist bereits abgelaufen.,
Start Year and End Year are mandatory,Startjahr und Endjahr sind obligatorisch,
GL Entry,Buchung zum Hauptbuch,
Cannot allocate more than {0} against payment term {1},Es kann nicht mehr als {0} für die Zahlungsbedingung {1} zugeordnet werden.,
+Cannot receive from customer against negative outstanding,Negativer Gesamtbetrag kann nicht vom Kunden empfangen werden,
The root account {0} must be a group,Das Root-Konto {0} muss eine Gruppe sein,
Shipping rule not applicable for country {0} in Shipping Address,Versandregel gilt nicht für Land {0} in Versandadresse,
Get Payments from,Zahlungen erhalten von,
@@ -4414,9 +4383,6 @@
Total Completed Qty,Total Completed Qty,
Qty to Manufacture,Herzustellende Menge,
Repay From Salary can be selected only for term loans,Die Rückzahlung vom Gehalt kann nur für befristete Darlehen ausgewählt werden,
-No valid Loan Security Price found for {0},Für {0} wurde kein gültiger Kreditsicherheitspreis gefunden.,
-Loan Account and Payment Account cannot be same,Darlehenskonto und Zahlungskonto können nicht identisch sein,
-Loan Security Pledge can only be created for secured loans,Kreditsicherheitsversprechen können nur für besicherte Kredite erstellt werden,
Social Media Campaigns,Social Media Kampagnen,
From Date can not be greater than To Date,Von Datum darf nicht größer als Bis Datum sein,
Please set a Customer linked to the Patient,Bitte legen Sie einen mit dem Patienten verknüpften Kunden fest,
@@ -4523,7 +4489,7 @@
Over Billing Allowance (%),Mehr als Abrechnungsbetrag (%),
Credit Controller,Kredit-Controller,
Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann",
-Make Payment via Journal Entry,Zahlung über Journaleintrag,
+Make Payment via Journal Entry,Zahlung über Buchungssatz,
Unlink Payment on Cancellation of Invoice,Zahlung bei Stornierung der Rechnung aufheben,
Book Asset Depreciation Entry Automatically,Vermögensabschreibung automatisch verbuchen,
Automatically Add Taxes and Charges from Item Tax Template,Steuern und Gebühren aus Artikelsteuervorlage automatisch hinzufügen,
@@ -4592,7 +4558,7 @@
Bank Transaction Entries,Banktransaktionseinträge,
New Transactions,Neue Transaktionen,
Match Transaction to Invoices,Transaktion mit Rechnungen abgleichen,
-Create New Payment/Journal Entry,Erstellen Sie eine neue Zahlung / Journaleintrag,
+Create New Payment/Journal Entry,Erstellen Sie eine neue Zahlung / Buchungssatz,
Submit/Reconcile Payments,Zahlungen absenden / abstimmen,
Matching Invoices,Passende Rechnungen,
Payment Invoice Items,Zahlung Rechnungspositionen,
@@ -4845,6 +4811,7 @@
Paid Amount (Company Currency),Gezahlter Betrag (Unternehmenswährung),
Received Amount,erhaltenen Betrag,
Received Amount (Company Currency),Erhaltene Menge (Gesellschaft Währung),
+Received Amount cannot be greater than Paid Amount,Der erhaltene Betrag darf nicht größer sein als der gezahlte Betrag,
Get Outstanding Invoice,Erhalten Sie eine ausstehende Rechnung,
Payment References,Bezahlung Referenzen,
Writeoff,Abschreiben,
@@ -4993,7 +4960,7 @@
Accounting Dimensions ,Buchhaltung Dimensionen,
Supplier Invoice Details,Lieferant Rechnungsdetails,
Supplier Invoice Date,Lieferantenrechnungsdatum,
-Return Against Purchase Invoice,Zurück zur Eingangsrechnung,
+Return Against Purchase Invoice,Gutschrift zur Eingangsrechnung,
Select Supplier Address,Lieferantenadresse auswählen,
Contact Person,Kontaktperson,
Select Shipping Address,Lieferadresse auswählen,
@@ -5043,7 +5010,7 @@
Terms and Conditions1,Allgemeine Geschäftsbedingungen1,
Group same items,Gruppe gleichen Artikel,
Print Language,Drucksprache,
-"Once set, this invoice will be on hold till the set date","Einmal eingestellt, wird diese Rechnung bis zum festgelegten Datum gehalten",
+"Once set, this invoice will be on hold till the set date","Einmal eingestellt, liegt diese Rechnung bis zum festgelegten Datum auf Eis",
Credit To,Gutschreiben auf,
Party Account Currency,Währung des Kontos der Partei,
Against Expense Account,Zu Aufwandskonto,
@@ -5367,7 +5334,7 @@
Asset Owner Company,Eigentümergesellschaft,
Custodian,Depotbank,
Disposal Date,Verkauf Datum,
-Journal Entry for Scrap,Journaleintrag für Ausschuss,
+Journal Entry for Scrap,Buchungssatz für Ausschuss,
Available-for-use Date,Verfügbarkeitsdatum,
Calculate Depreciation,Abschreibung berechnen,
Allow Monthly Depreciation,Monatliche Abschreibung zulassen,
@@ -5529,8 +5496,8 @@
Is Transporter,Ist Transporter,
Represents Company,Repräsentiert das Unternehmen,
Supplier Type,Lieferantentyp,
-Allow Purchase Invoice Creation Without Purchase Order,Erstellen von Kaufrechnungen ohne Bestellung zulassen,
-Allow Purchase Invoice Creation Without Purchase Receipt,Zulassen der Erstellung von Kaufrechnungen ohne Kaufbeleg,
+Allow Purchase Invoice Creation Without Purchase Order,Erstellen von Eingangsrechnung ohne Bestellung zulassen,
+Allow Purchase Invoice Creation Without Purchase Receipt,Erstellen von Eingangsrechnung ohne Kaufbeleg ohne Kaufbeleg zulassen,
Warn RFQs,Warnung Ausschreibungen,
Warn POs,Warnen Sie POs,
Prevent RFQs,Vermeidung von Ausschreibungen,
@@ -6443,7 +6410,6 @@
HR User,Nutzer Personalabteilung,
Appointment Letter,Ernennungsschreiben,
Job Applicant,Bewerber,
-Applicant Name,Bewerbername,
Appointment Date,Termin,
Appointment Letter Template,Termin Briefvorlage,
Body,Körper,
@@ -6690,12 +6656,12 @@
Vehicle Log,Fahrzeug Log,
Employees Email Id,E-Mail-ID des Mitarbeiters,
More Details,Mehr Details,
-Expense Claim Account,Kostenabrechnung Konto,
+Expense Claim Account,Konto für Auslagenabrechnung,
Expense Claim Advance,Auslagenvorschuss,
Unclaimed amount,Nicht beanspruchter Betrag,
-Expense Claim Detail,Aufwandsabrechnungsdetail,
-Expense Date,Datum der Aufwendung,
-Expense Claim Type,Art der Aufwandsabrechnung,
+Expense Claim Detail,Auslage,
+Expense Date,Datum der Auslage,
+Expense Claim Type,Art der Auslagenabrechnung,
Holiday List Name,Urlaubslistenname,
Total Holidays,Insgesamt Feiertage,
Add Weekly Holidays,Wöchentliche Feiertage hinzufügen,
@@ -6708,7 +6674,7 @@
Retirement Age,Rentenalter,
Enter retirement age in years,Geben Sie das Rentenalter in Jahren,
Stop Birthday Reminders,Geburtstagserinnerungen ausschalten,
-Expense Approver Mandatory In Expense Claim,Auslagengenehmiger in Spesenabrechnung erforderlich,
+Expense Approver Mandatory In Expense Claim,Auslagengenehmiger in Auslagenabrechnung erforderlich,
Payroll Settings,Einstellungen zur Gehaltsabrechnung,
Leave,Verlassen,
Max working hours against Timesheet,Max Arbeitszeit gegen Stundenzettel,
@@ -7065,99 +7031,12 @@
Sync in Progress,Synchronisierung läuft,
Hub Seller Name,Hub-Verkäufer Name,
Custom Data,Benutzerdefinierte Daten,
-Member,Mitglied,
-Partially Disbursed,teil~~POS=TRUNC Zahlter,
-Loan Closure Requested,Darlehensschließung beantragt,
Repay From Salary,Repay von Gehalts,
-Loan Details,Darlehensdetails,
-Loan Type,Art des Darlehens,
-Loan Amount,Darlehensbetrag,
-Is Secured Loan,Ist besichertes Darlehen,
-Rate of Interest (%) / Year,Zinssatz (%) / Jahr,
-Disbursement Date,Valuta-,
-Disbursed Amount,Ausgezahlter Betrag,
-Is Term Loan,Ist Laufzeitdarlehen,
-Repayment Method,Rückzahlweg,
-Repay Fixed Amount per Period,Repay fixen Betrag pro Periode,
-Repay Over Number of Periods,Repay über Anzahl der Perioden,
-Repayment Period in Months,Rückzahlungsfrist in Monaten,
-Monthly Repayment Amount,Monatlicher Rückzahlungsbetrag,
-Repayment Start Date,Startdatum der Rückzahlung,
-Loan Security Details,Details zur Kreditsicherheit,
-Maximum Loan Value,Maximaler Kreditwert,
-Account Info,Kontoinformation,
-Loan Account,Kreditkonto,
-Interest Income Account,Zinserträge Konto,
-Penalty Income Account,Strafeinkommenskonto,
-Repayment Schedule,Rückzahlungsplan,
-Total Payable Amount,Zahlenden Gesamtbetrag,
-Total Principal Paid,Total Principal Paid,
-Total Interest Payable,Gesamtsumme der Zinszahlungen,
-Total Amount Paid,Gezahlte Gesamtsumme,
-Loan Manager,Kreditmanager,
-Loan Info,Darlehensinformation,
-Rate of Interest,Zinssatz,
-Proposed Pledges,Vorgeschlagene Zusagen,
-Maximum Loan Amount,Maximaler Darlehensbetrag,
-Repayment Info,Die Rückzahlung Info,
-Total Payable Interest,Insgesamt fällige Zinsen,
-Against Loan ,Gegen Darlehen,
-Loan Interest Accrual,Darlehenszinsabgrenzung,
-Amounts,Beträge,
-Pending Principal Amount,Ausstehender Hauptbetrag,
-Payable Principal Amount,Zu zahlender Kapitalbetrag,
-Paid Principal Amount,Bezahlter Hauptbetrag,
-Paid Interest Amount,Bezahlter Zinsbetrag,
-Process Loan Interest Accrual,Prozessdarlehenszinsabgrenzung,
-Repayment Schedule Name,Name des Rückzahlungsplans,
Regular Payment,Reguläre Zahlung,
Loan Closure,Kreditabschluss,
-Payment Details,Zahlungsdetails,
-Interest Payable,Zu zahlende Zinsen,
-Amount Paid,Zahlbetrag,
-Principal Amount Paid,Hauptbetrag bezahlt,
-Repayment Details,Rückzahlungsdetails,
-Loan Repayment Detail,Detail der Kreditrückzahlung,
-Loan Security Name,Name der Kreditsicherheit,
-Unit Of Measure,Maßeinheit,
-Loan Security Code,Kreditsicherheitscode,
-Loan Security Type,Kreditsicherheitstyp,
-Haircut %,Haarschnitt%,
-Loan Details,Darlehensdetails,
-Unpledged,Nicht verpfändet,
-Pledged,Verpfändet,
-Partially Pledged,Teilweise verpfändet,
-Securities,Wertpapiere,
-Total Security Value,Gesamtsicherheitswert,
-Loan Security Shortfall,Kreditsicherheitsmangel,
-Loan ,Darlehen,
-Shortfall Time,Fehlzeit,
-America/New_York,Amerika / New York,
-Shortfall Amount,Fehlbetrag,
-Security Value ,Sicherheitswert,
-Process Loan Security Shortfall,Sicherheitslücke bei Prozessdarlehen,
-Loan To Value Ratio,Loan-to-Value-Verhältnis,
-Unpledge Time,Unpledge-Zeit,
-Loan Name,Darlehensname,
Rate of Interest (%) Yearly,Zinssatz (%) Jahres,
-Penalty Interest Rate (%) Per Day,Strafzinssatz (%) pro Tag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Bei verspäteter Rückzahlung wird täglich ein Strafzins auf den ausstehenden Zinsbetrag erhoben,
-Grace Period in Days,Gnadenfrist in Tagen,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Anzahl der Tage ab Fälligkeit, bis zu denen bei verspäteter Rückzahlung des Kredits keine Vertragsstrafe erhoben wird",
-Pledge,Versprechen,
-Post Haircut Amount,Post Haircut Betrag,
-Process Type,Prozesstyp,
-Update Time,Updatezeit,
-Proposed Pledge,Vorgeschlagenes Versprechen,
-Total Payment,Gesamtzahlung,
-Balance Loan Amount,Bilanz Darlehensbetrag,
-Is Accrued,Ist aufgelaufen,
Salary Slip Loan,Gehaltsabrechnung Vorschuss,
Loan Repayment Entry,Kreditrückzahlungseintrag,
-Sanctioned Loan Amount,Sanktionierter Darlehensbetrag,
-Sanctioned Amount Limit,Sanktioniertes Betragslimit,
-Unpledge,Unpledge,
-Haircut,Haarschnitt,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Zeitplan generieren,
Schedules,Zeitablaufpläne,
@@ -7485,15 +7364,17 @@
Project will be accessible on the website to these users,Projekt wird auf der Website für diese Benutzer zugänglich sein,
Copied From,Kopiert von,
Start and End Dates,Start- und Enddatum,
-Actual Time (in Hours),Tatsächliche Zeit (in Stunden),
+Actual Time in Hours (via Timesheet),Tatsächliche Dauer in Stunden (Zeiterfassung),
+Actual Start Date (via Timesheet),Tatsächliches Startdatum (Zeiterfassung),
+Actual End Date (via Timesheet),Tatsächliches Enddatum (Zeiterfassung),
Costing and Billing,Kalkulation und Abrechnung,
-Total Costing Amount (via Timesheets),Gesamtkalkulationsbetrag (über Zeiterfassung),
-Total Expense Claim (via Expense Claims),Gesamtbetrag der Auslagenabrechnung (über Auslagenabrechnungen),
-Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Eingangsrechnung),
-Total Sales Amount (via Sales Order),Auftragssumme (über Auftrag),
-Total Billable Amount (via Timesheets),Abrechenbare Summe (über Zeiterfassung),
-Total Billed Amount (via Sales Invoices),Abgerechnete Summe (über Ausgangsrechnungen),
-Total Consumed Material Cost (via Stock Entry),Summe der verbrauchten Materialkosten (über die Bestandsbuchung),
+Total Costing Amount (via Timesheet),Lohnkosten (Zeiterfassung),
+Total Expense Claim (via Expense Claim),Auslagen der Mitarbeiter (Auslagenabrechnung),
+Total Purchase Cost (via Purchase Invoice),Einkaufskosten (Eingangsrechnung),
+Total Sales Amount (via Sales Order),Auftragswert (Auftrag),
+Total Billable Amount (via Timesheet),Abrechenbare Zeiten (Zeiterfassung),
+Total Billed Amount (via Sales Invoice),Abgerechneter Betrag (Ausgangsrechnung),
+Total Consumed Material Cost (via Stock Entry),Verbrauchtes Material (Lagerbuchung),
Gross Margin,Handelsspanne,
Gross Margin %,Handelsspanne %,
Monitor Progress,Überwachung der Fortschritte,
@@ -7527,12 +7408,6 @@
Dependencies,Abhängigkeiten,
Dependent Tasks,Abhängige Vorgänge,
Depends on Tasks,Abhängig von Vorgang,
-Actual Start Date (via Time Sheet),Das tatsächliche Startdatum (durch Zeiterfassung),
-Actual Time (in hours),Tatsächliche Zeit (in Stunden),
-Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung),
-Total Costing Amount (via Time Sheet),Gesamtkosten (über Zeiterfassung),
-Total Expense Claim (via Expense Claim),Summe der Auslagen (über Auslagenabrechnung),
-Total Billing Amount (via Time Sheet),Gesamtrechnungsbetrag (über Zeiterfassung),
Review Date,Überprüfungsdatum,
Closing Date,Abschlussdatum,
Task Depends On,Vorgang hängt ab von,
@@ -7638,20 +7513,19 @@
Served,Serviert,
Restaurant Reservation,Restaurant Reservierung,
Waitlisted,Auf der Warteliste,
-No Show,Keine Show,
-No of People,Nein von Menschen,
+No Show,Nicht angetreten,
+No of People,Anzahl von Personen,
Reservation Time,Reservierungszeit,
Reservation End Time,Reservierungsendzeit,
No of Seats,Anzahl der Sitze,
Minimum Seating,Mindestbestuhlung,
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ","Verkaufskampagne verfolgen: Leads, Angebote, Aufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen.",
-SAL-CAM-.YYYY.-,SAL-CAM-.YYYY.-,
Campaign Schedules,Kampagnenpläne,
Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.,
-CUST-.YYYY.-,CUST-.YYYY.-,
Default Company Bank Account,Standard-Bankkonto des Unternehmens,
From Lead,Aus Lead,
-Account Manager,Buchhalter,
+Account Manager,Kundenberater,
+Accounts Manager,Buchhalter,
Allow Sales Invoice Creation Without Sales Order,Ermöglichen Sie die Erstellung von Kundenrechnungen ohne Auftrag,
Allow Sales Invoice Creation Without Delivery Note,Ermöglichen Sie die Erstellung einer Ausgangsrechnung ohne Lieferschein,
Default Price List,Standardpreisliste,
@@ -7692,7 +7566,6 @@
"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.\n\nNote: BOM = Bill of Materials","Fassen Sie eine Gruppe von Artikeln zu einem neuen Artikel zusammen. Dies ist nützlich, wenn Sie bestimmte Artikel zu einem Paket bündeln und einen Bestand an Artikel-Bündeln erhalten und nicht einen Bestand der einzelnen Artikel. Das Artikel-Bündel erhält für das Attribut ""Ist Lagerartikel"" den Wert ""Nein"" und für das Attribut ""Ist Verkaufsartikel"" den Wert ""Ja"". Beispiel: Wenn Sie Laptops und Tragetaschen getrennt verkaufen und einen bestimmten Preis anbieten, wenn der Kunde beides zusammen kauft, dann wird der Laptop mit der Tasche zusammen ein neuer Bündel-Artikel. Anmerkung: BOM = Stückliste",
Parent Item,Übergeordneter Artikel,
List items that form the package.,"Die Artikel auflisten, die das Paket bilden.",
-SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-,
Quotation To,Angebot für,
Rate at which customer's currency is converted to company's base currency,"Kurs, zu dem die Währung des Kunden in die Basiswährung des Unternehmens umgerechnet wird",
Rate at which Price list currency is converted to company's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Unternehmens umgerechnet wird",
@@ -7704,7 +7577,6 @@
Against Doctype,Zu DocType,
Against Docname,Zu Dokumentenname,
Additional Notes,Zusätzliche Bemerkungen,
-SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-,
Skip Delivery Note,Lieferschein überspringen,
In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Auftrag speichern.",
Track this Sales Order against any Project,Diesen Auftrag in jedem Projekt nachverfolgen,
@@ -7804,13 +7676,13 @@
Default Deferred Revenue Account,Standardkonto für passive Rechnungsabgrenzung,
Default Deferred Expense Account,Standardkonto für aktive Rechnungsabgrenzung,
Default Payroll Payable Account,Standardkonto für Verbindlichkeiten aus Lohn und Gehalt,
-Default Expense Claim Payable Account,Standard-Expense Claim Zahlbares Konto,
+Default Expense Claim Payable Account,Standardkonto für Verbindlichkeiten aus Auslagenabrechnungen,
Stock Settings,Lager-Einstellungen,
Enable Perpetual Inventory,Permanente Inventur aktivieren,
Default Inventory Account,Standard Inventurkonto,
Stock Adjustment Account,Bestandskorrektur-Konto,
Fixed Asset Depreciation Settings,Einstellungen Abschreibung von Anlagevermögen,
-Series for Asset Depreciation Entry (Journal Entry),Serie für Abschreibungs-Eintrag (Journaleintrag),
+Series for Asset Depreciation Entry (Journal Entry),Serie für Abschreibungs-Eintrag (Buchungssatz),
Gain/Loss Account on Asset Disposal,Gewinn-/Verlustrechnung auf die Veräußerung von Vermögenswerten,
Asset Depreciation Cost Center,Kostenstelle für Vermögenswertabschreibung,
Budget Detail,Budget-Detail,
@@ -7894,7 +7766,6 @@
Update Series,Nummernkreise aktualisieren,
Change the starting / current sequence number of an existing series.,Anfangs- / Ist-Wert eines Nummernkreises ändern.,
Prefix,Präfix,
-Current Value,Aktueller Wert,
This is the number of the last created transaction with this prefix,Dies ist die Nummer der letzten erstellten Transaktion mit diesem Präfix,
Update Series Number,Nummernkreis-Wert aktualisieren,
Quotation Lost Reason,Grund für verlorenes Angebotes,
@@ -7935,7 +7806,7 @@
Territory Targets,Ziele für die Region,
Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Artikelgruppenbezogene Budgets für diese Region erstellen. Durch Setzen der Auslieferungseinstellungen können auch saisonale Aspekte mit einbezogen werden.,
UOM Name,Maßeinheit-Name,
-Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen (für Nr.)",
+Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen (für Anzahl)",
Website Item Group,Webseiten-Artikelgruppe,
Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen,
Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb,
@@ -8016,7 +7887,6 @@
Email sent to,E-Mail versandt an,
Dispatch Information,Versandinformationen,
Estimated Arrival,Voraussichtliche Ankunft,
-MAT-DT-.YYYY.-,MAT-DT-.YYYY.-,
Initial Email Notification Sent,Erste E-Mail-Benachrichtigung gesendet,
Delivery Details,Lieferdetails,
Driver Email,Fahrer-E-Mail,
@@ -8176,7 +8046,6 @@
Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg,
Landed Cost Taxes and Charges,Einstandspreis Steuern und Gebühren,
Landed Cost Voucher,Beleg über Einstandskosten,
-MAT-LCV-.YYYY.-,MAT-LCV-.YYYY.-,
Purchase Receipts,Kaufbelege,
Purchase Receipt Items,Kaufbeleg-Artikel,
Get Items From Purchase Receipts,Artikel vom Kaufbeleg übernehmen,
@@ -8184,7 +8053,6 @@
Landed Cost Help,Hilfe zum Einstandpreis,
Manufacturers used in Items,Hersteller im Artikel verwendet,
Limited to 12 characters,Limitiert auf 12 Zeichen,
-MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
Partially Ordered,Teilweise bestellt,
Transferred,Übergeben,
% Ordered,% bestellt,
@@ -8199,7 +8067,6 @@
Parent Detail docname,Übergeordnetes Detail Dokumentenname,
"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren.",
Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)",
-MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-,
From Package No.,Von Paket Nr.,
Identification of the package for the delivery (for print),Kennzeichnung des Paketes für die Lieferung (für den Druck),
To Package No.,Bis Paket Nr.,
@@ -8227,7 +8094,7 @@
Applicable for Countries,Anwenden für Länder,
Price List Country,Preisliste Land,
MAT-PRE-.YYYY.-,MAT-PRE-.JJJJ.-,
-Supplier Delivery Note,Lieferumfang,
+Supplier Delivery Note,Lieferschein Nr.,
Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden",
Return Against Purchase Receipt,Zurück zum Kaufbeleg,
Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Währung des Lieferanten in die Basiswährung des Unternehmens umgerechnet wird",
@@ -8290,9 +8157,8 @@
Out of AMC,Außerhalb des jährlichen Wartungsvertrags,
Warranty Period (Days),Garantiefrist (Tage),
Serial No Details,Details zur Seriennummer,
-MAT-STE-.YYYY.-,MAT-STE-.JJJJ.-,
-Stock Entry Type,Bestandsbuchungsart,
-Stock Entry (Outward GIT),Bestandsbuchung (Outward GIT),
+Stock Entry Type,Art der Lagerbuchung,
+Stock Entry (Outward GIT),Lagerbuchung (ausgeh. WIT),
Material Consumption for Manufacture,Materialverbrauch für die Herstellung,
Repack,Umpacken,
Send to Subcontractor,An Subunternehmer senden,
@@ -8324,7 +8190,7 @@
BOM No. for a Finished Good Item,Stücklisten-Nr. für einen fertigen Artikel,
Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet,
Subcontracted Item,Unterauftragsgegenstand,
-Against Stock Entry,Gegen Bestandsaufnahme,
+Against Stock Entry,Gegen Lagerbuchung,
Stock Entry Child,Stock Entry Child,
PO Supplied Item,PO geliefertes Einzelteil,
Reference Purchase Receipt,Referenz Kaufbeleg,
@@ -8336,7 +8202,6 @@
Is Cancelled,Ist storniert,
Stock Reconciliation,Bestandsabgleich,
This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Werkzeug hilft Ihnen dabei, die Menge und die Bewertung von Bestand im System zu aktualisieren oder zu ändern. Es wird in der Regel verwendet, um die Systemwerte und den aktuellen Bestand Ihrer Lager zu synchronisieren.",
-MAT-RECO-.YYYY.-,MAT-RECO-.YYYY.-,
Reconciliation JSON,Abgleich JSON (JavaScript Object Notation),
Stock Reconciliation Item,Bestandsabgleich-Artikel,
Before reconciliation,Vor Ausgleich,
@@ -8525,8 +8390,6 @@
Itemwise Recommended Reorder Level,Empfohlener artikelbezogener Meldebestand,
Lead Details,Einzelheiten zum Lead,
Lead Owner Efficiency,Lead Besitzer Effizienz,
-Loan Repayment and Closure,Kreditrückzahlung und -schließung,
-Loan Security Status,Kreditsicherheitsstatus,
Lost Opportunity,Verpasste Gelegenheit,
Maintenance Schedules,Wartungspläne,
Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden",
@@ -8605,10 +8468,10 @@
Bank Clearance,Bankfreigabe,
Bank Clearance Detail,Bankfreigabedetail,
Update Cost Center Name / Number,Name / Nummer der Kostenstelle aktualisieren,
-Journal Entry Template,Journaleintragsvorlage,
+Journal Entry Template,Buchungssatz-Vorlage,
Template Title,Vorlagentitel,
-Journal Entry Type,Journaleintragstyp,
-Journal Entry Template Account,Journaleintragsvorlagenkonto,
+Journal Entry Type,Buchungssatz-Typ,
+Journal Entry Template Account,Buchungssatzvorlagenkonto,
Process Deferred Accounting,Aufgeschobene Buchhaltung verarbeiten,
Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again,Manuelle Eingabe kann nicht erstellt werden! Deaktivieren Sie die automatische Eingabe für die verzögerte Buchhaltung in den Konteneinstellungen und versuchen Sie es erneut,
End date cannot be before start date,Das Enddatum darf nicht vor dem Startdatum liegen,
@@ -8617,7 +8480,6 @@
Counts Targeted: {0},Zielzählungen: {0},
Payment Account is mandatory,Zahlungskonto ist obligatorisch,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Wenn diese Option aktiviert ist, wird der gesamte Betrag vom steuerpflichtigen Einkommen abgezogen, bevor die Einkommensteuer ohne Erklärung oder Nachweis berechnet wird.",
-Disbursement Details,Auszahlungsdetails,
Material Request Warehouse,Materialanforderungslager,
Select warehouse for material requests,Wählen Sie Lager für Materialanfragen,
Transfer Materials For Warehouse {0},Material für Lager übertragen {0},
@@ -8684,7 +8546,7 @@
Book Deferred Entries Based On,Buch verzögerte Einträge basierend auf,
Days,Tage,
Months,Monate,
-Book Deferred Entries Via Journal Entry,Buch verzögerte Einträge über Journaleintrag,
+Book Deferred Entries Via Journal Entry,Separaten Buchungssatz für latente Buchungen erstellen,
Submit Journal Entries,Journaleinträge senden,
If this is unchecked Journal Entries will be saved in a Draft state and will have to be submitted manually,"Wenn dieses Kontrollkästchen deaktiviert ist, werden Journaleinträge in einem Entwurfsstatus gespeichert und müssen manuell übermittelt werden",
Enable Distributed Cost Center,Aktivieren Sie die verteilte Kostenstelle,
@@ -8712,7 +8574,7 @@
Reference Detail No,Referenz Detail Nr,
Custom Remarks,Benutzerdefinierte Bemerkungen,
Please select a Company first.,Bitte wählen Sie zuerst eine Firma aus.,
-"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning","Zeile # {0}: Der Referenzdokumenttyp muss Auftrag, Ausgangsrechnung, Journaleintrag oder Mahnwesen sein",
+"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning","Zeile {0}: Der Referenzdokumenttyp muss Auftrag, Ausgangsrechnung, Buchungssatz oder Mahnung sein",
POS Closing Entry,POS Closing Entry,
POS Opening Entry,POS-Eröffnungseintrag,
POS Transactions,POS-Transaktionen,
@@ -8796,8 +8658,7 @@
Availed ITC Cess,ITC Cess verfügbar,
Is Nil Rated or Exempted,Ist gleich Null oder ausgenommen,
Is Non GST,Ist nicht GST,
-ACC-SINV-RET-.YYYY.-,ACC-SINV-RET-.YYYY.-,
-E-Way Bill No.,E-Way Bill No.,
+E-Way Bill No.,E-Way Bill Nr.,
Is Consolidated,Ist konsolidiert,
Billing Address GSTIN,Rechnungsadresse GSTIN,
Customer GSTIN,Kunde GSTIN,
@@ -8832,9 +8693,9 @@
"By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a ","Standardmäßig wird der Lieferantenname gemäß dem eingegebenen Lieferantennamen festgelegt. Wenn Sie möchten, dass Lieferanten von a benannt werden",
choose the 'Naming Series' option.,Wählen Sie die Option "Naming Series".,
Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List.,Konfigurieren Sie die Standardpreisliste beim Erstellen einer neuen Kauftransaktion. Artikelpreise werden aus dieser Preisliste abgerufen.,
-"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Kaufrechnung oder einen Beleg erstellen können, ohne zuvor eine Bestellung zu erstellen. Diese Konfiguration kann für einen bestimmten Lieferanten überschrieben werden, indem das Kontrollkästchen "Erstellung von Eingangsrechnungen ohne Bestellung zulassen" im Lieferantenstamm aktiviert wird.",
-"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master.","Wenn diese Option auf "Ja" konfiguriert ist, verhindert ERPNext, dass Sie eine Kaufrechnung erstellen können, ohne zuvor einen Kaufbeleg zu erstellen. Diese Konfiguration kann für einen bestimmten Lieferanten überschrieben werden, indem das Kontrollkästchen "Erstellung von Kaufrechnungen ohne Kaufbeleg zulassen" im Lieferantenstamm aktiviert wird.",
-Quantity & Stock,Menge & Lager,
+"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master.","Wenn diese Option auf 'Ja' gesetzt ist, validiert ERPNext, dass Sie eine Bestellung angelegt haben, bevor Sie eine Eingangsrechnung oder einen Kaufbeleg erfassen können. Diese Konfiguration kann für einzelne Lieferanten überschrieben werden, indem Sie die Option 'Erstellung von Eingangsrechnungen ohne Bestellung zulassen' im Lieferantenstamm aktivieren.",
+"If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master.","Wenn diese Option auf 'Ja' gesetzt ist, validiert ERPNext, dass Sie einen Kaufbeleg angelegt haben, bevor Sie eine Eingangsrechnung erfasen können. Diese Konfiguration kann für einzelne Lieferanten überschrieben werden, indem Sie die Option 'Erstellung von Kaufrechnungen ohne Kaufbeleg zulassen' im Lieferantenstamm aktivieren.",
+Quantity & Stock,Menge & Lager,
Call Details,Anrufdetails,
Authorised By,Authorisiert von,
Signee (Company),Unterzeichner (Firma),
@@ -9005,9 +8866,6 @@
Repay unclaimed amount from salary,Nicht zurückgeforderten Betrag vom Gehalt zurückzahlen,
Deduction from salary,Abzug vom Gehalt,
Expired Leaves,Abgelaufene Blätter,
-Reference No,Referenznummer,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Der prozentuale Abschlag ist die prozentuale Differenz zwischen dem Marktwert des Darlehenssicherheitsvermögens und dem Wert, der diesem Darlehenssicherheitsvermögen zugeschrieben wird, wenn es als Sicherheit für dieses Darlehen verwendet wird.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Das Verhältnis von Kredit zu Wert drückt das Verhältnis des Kreditbetrags zum Wert des verpfändeten Wertpapiers aus. Ein Kreditsicherheitsdefizit wird ausgelöst, wenn dieser den für ein Darlehen angegebenen Wert unterschreitet",
If this is not checked the loan by default will be considered as a Demand Loan,"Wenn dies nicht aktiviert ist, wird das Darlehen standardmäßig als Nachfragedarlehen betrachtet",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Dieses Konto wird zur Buchung von Kreditrückzahlungen vom Kreditnehmer und zur Auszahlung von Krediten an den Kreditnehmer verwendet,
This account is capital account which is used to allocate capital for loan disbursal account ,"Dieses Konto ist ein Kapitalkonto, das zur Zuweisung von Kapital für das Darlehensauszahlungskonto verwendet wird",
@@ -9071,7 +8929,7 @@
Monthly Eligible Amount,Monatlicher förderfähiger Betrag,
Total Eligible HRA Exemption,Insgesamt berechtigte HRA-Befreiung,
Validating Employee Attendance...,Überprüfung der Mitarbeiterbeteiligung ...,
-Submitting Salary Slips and creating Journal Entry...,Einreichen von Gehaltsabrechnungen und Erstellen eines Journaleintrags ...,
+Submitting Salary Slips and creating Journal Entry...,Gehaltsabrechnungen werden gebucht und Buchungssätze erstellt...,
Calculate Payroll Working Days Based On,Berechnen Sie die Arbeitstage der Personalabrechnung basierend auf,
Consider Unmarked Attendance As,Betrachten Sie die nicht markierte Teilnahme als,
Fraction of Daily Salary for Half Day,Bruchteil des Tagesgehalts für einen halben Tag,
@@ -9124,12 +8982,12 @@
"If blank, parent Warehouse Account or company default will be considered in transactions","Wenn leer, wird das übergeordnete Lagerkonto oder der Firmenstandard bei Transaktionen berücksichtigt",
Service Level Agreement Details,Details zum Service Level Agreement,
Service Level Agreement Status,Status des Service Level Agreements,
-On Hold Since,In der Warteschleife seit,
+On Hold Since,Auf Eis gelegt seit,
Total Hold Time,Gesamte Haltezeit,
Response Details,Antwortdetails,
Average Response Time,Durchschnittliche Reaktionszeit,
User Resolution Time,Benutzerauflösungszeit,
-SLA is on hold since {0},"SLA wird gehalten, da {0}",
+SLA is on hold since {0},"SLA ist seit {0} auf Eis gelegt",
Pause SLA On Status,SLA On Status anhalten,
Pause SLA On,SLA anhalten Ein,
Greetings Section,Grüße Abschnitt,
@@ -9216,7 +9074,7 @@
Time Required (In Mins),Erforderliche Zeit (in Minuten),
From Posting Date,Ab dem Buchungsdatum,
To Posting Date,Zum Buchungsdatum,
-No records found,Keine Aufzeichnungen gefunden,
+No records found,Keine Einträge gefunden,
Customer/Lead Name,Name des Kunden / Lead,
Unmarked Days,Nicht markierte Tage,
Jan,Jan.,
@@ -9275,7 +9133,7 @@
Group by Sales Order,Nach Auftrag gruppieren,
Sales Value,Verkaufswert,
Stock Qty vs Serial No Count,Lagermenge vs Seriennummer,
-Serial No Count,Seriennummer nicht gezählt,
+Serial No Count,Seriennummern gezählt,
Work Order Summary,Arbeitsauftragsübersicht,
Produce Qty,Menge produzieren,
Lead Time (in mins),Vorlaufzeit (in Minuten),
@@ -9343,6 +9201,7 @@
New Assets (This Year),Neue Vermögenswerte (dieses Jahr),
Row #{}: Depreciation Posting Date should not be equal to Available for Use Date.,Zeile # {}: Das Buchungsdatum der Abschreibung sollte nicht dem Datum der Verfügbarkeit entsprechen.,
Incorrect Date,Falsches Datum,
+Incorrect Payment Type,Falsche Zahlungsart,
Invalid Gross Purchase Amount,Ungültiger Bruttokaufbetrag,
There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset.,"Es gibt aktive Wartungs- oder Reparaturarbeiten am Vermögenswert. Sie müssen alle Schritte ausführen, bevor Sie das Asset stornieren können.",
% Complete,% Komplett,
@@ -9365,7 +9224,7 @@
Bank transaction creation error,Fehler beim Erstellen der Banküberweisung,
Unit of Measurement,Maßeinheit,
Fiscal Year {0} Does Not Exist,Geschäftsjahr {0} existiert nicht,
-Row # {0}: Returned Item {1} does not exist in {2} {3},Zeile # {0}: Zurückgegebenes Element {1} ist in {2} {3} nicht vorhanden,
+Row # {0}: Returned Item {1} does not exist in {2} {3},Zeile {0}: Zurückgegebenes Element {1} ist in {2} {3} nicht vorhanden,
Valuation type charges can not be marked as Inclusive,Bewertungsgebühren können nicht als Inklusiv gekennzeichnet werden,
You do not have permissions to {} items in a {}.,Sie haben keine Berechtigungen für {} Elemente in einem {}.,
Insufficient Permissions,Nicht ausreichende Berechtigungen,
@@ -9376,7 +9235,7 @@
The value {0} is already assigned to an existing Item {1}.,Der Wert {0} ist bereits einem vorhandenen Element {1} zugeordnet.,
"To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings.","Aktivieren Sie {0} in den Einstellungen für Elementvarianten, um mit der Bearbeitung dieses Attributwerts fortzufahren.",
Edit Not Allowed,Bearbeiten nicht erlaubt,
-Row #{0}: Item {1} is already fully received in Purchase Order {2},Zeile # {0}: Artikel {1} ist bereits vollständig in der Bestellung {2} eingegangen.,
+Row #{0}: Item {1} is already fully received in Purchase Order {2},Zeile {0}: Artikel {1} ist bereits vollständig in der Bestellung {2} eingegangen.,
You cannot create or cancel any accounting entries with in the closed Accounting Period {0},Sie können im abgeschlossenen Abrechnungszeitraum {0} keine Buchhaltungseinträge mit erstellen oder stornieren.,
POS Invoice should have {} field checked.,Für die POS-Rechnung sollte das Feld {} aktiviert sein.,
Invalid Item,Ungültiger Artikel,
@@ -9471,14 +9330,7 @@
Operation {0} does not belong to the work order {1},Operation {0} gehört nicht zum Arbeitsauftrag {1},
Print UOM after Quantity,UOM nach Menge drucken,
Set default {0} account for perpetual inventory for non stock items,Legen Sie das Standardkonto {0} für die fortlaufende Bestandsaufnahme für nicht vorrätige Artikel fest,
-Loan Security {0} added multiple times,Darlehenssicherheit {0} mehrfach hinzugefügt,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Darlehen Wertpapiere mit unterschiedlichem LTV-Verhältnis können nicht gegen ein Darlehen verpfändet werden,
-Qty or Amount is mandatory for loan security!,Menge oder Betrag ist für die Kreditsicherheit obligatorisch!,
-Only submittted unpledge requests can be approved,Es können nur übermittelte nicht gekoppelte Anforderungen genehmigt werden,
-Interest Amount or Principal Amount is mandatory,Der Zinsbetrag oder der Kapitalbetrag ist obligatorisch,
-Disbursed Amount cannot be greater than {0},Der ausgezahlte Betrag darf nicht größer als {0} sein.,
-Row {0}: Loan Security {1} added multiple times,Zeile {0}: Darlehenssicherheit {1} wurde mehrmals hinzugefügt,
-Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Zeile # {0}: Untergeordnetes Element sollte kein Produktpaket sein. Bitte entfernen Sie Artikel {1} und speichern Sie,
+Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Zeile {0}: Untergeordnetes Element sollte kein Produktpaket sein. Bitte entfernen Sie Artikel {1} und speichern Sie,
Credit limit reached for customer {0},Kreditlimit für Kunde erreicht {0},
Could not auto create Customer due to the following missing mandatory field(s):,Der Kunde konnte aufgrund der folgenden fehlenden Pflichtfelder nicht automatisch erstellt werden:,
Please create Customer from Lead {0}.,Bitte erstellen Sie einen Kunden aus Lead {0}.,
@@ -9490,7 +9342,7 @@
From date can not be less than employee's joining date.,Ab dem Datum darf das Beitrittsdatum des Mitarbeiters nicht unterschritten werden.,
To date can not be greater than employee's relieving date.,Bisher kann das Entlastungsdatum des Mitarbeiters nicht überschritten werden.,
Payroll date can not be greater than employee's relieving date.,Das Abrechnungsdatum darf nicht größer sein als das Entlastungsdatum des Mitarbeiters.,
-Row #{0}: Please enter the result value for {1},Zeile # {0}: Bitte geben Sie den Ergebniswert für {1} ein,
+Row #{0}: Please enter the result value for {1},Zeile {0}: Bitte geben Sie den Ergebniswert für {1} ein,
Mandatory Results,Obligatorische Ergebnisse,
Sales Invoice or Patient Encounter is required to create Lab Tests,Für die Erstellung von Labortests ist eine Ausgangsrechnung oder eine Patientenbegegnung erforderlich,
Insufficient Data,Unzureichende Daten,
@@ -9498,12 +9350,12 @@
Test :,Prüfung :,
Sample Collection {0} has been created,Die Probensammlung {0} wurde erstellt,
Normal Range: ,Normalbereich:,
-Row #{0}: Check Out datetime cannot be less than Check In datetime,Zeile # {0}: Die Check-out-Datumszeit darf nicht kleiner als die Check-In-Datumszeit sein,
+Row #{0}: Check Out datetime cannot be less than Check In datetime,Zeile {0}: Die Check-out-Datumszeit darf nicht kleiner als die Check-In-Datumszeit sein,
"Missing required details, did not create Inpatient Record","Fehlende erforderliche Details, keine stationäre Aufzeichnung erstellt",
Unbilled Invoices,Nicht in Rechnung gestellte Rechnungen,
Standard Selling Rate should be greater than zero.,Die Standardverkaufsrate sollte größer als Null sein.,
Conversion Factor is mandatory,Der Umrechnungsfaktor ist obligatorisch,
-Row #{0}: Conversion Factor is mandatory,Zeile # {0}: Der Umrechnungsfaktor ist obligatorisch,
+Row #{0}: Conversion Factor is mandatory,Zeile {0}: Der Umrechnungsfaktor ist obligatorisch,
Sample Quantity cannot be negative or 0,Die Probenmenge darf nicht negativ oder 0 sein,
Invalid Quantity,Ungültige Menge,
"Please set defaults for Customer Group, Territory and Selling Price List in Selling Settings","Bitte legen Sie in den Verkaufseinstellungen die Standardeinstellungen für Kundengruppe, Gebiet und Verkaufspreisliste fest",
@@ -9569,7 +9421,7 @@
You can alternatively disable selling price validation in {} to bypass this validation.,"Alternativ können Sie die Validierung des Verkaufspreises in {} deaktivieren, um diese Validierung zu umgehen.",
Invalid Selling Price,Ungültiger Verkaufspreis,
Address needs to be linked to a Company. Please add a row for Company in the Links table.,Die Adresse muss mit einem Unternehmen verknüpft sein. Bitte fügen Sie eine Zeile für Firma in die Tabelle Links ein.,
-Company Not Linked,Firma nicht verbunden,
+Company Not Linked,Firma nicht verknüpft,
Import Chart of Accounts from CSV / Excel files,Kontenplan aus CSV / Excel-Dateien importieren,
Completed Qty cannot be greater than 'Qty to Manufacture',Die abgeschlossene Menge darf nicht größer sein als die Menge bis zur Herstellung.,
"Row {0}: For Supplier {1}, Email Address is Required to send an email","Zeile {0}: Für Lieferant {1} ist eine E-Mail-Adresse erforderlich, um eine E-Mail zu senden",
@@ -9656,7 +9508,7 @@
Action If Quality Inspection Is Not Submitted,Maßnahme Wenn keine Qualitätsprüfung eingereicht wird,
Auto Insert Price List Rate If Missing,"Preisliste automatisch einfügen, falls fehlt",
Automatically Set Serial Nos Based on FIFO,Seriennummern basierend auf FIFO automatisch einstellen,
-Set Qty in Transactions Based on Serial No Input,Stellen Sie die Menge in Transaktionen basierend auf Seriennummer ohne Eingabe ein,
+Set Qty in Transactions Based on Serial No Input,Setze die Anzahl in der Transaktion basierend auf den Seriennummern,
Raise Material Request When Stock Reaches Re-order Level,"Erhöhen Sie die Materialanforderung, wenn der Lagerbestand die Nachbestellmenge erreicht",
Notify by Email on Creation of Automatic Material Request,Benachrichtigen Sie per E-Mail über die Erstellung einer automatischen Materialanforderung,
Allow Material Transfer from Delivery Note to Sales Invoice,Materialübertragung vom Lieferschein zur Ausgangsrechnung zulassen,
@@ -9695,7 +9547,7 @@
Payment amount cannot be less than or equal to 0,Der Zahlungsbetrag darf nicht kleiner oder gleich 0 sein,
Please enter the phone number first,Bitte geben Sie zuerst die Telefonnummer ein,
Row #{}: {} {} does not exist.,Zeile # {}: {} {} existiert nicht.,
-Row #{0}: {1} is required to create the Opening {2} Invoices,"Zeile # {0}: {1} ist erforderlich, um die Eröffnungsrechnungen {2} zu erstellen",
+Row #{0}: {1} is required to create the Opening {2} Invoices,"Zeile {0}: {1} ist erforderlich, um die Eröffnungsrechnungen {2} zu erstellen",
You had {} errors while creating opening invoices. Check {} for more details,Beim Erstellen von Eröffnungsrechnungen sind {} Fehler aufgetreten. Überprüfen Sie {} auf weitere Details,
Error Occured,Fehler aufgetreten,
Opening Invoice Creation In Progress,Öffnen der Rechnungserstellung läuft,
@@ -9707,7 +9559,7 @@
Posting future stock transactions are not allowed due to Immutable Ledger,Das Buchen zukünftiger Lagertransaktionen ist aufgrund des unveränderlichen Hauptbuchs nicht zulässig,
A BOM with name {0} already exists for item {1}.,Für Artikel {1} ist bereits eine Stückliste mit dem Namen {0} vorhanden.,
{0}{1} Did you rename the item? Please contact Administrator / Tech support,{0} {1} Haben Sie den Artikel umbenannt? Bitte wenden Sie sich an den Administrator / technischen Support,
-At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2},In Zeile # {0}: Die Sequenz-ID {1} darf nicht kleiner sein als die vorherige Zeilen-Sequenz-ID {2}.,
+At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2},In Zeile {0}: Die Sequenz-ID {1} darf nicht kleiner sein als die vorherige Zeilen-Sequenz-ID {2}.,
The {0} ({1}) must be equal to {2} ({3}),Die {0} ({1}) muss gleich {2} ({3}) sein.,
"{0}, complete the operation {1} before the operation {2}.","{0}, schließen Sie die Operation {1} vor der Operation {2} ab.",
Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No.,"Die Lieferung per Seriennummer kann nicht sichergestellt werden, da Artikel {0} mit und ohne Lieferung per Seriennummer hinzugefügt wird.",
@@ -9765,7 +9617,7 @@
POS invoice {0} created succesfully,POS-Rechnung {0} erfolgreich erstellt,
Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2}.,Lagermenge nicht ausreichend für Artikelcode: {0} unter Lager {1}. Verfügbare Menge {2}.,
Serial No: {0} has already been transacted into another POS Invoice.,Seriennummer: {0} wurde bereits in eine andere POS-Rechnung übertragen.,
-Balance Serial No,Balance Seriennr,
+Balance Serial No,Stand Seriennummern,
Warehouse: {0} does not belong to {1},Lager: {0} gehört nicht zu {1},
Please select batches for batched item {0},Bitte wählen Sie Chargen für Chargenartikel {0} aus,
Please select quantity on row {0},Bitte wählen Sie die Menge in Zeile {0},
@@ -9919,3 +9771,7 @@
Select an item from each set to be used in the Sales Order.,"Wählen Sie aus den Alternativen jeweils einen Artikel aus, der in die Auftragsbestätigung übernommen werden soll.",
Is Alternative,Ist Alternative,
Alternative Items,Alternativpositionen,
+Add Template,Vorlage einfügen,
+Prepend the template to the email message,Vorlage oberhalb der Email-Nachricht einfügen,
+Clear & Add Template,Leeren und Vorlage einfügen,
+Clear the email message and add the template,Email-Feld leeren und Vorlage einfügen,
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index c241558..7042eaf 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Ισχύει εάν η εταιρεία είναι SpA, SApA ή SRL",
Applicable if the company is a limited liability company,Ισχύει εάν η εταιρεία είναι εταιρεία περιορισμένης ευθύνης,
Applicable if the company is an Individual or a Proprietorship,Ισχύει εάν η εταιρεία είναι Πρόσωπο ή Ιδιοκτησία,
-Applicant,Αιτών,
-Applicant Type,Τύπος αιτούντος,
Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό),
Application period cannot be across two allocation records,Η περίοδος υποβολής αιτήσεων δεν μπορεί να εκτείνεται σε δύο εγγραφές κατανομής,
Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Κατάλογος διαθέσιμων Μετόχων με αριθμούς φακέλων,
Loading Payment System,Φόρτωση συστήματος πληρωμών,
Loan,Δάνειο,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0},
-Loan Application,Αίτηση για δάνειο,
-Loan Management,Διαχείριση δανείων,
-Loan Repayment,Αποπληρωμή δανείου,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Η ημερομηνία έναρξης δανείου και η περίοδος δανείου είναι υποχρεωτικές για την αποθήκευση της έκπτωσης τιμολογίου,
Loans (Liabilities),Δάνεια (παθητικό ),
Loans and Advances (Assets),Δάνεια και προκαταβολές ( ενεργητικό ),
@@ -1611,7 +1605,6 @@
Monday,Δευτέρα,
Monthly,Μηνιαίος,
Monthly Distribution,Μηνιαία διανομή,
-Monthly Repayment Amount cannot be greater than Loan Amount,Μηνιαία επιστροφή ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου,
More,Περισσότερο,
More Information,Περισσότερες πληροφορίες,
More than one selection for {0} not allowed,Δεν επιτρέπονται περισσότερες από μία επιλογές για {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Πληρώστε {0} {1},
Payable,Πληρωτέος,
Payable Account,Πληρωτέος λογαριασμός,
-Payable Amount,Πληρωτέο ποσό,
Payment,Πληρωμή,
Payment Cancelled. Please check your GoCardless Account for more details,Η πληρωμή ακυρώθηκε. Ελέγξτε το λογαριασμό GoCardless για περισσότερες λεπτομέρειες,
Payment Confirmation,Επιβεβαίωση πληρωμής,
-Payment Date,Ημερομηνία πληρωμής,
Payment Days,Ημέρες πληρωμής,
Payment Document,Έγγραφο πληρωμής,
Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Παρακαλώ εισάγετε πρώτα αποδεικτικό παραλαβής αγοράς,
Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής",
Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς,
-Please enter Repayment Periods,"Παρακαλούμε, εισάγετε περιόδους αποπληρωμής",
Please enter Reqd by Date,Πληκτρολογήστε Reqd by Date,
Please enter Woocommerce Server URL,Πληκτρολογήστε τη διεύθυνση URL του διακομιστή Woocommerce,
Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Παρακαλώ εισάγετε γονικό κέντρο κόστους,
Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0},
Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής,
-Please enter repayment Amount,"Παρακαλούμε, εισάγετε αποπληρωμής Ποσό",
Please enter valid Financial Year Start and End Dates,Παρακαλώ εισάγετε ένα έγκυρο οικονομικό έτος ημερομηνίες έναρξης και λήξης,
Please enter valid email address,Εισαγάγετε έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου,
Please enter {0} first,"Παρακαλούμε, εισάγετε {0} πρώτη",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα.,
Primary Address Details,Στοιχεία κύριας διεύθυνσης,
Primary Contact Details,Κύρια στοιχεία επικοινωνίας,
-Principal Amount,Κύριο ποσό,
Print Format,Μορφοποίηση εκτύπωσης,
Print IRS 1099 Forms,Εκτύπωση έντυπα IRS 1099,
Print Report Card,Εκτύπωση καρτών αναφοράς,
@@ -2550,7 +2538,6 @@
Sample Collection,Συλλογή δειγμάτων,
Sample quantity {0} cannot be more than received quantity {1},Η ποσότητα δείγματος {0} δεν μπορεί να είναι μεγαλύτερη από την ποσότητα που ελήφθη {1},
Sanctioned,Καθιερωμένος,
-Sanctioned Amount,Ποσό κύρωσης,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.,
Sand,Αμμος,
Saturday,Σάββατο,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} έχει ήδη μια διαδικασία γονέα {1}.,
API,API,
Annual,Ετήσιος,
-Approved,Εγκρίθηκε,
Change,Αλλαγή,
Contact Email,Email επαφής,
Export Type,Τύπος εξαγωγής,
@@ -3571,7 +3557,6 @@
Account Value,Αξία λογαριασμού,
Account is mandatory to get payment entries,Ο λογαριασμός είναι υποχρεωτικός για την πραγματοποίηση εγγραφών πληρωμής,
Account is not set for the dashboard chart {0},Ο λογαριασμός δεν έχει οριστεί για το διάγραμμα του πίνακα ελέγχου {0},
-Account {0} does not belong to company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1},
Account {0} does not exists in the dashboard chart {1},Ο λογαριασμός {0} δεν υπάρχει στο γράφημα του πίνακα ελέγχου {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Λογαριασμός: Το <b>{0}</b> είναι κεφάλαιο Οι εργασίες βρίσκονται σε εξέλιξη και δεν μπορούν να ενημερωθούν με καταχώριση ημερολογίου,
Account: {0} is not permitted under Payment Entry,Λογαριασμός: Η {0} δεν επιτρέπεται στην καταχώριση πληρωμής,
@@ -3582,7 +3567,6 @@
Activity,Δραστηριότητα,
Add / Manage Email Accounts.,Προσθήκη / διαχείριση λογαριασμών ηλεκτρονικού ταχυδρομείου.,
Add Child,Προσθήκη παιδιού,
-Add Loan Security,Προσθέστε ασφάλεια δανείου,
Add Multiple,Προσθήκη πολλαπλών,
Add Participants,Προσθέστε τους συμμετέχοντες,
Add to Featured Item,Προσθήκη στο Προτεινόμενο στοιχείο,
@@ -3593,15 +3577,12 @@
Address Line 1,Γραμμή διεύθυνσης 1,
Addresses,Διευθύνσεις,
Admission End Date should be greater than Admission Start Date.,Η ημερομηνία λήξης εισαγωγής πρέπει να είναι μεγαλύτερη από την ημερομηνία έναρξης εισαγωγής.,
-Against Loan,Ενάντια στο Δάνειο,
-Against Loan:,Ενάντια δανείου:,
All,Ολα,
All bank transactions have been created,Όλες οι τραπεζικές συναλλαγές έχουν δημιουργηθεί,
All the depreciations has been booked,Όλες οι αποσβέσεις έχουν εγγραφεί,
Allocation Expired!,Η κατανομή έχει λήξει!,
Allow Resetting Service Level Agreement from Support Settings.,Να επιτρέπεται η επαναφορά της συμφωνίας επιπέδου υπηρεσιών από τις ρυθμίσεις υποστήριξης.,
Amount of {0} is required for Loan closure,Ποσό {0} απαιτείται για το κλείσιμο του δανείου,
-Amount paid cannot be zero,Το ποσό που καταβλήθηκε δεν μπορεί να είναι μηδέν,
Applied Coupon Code,Κωδικός εφαρμοσμένου κουπονιού,
Apply Coupon Code,Εφαρμόστε τον κωδικό κουπονιού,
Appointment Booking,Κρατήσεις Κλήσεων,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Δεν είναι δυνατός ο υπολογισμός του χρόνου άφιξης, καθώς η διεύθυνση του οδηγού λείπει.",
Cannot Optimize Route as Driver Address is Missing.,"Δεν είναι δυνατή η βελτιστοποίηση της διαδρομής, καθώς η διεύθυνση του οδηγού λείπει.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Δεν είναι δυνατή η ολοκλήρωση της εργασίας {0} καθώς η εξαρτημένη εργασία {1} δεν έχει συμπληρωθεί / ακυρωθεί.,
-Cannot create loan until application is approved,Δεν είναι δυνατή η δημιουργία δανείου έως ότου εγκριθεί η αίτηση,
Cannot find a matching Item. Please select some other value for {0}.,Δεν μπορείτε να βρείτε μια αντίστοιχη Θέση. Παρακαλούμε επιλέξτε κάποια άλλη τιμή για το {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Δεν είναι δυνατή η υπερπαραγωγή στοιχείου {0} στη σειρά {1} περισσότερο από {2}. Για να επιτρέψετε την υπερχρέωση, παρακαλούμε να ορίσετε το επίδομα στις Ρυθμίσεις Λογαριασμών",
"Capacity Planning Error, planned start time can not be same as end time","Σφάλμα προγραμματισμού χωρητικότητας, η προγραμματισμένη ώρα έναρξης δεν μπορεί να είναι ίδια με την ώρα λήξης",
@@ -3812,20 +3792,9 @@
Less Than Amount,Λιγότερο από το ποσό,
Liabilities,Υποχρεώσεις,
Loading...,Φόρτωση...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Το ποσό δανείου υπερβαίνει το μέγιστο ποσό δανείου {0} σύμφωνα με τις προτεινόμενες αξίες,
Loan Applications from customers and employees.,Δάνειο Αιτήσεις από πελάτες και υπαλλήλους.,
-Loan Disbursement,Εκταμίευση δανείου,
Loan Processes,Διαδικασίες δανεισμού,
-Loan Security,Ασφάλεια δανείου,
-Loan Security Pledge,Εγγύηση ασφάλειας δανείου,
-Loan Security Pledge Created : {0},Δανεισμός ασφαλείας δανείου Δημιουργήθηκε: {0},
-Loan Security Price,Τιμή Ασφαλείας Δανείου,
-Loan Security Price overlapping with {0},Τιμή ασφάλειας δανείου που επικαλύπτεται με {0},
-Loan Security Unpledge,Ασφάλεια δανείου,
-Loan Security Value,Τιμή Ασφαλείας Δανείου,
Loan Type for interest and penalty rates,Τύπος δανείου για τόκους και ποινές,
-Loan amount cannot be greater than {0},Το ποσό δανείου δεν μπορεί να είναι μεγαλύτερο από {0},
-Loan is mandatory,Το δάνειο είναι υποχρεωτικό,
Loans,Δάνεια,
Loans provided to customers and employees.,Δάνεια που παρέχονται σε πελάτες και εργαζόμενους.,
Location,Τοποθεσία,
@@ -3894,7 +3863,6 @@
Pay,Πληρωμή,
Payment Document Type,Τύπος εγγράφου πληρωμής,
Payment Name,Όνομα πληρωμής,
-Penalty Amount,Ποσό ποινής,
Pending,εκκρεμής,
Performance,Εκτέλεση,
Period based On,Η περίοδος βασίζεται σε,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Συνδεθείτε ως χρήστης του Marketplace για να επεξεργαστείτε αυτό το στοιχείο.,
Please login as a Marketplace User to report this item.,Συνδεθείτε ως χρήστης του Marketplace για να αναφέρετε αυτό το στοιχείο.,
Please select <b>Template Type</b> to download template,Επιλέξτε <b>Τύπος προτύπου</b> για να κάνετε λήψη προτύπου,
-Please select Applicant Type first,Επιλέξτε πρώτα τον τύπο αιτούντος,
Please select Customer first,Επιλέξτε πρώτα τον πελάτη,
Please select Item Code first,Επιλέξτε πρώτα τον Κωδικό στοιχείου,
-Please select Loan Type for company {0},Επιλέξτε τύπο δανείου για εταιρεία {0},
Please select a Delivery Note,Επιλέξτε ένα Σημείωμα Παράδοσης,
Please select a Sales Person for item: {0},Επιλέξτε ένα πρόσωπο πωλήσεων για στοιχείο: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Επιλέξτε έναν άλλο τρόπο πληρωμής. Το Stripe δεν υποστηρίζει τις συναλλαγές στο νόμισμα '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Ρυθμίστε έναν προεπιλεγμένο τραπεζικό λογαριασμό για την εταιρεία {0},
Please specify,Παρακαλώ ορίστε,
Please specify a {0},Προσδιορίστε ένα {0},lead
-Pledge Status,Κατάσταση δέσμευσης,
-Pledge Time,Χρόνος δέσμευσης,
Printing,Εκτύπωση,
Priority,Προτεραιότητα,
Priority has been changed to {0}.,Η προτεραιότητα έχει αλλάξει σε {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Επεξεργασία αρχείων XML,
Profitability,Κερδοφορία,
Project,Έργο,
-Proposed Pledges are mandatory for secured Loans,Οι Προτεινόμενες Υποχρεώσεις είναι υποχρεωτικές για τα εξασφαλισμένα Δάνεια,
Provide the academic year and set the starting and ending date.,Παρέχετε το ακαδημαϊκό έτος και ορίστε την ημερομηνία έναρξης και λήξης.,
Public token is missing for this bank,Δημόσιο διακριτικό λείπει για αυτήν την τράπεζα,
Publish,Δημοσιεύω,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Η παραλαβή αγοράς δεν διαθέτει στοιχείο για το οποίο είναι ενεργοποιημένο το δείγμα διατήρησης δείγματος.,
Purchase Return,Επιστροφή αγοράς,
Qty of Finished Goods Item,Ποσότητα τεμαχίου τελικών προϊόντων,
-Qty or Amount is mandatroy for loan security,Το Ποσό ή το Ποσό είναι απαραίτητο για την ασφάλεια του δανείου,
Quality Inspection required for Item {0} to submit,Επιθεώρηση ποιότητας που απαιτείται για το στοιχείο {0} για υποβολή,
Quantity to Manufacture,Ποσότητα προς παραγωγή,
Quantity to Manufacture can not be zero for the operation {0},Η ποσότητα παραγωγής δεν μπορεί να είναι μηδενική για τη λειτουργία {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Η ημερομηνία ανακούφισης πρέπει να είναι μεγαλύτερη ή ίση με την Ημερομηνία Σύνδεσης,
Rename,Μετονομασία,
Rename Not Allowed,Μετονομασία Δεν επιτρέπεται,
-Repayment Method is mandatory for term loans,Η μέθοδος αποπληρωμής είναι υποχρεωτική για δάνεια με διάρκεια,
-Repayment Start Date is mandatory for term loans,Η ημερομηνία έναρξης αποπληρωμής είναι υποχρεωτική για τα δάνεια με διάρκεια,
Report Item,Στοιχείο αναφοράς,
Report this Item,Αναφέρετε αυτό το στοιχείο,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Προβλεπόμενη ποσότητα για υπεργολαβία: Ποσότητα πρώτων υλών για την πραγματοποίηση εργασιών υπεργολαβίας.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Η σειρά ({0}): {1} είναι ήδη προεξοφλημένη στο {2},
Rows Added in {0},Γραμμές που προστέθηκαν στο {0},
Rows Removed in {0},Οι σειρές έχουν καταργηθεί στο {0},
-Sanctioned Amount limit crossed for {0} {1},Το όριο ποσού που έχει κυρωθεί για {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Ποσό δανείου που έχει κυρωθεί υπάρχει ήδη για {0} έναντι εταιρείας {1},
Save,Αποθήκευση,
Save Item,Αποθήκευση στοιχείου,
Saved Items,Αποθηκευμένα στοιχεία,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Ο χρήστης {0} είναι απενεργοποιημένος,
Users and Permissions,Χρήστες και δικαιώματα,
Vacancies cannot be lower than the current openings,Οι κενές θέσεις εργασίας δεν μπορούν να είναι χαμηλότερες από τα τρέχοντα ανοίγματα,
-Valid From Time must be lesser than Valid Upto Time.,Το Valid From Time πρέπει να είναι μικρότερο από το Valid Upto Time.,
Valuation Rate required for Item {0} at row {1},Απαιτείται συντελεστής αποτίμησης για το στοιχείο {0} στη σειρά {1},
Values Out Of Sync,Τιμές εκτός συγχρονισμού,
Vehicle Type is required if Mode of Transport is Road,Ο τύπος οχήματος απαιτείται εάν ο τρόπος μεταφοράς είναι οδικώς,
@@ -4211,7 +4168,6 @@
Add to Cart,Προσθήκη στο καλάθι,
Days Since Last Order,Ημέρες από την τελευταία σειρά,
In Stock,Σε απόθεμα,
-Loan Amount is mandatory,Το ποσό δανείου είναι υποχρεωτικό,
Mode Of Payment,Τρόπος Πληρωμής,
No students Found,Δεν βρέθηκαν μαθητές,
Not in Stock,Όχι στο Αποθεματικό,
@@ -4240,7 +4196,6 @@
Group by,Ομαδοποίηση κατά,
In stock,Σε απόθεμα,
Item name,Όνομα είδους,
-Loan amount is mandatory,Το ποσό δανείου είναι υποχρεωτικό,
Minimum Qty,Ελάχιστη ποσότητα,
More details,Περισσότερες λεπτομέρειες,
Nature of Supplies,Φύση των αναλωσίμων,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Συνολική ποσότητα που ολοκληρώθηκε,
Qty to Manufacture,Ποσότητα για κατασκευή,
Repay From Salary can be selected only for term loans,Η αποπληρωμή από το μισθό μπορεί να επιλεγεί μόνο για δάνεια διάρκειας,
-No valid Loan Security Price found for {0},Δεν βρέθηκε έγκυρη τιμή ασφάλειας δανείου για {0},
-Loan Account and Payment Account cannot be same,Ο λογαριασμός δανείου και ο λογαριασμός πληρωμής δεν μπορούν να είναι ίδιοι,
-Loan Security Pledge can only be created for secured loans,Η εγγύηση δανείου μπορεί να δημιουργηθεί μόνο για εξασφαλισμένα δάνεια,
Social Media Campaigns,Εκστρατείες κοινωνικών μέσων,
From Date can not be greater than To Date,Η ημερομηνία δεν μπορεί να είναι μεγαλύτερη από την ημερομηνία,
Please set a Customer linked to the Patient,Ορίστε έναν Πελάτη συνδεδεμένο με τον Ασθενή,
@@ -6437,7 +6389,6 @@
HR User,Χρήστης ανθρωπίνου δυναμικού,
Appointment Letter,Επιστολή διορισμού,
Job Applicant,Αιτών εργασία,
-Applicant Name,Όνομα αιτούντος,
Appointment Date,Ημερομηνία ραντεβού,
Appointment Letter Template,Πρότυπο επιστολής συνάντησης,
Body,Σώμα,
@@ -7059,99 +7010,12 @@
Sync in Progress,Συγχρονισμός σε εξέλιξη,
Hub Seller Name,Όνομα πωλητή Hub,
Custom Data,Προσαρμοσμένα δεδομένα,
-Member,Μέλος,
-Partially Disbursed,"Εν μέρει, προέβη στη χορήγηση",
-Loan Closure Requested,Απαιτείται κλείσιμο δανείου,
Repay From Salary,Επιστρέψει από το μισθό,
-Loan Details,Λεπτομέρειες δανείου,
-Loan Type,Τύπος Δανείου,
-Loan Amount,Ποσο δανειου,
-Is Secured Loan,Είναι εξασφαλισμένο δάνειο,
-Rate of Interest (%) / Year,Επιτόκιο (%) / Έτος,
-Disbursement Date,Ημερομηνία εκταμίευσης,
-Disbursed Amount,Ποσό εκταμιεύσεων,
-Is Term Loan,Είναι δάνειο διάρκειας,
-Repayment Method,Τρόπος αποπληρωμής,
-Repay Fixed Amount per Period,Εξοφλήσει σταθερό ποσό ανά Περίοδο,
-Repay Over Number of Periods,Εξοφλήσει Πάνω αριθμός των περιόδων,
-Repayment Period in Months,Αποπληρωμή Περίοδος σε μήνες,
-Monthly Repayment Amount,Μηνιαία επιστροφή Ποσό,
-Repayment Start Date,Ημερομηνία έναρξης επιστροφής,
-Loan Security Details,Στοιχεία Ασφαλείας Δανείου,
-Maximum Loan Value,Μέγιστη τιμή δανείου,
-Account Info,Πληροφορίες λογαριασμού,
-Loan Account,Λογαριασμός δανείου,
-Interest Income Account,Ο λογαριασμός Έσοδα από Τόκους,
-Penalty Income Account,Λογαριασμός εισοδήματος,
-Repayment Schedule,Χρονοδιάγραμμα αποπληρωμής,
-Total Payable Amount,Συνολικό πληρωτέο ποσό,
-Total Principal Paid,Συνολική πληρωμή βασικού ποσού,
-Total Interest Payable,Σύνολο Τόκοι πληρωτέοι,
-Total Amount Paid,Συνολικό ποσό που καταβλήθηκε,
-Loan Manager,Διευθυντής Δανείων,
-Loan Info,Πληροφορίες δανείων,
-Rate of Interest,Βαθμός ενδιαφέροντος,
-Proposed Pledges,Προτεινόμενες υποσχέσεις,
-Maximum Loan Amount,Ανώτατο ποσό του δανείου,
-Repayment Info,Πληροφορίες αποπληρωμής,
-Total Payable Interest,Σύνολο πληρωτέοι τόκοι,
-Against Loan ,Ενάντια στο δάνειο,
-Loan Interest Accrual,Δαπάνη δανεισμού,
-Amounts,Ποσά,
-Pending Principal Amount,Εκκρεμεί το κύριο ποσό,
-Payable Principal Amount,Βασικό ποσό πληρωτέο,
-Paid Principal Amount,Πληρωμένο κύριο ποσό,
-Paid Interest Amount,Ποσό καταβεβλημένου τόκου,
-Process Loan Interest Accrual,Διαδικασία δανεισμού διαδικασιών,
-Repayment Schedule Name,Όνομα προγράμματος αποπληρωμής,
Regular Payment,Τακτική Πληρωμή,
Loan Closure,Κλείσιμο δανείου,
-Payment Details,Οι λεπτομέρειες πληρωμής,
-Interest Payable,Πληρωτέος τόκος,
-Amount Paid,Πληρωμένο Ποσό,
-Principal Amount Paid,Βασικό ποσό που καταβλήθηκε,
-Repayment Details,Λεπτομέρειες αποπληρωμής,
-Loan Repayment Detail,Λεπτομέρεια αποπληρωμής δανείου,
-Loan Security Name,Όνομα ασφάλειας δανείου,
-Unit Of Measure,Μονάδα μέτρησης,
-Loan Security Code,Κωδικός ασφαλείας δανείου,
-Loan Security Type,Τύπος ασφαλείας δανείου,
-Haircut %,ΚΟΥΡΕΜΑ ΜΑΛΛΙΩΝ %,
-Loan Details,Λεπτομέρειες δανείου,
-Unpledged,Χωρίς υποσχέσεις,
-Pledged,Δεσμεύτηκε,
-Partially Pledged,Εν μέρει δέσμευση,
-Securities,Χρεόγραφα,
-Total Security Value,Συνολική αξία ασφαλείας,
-Loan Security Shortfall,Σφάλμα ασφάλειας δανείων,
-Loan ,Δάνειο,
-Shortfall Time,Χρόνος έλλειψης,
-America/New_York,Αμερική / New_York,
-Shortfall Amount,Ποσό ελλείψεων,
-Security Value ,Τιμή ασφαλείας,
-Process Loan Security Shortfall,Διαδικασία έλλειψης ασφάλειας δανείων διαδικασίας,
-Loan To Value Ratio,Αναλογία δανείου προς αξία,
-Unpledge Time,Χρόνος αποποίησης,
-Loan Name,δάνειο Όνομα,
Rate of Interest (%) Yearly,Επιτόκιο (%) Ετήσιο,
-Penalty Interest Rate (%) Per Day,Επιτόκιο ποινής (%) ανά ημέρα,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Το επιτόκιο κυρώσεων επιβάλλεται σε ημερήσια βάση σε περίπτωση καθυστερημένης εξόφλησης,
-Grace Period in Days,Περίοδος χάριτος στις Ημέρες,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Αριθμός ημερών από την ημερομηνία λήξης έως την οποία δεν θα επιβληθεί ποινή σε περίπτωση καθυστέρησης στην αποπληρωμή δανείου,
-Pledge,Ενέχυρο,
-Post Haircut Amount,Δημοσίευση ποσού Haircut,
-Process Type,Τύπος διαδικασίας,
-Update Time,Ώρα ενημέρωσης,
-Proposed Pledge,Προτεινόμενη υπόσχεση,
-Total Payment,Σύνολο πληρωμών,
-Balance Loan Amount,Υπόλοιπο Ποσό Δανείου,
-Is Accrued,Είναι δεδουλευμένη,
Salary Slip Loan,Δανείου μισθοδοσίας,
Loan Repayment Entry,Καταχώρηση αποπληρωμής δανείου,
-Sanctioned Loan Amount,Ποσό δανείου που έχει κυρωθεί,
-Sanctioned Amount Limit,Καθορισμένο όριο ποσού,
-Unpledge,Αποποίηση,
-Haircut,ΚΟΥΡΕΜΑ ΜΑΛΛΙΩΝ,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Δημιούργησε πρόγραμμα,
Schedules,Χρονοδιαγράμματα,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Του έργου θα είναι προσβάσιμη στην ιστοσελίδα του σε αυτούς τους χρήστες,
Copied From,Αντιγραφή από,
Start and End Dates,Ημερομηνίες έναρξης και λήξης,
-Actual Time (in Hours),Πραγματική ώρα (σε ώρες),
+Actual Time in Hours (via Timesheet),Πραγματική ώρα (σε ώρες),
Costing and Billing,Κοστολόγηση και Τιμολόγηση,
-Total Costing Amount (via Timesheets),Συνολικό ποσό κοστολόγησης (μέσω Timesheets),
-Total Expense Claim (via Expense Claims),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων),
+Total Costing Amount (via Timesheet),Συνολικό ποσό κοστολόγησης (μέσω Timesheets),
+Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων),
Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς),
Total Sales Amount (via Sales Order),Συνολικό Ποσό Πωλήσεων (μέσω Παραγγελίας),
-Total Billable Amount (via Timesheets),Συνολικό χρεώσιμο ποσό (μέσω Timesheets),
-Total Billed Amount (via Sales Invoices),Συνολικό ποσό χρέωσης (μέσω τιμολογίων πωλήσεων),
-Total Consumed Material Cost (via Stock Entry),Συνολικό Καταναλωμένο Κόστος Υλικού (μέσω Εισαγωγής στο Αποθεματικό),
+Total Billable Amount (via Timesheet),Συνολικό χρεώσιμο ποσό (μέσω Timesheets),
+Total Billed Amount (via Sales Invoice),Συνολικό ποσό χρέωσης (μέσω τιμολογίων πωλήσεων),
+Total Consumed Material Cost (via Stock Entry),Συνολικό Καταναλωμένο Κόστος Υλικού (μέσω Εισαγωγής στο Αποθεματικό),
Gross Margin,Μικτό Περιθώριο Κέρδους,
Gross Margin %,Μικτό κέρδος (περιθώριο) %,
Monitor Progress,Παρακολουθήστε την πρόοδο,
@@ -7521,12 +7385,10 @@
Dependencies,Εξαρτήσεις,
Dependent Tasks,Εξαρτημένες εργασίες,
Depends on Tasks,Εξαρτάται από Εργασίες,
-Actual Start Date (via Time Sheet),Πραγματική Ημερομηνία Έναρξης (μέσω Ώρα Φύλλο),
-Actual Time (in hours),Πραγματικός χρόνος (σε ώρες),
-Actual End Date (via Time Sheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο),
-Total Costing Amount (via Time Sheet),Σύνολο Κοστολόγηση Ποσό (μέσω Ώρα Φύλλο),
+Actual Start Date (via Timesheet),Πραγματική Ημερομηνία Έναρξης (μέσω Ώρα Φύλλο),
+Actual Time in Hours (via Timesheet),Πραγματικός χρόνος (σε ώρες),
+Actual End Date (via Timesheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο),
Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αιτημάτων εξόδων),
-Total Billing Amount (via Time Sheet),Συνολικό Ποσό χρέωσης (μέσω Ώρα Φύλλο),
Review Date,Ημερομηνία αξιολόγησης,
Closing Date,Καταληκτική ημερομηνία,
Task Depends On,Εργασία Εξαρτάται από,
@@ -7887,7 +7749,6 @@
Update Series,Ενημέρωση σειράς,
Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.,
Prefix,Πρόθεμα,
-Current Value,Τρέχουσα αξία,
This is the number of the last created transaction with this prefix,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα,
Update Series Number,Ενημέρωση αριθμού σειράς,
Quotation Lost Reason,Λόγος απώλειας προσφοράς,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος,
Lead Details,Λεπτομέρειες Σύστασης,
Lead Owner Efficiency,Ηγετική απόδοση του ιδιοκτήτη,
-Loan Repayment and Closure,Επιστροφή και κλείσιμο δανείου,
-Loan Security Status,Κατάσταση ασφάλειας δανείου,
Lost Opportunity,Χαμένη Ευκαιρία,
Maintenance Schedules,Χρονοδιαγράμματα συντήρησης,
Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Πλήθος στόχευσης: {0},
Payment Account is mandatory,Ο λογαριασμός πληρωμής είναι υποχρεωτικός,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Εάν ελεγχθεί, το πλήρες ποσό θα αφαιρεθεί από το φορολογητέο εισόδημα πριν από τον υπολογισμό του φόρου εισοδήματος χωρίς καμία δήλωση ή υποβολή αποδεικτικών στοιχείων.",
-Disbursement Details,Λεπτομέρειες εκταμίευσης,
Material Request Warehouse,Αποθήκη αιτήματος υλικού,
Select warehouse for material requests,Επιλέξτε αποθήκη για αιτήματα υλικών,
Transfer Materials For Warehouse {0},Μεταφορά υλικών για αποθήκη {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Επιστρέψτε το ποσό που δεν ζητήθηκε από το μισθό,
Deduction from salary,Έκπτωση από το μισθό,
Expired Leaves,Έληξε φύλλα,
-Reference No,Αριθμός αναφοράς,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Το ποσοστό κούρεμα είναι η ποσοστιαία διαφορά μεταξύ της αγοραίας αξίας της Ασφάλειας Δανείου και της αξίας που αποδίδεται σε αυτήν την Ασφάλεια Δανείου όταν χρησιμοποιείται ως εγγύηση για αυτό το δάνειο.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Loan to Value Ratio εκφράζει την αναλογία του ποσού του δανείου προς την αξία του εγγυημένου τίτλου. Ένα έλλειμμα ασφάλειας δανείου θα ενεργοποιηθεί εάν αυτό πέσει κάτω από την καθορισμένη τιμή για οποιοδήποτε δάνειο,
If this is not checked the loan by default will be considered as a Demand Loan,"Εάν αυτό δεν ελεγχθεί, το δάνειο από προεπιλογή θα θεωρείται ως Δάνειο Ζήτησης",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Αυτός ο λογαριασμός χρησιμοποιείται για την κράτηση αποπληρωμών δανείου από τον δανειολήπτη και επίσης για την εκταμίευση δανείων προς τον οφειλέτη,
This account is capital account which is used to allocate capital for loan disbursal account ,Αυτός ο λογαριασμός είναι λογαριασμός κεφαλαίου που χρησιμοποιείται για την κατανομή κεφαλαίου για λογαριασμό εκταμίευσης δανείου,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Η λειτουργία {0} δεν ανήκει στην εντολή εργασίας {1},
Print UOM after Quantity,Εκτύπωση UOM μετά την ποσότητα,
Set default {0} account for perpetual inventory for non stock items,Ορίστε τον προεπιλεγμένο λογαριασμό {0} για διαρκές απόθεμα για μη αποθέματα,
-Loan Security {0} added multiple times,Η ασφάλεια δανείου {0} προστέθηκε πολλές φορές,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Τα δανειακά χρεόγραφα με διαφορετική αναλογία LTV δεν μπορούν να δεσμευτούν έναντι ενός δανείου,
-Qty or Amount is mandatory for loan security!,Το ποσό ή το ποσό είναι υποχρεωτικό για την ασφάλεια δανείου!,
-Only submittted unpledge requests can be approved,Μπορούν να εγκριθούν μόνο αιτήματα αποσύνδεσης που έχουν υποβληθεί,
-Interest Amount or Principal Amount is mandatory,Ποσό τόκου ή κύριο ποσό είναι υποχρεωτικό,
-Disbursed Amount cannot be greater than {0},Το εκταμιευμένο ποσό δεν μπορεί να είναι μεγαλύτερο από {0},
-Row {0}: Loan Security {1} added multiple times,Σειρά {0}: Ασφάλεια δανείου {1} προστέθηκε πολλές φορές,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Σειρά # {0}: Το θυγατρικό στοιχείο δεν πρέπει να είναι πακέτο προϊόντων. Καταργήστε το στοιχείο {1} και αποθηκεύστε,
Credit limit reached for customer {0},Συμπληρώθηκε το πιστωτικό όριο για τον πελάτη {0},
Could not auto create Customer due to the following missing mandatory field(s):,Δεν ήταν δυνατή η αυτόματη δημιουργία πελάτη λόγω των ακόλουθων υποχρεωτικών πεδίων που λείπουν:,
diff --git a/erpnext/translations/en-US.csv b/erpnext/translations/en-US.csv
index 845bae3..85272a9 100644
--- a/erpnext/translations/en-US.csv
+++ b/erpnext/translations/en-US.csv
@@ -1,47 +1,47 @@
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +93,Cheques Required,Checks Required
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row #{0}: Clearance date {1} cannot be before Check Date {2}
-apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,People who teach at your organization
-apps/erpnext/erpnext/stock/stock_ledger.py +482,"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","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 submitting/canceling this entry"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave cannot be applied/canceled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}"
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before canceling this Warranty Claim
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +100,"Appointment cancelled, Please review and cancel the invoice {0}","Appointment canceled, Please review and cancel the invoice {0}"
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Outstanding Checks and Deposits to clear
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +103,Appointment cancelled,Appointment canceled
-DocType: Payment Entry,Cheque/Reference Date,Check/Reference Date
-DocType: Cheque Print Template,Scanned Cheque,Scanned Check
-DocType: Cheque Print Template,Cheque Size,Check Size
-apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Maintenance Status has to be Canceled or Completed to Submit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +486,'Entries' cannot be empty,'Entries' can not be empty
-apps/erpnext/erpnext/setup/doctype/company/company.py +84,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be canceled to change the default currency."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +257,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Maintenance Visit {0} must be canceled before cancelling this Sales Order
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +235,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Sales Invoice {0} must be canceled before cancelling this Sales Order
-DocType: Bank Reconciliation Detail,Cheque Date,Check Date
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +249,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stopped Work Order cannot be canceled, Unstop it first to cancel"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +164,Material Request {0} is cancelled or stopped,Material Request {0} is canceled or stopped
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +188,Closed order cannot be cancelled. Unclose to cancel.,Closed order cannot be canceled. Unclose to cancel.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +246,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Schedule {0} must be canceled before cancelling this Sales Order
-DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment on Cancelation of Invoice
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery Notes {0} must be canceled before cancelling this Sales Order
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Work Order {0} must be cancelled before cancelling this Sales Order,Work Order {0} must be canceled before cancelling this Sales Order
-apps/erpnext/erpnext/config/accounts.py +240,Setup cheque dimensions for printing,Setup check dimensions for printing
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checks and Deposits incorrectly cleared
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +130,{0} {1} is cancelled so the action cannot be completed,{0} {1} is canceled so the action cannot be completed
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +300,Packing Slip(s) cancelled,Packing Slip(s) canceled
-DocType: Payment Entry,Cheque/Reference No,Check/Reference No
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
-DocType: Cheque Print Template,Cheque Print Template,Check Print Template
-apps/erpnext/erpnext/controllers/buying_controller.py +503,{0} {1} is cancelled or closed,{0} {1} is canceled or closed
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Quotation {0} is cancelled,Quotation {0} is canceled
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +367,Timesheet {0} is already completed or cancelled,Timesheet {0} is already completed or canceled
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,Payment Canceled. Please check your GoCardless Account for more details
-apps/erpnext/erpnext/stock/doctype/item/item.py +840,Item {0} is cancelled,Item {0} is canceled
-DocType: Serial No,Is Cancelled,Is Canceled
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +227,{0} {1} is cancelled or stopped,{0} {1} is canceled or stopped
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Colour,Color
-DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel Material Visits {0} before canceling this Maintenance Visit
-DocType: Employee,Cheque,Check
-DocType: Cheque Print Template,Cheque Height,Check Height
-DocType: Cheque Print Template,Cheque Width,Check Width
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Wire Transfer,Wire Transfer
+Cheques Required,Checks Required,
+Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row #{0}: Clearance date {1} cannot be before Check Date {2}
+People who teach at your organisation,People who teach at your organization,
+"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","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 submitting/canceling this entry"
+"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave cannot be applied/canceled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}"
+Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before canceling this Warranty Claim,
+"Appointment cancelled, Please review and cancel the invoice {0}","Appointment canceled, Please review and cancel the invoice {0}"
+Outstanding Cheques and Deposits to clear,Outstanding Checks and Deposits to clear,
+Appointment cancelled,Appointment canceled,
+Cheque/Reference Date,Check/Reference Date,
+Scanned Cheque,Scanned Check,
+Cheque Size,Check Size,
+Maintenance Status has to be Cancelled or Completed to Submit,Maintenance Status has to be Canceled or Completed to Submit,
+'Entries' cannot be empty,'Entries' can not be empty,
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Cannot change company's default currency, because there are existing transactions. Transactions must be canceled to change the default currency."
+Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Maintenance Visit {0} must be canceled before cancelling this Sales Order,
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Sales Invoice {0} must be canceled before cancelling this Sales Order,
+Cheque Date,Check Date,
+"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stopped Work Order cannot be canceled, Unstop it first to cancel"
+Material Request {0} is cancelled or stopped,Material Request {0} is canceled or stopped,
+Closed order cannot be cancelled. Unclose to cancel.,Closed order cannot be canceled. Unclose to cancel.
+Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Schedule {0} must be canceled before cancelling this Sales Order,
+Unlink Payment on Cancellation of Invoice,Unlink Payment on Cancelation of Invoice,
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery Notes {0} must be canceled before cancelling this Sales Order,
+Work Order {0} must be cancelled before cancelling this Sales Order,Work Order {0} must be canceled before cancelling this Sales Order,
+Setup cheque dimensions for printing,Setup check dimensions for printing,
+Cheques and Deposits incorrectly cleared,Checks and Deposits incorrectly cleared,
+{0} {1} is cancelled so the action cannot be completed,{0} {1} is canceled so the action cannot be completed,
+Packing Slip(s) cancelled,Packing Slip(s) canceled,
+Cheque/Reference No,Check/Reference No,
+"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
+Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
+Cheque Print Template,Check Print Template,
+{0} {1} is cancelled or closed,{0} {1} is canceled or closed,
+Quotation {0} is cancelled,Quotation {0} is canceled,
+Timesheet {0} is already completed or cancelled,Timesheet {0} is already completed or canceled,
+Payment Cancelled. Please check your GoCardless Account for more details,Payment Canceled. Please check your GoCardless Account for more details,
+Item {0} is cancelled,Item {0} is canceled,
+Is Cancelled,Is Canceled,
+{0} {1} is cancelled or stopped,{0} {1} is canceled or stopped,
+Colour,Color,
+Cheque Number,Check Number,
+Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel Material Visits {0} before canceling this Maintenance Visit,
+Cheque,Check,
+Cheque Height,Check Height,
+Cheque Width,Check Width,
+Wire Transfer,Wire Transfer,
diff --git a/erpnext/translations/es-AR.csv b/erpnext/translations/es-AR.csv
index 2e9ff31..6c8efa6 100644
--- a/erpnext/translations/es-AR.csv
+++ b/erpnext/translations/es-AR.csv
@@ -1,6 +1,6 @@
-DocType: Fee Structure,Components,Componentes
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},"Empleado {0}, media jornada el día {1}"
-DocType: Purchase Invoice Item,Item,Producto
-DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdidas
-DocType: Cheque Print Template,Cheque Size,Tamaño de Cheque
-apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Hacer lotes de Estudiante
+Components,Componentes,
+Employee {0} on Half day on {1},"Empleado {0}, media jornada el día {1}"
+Item,Producto,
+Deductions or Loss,Deducciones o Pérdidas,
+Cheque Size,Tamaño de Cheque,
+Make Student Batch,Hacer lotes de Estudiante,
diff --git a/erpnext/translations/es-CL.csv b/erpnext/translations/es-CL.csv
index a0a1df7..cceba1a 100644
--- a/erpnext/translations/es-CL.csv
+++ b/erpnext/translations/es-CL.csv
@@ -1,32 +1,32 @@
-DocType: Assessment Plan,Grading Scale,Escala de Calificación
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Número de Móvil de Guardián 1
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Ganancia / Pérdida Bruta
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Los cheques y depósitos resueltos de forma incorrecta
-DocType: Assessment Group,Parent Assessment Group,Grupo de Evaluación Padre
-DocType: Student,Guardians,Guardianes
-DocType: Fee Schedule,Fee Schedule,Programa de Tarifas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1021,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
-DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web
-DocType: Delivery Note,% Installed,% Instalado
-DocType: Student,Guardian Details,Detalles del Guardián
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Nombre de Guardián 1
-DocType: Grading Scale Interval,Grade Code,Grado de Código
-DocType: Fee Schedule,Fee Structure,Estructura de Tarifas
-DocType: Purchase Order,Get Items from Open Material Requests,Obtener Ítems de Solicitudes Abiertas de Materiales
-,Batch Item Expiry Status,Estatus de Expiración de Lote de Ítems
-DocType: Guardian,Guardian Interests,Intereses del Guardián
-DocType: Guardian,Guardian Name,Nombre del Guardián
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Artículo hijo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar
-DocType: BOM Scrap Item,Basic Amount (Company Currency),Monto Base (Divisa de Compañía)
-DocType: Grading Scale,Grading Scale Name,Nombre de Escala de Calificación
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Número de Móvil de Guardián 2
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Nombre de Guardián 2
-DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
-DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de cursos
-DocType: Shopping Cart Settings,Checkout Settings,Ajustes de Finalización de Pedido
-DocType: Guardian Interest,Guardian Interest,Interés del Guardián
-apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las lecturas se pueden programar."
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Finalizando pedido
-DocType: Guardian Student,Guardian Student,Guardián del Estudiante
-DocType: BOM Operation,Base Hour Rate(Company Currency),Tarifa Base por Hora (Divisa de Compañía)
+Grading Scale,Escala de Calificación,
+Guardian1 Mobile No,Número de Móvil de Guardián 1,
+Gross Profit / Loss,Ganancia / Pérdida Bruta,
+Cheques and Deposits incorrectly cleared,Los cheques y depósitos resueltos de forma incorrecta,
+Parent Assessment Group,Grupo de Evaluación Padre,
+Guardians,Guardianes,
+Fee Schedule,Programa de Tarifas,
+Get Items from Product Bundle,Obtener Ítems de Paquete de Productos,
+BOM does not contain any stock item,BOM no contiene ningún ítem de stock,
+Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web,
+% Installed,% Instalado,
+Guardian Details,Detalles del Guardián,
+Guardian1 Name,Nombre de Guardián 1,
+Grade Code,Grado de Código,
+Fee Structure,Estructura de Tarifas,
+Get Items from Open Material Requests,Obtener Ítems de Solicitudes Abiertas de Materiales,
+Batch Item Expiry Status,Estatus de Expiración de Lote de Ítems,
+Guardian Interests,Intereses del Guardián,
+Guardian Name,Nombre del Guardián,
+Child Item should not be a Product Bundle. Please remove item `{0}` and save,Artículo hijo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar,
+Basic Amount (Company Currency),Monto Base (Divisa de Compañía)
+Grading Scale Name,Nombre de Escala de Calificación,
+Guardian2 Mobile No,Número de Móvil de Guardián 2,
+Guardian2 Name,Nombre de Guardián 2,
+Customer or Supplier Details,Detalle de cliente o proveedor,
+Course Scheduling Tool,Herramienta de Programación de cursos,
+Checkout Settings,Ajustes de Finalización de Pedido,
+Guardian Interest,Interés del Guardián,
+Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las lecturas se pueden programar."
+Checkout,Finalizando pedido,
+Guardian Student,Guardián del Estudiante,
+Base Hour Rate(Company Currency),Tarifa Base por Hora (Divisa de Compañía)
diff --git a/erpnext/translations/es-CO.csv b/erpnext/translations/es-CO.csv
index d74f9e5..8754234 100644
--- a/erpnext/translations/es-CO.csv
+++ b/erpnext/translations/es-CO.csv
@@ -1,3 +1,3 @@
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Barcode {0} is not a valid {1} code,El código de barras {0} no es un código válido {1}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +190,{0} on Half day Leave on {1},{0} Ausente medio día en {1}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +200,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no tiene agenda del profesional médico . Añádelo al médico correspondiente.
+Barcode {0} is not a valid {1} code,El código de barras {0} no es un código válido {1}
+{0} on Half day Leave on {1},{0} Ausente medio día en {1}
+{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no tiene agenda del profesional médico . Añádelo al médico correspondiente.
diff --git a/erpnext/translations/es-EC.csv b/erpnext/translations/es-EC.csv
index 15008a4..947805b 100644
--- a/erpnext/translations/es-EC.csv
+++ b/erpnext/translations/es-EC.csv
@@ -1,12 +1,12 @@
-DocType: Supplier,Block Supplier,Bloque de Proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +742,"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
-apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,No se puede crear una bonificación de retención para los empleados que se han marchado
-apps/erpnext/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py +23,Cancel the journal entry {0} first,Cancelar el ingreso diario {0} primero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,No se puede transferir Empleado con estado ah salido
-DocType: Employee Benefit Claim,Benefit Type and Amount,Tipo de beneficio y monto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +878,Block Invoice,Bloque de Factura
-apps/erpnext/erpnext/stock/doctype/item/item.py +742,"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
-DocType: Item,Asset Naming Series,Series de Nombres de Activos
-,BOM Variance Report,Informe de varianza BOM(Lista de Materiales)
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,No se puede promover Empleado con estado ha salido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Auto repeat document updated,Repetición automática del documento actualizado
+Block Supplier,Bloque de Proveedor,
+"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
+Cannot create Retention Bonus for left Employees,No se puede crear una bonificación de retención para los empleados que se han marchado,
+Cancel the journal entry {0} first,Cancelar el ingreso diario {0} primero,
+Cannot transfer Employee with status Left,No se puede transferir Empleado con estado ah salido,
+Benefit Type and Amount,Tipo de beneficio y monto,
+Block Invoice,Bloque de Factura,
+"Asset is already exists against the item {0}, you cannot change the has serial no value","El activo ya existe contra el artículo {0}, no puede cambiar no tiene valor de serie"
+Asset Naming Series,Series de Nombres de Activos,
+BOM Variance Report,Informe de varianza BOM(Lista de Materiales)
+Cannot promote Employee with status Left,No se puede promover Empleado con estado ha salido,
+Auto repeat document updated,Repetición automática del documento actualizado,
diff --git a/erpnext/translations/es-GT.csv b/erpnext/translations/es-GT.csv
index 5d03aed..10e4e59 100644
--- a/erpnext/translations/es-GT.csv
+++ b/erpnext/translations/es-GT.csv
@@ -1,7 +1,7 @@
-DocType: Instructor Log,Other Details,Otros Detalles
-DocType: Material Request Item,Lead Time Date,Fecha de la Iniciativa
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de ejecución en días
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Outstanding Amt,Saldo Pendiente
-DocType: Bank Statement Transaction Invoice Item,Outstanding Amount,Saldo Pendiente
-DocType: Payment Entry Reference,Outstanding,Pendiente
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
+Other Details,Otros Detalles,
+Lead Time Date,Fecha de la Iniciativa,
+Lead Time Days,Tiempo de ejecución en días,
+Outstanding Amt,Saldo Pendiente,
+Outstanding Amount,Saldo Pendiente,
+Outstanding,Pendiente,
+Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa,
diff --git a/erpnext/translations/es-MX.csv b/erpnext/translations/es-MX.csv
index 6997937..92479c4 100644
--- a/erpnext/translations/es-MX.csv
+++ b/erpnext/translations/es-MX.csv
@@ -1,22 +1,22 @@
-DocType: Timesheet,Total Costing Amount,Monto Total Calculado
-DocType: Leave Policy,Leave Policy Details,Detalles de Política de Licencia
-apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html +35,Mode of Payments,Forma de pago
-DocType: Student Group Student,Student Group Student,Alumno de Grupo de Estudiantes
-DocType: Delivery Note,% Installed,% Instalado
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +55,The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,La cantidad de {0} establecida en esta solicitud de pago es diferente de la cantidad calculada para todos los planes de pago: {1}. Verifique que esto sea correcto antes de enviar el documento.
-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 +550,Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
-DocType: Loyalty Point Entry,Loyalty Point Entry,Entrada de Punto de Lealtad
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +372,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 +76,Show unclosed fiscal year's P&L balances,Mostrar saldos de Ganancias y Perdidas de año fiscal sin cerrar
-,Support Hour Distribution,Distribución de Hora de Soporte
-apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Fortaleza de Grupo Estudiante
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +197,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida por Ventas de Activos' en la empresa {0}
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +58,Leave Type {0} cannot be allocated since it is leave without pay,Tipo de Permiso {0} no puede ser asignado ya que es un Permiso sin paga
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +48,The payment gateway account in plan {0} is different from the payment gateway account in this payment request,La cuenta para pasarela de pago en el plan {0} es diferente de la cuenta de pasarela de pago en en esta petición de pago
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +488,Show Salary Slip,Mostrar Recibo de Nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +328,Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas
-DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+Total Costing Amount,Monto Total Calculado,
+Leave Policy Details,Detalles de Política de Licencia,
+Mode of Payments,Forma de pago,
+Student Group Student,Alumno de Grupo de Estudiantes,
+% Installed,% Instalado,
+The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,La cantidad de {0} establecida en esta solicitud de pago es diferente de la cantidad calculada para todos los planes de pago: {1}. Verifique que esto sea correcto antes de enviar el documento.
+Gain/Loss Account on Asset Disposal,Cuenta de ganancia/pérdida en la disposición de activos,
+Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
+Loyalty Point Entry,Entrada de Punto de Lealtad,
+Please set the Item Code first,"Por favor, primero define el Código del Artículo"
+Show unclosed fiscal year's P&L balances,Mostrar saldos de Ganancias y Perdidas de año fiscal sin cerrar,
+Support Hour Distribution,Distribución de Hora de Soporte
+Student Group Strength,Fortaleza de Grupo Estudiante,
+Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Por favor defina la 'Cuenta de Ganacia/Pérdida por Ventas de Activos' en la empresa {0}
+Leave Type {0} cannot be allocated since it is leave without pay,Tipo de Permiso {0} no puede ser asignado ya que es un Permiso sin paga,
+The payment gateway account in plan {0} is different from the payment gateway account in this payment request,La cuenta para pasarela de pago en el plan {0} es diferente de la cuenta de pasarela de pago en en esta petición de pago,
+Show Salary Slip,Mostrar Recibo de Nómina,
+Leave Without Pay does not match with approved Leave Application records,Permiso sin sueldo no coincide con los registros de Solicitud de Permiso aprobadas,
+"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
#### Note
@@ -28,7 +28,7 @@
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
-2. Account Head: The Account ledger under which this tax will be booked
+2. Account Head: The Account ledger under which this tax will be booked,
3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
4. Description: Description of the tax (that will be printed in invoices / quotes).
5. Rate: Tax rate.
@@ -57,28 +57,28 @@
8. Línea de referencia: Si se basa en ""Línea anterior al total"" se puede seleccionar el número de la fila que será tomado como base para este cálculo (por defecto es la fila anterior).
9. Considerar impuesto o cargo para: En esta sección se puede especificar si el impuesto / cargo es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +160,Leave Type {0} cannot be carry-forwarded,Tipo de Permiso {0} no se puede arrastar o trasladar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el Tipo de Cambio para convertir de una divisa a otra
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +46,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
-DocType: Loyalty Point Entry,Loyalty Program,Programa de Lealtad
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +163,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 +72,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
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
-apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +48,Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima
-DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el número de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el número de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de Inventario."
-apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, establezca el filtro de Compañía en blanco si Agrupar Por es 'Compañía'"
-DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para Grupo de Estudiantes por Curso, el Curso será validado para cada Estudiante de los Cursos inscritos en la Inscripción del Programa."
-DocType: Leave Policy Detail,Leave Policy Detail,Detalles de política de Licencia
-DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para grupo de estudiantes por lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
-DocType: Subscription Plan,Payment Plan,Plan de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +731,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de Variantes después de la transacción de inventario. Deberá crear un nuevo artículo para hacer esto.
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +98,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,La cantidad de existencias para comenzar el procedimiento no está disponible en el almacén. ¿Desea registrar una transferencia de inventario?
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +259,"Company, Payment Account, From Date and To Date is mandatory","Empresa, cuenta de pago, fecha de inicio y fecha final son obligatorios"
-DocType: Leave Encashment,Leave Encashment,Cobro de Permiso
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1211,Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega
-DocType: Salary Structure,Leave Encashment Amount Per Day,Cantidad por día para pago por Ausencia
+Leave Type {0} cannot be carry-forwarded,Tipo de Permiso {0} no se puede arrastar o trasladar,
+Gain/Loss on Asset Disposal,Ganancia/Pérdida por la venta de activos,
+Specify Exchange Rate to convert one currency into another,Especificar el Tipo de Cambio para convertir de una divisa a otra,
+Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
+Loyalty Program,Programa de Lealtad,
+Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes,
+"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"
+Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio,
+Customer or Supplier Details,Detalle de cliente o proveedor,
+Standard Selling Rate,Tarifa de Venta Estándar,
+School House,Casa Escuela,
+Please set default account in Expense Claim Type {0},"Por favor, establezca la Cuenta predeterminada en el Tipo de Reembolso de Gastos {0}"
+Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que la Puntuación Máxima,
+"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el número de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el número de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de Inventario."
+Please set Company filter blank if Group By is 'Company',"Por favor, establezca el filtro de Compañía en blanco si Agrupar Por es 'Compañía'"
+"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para Grupo de Estudiantes por Curso, el Curso será validado para cada Estudiante de los Cursos inscritos en la Inscripción del Programa."
+Leave Policy Detail,Detalles de política de Licencia,
+"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para grupo de estudiantes por lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
+Payment Plan,Plan de pago,
+Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de Variantes después de la transacción de inventario. Deberá crear un nuevo artículo para hacer esto.
+Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,La cantidad de existencias para comenzar el procedimiento no está disponible en el almacén. ¿Desea registrar una transferencia de inventario?
+"Company, Payment Account, From Date and To Date is mandatory","Empresa, cuenta de pago, fecha de inicio y fecha final son obligatorios"
+Leave Encashment,Cobro de Permiso,
+Select Items based on Delivery Date,Seleccionar Artículos según la fecha de entrega,
+Leave Encashment Amount Per Day,Cantidad por día para pago por Ausencia,
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index dc0e9fb..28c57dc 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -1,16 +1,16 @@
-DocType: Tax Rule,Tax Rule,Regla Fiscal
-DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio de Monto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +873,Bill of Materials,Lista de Materiales
-apps/erpnext/erpnext/controllers/accounts_controller.py +703,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
-DocType: Purchase Invoice,Tax ID,RUC
-DocType: BOM Item,Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
-DocType: Timesheet Detail,Bill,Factura
-DocType: Activity Cost,Billing Rate,Monto de Facturación
-apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de Saldos Contables
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
-DocType: Tax Rule,Billing County,Municipio de Facturación
-DocType: Sales Invoice Timesheet,Billing Hours,Horas de Facturación
-DocType: Timesheet,Billing Details,Detalles de Facturación
-DocType: Tax Rule,Billing State,Región de Facturación
-DocType: Purchase Order Item,Billed Amt,Monto Facturado
-DocType: Item Tax,Tax Rate,Tasa de Impuesto
+Tax Rule,Regla Fiscal,
+Account for Change Amount,Cuenta para el Cambio de Monto,
+Bill of Materials,Lista de Materiales,
+'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
+Tax ID,RUC,
+Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
+Bill,Factura,
+Billing Rate,Monto de Facturación,
+Opening Accounting Balance,Apertura de Saldos Contables,
+Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
+Billing County,Municipio de Facturación,
+Billing Hours,Horas de Facturación,
+Billing Details,Detalles de Facturación,
+Billing State,Región de Facturación,
+Billed Amt,Monto Facturado,
+Tax Rate,Tasa de Impuesto,
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index de11c72..7ebbc36 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -1,1024 +1,1023 @@
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +22,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
-DocType: HR Settings,Employee Settings,Configuración del Empleado
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
-DocType: Naming Series,User must always select,Usuario elegirá siempre
-DocType: Account,Cost of Goods Sold,Costo de las Ventas
-apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} no en algún año fiscal activo.
-DocType: Sales Invoice,Packing List,Lista de Envío
-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 +68,Avg. Buying Rate,Promedio de Compra
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +398,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: Work Order Operation,"in Minutes
+This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
+"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
+Employee Settings,Configuración del Empleado,
+Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
+User must always select,Usuario elegirá siempre,
+Cost of Goods Sold,Costo de las Ventas,
+{0} {1} not in any active Fiscal Year.,{0} {1} no en algún año fiscal activo.
+Packing List,Lista de Envío,
+From Package No.,Del Paquete N o,
+Quotation Trends,Tendencias de Cotización,
+Purchase Order Item,Articulos de la Orden de Compra,
+Avg. Buying Rate,Promedio de Compra,
+Serial No {0} created,Número de orden {0} creado,
+If subcontracted to a vendor,Si es sub-contratado a un vendedor,
+"in Minutes,
Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
-DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
-DocType: Issue,Opening Time,Tiempo de Apertura
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +873,Bill of Materials,Lista de materiales (LdM)
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas
-DocType: Activity Cost,Billing Rate,Tasa de facturación
-DocType: BOM Update Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +228,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
-DocType: Journal Entry,Print Heading,Título de impresión
-DocType: Workstation,Electricity Cost,Coste de electricidad
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Comisión de Ventas
-DocType: Travel Request,Costing,Costeo
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
-DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
-DocType: Bank Statement Transaction Invoice Item,Journal Entry,Asientos Contables
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
-DocType: Sales Invoice Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario
-DocType: Item,Manufacture,Manufactura
-DocType: Sales Invoice,Write Off Outstanding Amount,Cantidad de desajuste
-apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
-apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,venta al por menor
-DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
-DocType: Project,Expected End Date,Fecha de finalización prevista
-DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
-apps/erpnext/erpnext/setup/doctype/company/company.js +133,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,La Abreviación es mandatoria
-DocType: Item,End of Life,Final de la Vida
-,Reqd By Date,Solicitado Por Fecha
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
-DocType: Department,Leave Approver,Supervisor de Vacaciones
-DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete
-DocType: Maintenance Schedule,Generate Schedule,Generar Horario
-DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
-DocType: Task,depends_on,depende de
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Secured Loans,Préstamos Garantizados
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +975,Make Supplier Quotation,Crear cotización de proveedor
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre de Nuevo Centro de Coste
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto a Imprimir"
-DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
-DocType: Job Card,WIP Warehouse,WIP Almacén
-DocType: Job Card,Actual Start Date,Fecha de inicio actual
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +24,Make Journal Entry,Haga Comprobante de Diario
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,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/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
-DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
-DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
-DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Maintenance Time,Tiempo de Mantenimiento,
+Opening Time,Tiempo de Apertura,
+Bill of Materials,Lista de materiales (LdM)
+Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas,
+Billing Rate,Tasa de facturación,
+The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución,
+Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
+Print Heading,Título de impresión,
+Electricity Cost,Coste de electricidad,
+Commission on Sales,Comisión de Ventas,
+Costing,Costeo,
+Retail & Wholesale,Venta al por menor y al por mayor,
+Default Holiday List,Listado de vacaciones / feriados predeterminados,
+Journal Entry,Asientos Contables,
+Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir,
+Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
+Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario,
+Manufacture,Manufactura,
+Write Off Outstanding Amount,Cantidad de desajuste,
+Manage Customer Group Tree.,Administrar el listado de las categorías de clientes,
+Retail,venta al por menor,
+Time at which materials were received,Momento en que se recibieron los materiales,
+Expected End Date,Fecha de finalización prevista,
+HR Settings,Configuración de Recursos Humanos,
+Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa,
+Abbreviation is mandatory,La Abreviación es mandatoria,
+End of Life,Final de la Vida,
+Reqd By Date,Solicitado Por Fecha,
+Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
+You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado,
+Leave Approver,Supervisor de Vacaciones,
+Package Weight Details,Peso Detallado del Paquete,
+Generate Schedule,Generar Horario,
+Employee External Work History,Historial de Trabajo Externo del Empleado,
+"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
+depends_on,depende de,
+Secured Loans,Préstamos Garantizados,
+This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
+Make Supplier Quotation,Crear cotización de proveedor,
+Repeat Customer Revenue,Repita los ingresos de los clientes,
+New Cost Center Name,Nombre de Nuevo Centro de Coste,
+"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto a Imprimir"
+Purchase Taxes and Charges,Impuestos de Compra y Cargos,
+This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext,
+WIP Warehouse,WIP Almacén,
+Actual Start Date,Fecha de inicio actual,
+Make Journal Entry,Haga Comprobante de Diario,
+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,
+Delivery Note Item,Articulo de la Nota de Entrega,
+Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
+Potential opportunities for selling.,Oportunidades de venta,
+Against Sales Order Item,Contra la Orden de Venta de Artículos,
+Sample Size,Tamaño de la muestra,
+Terms and Conditions1,Términos y Condiciones 1,
+Customerwise Discount,Customerwise Descuento,
+Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización,
+"Tax detail table fetched from item master as a string and stored in this field.
Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
Se utiliza para las tasas y cargos"
-DocType: BOM,Operating Cost,Costo de Funcionamiento
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Target,Totales del Objetivo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,"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: Work 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 +534,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: Additional Salary,Employee Name,Nombre del Empleado
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
-DocType: Email Digest,New Sales Orders,Nueva Órden de Venta
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,Dinero Ganado
-DocType: Quotation,Term Details,Detalles de los Terminos
-DocType: Crop,Target Warehouse,Inventario Objetivo
-DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
-DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
-DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
-DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
-DocType: Serial No,Under AMC,Bajo AMC
-DocType: Item,Warranty Period (in days),Período de garantía ( en días)
-DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo On
-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.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
-DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
-DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +162,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,Maquinaria y Equipos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +273,{0} {1} is not submitted,{0} {1} no esta presentado
-DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
-DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
-DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periódicos resumidos por correo electrónico.
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,Net pay cannot be negative,Salario neto no puede ser negativo
-DocType: Company,Phone No,Teléfono No
-DocType: QuickBooks Migrator,Default Cost Center,Centro de coste por defecto
-DocType: Education Settings,Employee Number,Número del Empleado
-DocType: Opportunity,Customer / Lead Address,Cliente / Dirección de Oportunidad
-DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +287,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
-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 +231,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 +72,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Current Liabilities,Pasivo Corriente
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
-apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
-apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
-DocType: Account,Credit,Crédito
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Mayor
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +432,Accounting Entry for Stock,Asiento contable de inventario
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
-apps/erpnext/erpnext/controllers/buying_controller.py +399,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +928,Purchase Receipt,Recibos de Compra
-DocType: Pricing Rule,Disable,Inhabilitar
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
-DocType: Attendance,Leave Type,Tipo de Vacaciones
-DocType: Pricing Rule,Applicable For,Aplicable para
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
-DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +105,Convert to Group,Convertir al Grupo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +284,Serial No {0} not in stock,Número de orden {0} no está en stock
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor
-DocType: Naming Series,Setup Series,Serie de configuración
-DocType: Work Order Operation,Actual Start Time,Hora de inicio actual
-apps/erpnext/erpnext/stock/doctype/item/item.py +523,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Cuidado de la Salud
-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 +657,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
-apps/erpnext/erpnext/utilities/transaction_base.py +126,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
-DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
-DocType: Account,Frozen,Congelado
-DocType: Contract,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/controllers/accounts_controller.py +545,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +17,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +79,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
-DocType: Production Plan,Not Started,Sin comenzar
-DocType: Healthcare Practitioner,Default Currency,Moneda Predeterminada
-apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
-,Requested Items To Be Transferred,Artículos solicitados para ser transferido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +267,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +907,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
-DocType: Opening Invoice Creation Tool,Sales,Venta
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
-DocType: Department,Leave Approvers,Supervisores de Vacaciones
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +187,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
-DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +139,Total Outstanding Amount,Total Monto Pendiente
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +91,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días)
-DocType: Employee,Rented,Alquilado
-DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
-DocType: Item,Moving Average,Promedio Movil
-,Qty to Deliver,Cantidad para Ofrecer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +179,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
-apps/erpnext/erpnext/setup/doctype/company/company.js +111,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, asegúrese 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: Shopping Cart Settings,Shopping Cart Settings,Compras Ajustes
-DocType: BOM,Raw Material Cost,Costo de la Materia Prima
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +175,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Quotation {0} is cancelled,Cotización {0} se cancela
-apps/erpnext/erpnext/controllers/stock_controller.py +341,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,¿Qué hace?
-DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Hacer Orden de Venta
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +157,Doc Type,Tipo Doc.
-apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
-DocType: Item Customer Detail,Ref Code,Código Referencia
-DocType: Item Default,Default Selling Cost Center,Centros de coste por defecto
-DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
-DocType: Quality Inspection,Report Date,Fecha del Informe
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +145,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
-DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
-DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
-DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
-DocType: Project,Customer Details,Datos del Cliente
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran contra **Año Fiscal**
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
-DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +50,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
-DocType: Purchase Taxes and Charges,On Previous Row Total,En la Anterior Fila Total
-DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
-DocType: Purchase Order Item,Supplier Quotation Item,Articulo de la Cotización del Proveedor
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Brokerage
-DocType: Opportunity,Opportunity From,Oportunidad De
-DocType: Supplier Quotation,Supplier Address,Dirección del proveedor
-DocType: Purchase Order Item,Expected Delivery Date,Fecha Esperada de Envio
-DocType: Product Bundle,Parent Item,Artículo Principal
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +98,Software Developer,Desarrollador de Software
-DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Marketing Expenses,Gastos de Comercialización
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
-DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
-apps/erpnext/erpnext/utilities/user_progress.py +252,user@example.com,user@example.com
-DocType: BOM Explosion Item,Source Warehouse,fuente de depósito
-apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,No se han añadido contactos todavía
-apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Root Type is mandatory,Tipo Root es obligatorio
-DocType: Patient Appointment,Scheduled,Programado
-DocType: Salary Component,Depends on Leave Without Pay,Depende de ausencia sin pago
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +34,Total Paid Amt,Total Pagado Amt
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde el último pedido' debe ser mayor o igual a cero
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1161,For Warehouse,Por almacén
-,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
-DocType: Notification Control,Delivery Note Message,Mensaje de la Nota de Entrega
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +578,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
-DocType: Item,Synced With Hub,Sincronizado con Hub
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +32,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 +1389,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/buying/doctype/supplier/supplier.py +49,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
-DocType: Stock Entry,Sales Invoice No,Factura de Venta No
-DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado
-,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
-apps/erpnext/erpnext/config/accounts.py +543,Point-of-Sale Profile,Perfiles del Punto de Venta POS
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
-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 +506,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
-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}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +132,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
-DocType: Buying Settings,Settings for Buying Module,Ajustes para la compra de módulo
-DocType: Sales Person,Sales Person Targets,Metas de Vendedor
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
-DocType: Clinical Procedure Item,Actual Qty (at source/target),Cantidad Actual (en origen/destino)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +70,Privilege Leave,Permiso con Privilegio
-DocType: Cost Center,Stock User,Foto del usuario
-DocType: Purchase Taxes and Charges,On Previous Row Amount,En la Fila Anterior de Cantidad
-DocType: Appraisal Goal,Weightage (%),Coeficiente de ponderación (% )
-DocType: Serial No,Creation Time,Momento de la creación
-DocType: Stock Entry,Default Source Warehouse,Origen predeterminado Almacén
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas
-DocType: Employee,Educational Qualification,Capacitación Académica
-DocType: Cashier Closing,From Time,Desde fecha
-DocType: Employee,Health Concerns,Preocupaciones de salud
-DocType: Landed Cost Item,Purchase Receipt Item,Recibo de Compra del Artículo
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nombre o Email es obligatorio
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +19,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
-DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
-apps/erpnext/erpnext/hooks.py +115,Shipments,Los envíos
-apps/erpnext/erpnext/controllers/buying_controller.py +196,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,La Abreviación ya está siendo utilizada para otra compañía
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
-DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
-DocType: Request for Quotation Item,Required Date,Fecha Requerida
-DocType: Manufacturing Settings,Allow Overtime,Permitir horas extras
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +154,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
-DocType: Pricing Rule,Pricing Rule,Reglas de Precios
-DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +91,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
-apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1156,Supplier Quotation,Cotizaciónes a Proveedores
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} contra el tipo de actividad - {1}
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
-DocType: Stock Entry,Total Value Difference (Out - In),Diferencia (Salidas - Entradas)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +648,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +622,Product Bundle,Conjunto/Paquete de productos
-DocType: Material Request,Requested For,Solicitados para
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +396,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
-DocType: Production Plan,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +391,Quality Management,Gestión de la Calidad
-apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Los detalles de las operaciones realizadas.
-DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
-DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas
-DocType: Employee External Work History,Salary,Salario
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Stock Liabilities,Inventario de Pasivos
-DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
-DocType: Target Detail,Target Amount,Monto Objtetivo
-,S.O. No.,S.O. No.
-DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
-DocType: Sales Invoice,Sales Taxes and Charges,Los impuestos y cargos de venta
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
-DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
-DocType: Shipping Rule,Shipping Account,cuenta Envíos
-DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
-DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
-DocType: Selling Settings,Campaign Naming By,Nombramiento de la Campaña Por
-DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Registrar pago
-DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
-DocType: Material Request,% Ordered,% Pedido
-apps/erpnext/erpnext/projects/doctype/task/task.py +41,'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 +76,"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
-apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas de mantenimiento.
-,SO Qty,SO Cantidad
-DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +139,"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 +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 +797,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 +263,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 #
-DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-DocType: Employee,Salary Mode,Modo de Salario
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
-DocType: Quotation Item,Against Doctype,Contra Doctype
-apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Cant. Proyectada
-DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
-apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
-DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
-,Lead Details,Iniciativas
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +59,Serial #,Serial #
-DocType: Delivery Note,Vehicle No,Vehículo No
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +214,Lower Income,Ingreso Bajo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +210,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Delivered Amount,Cantidad Entregada
-DocType: Employee Transfer,New Company,Nueva Empresa
-DocType: Employee,Permanent Address Is,Dirección permanente es
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +276,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
-DocType: Item,Item Tax,Impuesto del artículo
-,Item Prices,Precios de los Artículos
-DocType: Account,Balance must be,Balance debe ser
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
-apps/erpnext/erpnext/projects/doctype/project/project.py +84,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
-apps/erpnext/erpnext/accounts/general_ledger.py +178,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
-DocType: Target Detail,Target Qty,Cantidad Objetivo
-apps/erpnext/erpnext/stock/doctype/item/item.js +366,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +244,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
-DocType: Account,Accounts,Contabilidad
-DocType: Workstation,per hour,por horas
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como Cerrada
-DocType: Work Order Operation,Work In Progress,Trabajos en Curso
-DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
-DocType: SMS Center,All Sales Partner Contact,Todo Punto de Contacto de Venta
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver ofertas
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
-DocType: Employee,Reports to,Informes al
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +99,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
-DocType: Purchase Order,Ref SQ,Ref SQ
-DocType: Purchase Invoice,Total (Company Currency),Total (Compañía moneda)
-DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta
-DocType: Bank Reconciliation,Account Currency,Moneda de la Cuenta
-DocType: Journal Entry Account,Party Balance,Saldo de socio
-DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +538,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado debe ser uno de {0}
-DocType: Department,Leave Block List,Lista de Bloqueo de Vacaciones
-DocType: Sales Invoice Item,Customer's Item Code,Código de artículo del Cliente
-DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
-DocType: SMS Log,No of Sent SMS,No. de SMS enviados
-DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
-apps/erpnext/erpnext/stock/doctype/item/item.py +191,Stores,Tiendas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +128,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Report Type is mandatory,Tipo de informe es obligatorio
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
-apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,Electrónica
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
-DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
-apps/erpnext/erpnext/stock/doctype/item/item.py +541,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
-DocType: Lead,Lead,Iniciativas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +201,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
-DocType: Account,Depreciation,Depreciación
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +242,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
-DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
-DocType: Payment Entry Reference,Supplier Invoice No,Factura del Proveedor No
-DocType: Payment Gateway Account,Payment Account,Pago a cuenta
-DocType: Journal Entry,Cash Entry,Entrada de Efectivo
-apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,Seleccione el año fiscal ...
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +209,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la fila {0} en {1}. e incluir {2} en la tasa del producto, las filas {3} también deben ser incluidas"
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de vacaciones: {0}
-DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
-DocType: Opportunity,With Items,Con artículos
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Número de orden {0} no existe
-DocType: Purchase Receipt Item,Required By,Requerido por
-DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +102,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +164,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
-apps/erpnext/erpnext/config/accounts.py +287,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
-DocType: Work Order,Material Transferred for Manufacturing,Material transferido para fabricación
-DocType: Item Reorder,Item Reorder,Reordenar productos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +147,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
-,Lead Id,Iniciativa ID
-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 +539,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
-DocType: Workstation,Rent Cost,Renta Costo
-DocType: Support Settings,Issues,Problemas
-DocType: BOM Update Tool,Current BOM,Lista de materiales actual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,Fila # {0}:
-DocType: Timesheet,% Amount Billed,% Monto Facturado
-DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
-DocType: Employee,Company Email,Correo de la compañía
-apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Números de serie únicos para cada producto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
-DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Los gastos de servicios públicos
-DocType: Account,Parent Account,Cuenta Primaria
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
-DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
-,Sales Register,Registros de Ventas
-DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
-DocType: Lab Test Template,Single,solo
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +84,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +76,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
-DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
-DocType: C-Form Invoice Detail,Invoice No,Factura No
-DocType: Employee,Bank A/C No.,Número de cuenta bancaria
-DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
-DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
-DocType: Salary Slip,Hour Rate,Hora de Cambio
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas
-DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
-DocType: Purchase Invoice,Shipping Address,Dirección de envío
-apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +67,Series Updated,Series Actualizado
-DocType: Employee,Contract End Date,Fecha Fin de Contrato
-DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
-DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales
-DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1083,Opportunity,Oportunidades
-DocType: Additional Salary,Salary Slip,Planilla
-DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Proveedor Id
-DocType: Leave Block List,Block Holidays on important days.,Bloqueo de vacaciones en días importantes.
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
-DocType: Buying Settings,Subcontract,Subcontrato
-DocType: Customer,From Lead,De la iniciativa
-DocType: Bank Account,Party,Socio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +81,Update Cost,Actualización de Costos
-DocType: Purchase Order Item,Last Purchase Rate,Tasa de Cambio de la Última Compra
-DocType: Bin,Actual Quantity,Cantidad actual
-DocType: Asset Movement,Stock Manager,Gerente
-DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Opening Balance Equity,Apertura de saldos de capital
-DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
-DocType: Employee,Health Details,Detalles de la Salud
-DocType: Maintenance Visit,Unscheduled,No Programada
-DocType: Instructor Log,Other Details,Otros Datos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +65,Period Closing Entry,Entradas de cierre de período
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados
-DocType: Company,Delete Company Transactions,Eliminar Transacciones de la empresa
-DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
-,Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto
-DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
-DocType: Work Order Operation,Actual End Time,Hora actual de finalización
-apps/erpnext/erpnext/accounts/general_ledger.py +181,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
-DocType: Employee Education,Under Graduate,Bajo Graduación
-DocType: Stock Entry,Purchase Receipt No,Recibo de Compra No
-DocType: Buying Settings,Default Buying Price List,Lista de precios predeterminada
-DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
-DocType: Lead,Suggestions,Sugerencias
-DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
-DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos de venta por defecto
-DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
-apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Órdenes de venta al Pago
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +174,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
-apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
-DocType: Notification Control,Customize the Notification,Personalice la Notificación
-DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia
-DocType: Production Plan Item,Ordered Qty,Cantidad Pedida
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
-DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +194,Stock Options,Opciones sobre Acciones
-DocType: Account,Receivable,Cuenta por Cobrar
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +78,-Above,-Mayor
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
-DocType: Blanket Order,Manufacturing,Producción
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +486,'Entries' cannot be empty,'Entradas' no puede estar vacío
-DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
-DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
-DocType: Shipping Rule,Shipping Amount,Importe del envío
-apps/erpnext/erpnext/stock/doctype/item/item.py +74,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
-DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
-DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
-DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
-DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +40,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
-DocType: Fiscal Year,Year Start Date,Fecha de Inicio
-DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por:
-DocType: Notification Control,Sales Invoice Message,Mensaje de la Factura
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
-DocType: Quotation,Shopping Cart,Cesta de la compra
-DocType: Bank Guarantee,Supplier,Proveedores
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,Libro Mayor Contable
-DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Gastos de Ventas
-DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
-DocType: Maintenance Schedule Item,No of Visits,No. de visitas
-DocType: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
-DocType: BOM,Item Description,Descripción del Artículo
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Stock Expenses,Inventario de Gastos
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,Activos por Impuestos
-DocType: Maintenance Schedule,Schedules,Horarios
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
-DocType: Item,Has Serial No,Tiene No de Serie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
-DocType: Serial No,Out of AMC,Fuera de AMC
-DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
-DocType: Job Offer,Select Terms and Conditions,Selecciona Términos y Condiciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +660,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 \
+Operating Cost,Costo de Funcionamiento,
+Total Target,Totales del Objetivo,
+"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'"
+Help HTML,Ayuda HTML,
+Actual Operation Time,Tiempo de operación actual,
+To Deliver and Bill,Para Entregar y Bill,
+Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+Territory Targets,Territorios Objetivos,
+Warranty / AMC Status,Garantía / AMC Estado,
+Employee Name,Nombre del Empleado,
+Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
+New Sales Orders,Nueva Órden de Venta,
+Software,Software,
+Earnest Money,Dinero Ganado,
+Term Details,Detalles de los Terminos,
+Target Warehouse,Inventario Objetivo,
+Net Weight UOM,Unidad de Medida Peso Neto,
+Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
+Operation Time,Tiempo de funcionamiento,
+Leave Balance Before Application,Vacaciones disponibles antes de la solicitud,
+Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones,
+Under AMC,Bajo AMC,
+Warranty Period (in days),Período de garantía ( en días)
+Next email will be sent on:,Siguiente correo electrónico será enviado el:
+Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
+Target On,Objetivo On,
+"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
+"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
+Manufacturing Settings,Ajustes de Manufactura,
+Appraisal Template Title,Titulo de la Plantilla deEvaluación,
+Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
+Capital Equipments,Maquinaria y Equipos,
+{0} {1} is not submitted,{0} {1} no esta presentado,
+Earning & Deduction,Ganancia y Descuento,
+Leave Encashed?,Vacaciones Descansadas?
+Send regular summary reports via Email.,Enviar informes periódicos resumidos por correo electrónico.
+'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
+Net pay cannot be negative,Salario neto no puede ser negativo,
+Phone No,Teléfono No,
+Default Cost Center,Centro de coste por defecto,
+Employee Number,Número del Empleado,
+Customer / Lead Address,Cliente / Dirección de Oportunidad,
+In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
+Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado,
+Manage Territory Tree.,Vista en árbol para la administración de los territorios,
+Serial number {0} entered more than once,Número de serie {0} entraron más de una vez,
+Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
+Target Detail,Objetivo Detalle,
+Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos,
+Current Liabilities,Pasivo Corriente,
+Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
+Freight and Forwarding Charges,Cargos por transporte de mercancías y transito,
+Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
+Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
+Credit,Crédito,
+90-Above,90-Mayor,
+Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres,
+Accounting Entry for Stock,Asiento contable de inventario,
+Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
+Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria,
+Purchase Receipt,Recibos de Compra,
+Disable,Inhabilitar,
+Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web,
+Leave Type,Tipo de Vacaciones,
+Applicable For,Aplicable para,
+Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
+Rate (Company Currency),Precio (Moneda Local)
+Convert to Group,Convertir al Grupo,
+{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
+Serial No {0} not in stock,Número de orden {0} no está en stock,
+Ref Date,Fecha Ref,
+Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor,
+Setup Series,Serie de configuración,
+Actual Start Time,Hora de inicio actual,
+Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+Health Care,Cuidado de la Salud,
+Manufacturer Part Number,Número de Pieza del Fabricante,
+Re-Order Level,Reordenar Nivel,
+Sales Team Details,Detalles del equipo de ventas,
+Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada,
+Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
+Confirmed orders from Customers.,Pedidos en firme de los clientes.
+Service Address,Dirección del Servicio,
+Application of Funds (Assets),Aplicación de Fondos (Activos )
+Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
+The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
+Frozen,Congelado,
+HR Manager,Gerente de Recursos Humanos,
+Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero,
+Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
+Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
+Not Started,Sin comenzar,
+Default Currency,Moneda Predeterminada,
+This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
+Requested Items To Be Transferred,Artículos solicitados para ser transferido,
+Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta,
+Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada,
+Sales,Venta,
+Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
+Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo,
+Leave Approvers,Supervisores de Vacaciones,
+Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
+Parent Customer Group,Categoría de cliente principal,
+Total Outstanding Amount,Total Monto Pendiente,
+Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
+You need to enable Shopping Cart,Necesita habilitar Carito de Compras,
+New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días)
+Rented,Alquilado,
+Shipping Address Name,Dirección de envío Nombre,
+Moving Average,Promedio Movil,
+Qty to Deliver,Cantidad para Ofrecer,
+Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
+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, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
+Shopping Cart Settings,Compras Ajustes,
+Raw Material Cost,Costo de la Materia Prima,
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
+Quotation {0} is cancelled,Cotización {0} se cancela,
+Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0},
+What does it do?,¿Qué hace?,
+Actual Time in Hours (via Timesheet),Tiempo actual en horas,
+Make Sales Order,Hacer Orden de Venta,
+Doc Type,Tipo Doc.,
+List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.,
+Ref Code,Código Referencia,
+Default Selling Cost Center,Centros de coste por defecto,
+Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida,
+Report Date,Fecha del Informe,
+Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe,
+Currency and Price List,Divisa y Lista de precios,
+Current Assets,Activo Corriente,
+Re-Order Qty,Reordenar Cantidad,
+Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
+Customer Details,Datos del Cliente,
+**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran contra **Año Fiscal**
+Actual Qty is mandatory,Cantidad actual es obligatoria,
+Stock Reconciliation,Reconciliación de Inventario,
+Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5,
+On Previous Row Total,En la Anterior Fila Total,
+Serial No / Batch,N º de serie / lote,
+Supplier Quotation Item,Articulo de la Cotización del Proveedor,
+Brokerage,Brokerage,
+Opportunity From,Oportunidad De,
+Supplier Address,Dirección del proveedor,
+Expected Delivery Date,Fecha Esperada de Envio,
+Parent Item,Artículo Principal,
+Software Developer,Desarrollador de Software,
+Website Item Groups,Grupos de Artículos del Sitio Web,
+Marketing Expenses,Gastos de Comercialización,
+"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
+New Leaves Allocated,Nuevas Vacaciones Asignadas,
+user@example.com,user@example.com,
+Source Warehouse,fuente de depósito,
+No contacts added yet.,No se han añadido contactos todavía,
+Root Type is mandatory,Tipo Root es obligatorio,
+Scheduled,Programado,
+Depends on Leave Without Pay,Depende de ausencia sin pago,
+Total Paid Amt,Total Pagado Amt,
+'Days Since Last Order' must be greater than or equal to zero,'Días desde el último pedido' debe ser mayor o igual a cero,
+For Warehouse,Por almacén,
+Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos,
+Delivery Note Message,Mensaje de la Nota de Entrega,
+Raw Materials Supplied Cost,Coste materias primas suministradas,
+Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+Synced With Hub,Sincronizado con Hub,
+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,
+Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
+Series is mandatory,Serie es obligatorio,
+Item Shortage Report,Reportar carencia de producto,
+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,
+Sales Invoice No,Factura de Venta No,
+Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado,
+Ordered Items To Be Delivered,Artículos pedidos para ser entregados,
+Point-of-Sale Profile,Perfiles del Punto de Venta POS,
+Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender,
+Serial No,Números de Serie,
+Bank Reconciliation Statement,Extractos Bancarios,
+{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+Copy From Item Group,Copiar de Grupo de Elementos,
+{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}
+Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento,
+Settings for Buying Module,Ajustes para la compra de módulo,
+Sales Person Targets,Metas de Vendedor,
+Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
+Actual Qty (at source/target),Cantidad Actual (en origen/destino)
+Privilege Leave,Permiso con Privilegio,
+Stock User,Foto del usuario,
+On Previous Row Amount,En la Fila Anterior de Cantidad,
+Weightage (%),Coeficiente de ponderación (% )
+Creation Time,Momento de la creación,
+Default Source Warehouse,Origen predeterminado Almacén,
+Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas,
+Educational Qualification,Capacitación Académica,
+From Time,Desde fecha,
+Health Concerns,Preocupaciones de salud,
+Purchase Receipt Item,Recibo de Compra del Artículo,
+Name or Email is mandatory,Nombre o Email es obligatorio,
+Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía,
+Parent Cost Center,Centro de Costo Principal,
+Loans and Advances (Assets),Préstamos y anticipos (Activos)
+Shipments,Los envíos,
+Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
+Abbreviation already used for another company,La Abreviación ya está siendo utilizada para otra compañía,
+Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado,
+Sales Order Required,Orden de Ventas Requerida,
+Required Date,Fecha Requerida,
+Allow Overtime,Permitir horas extras,
+Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia,
+Pricing Rule,Reglas de Precios,
+View Task,Vista de tareas,
+`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
+Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
+Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
+Raw Material Item Code,Materia Prima Código del Artículo,
+Supplier Quotation,Cotizaciónes a Proveedores,
+Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} contra el tipo de actividad - {1}
+Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
+Total Value Difference (Out - In),Diferencia (Salidas - Entradas)
+BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
+Product Bundle,Conjunto/Paquete de productos,
+Requested For,Solicitados para,
+{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+Select Items,Seleccione Artículos,
+Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
+Quality Management,Gestión de la Calidad,
+Details of the operations carried out.,Los detalles de las operaciones realizadas.
+Quality Inspection Reading,Lectura de Inspección de Calidad,
+Net Amount (Company Currency),Importe neto (moneda de la compañía)
+Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto,
+"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
+Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas,
+Salary,Salario,
+Stock Liabilities,Inventario de Pasivos,
+Shipping Rule Label,Regla Etiqueta de envío,
+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,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
+Target Amount,Monto Objtetivo,
+S.O. No.,S.O. No.
+"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
+Sales Taxes and Charges,Los impuestos y cargos de venta,
+Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
+Bank Account No.,Número de Cuenta Bancaria,
+Shipping Account,cuenta Envíos,
+Parent Item Group,Grupo Principal de Artículos,
+Warranty Period (Days),Período de garantía ( Días)
+Campaign Naming By,Nombramiento de la Campaña Por,
+Terms and Conditions Content,Términos y Condiciones Contenido,
+Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
+Shopping Cart Shipping Rule,Compras Regla de envío,
+Make Payment Entry,Registrar pago,
+Scheduled Date,Fecha prevista,
+% Ordered,% Pedido,
+'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'
+UOM Conversion Detail,Detalle de Conversión de Unidad de Medida,
+"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
+Contact Name,Nombre del Contacto,
+Quotation Lost Reason,Cotización Pérdida Razón,
+Monthly Distribution Percentages,Los porcentajes de distribución mensuales,
+Plan for maintenance visits.,Plan para las visitas de mantenimiento.
+SO Qty,SO Cantidad,
+Quotation Series,Serie Cotización,
+New Customer Revenue,Ingresos de nuevo cliente,
+"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
+Schedule,Horario,
+Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
+Material Requests {0} created,Solicitud de Material {0} creada,
+Has Variants,Tiene Variantes,
+Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
+Buyer of Goods and Services.,Compradores de Productos y Servicios.
+Stock Balance,Balance de Inventarios,
+Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+Write Off Cost Center,Centro de costos de desajuste,
+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}"
+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.
+Net Rate,Tasa neta,
+Reference Row #,Referencia Fila #
+Employee Internal Work History,Historial de Trabajo Interno del Empleado,
+Salary Mode,Modo de Salario,
+Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
+Against Doctype,Contra Doctype,
+{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
+The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
+Projected Qty,Cant. Proyectada,
+Moving Average Rate,Porcentaje de Promedio Movil,
+Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe,
+Net Total (Company Currency),Total neto (Moneda Local)
+Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada,
+Lead Details,Iniciativas,
+Serial #,Serial #
+Vehicle No,Vehículo No,
+Lower Income,Ingreso Bajo,
+Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
+Delivered Amount,Cantidad Entregada,
+New Company,Nueva Empresa,
+Permanent Address Is,Dirección permanente es,
+Max: {0},Max: {0}
+{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
+Item Tax,Impuesto del artículo,
+Item Prices,Precios de los Artículos,
+Balance must be,Balance debe ser,
+A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
+Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
+Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio,
+Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
+Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
+Target Qty,Cantidad Objetivo,
+"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo,
+Accounts,Contabilidad,
+per hour,por horas,
+Set as Closed,Establecer como Cerrada,
+Work In Progress,Trabajos en Curso,
+Credit Controller,Credit Controller,
+Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido,
+All Sales Partner Contact,Todo Punto de Contacto de Venta,
+View Leads,Ver ofertas,
+Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
+Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
+Reports to,Informes al,
+Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional,
+Ref SQ,Ref SQ,
+Total (Company Currency),Total (Compañía moneda)
+% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta,
+Account Currency,Moneda de la Cuenta,
+Party Balance,Saldo de socio,
+Name of the Monthly Distribution,Nombre de la Distribución Mensual,
+Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación,
+Status must be one of {0},Estado debe ser uno de {0}
+Leave Block List,Lista de Bloqueo de Vacaciones,
+Customer's Item Code,Código de artículo del Cliente,
+Item Tax Amount,Total de impuestos de los artículos,
+Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento,
+No of Sent SMS,No. de SMS enviados,
+Stock Received But Not Billed,Inventario Recibido pero no facturados,
+Stores,Tiendas,
+Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio,
+Report Type is mandatory,Tipo de informe es obligatorio,
+"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
+UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
+Electronics,Electrónica,
+Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
+If Income or Expense,Si es un ingreso o egreso,
+Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+Lead,Iniciativas,
+There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
+Repeat Customers,Repita los Clientes,
+Depreciation,Depreciación,
+Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
+Make Sales Invoice,Hacer Factura de Venta,
+Supplier Invoice No,Factura del Proveedor No,
+Payment Account,Pago a cuenta,
+Cash Entry,Entrada de Efectivo,
+Select Fiscal Year...,Seleccione el año fiscal ...
+"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la fila {0} en {1}. e incluir {2} en la tasa del producto, las filas {3} también deben ser incluidas"
+Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de vacaciones: {0}
+Select company name first.,Seleccionar nombre de la empresa en primer lugar.
+With Items,Con artículos,
+Serial No {0} does not exist,Número de orden {0} no existe,
+Required By,Requerido por,
+Purchase Invoice Item,Factura de Compra del artículo,
+Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
+Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida,
+Supplied Items,Artículos suministrados,
+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,
+Debit,Débito,
+"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
+Material Transferred for Manufacturing,Material transferido para fabricación,
+Item Reorder,Reordenar productos,
+Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar,
+Lead Id,Iniciativa ID,
+Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
+Sales Partner Target,Socio de Ventas Objetivo,
+Make Maintenance Visit,Hacer Visita de Mantenimiento,
+Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+Rent Cost,Renta Costo,
+Issues,Problemas,
+Current BOM,Lista de materiales actual,
+Row # {0}:,Fila # {0}:
+% Amount Billed,% Monto Facturado,
+Manage cost of operations,Administrar el costo de las operaciones,
+Company Email,Correo de la compañía,
+Single unit of an Item.,Números de serie únicos para cada producto,
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas,
+Tax Rate,Tasa de Impuesto,
+Utility Expenses,Los gastos de servicios públicos,
+Parent Account,Cuenta Primaria,
+Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes,
+{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura,
+Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones,
+Sales Register,Registros de Ventas,
+Account Head,Cuenta matriz,
+Single,solo,
+Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
+{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
+Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla,
+Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
+How frequently?,¿Con qué frecuencia ?
+Invoice No,Factura No,
+Bank A/C No.,Número de cuenta bancaria,
+Customer's Purchase Order No,Nº de Pedido de Compra del Cliente,
+Supplier Name,Nombre del Proveedor,
+Hour Rate,Hora de Cambio,
+Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas,
+Get Outstanding Invoices,Verifique Facturas Pendientes,
+Shipping Address,Dirección de envío,
+"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
+Series Updated,Series Actualizado,
+Contract End Date,Fecha Fin de Contrato,
+Attendance From Date,Asistencia De Fecha,
+Excise Entry,Entrada Impuestos Especiales,
+Appraisal Template Goal,Objetivo Plantilla de Evaluación,
+Opportunity,Oportunidades,
+Salary Slip,Planilla,
+Rate at which this tax is applied,Velocidad a la que se aplica este impuesto,
+Supplier Id,Proveedor Id,
+Block Holidays on important days.,Bloqueo de vacaciones en días importantes.
+Support Analtyics,Analitico de Soporte,
+Subcontract,Subcontrato,
+From Lead,De la iniciativa,
+Party,Socio,
+Update Cost,Actualización de Costos,
+Last Purchase Rate,Tasa de Cambio de la Última Compra,
+Actual Quantity,Cantidad actual,
+Stock Manager,Gerente,
+Shipping Rule Condition,Regla Condición inicial,
+Opening Balance Equity,Apertura de saldos de capital,
+Stock Entry Detail,Detalle de la Entrada de Inventario,
+'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
+Health Details,Detalles de la Salud,
+Unscheduled,No Programada,
+Other Details,Otros Datos,
+"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
+Period Closing Entry,Entradas de cierre de período,
+Cost of Purchased Items,El costo de artículos comprados,
+Delete Company Transactions,Eliminar Transacciones de la empresa,
+Stock UOM,Unidad de Media del Inventario,
+Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto,
+Leave Type Name,Nombre de Tipo de Vacaciones,
+Actual End Time,Hora actual de finalización,
+Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
+Under Graduate,Bajo Graduación,
+Purchase Receipt No,Recibo de Compra No,
+Default Buying Price List,Lista de precios predeterminada,
+Lead Time Date,Fecha y Hora de la Iniciativa,
+Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
+Suggestions,Sugerencias,
+Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados,
+Default Cost of Goods Sold Account,Cuenta de costos de venta por defecto,
+Is Carry Forward,Es llevar adelante,
+"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
+Sales Order to Payment,Órdenes de venta al Pago,
+Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas,
+Total Leaves Allocated,Total Vacaciones Asignadas,
+Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
+Customize the Notification,Personalice la Notificación,
+Make Difference Entry,Hacer Entrada de Diferencia,
+Ordered Qty,Cantidad Pedida,
+Total(Amt),Total (Amt)
+Credit Card Entry,Introducción de tarjetas de crédito,
+Applicable To (Designation),Aplicables a (Denominación )
+Stock Options,Opciones sobre Acciones,
+Receivable,Cuenta por Cobrar,
+Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio,
+-Above,-Mayor,
+Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas,
+Manufacturing,Producción,
+'Entries' cannot be empty,'Entradas' no puede estar vacío,
+Leave Control Panel,Salir del Panel de Control,
+Percentage Allocation,Porcentaje de asignación de,
+Shipping Amount,Importe del envío,
+Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente,
+Sales Order Item,Articulo de la Solicitud de Venta,
+Parent Sales Person,Contacto Principal de Ventas,
+Warehouse Contact Info,Información de Contacto del Almacén,
+Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor,
+Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión,
+From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma,
+Default settings for Shopping Cart,Ajustes por defecto para Compras,
+Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo,
+Year Start Date,Fecha de Inicio,
+Supplier Naming By,Ordenar proveedores por:
+Sales Invoice Message,Mensaje de la Factura,
+Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales,
+"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
+Shopping Cart,Cesta de la compra,
+Supplier,Proveedores,
+Accounting Ledger,Libro Mayor Contable,
+Stop Birthday Reminders,Detener recordatorios de cumpleaños,
+Sales Expenses,Gastos de Ventas,
+Warranty / AMC Details,Garantía / AMC Detalles,
+No of Visits,No. de visitas,
+Leave Approver Name,Nombre de Supervisor de Vacaciones,
+Item Description,Descripción del Artículo,
+Cost of Issued Items,Costo de Artículos Emitidas,
+Stock Expenses,Inventario de Gastos,
+Lead Time Days,Tiempo de Entrega en Días,
+Tax Assets,Activos por Impuestos,
+Schedules,Horarios,
+Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento,
+Has Serial No,Tiene No de Serie,
+Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+Out of AMC,Fuera de AMC,
+Apply / Approve Leaves,Aplicar / Aprobar Vacaciones,
+Select Terms and Conditions,Selecciona Términos y Condiciones,
+Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada,
+"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}"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +163,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduzca el nombre de la campaña si el origen de la encuesta es una campaña
-DocType: BOM Item,Scrap %,Chatarra %
-apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
-DocType: Item,Is Purchase Item,Es una compra de productos
-DocType: Serial No,Delivery Document No,Entrega del documento No
-DocType: Notification Control,Notification Control,Control de Notificación
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +93,Administrative Officer,Oficial Administrativo
-DocType: BOM,Show In Website,Mostrar En Sitio Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Bank Overdraft Account,Cuenta de sobregiros
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +586,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
-DocType: Daily Work Summary Group,Holiday List,Lista de Feriados
-DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
-apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
-DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
-DocType: Work Order Operation,Actual Time and Cost,Tiempo y costo actual
-DocType: Additional Salary,HR User,Usuario Recursos Humanos
-DocType: Purchase Invoice,Unpaid,No pagado
-DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
-apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Puntos de venta.
-DocType: Journal Entry,Opening Entry,Entrada de Apertura
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo del Material que se adjunta
-DocType: Item,Default Unit of Measure,Unidad de Medida Predeterminada
-DocType: Purchase Invoice,Credit To,Crédito Para
-DocType: Currency Exchange,To Currency,Para la moneda
-apps/erpnext/erpnext/config/stock.py +194,Unit of Measure,Unidad de Medida
-DocType: Item,Material Issue,Incidencia de Material
-,Material Requests for which Supplier Quotations are not created,Solicitudes de Productos sin Cotizaciones Creadas
-DocType: Course Assessment Criteria,Weightage,Coeficiente de Ponderación
-DocType: Item,"Example: ABCD.#####
+"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
+Enter name of campaign if source of enquiry is campaign,Introduzca el nombre de la campaña si el origen de la encuesta es una campaña,
+Scrap %,Chatarra %
+Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
+Is Purchase Item,Es una compra de productos,
+Delivery Document No,Entrega del documento No,
+Notification Control,Control de Notificación,
+Administrative Officer,Oficial Administrativo,
+Show In Website,Mostrar En Sitio Web,
+Bank Overdraft Account,Cuenta de sobregiros,
+Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia,
+'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
+Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
+Holiday List,Lista de Feriados,
+Settings for Selling Module,Ajustes para vender Módulo,
+"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
+Taxes and Charges Deducted,Impuestos y Gastos Deducidos,
+Actual Time and Cost,Tiempo y costo actual,
+HR User,Usuario Recursos Humanos,
+Unpaid,No pagado,
+All Sales Person,Todos Ventas de Ventas,
+Material Request to Purchase Order,Requisición de materiales hacia la órden de compra,
+Manage Sales Partners.,Administrar Puntos de venta.
+Opening Entry,Entrada de Apertura,
+Ordered,Ordenado,
+Cost of Delivered Items,Costo del Material que se adjunta,
+Default Unit of Measure,Unidad de Medida Predeterminada,
+Credit To,Crédito Para,
+To Currency,Para la moneda,
+Unit of Measure,Unidad de Medida,
+Material Issue,Incidencia de Material,
+Material Requests for which Supplier Quotations are not created,Solicitudes de Productos sin Cotizaciones Creadas,
+Weightage,Coeficiente de Ponderación,
+"Example: ABCD.#####
If 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.","Ejemplo:. ABCD #####
Si la serie se establece y Número de Serie no se menciona en las transacciones, entonces se creara un número de serie automático sobre la base de esta serie. Si siempre quiere mencionar explícitamente los números de serie para este artículo, déjelo en blanco."
-DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nombre de nueva cuenta
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
-DocType: Purchase Invoice,Supplier Warehouse,Almacén Proveedor
-apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campañas de Ventas.
-DocType: Request for Quotation Item,Project Name,Nombre del proyecto
-,Serial No Warranty Expiry,Número de orden de caducidad Garantía
-DocType: Asset Repair,Manufacturing Manager,Gerente de Manufactura
-DocType: BOM,Item UOM,Unidad de Medida del Artículo
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,Total Invoiced Amt,Total Monto Facturado
-DocType: Leave Application,Total Leave Days,Total Vacaciones
-apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
-DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +942,Re-open,Re Abrir
-DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no encontrado
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +167,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
-DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +909,Sales Return,Volver Ventas
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automotor
-DocType: Payment Schedule,Payment Amount,Pago recibido
-DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +171,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
-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 +52,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 +639,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 +88,Root cannot be edited.,Root no se puede editar .
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +250,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
-DocType: Sales Partner,Target Distribution,Distribución Objetivo
-DocType: BOM,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
-DocType: Quotation,Quotation To,Cotización Para
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Seleccione el año fiscal
-apps/erpnext/erpnext/stock/doctype/item/item.py +479,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo Disponible
-DocType: Salary Component,Earning,Ganancia
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
-DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Fecha se repite
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +112,Government,Gobierno
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
-DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +139,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
-DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Secretary,Secretario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
-DocType: Work Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
-DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
-DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento excepto el rol que se especifica a continuación .
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de la lista de materiales
-DocType: Asset Maintenance,Manufacturing User,Usuario de Manufactura
-,Profit and Loss Statement,Estado de Pérdidas y Ganancias
-DocType: Item Supplier,Item Supplier,Proveedor del Artículo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,El carro esta vacío
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
-,Monthly Attendance Sheet,Hoja de Asistencia Mensual
-DocType: Upload Attendance,Get Template,Verificar Plantilla
-apps/erpnext/erpnext/controllers/accounts_controller.py +886,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
-DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
-DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
-DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
-DocType: Item,Website Warehouse,Almacén del Sitio Web
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +275,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +75,Submit Salary Slip,Presentar nómina
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
-DocType: Item,Customer Items,Artículos de clientes
-DocType: Selling Settings,Customer Naming By,Naming Cliente Por
-DocType: Account,Fixed Asset,Activos Fijos
-DocType: Purchase Invoice,Start date of current invoice's period,Fecha del período de facturación actual Inicie
-DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
-apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación.
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
-DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +33,Investment Banking,Banca de Inversión
-apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,Unidad
-,Stock Analytics,Análisis de existencias
-DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
-,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +166,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
-DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
-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 +81,Piecework,Pieza de trabajo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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
-DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-DocType: Student Attendance Tool,Batch,Lotes de Producto
-DocType: BOM Update Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with child nodes cannot be set as ledger,La Cuenta con subcuentas no puede convertirse en libro de diario.
-,Stock Projected Qty,Cantidad de Inventario Proyectada
-DocType: Work Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +408,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
-apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,Sus productos o servicios
-apps/erpnext/erpnext/controllers/accounts_controller.py +864,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
-DocType: Cashier Closing,To Time,Para Tiempo
-apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No se ha añadido ninguna dirección todavía.
-,Terretory,Territorios
-DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
-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 Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", el código de artículo de la variante será ""CAMISETA-SM"""
-DocType: Workstation,Wages,Salario
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
-DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
-DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Producción en Vacaciones
-DocType: Purchase Invoice,Terms,Términos
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +50,Supplier(s),Proveedor (s)
-DocType: Serial No,Serial No Details,Serial No Detalles
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista en las transacciones
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +286,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
-DocType: Employee,Place of Issue,Lugar de emisión
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +263,Purchase Order {0} is not submitted,La órden de compra {0} no existe
-apps/erpnext/erpnext/controllers/accounts_controller.py +376,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
-DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
-apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultas de soporte de clientes .
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Consumed Amount,Cantidad Consumida
-apps/erpnext/erpnext/stock/doctype/item/item.py +507,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
-DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde fecha' debe ser después de 'Hasta Fecha'
-apps/erpnext/erpnext/accounts/doctype/account/account.py +135,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
-,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
-apps/erpnext/erpnext/controllers/buying_controller.py +200,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas
-DocType: Employee Education,School/University,Escuela / Universidad
-apps/erpnext/erpnext/stock/get_item_details.py +167,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
-DocType: Supplier,Is Frozen,Está Inactivo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
-apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +204,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
-DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
-DocType: Pricing Rule,"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
-DocType: Leave Control Panel,Carry Forward,Cargar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,Cuenta {0} está congelada
-DocType: Asset Maintenance Log,Periodicity,Periodicidad
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +333,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
-,Employee Leave Balance,Balance de Vacaciones del Empleado
-DocType: Sales Person,Sales Person Name,Nombre del Vendedor
-DocType: Territory,Classification of Customers by region,Clasificación de los clientes por región
-DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
-DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Can. en balance
-DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
-DocType: BOM,Exploded_items,Vista detallada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +235,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
-DocType: GL Entry,Is Opening,Es apertura
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Almacén {0} no existe
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,{0} is not a stock Item,{0} no es un producto de stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +180,Due Date is mandatory,La fecha de vencimiento es obligatorio
-,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Reordenar Cantidad
-DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
-DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Salir Cant.
-DocType: Sales Team,Contribution (%),Contribución (%)
-DocType: Cost Center,Cost Center Name,Nombre Centro de Costo
-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/setup/doctype/item_group/item_group.js +71,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 +719,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}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
-DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
-,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
-DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
-DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +51,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +39,Current BOM and New BOM can not be same,Solicitud de Materiales actual y Nueva Solicitud de Materiales no pueden ser iguales
-DocType: Account,Stock,Existencias
-apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +75,Contribution %,Contribución %
-DocType: Stock Entry,Repack,Vuelva a embalar
-,Support Analytics,Analitico de Soporte
-DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción
-DocType: Pricing Rule,Apply On,Aplique En
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,{0} against Sales Order {1},{0} contra orden de venta {1}
-DocType: Work Order,Manufactured Qty,Cantidad Fabricada
-apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (LdM)
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Libro Mayor
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
-apps/erpnext/erpnext/config/projects.py +36,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
-DocType: Purchase Order Item,Material Request Item,Elemento de la Solicitud de Material
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
-DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra .
-DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
-,Requested,Requerido
-DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
-apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +87,Contribution Amount,Contribución Monto
-DocType: Work Order,Item To Manufacture,Artículo Para Fabricación
-DocType: Notification Control,Quotation Message,Cotización Mensaje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,Activos de Inventario
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
-apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
-apps/erpnext/erpnext/accounts/doctype/account/account.py +57,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 +440,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
-DocType: POS Item Group,Item Group,Grupo de artículos
-apps/erpnext/erpnext/config/selling.py +332,Point-of-Sale,Punto de venta
-DocType: Purchase Invoice Item,Rejected Serial No,Rechazado Serie No
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
-DocType: Item,Supplier Items,Artículos del Proveedor
-DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
-DocType: Bank Statement Transaction Invoice Item,Invoice Date,Fecha de la factura
-DocType: Employee,Date Of Retirement,Fecha de la jubilación
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +218,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
-DocType: Products Settings,Home Page is Products,Pagína de Inicio es Productos
-DocType: Account,Round Off,Redondear
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Set as Lost,Establecer como Perdidos
-,Sales Partners Commission,Comisiones de Ventas
-,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +631,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
-apps/erpnext/erpnext/controllers/buying_controller.py +204,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
-DocType: Lead,Person Name,Nombre de la persona
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
-apps/erpnext/erpnext/accounts/general_ledger.py +113,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
-DocType: Expense Claim,Employees Email Id,Empleados Email Id
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +81,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 +236,{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--
-DocType: Company,Stock Settings,Ajustes de Inventarios
-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 +516,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 +45,Accounting journal entries.,Entradas en el diario de contabilidad.
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +59,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Capital Stock,Capital Social
-DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
-DocType: Account,Expense Account,Cuenta de gastos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +246,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de la transacción
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
-DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
-DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
-apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1103,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +262,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
-apps/erpnext/erpnext/controllers/buying_controller.py +405,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
-apps/erpnext/erpnext/config/accounts.py +266,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
-DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1008,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
-DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +997,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
-apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Las direcciones de clientes y contactos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
-DocType: Item Price,Item Price,Precios de Productos
-DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas
-DocType: Purchase Order,To Bill,A Facturar
-DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
-DocType: Purchase Invoice,Return,Retorno
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +135,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +215,Middle Income,Ingresos Medio
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +280,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
-DocType: Employee Education,Year of Passing,Año de Fallecimiento
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +717,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
-DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
-DocType: Sales Invoice,Total Billing Amount,Monto total de facturación
-DocType: Branch,Branch,Rama
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fondos de Pensiones
-DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente
-DocType: Work Order,Actual Operating Cost,Costo de operación actual
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +125,Telephone Expenses,Gastos por Servicios Telefónicos
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
-DocType: Holiday,Holiday,Feriado
-DocType: Work Order Operation,Completed Qty,Cant. Completada
-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.
-DocType: POS Profile,POS Profile,Perfiles POS
-apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
-DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
-apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,Números
-DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +257,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 +243,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/stock/doctype/stock_entry/stock_entry.py +284,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,No puede ser mayor que 100
-DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
-DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +990,Delivery Note,Notas de Entrega
-DocType: Bin,Stock Value,Valor de Inventario
-DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
-DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
-DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serie actualizado correctamente
-DocType: Opportunity,Opportunity Date,Oportunidad Fecha
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
-,POS,POS
-apps/erpnext/erpnext/hr/doctype/payroll_period/payroll_period.py +19,End Date can not be less than Start Date,Fecha Final no puede ser inferior a Fecha de Inicio
-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: Bank Account,Contact HTML,HTML del Contacto
-DocType: Shipping Rule,Calculate Based On,Calcular basado en
-DocType: Work Order,Qty To Manufacture,Cantidad Para Fabricación
-DocType: BOM Item,Basic Rate (Company Currency),Precio Base (Moneda Local)
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +50,Total Outstanding Amt,Monto Total Soprepasado
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Outstanding Amt,Monto Sobrepasado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +231,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Credit Card,Tarjeta de Crédito
-apps/erpnext/erpnext/accounts/party.py +288,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
-apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
-DocType: Leave Application,Leave Application,Solicitud de Vacaciones
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +39,For Supplier,Por proveedor
-apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
-apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +33,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1064,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +237,'Total','Total'
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer presupuestos - Grupo sabio artículo en este Territorio. También puede incluir la estacionalidad mediante el establecimiento de la Distribución .
-DocType: Territory,For reference,Por referencia
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar contra múltiples **vendedores ** para que pueda establecer y monitorear metas.
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,Hacer Nómina
-DocType: Purchase Invoice,Rounded Total (Company Currency),Total redondeado (Moneda local)
-DocType: Item,Default BOM,Solicitud de Materiales por Defecto
-,Delivery Note Trends,Tendencia de Notas de Entrega
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
-apps/erpnext/erpnext/stock/doctype/item/item.py +510,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
-apps/erpnext/erpnext/config/projects.py +13,Project master.,Proyecto maestro
-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""","Sólo puede haber una Condición de Regla de Envió con valor 0 o valor en blanco para ""To Value"""
-DocType: Item Group,Item Group Name,Nombre del grupo de artículos
-DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
-DocType: Account,Root Type,Tipo Root
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
-DocType: Sales Order Item,Gross Profit,Utilidad bruta
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Almacén no se encuentra en el sistema
-,Serial No Status,Número de orden Estado
-DocType: Blanket Order Item,Ordered Quantity,Cantidad Pedida
-DocType: Item,UOMs,Unidades de Medida
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
-DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
-DocType: Journal Entry Account,Sales Order,Ordenes de Venta
-DocType: Purchase Invoice Item,Weight UOM,Peso Unidad de Medida
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
-DocType: Production Plan,Get Sales Orders,Recibe Órdenes de Venta
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
-DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +132,Successfully Reconciled,Reconciliado con éxito
-DocType: Payroll Entry,Select Employees,Seleccione Empleados
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Moneda Local)
-DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde el último pedido
-DocType: Item Default,Default Buying Cost Center,Centro de Costos Por Defecto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +257,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nombre nuevo"
-DocType: Depreciation Schedule,Schedule Date,Horario Fecha
-DocType: UOM,UOM Name,Nombre Unidad de Medida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +256,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra
-DocType: Item,Serial Number Series,Número de Serie Serie
-DocType: Sales Invoice,Product Bundle Help,Ayuda del conjunto/paquete de productos
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
+Recd Quantity,Recd Cantidad,
+New Account Name,Nombre de nueva cuenta,
+Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
+Supplier Warehouse,Almacén Proveedor,
+Sales campaigns.,Campañas de Ventas.
+Project Name,Nombre del proyecto,
+Serial No Warranty Expiry,Número de orden de caducidad Garantía,
+Manufacturing Manager,Gerente de Manufactura,
+Item UOM,Unidad de Medida del Artículo,
+Total Invoiced Amt,Total Monto Facturado,
+Total Leave Days,Total Vacaciones,
+Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
+Score Earned,Puntuación Obtenida,
+Re-open,Re Abrir,
+Material Request Type,Tipo de Solicitud de Material,
+Serial No {0} not found,Serial No {0} no encontrado,
+Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía,
+Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
+Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
+Holiday List Name,Lista de nombres de vacaciones,
+Sales Return,Volver Ventas,
+Automotive,Automotor,
+Payment Amount,Pago recibido,
+Supplied Qty,Suministrado Cantidad,
+Employee cannot report to himself.,Empleado no puede informar a sí mismo.
+Delivery Note No,No. de Nota de Entrega,
+Purchase Order,Órdenes de Compra,
+Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe,
+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,
+Leave Without Pay,Licencia sin Sueldo,
+Root cannot be edited.,Root no se puede editar .
+Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
+Target Distribution,Distribución Objetivo,
+Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
+Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción,
+Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra,
+Quotation To,Cotización Para,
+Select Fiscal Year,Seleccione el año fiscal,
+'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
+Cash In Hand,Efectivo Disponible,
+Earning,Ganancia,
+Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
+Purchase Order Message,Mensaje de la Orden de Compra,
+Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción,
+Date is repeated,Fecha se repite,
+Government,Gobierno,
+Securities & Commodity Exchanges,Valores y Bolsas de Productos,
+Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba,
+Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa,
+Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
+Supplier of Goods or Services.,Proveedor de Productos o Servicios.
+Secretary,Secretario,
+Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas,
+Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
+Type of document to rename.,Tipo de documento para cambiar el nombre.
+Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento excepto el rol que se especifica a continuación .
+Duties and Taxes,Derechos e Impuestos,
+Tree of Bill of Materials,Árbol de la lista de materiales,
+Manufacturing User,Usuario de Manufactura,
+Profit and Loss Statement,Estado de Pérdidas y Ganancias,
+Item Supplier,Proveedor del Artículo,
+Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor,
+Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria,
+Cart is Empty,El carro esta vacío,
+Please Delivery Note first,Primero la nota de entrega,
+Monthly Attendance Sheet,Hoja de Asistencia Mensual,
+Get Template,Verificar Plantilla,
+"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos,
+Sales Invoice Advance,Factura Anticipadas,
+Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
+Stock Value Difference,Diferencia de Valor de Inventario,
+Min Order Qty,Cantidad mínima de Pedido (MOQ)
+Website Warehouse,Almacén del Sitio Web,
+Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
+Submit Salary Slip,Presentar nómina,
+Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío,
+This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
+Customer Items,Artículos de clientes,
+Customer Naming By,Naming Cliente Por,
+Fixed Asset,Activos Fijos,
+Start date of current invoice's period,Fecha del período de facturación actual Inicie,
+Score (0-5),Puntuación ( 0-5)
+"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
+Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación.
+Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado,
+Employee Leave Approver,Supervisor de Vacaciones del Empleado,
+Investment Banking,Banca de Inversión,
+Unit,Unidad,
+Stock Analytics,Análisis de existencias,
+Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos,
+Purchase Order Items To Be Billed,Ordenes de Compra por Facturar,
+The selected item cannot have Batch,El elemento seleccionado no puede tener lotes,
+Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
+User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
+Expenses Included In Valuation,Gastos dentro de la valoración,
+New Customers,Clientes Nuevos,
+Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
+Piecework,Pieza de trabajo,
+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).
+A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
+Has Batch No,Tiene lote No,
+Creation Document Type,Tipo de creación de documentos,
+Prevdoc DocType,DocType Prevdoc,
+Batch,Lotes de Producto,
+The BOM which will be replaced,La Solicitud de Materiales que será sustituida,
+Account with child nodes cannot be set as ledger,La Cuenta con subcuentas no puede convertirse en libro de diario.
+Stock Projected Qty,Cantidad de Inventario Proyectada,
+Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
+{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
+Your Products or Services,Sus productos o servicios,
+{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+To Time,Para Tiempo,
+No address added yet.,No se ha añadido ninguna dirección todavía.
+Terretory,Territorios,
+Series List for this Transaction,Lista de series para esta transacción,
+"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 Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", el código de artículo de la variante será ""CAMISETA-SM"""
+Wages,Salario,
+Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
+Appraisal Goal,Evaluación Meta,
+Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
+Allow Production on Holidays,Permitir Producción en Vacaciones,
+Terms,Términos,
+Supplier(s),Proveedor (s)
+Serial No Details,Serial No Detalles,
+Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista en las transacciones,
+Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
+"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
+Place of Issue,Lugar de emisión,
+Purchase Order {0} is not submitted,La órden de compra {0} no existe,
+Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
+"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
+Sales Team1,Team1 Ventas,
+Stock Entry {0} is not submitted,Entrada de la {0} no se presenta,
+Support queries from customers.,Consultas de soporte de clientes .
+Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes,
+Consumed Amount,Cantidad Consumida,
+Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+Supplier Part Number,Número de pieza del proveedor,
+'From Date' must be after 'To Date','Desde fecha' debe ser después de 'Hasta Fecha'
+Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor,
+Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad,
+Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas,
+School/University,Escuela / Universidad,
+Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado,
+Is Frozen,Está Inactivo,
+Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
+Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
+Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
+Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado,
+"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad"
+Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes,
+Carry Forward,Cargar,
+Account {0} is frozen,Cuenta {0} está congelada,
+Periodicity,Periodicidad,
+Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso,
+Employee Leave Balance,Balance de Vacaciones del Empleado,
+Sales Person Name,Nombre del Vendedor,
+Classification of Customers by region,Clasificación de los clientes por región,
+Grand Total (Company Currency),Suma total (Moneda Local)
+Quantity and Rate,Cantidad y Cambio,
+Balance Qty,Can. en balance,
+Materials Required (Exploded),Materiales necesarios ( despiece )
+Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
+Exploded_items,Vista detallada,
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas,
+Is Opening,Es apertura,
+Warehouse {0} does not exist,Almacén {0} no existe,
+{0} is not a stock Item,{0} no es un producto de stock,
+Due Date is mandatory,La fecha de vencimiento es obligatorio,
+Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor,
+Reorder Qty,Reordenar Cantidad,
+Rate Of Materials Based On,Cambio de materiales basados en,
+Purchase Receipt Items,Artículos de Recibo de Compra,
+Out Qty,Salir Cant.
+Contribution (%),Contribución (%)
+Cost Center Name,Nombre Centro de Costo,
+Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario,
+Year End Date,Año de Finalización,
+Supplier Invoice Date,Fecha de la Factura de Proveedor,
+This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
+Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
+Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
+There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+Gross Weight UOM,Peso Bruto de la Unidad de Medida,
+Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo,
+Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo,
+Supply Raw Materials,Suministro de Materias Primas,
+Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
+Current BOM and New BOM can not be same,Solicitud de Materiales actual y Nueva Solicitud de Materiales no pueden ser iguales,
+Stock,Existencias,
+Contribution %,Contribución %
+Repack,Vuelva a embalar,
+Support Analytics,Analitico de Soporte,
+Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción,
+Apply On,Aplique En,
+{0} against Sales Order {1},{0} contra orden de venta {1}
+Manufactured Qty,Cantidad Fabricada,
+Bill of Materials (BOM),Lista de Materiales (LdM)
+General Ledger,Libro Mayor,
+Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
+Set as Open,Establecer como abierto,
+Required On,Requerido Por,
+Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
+Material Request Item,Elemento de la Solicitud de Material,
+Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
+Required only for sample item.,Sólo es necesario para el artículo de muestra .
+Add/Remove Recipients,Añadir / Quitar Destinatarios,
+Requested,Requerido,
+Shipping Rule Conditions,Regla envío Condiciones,
+Contribution Amount,Contribución Monto,
+Item To Manufacture,Artículo Para Fabricación,
+Quotation Message,Cotización Mensaje,
+Stock Assets,Activos de Inventario,
+Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente,
+Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
+Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
+Stock Reconciliation Item,Articulo de Reconciliación de Inventario,
+Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
+Purchase / Manufacture Details,Detalles de Compra / Fábricas,
+Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar,
+Warehouse Detail,Detalle de almacenes,
+Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock,
+Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento,
+Item Group,Grupo de artículos,
+Point-of-Sale,Punto de venta,
+Rejected Serial No,Rechazado Serie No,
+Search Sub Assemblies,Asambleas Buscar Sub,
+Supplier Items,Artículos del Proveedor,
+Contact Mobile No,No Móvil del Contacto,
+Invoice Date,Fecha de la factura,
+Date Of Retirement,Fecha de la jubilación,
+Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
+Home Page is Products,Pagína de Inicio es Productos,
+Round Off,Redondear,
+Set as Lost,Establecer como Perdidos,
+Sales Partners Commission,Comisiones de Ventas,
+Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta,
+BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada,
+Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
+Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía,
+Person Name,Nombre de la persona,
+Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
+Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario,
+Employees Email Id,Empleados Email Id,
+Shortage Qty,Escasez Cantidad,
+Cash Flow,Flujo de Caja,
+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 .
+{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
+Default Stock UOM,Unidad de Medida Predeterminada para Inventario,
+Description of a Job Opening,Descripción de una oferta de trabajo,
+Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
+Stock Settings,Ajustes de Inventarios,
+Quotation Item,Cotización del artículo,
+Date of Issue,Fecha de emisión,
+Sales Invoice Item,Articulo de la Factura de Venta,
+Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+Against Sales Invoice Item,Contra la Factura de Venta de Artículos,
+Accounting Details,detalles de la contabilidad,
+Accounting journal entries.,Entradas en el diario de contabilidad.
+Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
+Capital Stock,Capital Social,
+Employee Records to be created by,Registros de empleados a ser creados por,
+Expense Account,Cuenta de gastos,
+Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta,
+Actual Qty After Transaction,Cantidad actual después de la transacción,
+Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria,
+Applicable To (Role),Aplicable a (Rol )
+Amount (Company Currency),Importe (Moneda Local)
+Gantt Chart,Diagrama de Gantt,
+Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida,
+Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
+"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
+Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular,
+Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno,
+Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas,
+Material Transfer for Manufacture,Trasferencia de Material para Manufactura,
+"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
+Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
+Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+Auto Material Request,Solicitud de Materiales Automatica,
+Get Items from BOM,Obtener elementos de la Solicitud de Materiales,
+Customer Addresses And Contacts,Las direcciones de clientes y contactos,
+Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
+Item Price,Precios de Productos,
+Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas,
+To Bill,A Facturar,
+Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
+Return,Retorno,
+Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
+Middle Income,Ingresos Medio,
+Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado,
+Year of Passing,Año de Fallecimiento,
+Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía,
+Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria,
+AMC Expiry Date,AMC Fecha de caducidad,
+Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
+Total Billing Amount,Monto total de facturación,
+Branch,Rama,
+Pension Funds,Fondos de Pensiones,
+example: Next Day Shipping,ejemplo : Envío Día Siguiente,
+Actual Operating Cost,Costo de operación actual,
+Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias"
+Telephone Expenses,Gastos por Servicios Telefónicos,
+Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
+Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante,
+Holiday,Feriado,
+Completed Qty,Cant. Completada,
+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.
+POS Profile,Perfiles POS,
+Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
+Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
+No of Requested SMS,No. de SMS solicitados,
+Nos,Números,
+Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
+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,
+Contact Details,Datos del Contacto,
+Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
+The Item {0} cannot have Batch,El artículo {0} no puede tener lotes,
+Users who can approve a specific employee's leave applications,Los usuarios que pueden aprobar las solicitudes de licencia de un empleado específico,
+For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio,
+cannot be greater than 100,No puede ser mayor que 100,
+Customer Feedback,Comentarios del cliente,
+Required Qty,Cant. Necesaria,
+Delivery Note,Notas de Entrega,
+Stock Value,Valor de Inventario,
+In Words (Company Currency),En palabras (Moneda Local)
+Website Item Group,Grupo de Artículos del Sitio Web,
+Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra,
+Series Updated Successfully,Serie actualizado correctamente,
+Opportunity Date,Oportunidad Fecha,
+There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
+Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
+POS,POS,
+End Date can not be less than Start Date,Fecha Final no puede ser inferior a Fecha de Inicio,
+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"
+Contact HTML,HTML del Contacto,
+Calculate Based On,Calcular basado en,
+Qty To Manufacture,Cantidad Para Fabricación,
+Basic Rate (Company Currency),Precio Base (Moneda Local)
+Total Outstanding Amt,Monto Total Soprepasado,
+Outstanding Amt,Monto Sobrepasado,
+Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
+Credit Card,Tarjeta de Crédito,
+Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
+Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
+Leave Application,Solicitud de Vacaciones,
+For Supplier,Por proveedor,
+Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
+Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores,
+New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra,
+Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
+Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
+Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material,
+'Total','Total'
+Debtors,Deudores,
+Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer presupuestos - Grupo sabio artículo en este Territorio. También puede incluir la estacionalidad mediante el establecimiento de la Distribución .
+For reference,Por referencia,
+All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar contra múltiples **vendedores ** para que pueda establecer y monitorear metas.
+Make Salary Slip,Hacer Nómina,
+Rounded Total (Company Currency),Total redondeado (Moneda local)
+Default BOM,Solicitud de Materiales por Defecto,
+Delivery Note Trends,Tendencia de Notas de Entrega,
+Serial No {0} has already been received,Número de orden {0} ya se ha recibido,
+{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto,
+Project master.,Proyecto maestro,
+"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió con valor 0 o valor en blanco para ""To Value"""
+Item Group Name,Nombre del grupo de artículos,
+On Net Total,En Total Neto,
+Root Type,Tipo Root,
+Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
+Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
+Gross Profit,Utilidad bruta,
+Warehouse not found in the system,Almacén no se encuentra en el sistema,
+Serial No Status,Número de orden Estado,
+Ordered Quantity,Cantidad Pedida,
+UOMs,Unidades de Medida,
+Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
+Distribution Name,Nombre del Distribución,
+Sales Order,Ordenes de Venta,
+Weight UOM,Peso Unidad de Medida,
+Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar,
+Get Sales Orders,Recibe Órdenes de Venta,
+Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción,
+Applicable Holiday List,Lista de Días Feriados Aplicable,
+Successfully Reconciled,Reconciliado con éxito,
+Select Employees,Seleccione Empleados,
+Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan,
+Net Rate (Company Currency),Tasa neta (Moneda Local)
+Closing Account Head,Cuenta de cierre principal,
+Days Since Last Order,Días desde el último pedido,
+Default Buying Cost Center,Centro de Costos Por Defecto,
+Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas,
+"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nombre nuevo"
+Schedule Date,Horario Fecha,
+UOM Name,Nombre Unidad de Medida,
+Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
+Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra,
+Serial Number Series,Número de Serie Serie,
+Product Bundle Help,Ayuda del conjunto/paquete de productos,
+Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra,
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 9996fe5..90a4514 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Aplicable si la empresa es SpA, SApA o SRL",
Applicable if the company is a limited liability company,Aplicable si la empresa es una sociedad de responsabilidad limitada.,
Applicable if the company is an Individual or a Proprietorship,Aplicable si la empresa es un individuo o un propietario,
-Applicant,Solicitante,
-Applicant Type,Tipo de solicitante,
Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS),
Application period cannot be across two allocation records,El período de solicitud no puede estar en dos registros de asignación,
Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lista de Accionistas disponibles con números de folio,
Loading Payment System,Cargando el Sistema de Pago,
Loan,Préstamo,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0},
-Loan Application,Solicitud de préstamo,
-Loan Management,Gestion de prestamos,
-Loan Repayment,Pago de prestamo,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,La fecha de inicio del préstamo y el período de préstamo son obligatorios para guardar el descuento de facturas,
Loans (Liabilities),Préstamos (Pasivos),
Loans and Advances (Assets),INVERSIONES Y PRESTAMOS,
@@ -1611,7 +1605,6 @@
Monday,Lunes,
Monthly,Mensual,
Monthly Distribution,Distribución mensual,
-Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad mensual La devolución no puede ser mayor que monto del préstamo,
More,Más,
More Information,Mas información,
More than one selection for {0} not allowed,Más de una selección para {0} no permitida,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pagar {0} {1},
Payable,Pagadero,
Payable Account,Cuenta por pagar,
-Payable Amount,Cantidad a pagar,
Payment,Pago,
Payment Cancelled. Please check your GoCardless Account for more details,Pago cancelado Verifique su Cuenta GoCardless para más detalles,
Payment Confirmation,Confirmación de pago,
-Payment Date,Fecha de pago,
Payment Days,Días de pago,
Payment Document,Documento de pago,
Payment Due Date,Fecha de pago,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra",
Please enter Receipt Document,"Por favor, introduzca recepción de documentos",
Please enter Reference date,"Por favor, introduzca la fecha de referencia",
-Please enter Repayment Periods,"Por favor, introduzca plazos de amortización",
Please enter Reqd by Date,Ingrese Requerido por Fecha,
Please enter Woocommerce Server URL,Ingrese la URL del servidor WooCommerce,
Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Por favor, ingrese el centro de costos principal",
Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}",
Please enter relieving date.,"Por favor, introduzca la fecha de relevo",
-Please enter repayment Amount,"Por favor, ingrese el monto de amortización",
Please enter valid Financial Year Start and End Dates,"Por favor, introduzca fecha de Inicio y Fin válidas para el Año Fiscal",
Please enter valid email address,Por favor ingrese una dirección de correo electrónico válida,
Please enter {0} first,"Por favor, introduzca {0} primero",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.,
Primary Address Details,Detalles de la Dirección Primaria,
Primary Contact Details,Detalles de Contacto Principal,
-Principal Amount,Cantidad principal,
Print Format,Formatos de Impresión,
Print IRS 1099 Forms,Imprimir formularios del IRS 1099,
Print Report Card,Imprimir Boleta de Calificaciones,
@@ -2550,7 +2538,6 @@
Sample Collection,Coleccion de muestra,
Sample quantity {0} cannot be more than received quantity {1},La Cantidad de Muestra {0} no puede ser más que la Cantidad Recibida {1},
Sanctioned,Sancionada,
-Sanctioned Amount,Monto sancionado,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.,
Sand,Arena,
Saturday,Sábado,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ya tiene un Procedimiento principal {1}.,
API,API,
Annual,Anual,
-Approved,Aprobado,
Change,Cambio,
Contact Email,Correo electrónico de contacto,
Export Type,Tipo de Exportación,
@@ -3571,7 +3557,6 @@
Account Value,Valor de la cuenta,
Account is mandatory to get payment entries,La cuenta es obligatoria para obtener entradas de pago,
Account is not set for the dashboard chart {0},La cuenta no está configurada para el cuadro de mandos {0},
-Account {0} does not belong to company {1},Cuenta {0} no pertenece a la Compañía {1},
Account {0} does not exists in the dashboard chart {1},La cuenta {0} no existe en el cuadro de mandos {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Cuenta: <b>{0}</b> es capital Trabajo en progreso y no puede actualizarse mediante Entrada de diario,
Account: {0} is not permitted under Payment Entry,Cuenta: {0} no está permitido en Entrada de pago,
@@ -3582,7 +3567,6 @@
Activity,Actividad,
Add / Manage Email Accounts.,Añadir / Administrar cuentas de correo electrónico.,
Add Child,Agregar hijo,
-Add Loan Security,Agregar seguridad de préstamo,
Add Multiple,Añadir Multiple,
Add Participants,Agregar Participantes,
Add to Featured Item,Agregar al artículo destacado,
@@ -3593,15 +3577,12 @@
Address Line 1,Dirección línea 1,
Addresses,Direcciones,
Admission End Date should be greater than Admission Start Date.,La fecha de finalización de la admisión debe ser mayor que la fecha de inicio de la admisión.,
-Against Loan,Contra préstamo,
-Against Loan:,Contra préstamo:,
All,Todos,
All bank transactions have been created,Se han creado todas las transacciones bancarias.,
All the depreciations has been booked,Todas las amortizaciones han sido registradas,
Allocation Expired!,Asignación expirada!,
Allow Resetting Service Level Agreement from Support Settings.,Permitir restablecer el acuerdo de nivel de servicio desde la configuración de soporte.,
Amount of {0} is required for Loan closure,Se requiere una cantidad de {0} para el cierre del préstamo,
-Amount paid cannot be zero,El monto pagado no puede ser cero,
Applied Coupon Code,Código de cupón aplicado,
Apply Coupon Code,Aplicar código de cupón,
Appointment Booking,Reserva de citas,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,No se puede calcular la hora de llegada porque falta la dirección del conductor.,
Cannot Optimize Route as Driver Address is Missing.,No se puede optimizar la ruta porque falta la dirección del conductor.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,No se puede completar la tarea {0} ya que su tarea dependiente {1} no se ha completado / cancelado.,
-Cannot create loan until application is approved,No se puede crear un préstamo hasta que se apruebe la solicitud.,
Cannot find a matching Item. Please select some other value for {0}.,No se peude encontrar un artículo que concuerde. Por favor seleccione otro valor para {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","No se puede facturar en exceso el artículo {0} en la fila {1} más de {2}. Para permitir una facturación excesiva, configure la asignación en la Configuración de cuentas",
"Capacity Planning Error, planned start time can not be same as end time","Error de planificación de capacidad, la hora de inicio planificada no puede ser la misma que la hora de finalización",
@@ -3812,20 +3792,9 @@
Less Than Amount,Menos de la cantidad,
Liabilities,Pasivo,
Loading...,Cargando ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,El monto del préstamo excede el monto máximo del préstamo de {0} según los valores propuestos,
Loan Applications from customers and employees.,Solicitudes de préstamos de clientes y empleados.,
-Loan Disbursement,Desembolso del préstamo,
Loan Processes,Procesos de préstamo,
-Loan Security,Préstamo de seguridad,
-Loan Security Pledge,Compromiso de seguridad del préstamo,
-Loan Security Pledge Created : {0},Compromiso de seguridad del préstamo creado: {0},
-Loan Security Price,Precio de seguridad del préstamo,
-Loan Security Price overlapping with {0},Precio de seguridad del préstamo superpuesto con {0},
-Loan Security Unpledge,Préstamo Seguridad Desplegar,
-Loan Security Value,Valor de seguridad del préstamo,
Loan Type for interest and penalty rates,Tipo de préstamo para tasas de interés y multas,
-Loan amount cannot be greater than {0},El monto del préstamo no puede ser mayor que {0},
-Loan is mandatory,El préstamo es obligatorio.,
Loans,Préstamos,
Loans provided to customers and employees.,Préstamos otorgados a clientes y empleados.,
Location,Ubicación,
@@ -3894,7 +3863,6 @@
Pay,Pagar,
Payment Document Type,Tipo de documento de pago,
Payment Name,Nombre de pago,
-Penalty Amount,Importe de la pena,
Pending,Pendiente,
Performance,Actuación,
Period based On,Período basado en,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Inicie sesión como usuario de Marketplace para editar este artículo.,
Please login as a Marketplace User to report this item.,Inicie sesión como usuario de Marketplace para informar este artículo.,
Please select <b>Template Type</b> to download template,Seleccione <b>Tipo de plantilla</b> para descargar la plantilla,
-Please select Applicant Type first,Seleccione primero el tipo de solicitante,
Please select Customer first,Por favor seleccione Cliente primero,
Please select Item Code first,Seleccione primero el código del artículo,
-Please select Loan Type for company {0},Seleccione Tipo de préstamo para la empresa {0},
Please select a Delivery Note,Por favor seleccione una nota de entrega,
Please select a Sales Person for item: {0},Seleccione una persona de ventas para el artículo: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Seleccione otro método de pago. Stripe no admite transacciones en moneda '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Configure una cuenta bancaria predeterminada para la empresa {0},
Please specify,"Por favor, especifique",
Please specify a {0},"Por favor, especifique un {0}",lead
-Pledge Status,Estado de compromiso,
-Pledge Time,Tiempo de compromiso,
Printing,Impresión,
Priority,Prioridad,
Priority has been changed to {0}.,La prioridad se ha cambiado a {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Procesando archivos XML,
Profitability,Rentabilidad,
Project,Proyecto,
-Proposed Pledges are mandatory for secured Loans,Las promesas propuestas son obligatorias para los préstamos garantizados,
Provide the academic year and set the starting and ending date.,Proporcione el año académico y establezca la fecha de inicio y finalización.,
Public token is missing for this bank,Falta un token público para este banco,
Publish,Publicar,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,El recibo de compra no tiene ningún artículo para el que esté habilitada la opción Conservar muestra.,
Purchase Return,Devolución de compra,
Qty of Finished Goods Item,Cantidad de artículos terminados,
-Qty or Amount is mandatroy for loan security,Cantidad o monto es obligatorio para la seguridad del préstamo,
Quality Inspection required for Item {0} to submit,Inspección de calidad requerida para el Artículo {0} para enviar,
Quantity to Manufacture,Cantidad a fabricar,
Quantity to Manufacture can not be zero for the operation {0},La cantidad a fabricar no puede ser cero para la operación {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,La fecha de liberación debe ser mayor o igual que la fecha de incorporación,
Rename,Renombrar,
Rename Not Allowed,Cambiar nombre no permitido,
-Repayment Method is mandatory for term loans,El método de reembolso es obligatorio para préstamos a plazo,
-Repayment Start Date is mandatory for term loans,La fecha de inicio de reembolso es obligatoria para préstamos a plazo,
Report Item,Reportar articulo,
Report this Item,Reportar este artículo,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Cantidad reservada para subcontrato: Cantidad de materias primas para hacer artículos subcontratados.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Fila ({0}): {1} ya está descontada en {2},
Rows Added in {0},Filas agregadas en {0},
Rows Removed in {0},Filas eliminadas en {0},
-Sanctioned Amount limit crossed for {0} {1},Límite de cantidad sancionado cruzado por {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},El monto del préstamo sancionado ya existe para {0} contra la compañía {1},
Save,Guardar,
Save Item,Guardar artículo,
Saved Items,Artículos guardados,
@@ -4135,7 +4093,6 @@
User {0} is disabled,El usuario {0} está deshabilitado,
Users and Permissions,Usuarios y Permisos,
Vacancies cannot be lower than the current openings,Las vacantes no pueden ser inferiores a las vacantes actuales,
-Valid From Time must be lesser than Valid Upto Time.,Válido desde el tiempo debe ser menor que Válido hasta el tiempo.,
Valuation Rate required for Item {0} at row {1},Tasa de valoración requerida para el artículo {0} en la fila {1},
Values Out Of Sync,Valores fuera de sincronización,
Vehicle Type is required if Mode of Transport is Road,El tipo de vehículo es obligatorio si el modo de transporte es carretera,
@@ -4211,7 +4168,6 @@
Add to Cart,Añadir a la Cesta,
Days Since Last Order,Días desde el último pedido,
In Stock,En inventario,
-Loan Amount is mandatory,El monto del préstamo es obligatorio,
Mode Of Payment,Método de pago,
No students Found,No se encontraron estudiantes,
Not in Stock,No disponible en stock,
@@ -4240,7 +4196,6 @@
Group by,Agrupar por,
In stock,En stock,
Item name,Nombre del producto,
-Loan amount is mandatory,El monto del préstamo es obligatorio,
Minimum Qty,Cantidad mínima,
More details,Más detalles,
Nature of Supplies,Naturaleza de los suministros,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Cantidad total completada,
Qty to Manufacture,Cantidad para producción,
Repay From Salary can be selected only for term loans,Reembolsar desde el salario se puede seleccionar solo para préstamos a plazo,
-No valid Loan Security Price found for {0},No se encontró ningún precio de garantía de préstamo válido para {0},
-Loan Account and Payment Account cannot be same,La cuenta de préstamo y la cuenta de pago no pueden ser iguales,
-Loan Security Pledge can only be created for secured loans,La promesa de garantía de préstamo solo se puede crear para préstamos garantizados,
Social Media Campaigns,Campañas de redes sociales,
From Date can not be greater than To Date,Desde la fecha no puede ser mayor que hasta la fecha,
Please set a Customer linked to the Patient,Establezca un cliente vinculado al paciente,
@@ -6437,7 +6389,6 @@
HR User,Usuario de recursos humanos,
Appointment Letter,Carta de cita,
Job Applicant,Solicitante de empleo,
-Applicant Name,Nombre del Solicitante,
Appointment Date,Día de la cita,
Appointment Letter Template,Plantilla de carta de cita,
Body,Cuerpo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sincronización en Progreso,
Hub Seller Name,Nombre del vendedor de Hub,
Custom Data,Datos Personalizados,
-Member,Miembro,
-Partially Disbursed,Parcialmente Desembolsado,
-Loan Closure Requested,Cierre de préstamo solicitado,
Repay From Salary,Reembolso del Salario,
-Loan Details,Detalles de préstamo,
-Loan Type,Tipo de préstamo,
-Loan Amount,Monto del préstamo,
-Is Secured Loan,Es un préstamo garantizado,
-Rate of Interest (%) / Year,Tasa de interés (%) / Año,
-Disbursement Date,Fecha de desembolso,
-Disbursed Amount,Monto desembolsado,
-Is Term Loan,¿Es el préstamo a plazo,
-Repayment Method,Método de Reembolso,
-Repay Fixed Amount per Period,Pagar una Cantidad Fja por Período,
-Repay Over Number of Periods,Devolución por cantidad de períodos,
-Repayment Period in Months,Plazo de devolución en Meses,
-Monthly Repayment Amount,Cantidad de pago mensual,
-Repayment Start Date,Fecha de Inicio de Pago,
-Loan Security Details,Detalles de seguridad del préstamo,
-Maximum Loan Value,Valor máximo del préstamo,
-Account Info,Informacion de cuenta,
-Loan Account,Cuenta de Préstamo,
-Interest Income Account,Cuenta de Utilidad interés,
-Penalty Income Account,Cuenta de ingresos por penalizaciones,
-Repayment Schedule,Calendario de reembolso,
-Total Payable Amount,Monto Total a Pagar,
-Total Principal Paid,Total principal pagado,
-Total Interest Payable,Interés total a pagar,
-Total Amount Paid,Cantidad Total Pagada,
-Loan Manager,Gerente de préstamos,
-Loan Info,Información del Préstamo,
-Rate of Interest,Tasa de interés,
-Proposed Pledges,Prendas Propuestas,
-Maximum Loan Amount,Cantidad máxima del préstamo,
-Repayment Info,Información de la Devolución,
-Total Payable Interest,Interés Total a Pagar,
-Against Loan ,Contra préstamo,
-Loan Interest Accrual,Devengo de intereses de préstamos,
-Amounts,Cantidades,
-Pending Principal Amount,Monto principal pendiente,
-Payable Principal Amount,Monto del principal a pagar,
-Paid Principal Amount,Monto principal pagado,
-Paid Interest Amount,Monto de interés pagado,
-Process Loan Interest Accrual,Proceso de acumulación de intereses de préstamos,
-Repayment Schedule Name,Nombre del programa de pago,
Regular Payment,Pago regular,
Loan Closure,Cierre de préstamo,
-Payment Details,Detalles del Pago,
-Interest Payable,Los intereses a pagar,
-Amount Paid,Total Pagado,
-Principal Amount Paid,Importe principal pagado,
-Repayment Details,Detalles de reembolso,
-Loan Repayment Detail,Detalle de reembolso del préstamo,
-Loan Security Name,Nombre de seguridad del préstamo,
-Unit Of Measure,Unidad de medida,
-Loan Security Code,Código de seguridad del préstamo,
-Loan Security Type,Tipo de seguridad de préstamo,
-Haircut %,Corte de pelo %,
-Loan Details,Detalles del préstamo,
-Unpledged,Sin plegar,
-Pledged,Comprometido,
-Partially Pledged,Parcialmente comprometido,
-Securities,Valores,
-Total Security Value,Valor total de seguridad,
-Loan Security Shortfall,Déficit de seguridad del préstamo,
-Loan ,Préstamo,
-Shortfall Time,Tiempo de déficit,
-America/New_York,América / Nueva_York,
-Shortfall Amount,Cantidad de déficit,
-Security Value ,Valor de seguridad,
-Process Loan Security Shortfall,Déficit de seguridad del préstamo de proceso,
-Loan To Value Ratio,Préstamo a valor,
-Unpledge Time,Desplegar tiempo,
-Loan Name,Nombre del préstamo,
Rate of Interest (%) Yearly,Tasa de interés (%) Anual,
-Penalty Interest Rate (%) Per Day,Tasa de interés de penalización (%) por día,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,La tasa de interés de penalización se aplica diariamente sobre el monto de interés pendiente en caso de reembolso retrasado,
-Grace Period in Days,Período de gracia en días,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Cantidad de días desde la fecha de vencimiento hasta la cual no se cobrará la multa en caso de retraso en el pago del préstamo,
-Pledge,Promesa,
-Post Haircut Amount,Cantidad de post corte de pelo,
-Process Type,Tipo de proceso,
-Update Time,Tiempo de actualizacion,
-Proposed Pledge,Compromiso propuesto,
-Total Payment,Pago total,
-Balance Loan Amount,Saldo del balance del préstamo,
-Is Accrued,Está acumulado,
Salary Slip Loan,Préstamo de Nómina,
Loan Repayment Entry,Entrada de reembolso de préstamo,
-Sanctioned Loan Amount,Monto de préstamo sancionado,
-Sanctioned Amount Limit,Límite de cantidad sancionada,
-Unpledge,Desatar,
-Haircut,Corte de pelo,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generar planificación,
Schedules,Programas,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Proyecto será accesible en la página web de estos usuarios,
Copied From,Copiado de,
Start and End Dates,Fechas de Inicio y Fin,
-Actual Time (in Hours),Tiempo real (en horas),
+Actual Time in Hours (via Timesheet),Tiempo real (en horas),
Costing and Billing,Cálculo de Costos y Facturación,
-Total Costing Amount (via Timesheets),Monto Total de Costos (a través de Partes de Horas),
-Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos),
+Total Costing Amount (via Timesheet),Monto Total de Costos (a través de Partes de Horas),
+Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolsos de gastos),
Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra),
Total Sales Amount (via Sales Order),Importe de Ventas Total (a través de Ordenes de Venta),
-Total Billable Amount (via Timesheets),Monto Total Facturable (a través de Partes de Horas),
-Total Billed Amount (via Sales Invoices),Importe Total Facturado (a través de Facturas de Ventas),
-Total Consumed Material Cost (via Stock Entry),Costo total del Material Consumido (a través de la Entrada de Stock),
+Total Billable Amount (via Timesheet),Monto Total Facturable (a través de Partes de Horas),
+Total Billed Amount (via Sales Invoice),Importe Total Facturado (a través de Facturas de Ventas),
+Total Consumed Material Cost (via Stock Entry),Costo total del Material Consumido (a través de la Entrada de Stock),
Gross Margin,Margen bruto,
Gross Margin %,Margen bruto %,
Monitor Progress,Monitorear el Progreso,
@@ -7521,12 +7385,10 @@
Dependencies,Dependencias,
Dependent Tasks,Tareas dependientes,
Depends on Tasks,Depende de Tareas,
-Actual Start Date (via Time Sheet),Fecha de inicio real (a través de hoja de horas),
-Actual Time (in hours),Tiempo real (en horas),
-Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas),
-Total Costing Amount (via Time Sheet),Importe total del cálculo del coste (mediante el cuadro de horario de trabajo),
+Actual Start Date (via Timesheet),Fecha de inicio real (a través de hoja de horas),
+Actual Time in Hours (via Timesheet),Tiempo real (en horas),
+Actual End Date (via Timesheet),Fecha de finalización real (a través de hoja de horas),
Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos),
-Total Billing Amount (via Time Sheet),Monto Total Facturable (a través de tabla de tiempo),
Review Date,Fecha de Revisión,
Closing Date,Fecha de cierre,
Task Depends On,Tarea depende de,
@@ -7887,7 +7749,6 @@
Update Series,Definir Secuencia,
Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.,
Prefix,Prefijo,
-Current Value,Valor actual,
This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo,
Update Series Number,Actualizar número de serie,
Quotation Lost Reason,Razón de la Pérdida,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto,
Lead Details,Detalle de Iniciativas,
Lead Owner Efficiency,Eficiencia del Propietario de la Iniciativa,
-Loan Repayment and Closure,Reembolso y cierre de préstamos,
-Loan Security Status,Estado de seguridad del préstamo,
Lost Opportunity,Oportunidad perdida,
Maintenance Schedules,Programas de Mantenimiento,
Material Requests for which Supplier Quotations are not created,Solicitudes de Material para los que no hay Presupuestos de Proveedor creados,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Recuentos orientados: {0},
Payment Account is mandatory,La cuenta de pago es obligatoria,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Si está marcado, el monto total se deducirá de la renta imponible antes de calcular el impuesto sobre la renta sin ninguna declaración o presentación de prueba.",
-Disbursement Details,Detalles del desembolso,
Material Request Warehouse,Almacén de solicitud de material,
Select warehouse for material requests,Seleccionar almacén para solicitudes de material,
Transfer Materials For Warehouse {0},Transferir materiales para almacén {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Reembolsar la cantidad no reclamada del salario,
Deduction from salary,Deducción del salario,
Expired Leaves,Hojas caducadas,
-Reference No,Numero de referencia,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,El porcentaje de quita es la diferencia porcentual entre el valor de mercado de la Garantía de Préstamo y el valor atribuido a esa Garantía de Préstamo cuando se utiliza como garantía para ese préstamo.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,La relación entre préstamo y valor expresa la relación entre el monto del préstamo y el valor del valor comprometido. Se activará un déficit de seguridad del préstamo si este cae por debajo del valor especificado para cualquier préstamo,
If this is not checked the loan by default will be considered as a Demand Loan,"Si no se marca, el préstamo por defecto se considerará Préstamo a la vista.",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Esta cuenta se utiliza para registrar los reembolsos de préstamos del prestatario y también para desembolsar préstamos al prestatario.,
This account is capital account which is used to allocate capital for loan disbursal account ,Esta cuenta es una cuenta de capital que se utiliza para asignar capital para la cuenta de desembolso de préstamos.,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},La operación {0} no pertenece a la orden de trabajo {1},
Print UOM after Quantity,Imprimir UOM después de Cantidad,
Set default {0} account for perpetual inventory for non stock items,Establecer la cuenta {0} predeterminada para el inventario permanente de los artículos que no están en stock,
-Loan Security {0} added multiple times,Seguridad de préstamo {0} agregada varias veces,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Los valores de préstamo con diferente ratio LTV no se pueden pignorar contra un préstamo,
-Qty or Amount is mandatory for loan security!,¡La cantidad o cantidad es obligatoria para la seguridad del préstamo!,
-Only submittted unpledge requests can be approved,Solo se pueden aprobar las solicitudes de desacuerdo enviadas,
-Interest Amount or Principal Amount is mandatory,El monto de interés o el monto principal es obligatorio,
-Disbursed Amount cannot be greater than {0},El monto desembolsado no puede ser mayor que {0},
-Row {0}: Loan Security {1} added multiple times,Fila {0}: garantía de préstamo {1} agregada varias veces,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Fila n.º {0}: el elemento secundario no debe ser un paquete de productos. Elimine el elemento {1} y guarde,
Credit limit reached for customer {0},Se alcanzó el límite de crédito para el cliente {0},
Could not auto create Customer due to the following missing mandatory field(s):,No se pudo crear automáticamente el Cliente debido a que faltan los siguientes campos obligatorios:,
diff --git a/erpnext/translations/es_pe.csv b/erpnext/translations/es_pe.csv
index 108782c..9b801e5 100644
--- a/erpnext/translations/es_pe.csv
+++ b/erpnext/translations/es_pe.csv
@@ -814,7 +814,7 @@
Home Page is Products,Pagína de Inicio es Productos,
Billing Rate,Tasa de facturación,
Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura),
-Actual Time (in hours),Tiempo actual (En horas),
+Actual Time in Hours (via Timesheet),Tiempo actual (En horas),
% Amount Billed,% Monto Facturado,
Buyer of Goods and Services.,Compradores de Productos y Servicios.,
From Lead,De la iniciativa,
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 6e60809..84f3ccd 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Kohaldatakse juhul, kui ettevõte on SpA, SApA või SRL",
Applicable if the company is a limited liability company,"Kohaldatakse juhul, kui ettevõte on piiratud vastutusega äriühing",
Applicable if the company is an Individual or a Proprietorship,"Kohaldatakse juhul, kui ettevõte on füüsiline või füüsilisest isikust ettevõtja",
-Applicant,Taotleja,
-Applicant Type,Taotleja tüüp,
Application of Funds (Assets),Application of Funds (vara),
Application period cannot be across two allocation records,Taotluste esitamise periood ei tohi olla üle kahe jaotamise kirje,
Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Folio numbritega ostetud aktsionäride nimekiri,
Loading Payment System,Maksesüsteemi laadimine,
Loan,Laen,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0},
-Loan Application,Laenu taotlemine,
-Loan Management,Laenujuhtimine,
-Loan Repayment,laenu tagasimaksmine,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Arve diskonteerimise salvestamiseks on laenu alguskuupäev ja laenuperiood kohustuslikud,
Loans (Liabilities),Laenudega (kohustused),
Loans and Advances (Assets),Laenud ja ettemaksed (vara),
@@ -1611,7 +1605,6 @@
Monday,Esmaspäev,
Monthly,Kuu,
Monthly Distribution,Kuu Distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Igakuine tagasimakse ei saa olla suurem kui Laenusumma,
More,Rohkem,
More Information,Rohkem informatsiooni,
More than one selection for {0} not allowed,Rohkem kui üks valik {0} jaoks pole lubatud,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Maksa {0} {1},
Payable,Maksmisele kuuluv,
Payable Account,Võlgnevus konto,
-Payable Amount,Makstav summa,
Payment,Makse,
Payment Cancelled. Please check your GoCardless Account for more details,"Makse tühistatud. Palun kontrollige oma GoCardlessi kontot, et saada lisateavet",
Payment Confirmation,Maksekinnitus,
-Payment Date,maksekuupäev,
Payment Days,Makse päeva,
Payment Document,maksedokumendi,
Payment Due Date,Maksetähtpäevast,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Palun sisestage ostutšeki esimene,
Please enter Receipt Document,Palun sisesta laekumine Dokumendi,
Please enter Reference date,Palun sisestage Viitekuupäev,
-Please enter Repayment Periods,Palun sisesta tagasimakseperioodid,
Please enter Reqd by Date,Palun sisesta Reqd kuupäeva järgi,
Please enter Woocommerce Server URL,Palun sisestage Woocommerce Serveri URL,
Please enter Write Off Account,Palun sisestage maha konto,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Palun sisestage vanem kulukeskus,
Please enter quantity for Item {0},Palun sisestage koguse Punkt {0},
Please enter relieving date.,Palun sisestage leevendab kuupäeva.,
-Please enter repayment Amount,Palun sisesta tagasimaksmise summa,
Please enter valid Financial Year Start and End Dates,Palun sisesta kehtivad majandusaasta algus- ja lõppkuupäev,
Please enter valid email address,Sisestage kehtiv e-posti aadress,
Please enter {0} first,Palun sisestage {0} Esimene,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Hinnakujundus on reeglid veelgi filtreeritud põhineb kogusest.,
Primary Address Details,Peamine aadressi üksikasjad,
Primary Contact Details,Peamised kontaktandmed,
-Principal Amount,Põhisumma,
Print Format,Prindi Formaat,
Print IRS 1099 Forms,Printige IRS 1099 vorme,
Print Report Card,Prindi aruande kaart,
@@ -2550,7 +2538,6 @@
Sample Collection,Proovide kogu,
Sample quantity {0} cannot be more than received quantity {1},Proovi kogus {0} ei saa olla suurem kui saadud kogus {1},
Sanctioned,sanktsioneeritud,
-Sanctioned Amount,Sanktsioneeritud summa,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.,
Sand,Liiv,
Saturday,Laupäev,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} juba on vanemamenetlus {1}.,
API,API,
Annual,Aastane,
-Approved,Kinnitatud,
Change,Muuda,
Contact Email,Kontakt E-,
Export Type,Ekspordi tüüp,
@@ -3571,7 +3557,6 @@
Account Value,Konto väärtus,
Account is mandatory to get payment entries,Konto on maksekirjete saamiseks kohustuslik,
Account is not set for the dashboard chart {0},Armatuurlaua diagrammi jaoks pole kontot {0} seatud,
-Account {0} does not belong to company {1},Konto {0} ei kuulu Company {1},
Account {0} does not exists in the dashboard chart {1},Kontot {0} kontot {0} ei eksisteeri,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> on kapital Käimasolev töö ja seda ei saa ajakirjakanne värskendada,
Account: {0} is not permitted under Payment Entry,Konto: {0} pole makse sisestamise korral lubatud,
@@ -3582,7 +3567,6 @@
Activity,Aktiivsus,
Add / Manage Email Accounts.,Lisa / Manage Email Accounts.,
Add Child,Lisa Child,
-Add Loan Security,Lisage laenuturve,
Add Multiple,Lisa mitu,
Add Participants,Lisage osalejaid,
Add to Featured Item,Lisa esiletõstetud üksusesse,
@@ -3593,15 +3577,12 @@
Address Line 1,Aadress Line 1,
Addresses,Aadressid,
Admission End Date should be greater than Admission Start Date.,Sissepääsu lõppkuupäev peaks olema suurem kui vastuvõtu alguskuupäev.,
-Against Loan,Laenu vastu,
-Against Loan:,Laenu vastu:,
All,Kõik,
All bank transactions have been created,Kõik pangatehingud on loodud,
All the depreciations has been booked,Kõik amortisatsioonid on broneeritud,
Allocation Expired!,Jaotus on aegunud!,
Allow Resetting Service Level Agreement from Support Settings.,Luba teenuse taseme lepingu lähtestamine tugiseadetest.,
Amount of {0} is required for Loan closure,Laenu sulgemiseks on vaja summat {0},
-Amount paid cannot be zero,Makstud summa ei saa olla null,
Applied Coupon Code,Rakendatud kupongi kood,
Apply Coupon Code,Rakenda kupongikood,
Appointment Booking,Kohtumiste broneerimine,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Saabumisaega ei saa arvutada, kuna juhi aadress on puudu.",
Cannot Optimize Route as Driver Address is Missing.,"Teekonda ei saa optimeerida, kuna juhi aadress puudub.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Ülesannet {0} ei saa täita, kuna selle sõltuv ülesanne {1} pole lõpule viidud / tühistatud.",
-Cannot create loan until application is approved,"Laenu ei saa luua enne, kui taotlus on heaks kiidetud",
Cannot find a matching Item. Please select some other value for {0}.,Kas te ei leia sobivat Punkt. Palun valige mõni muu väärtus {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",Üksuse {0} reas {1} ei saa ülearveldada rohkem kui {2}. Ülearvelduste lubamiseks määrake konto konto seadetes soodustus,
"Capacity Planning Error, planned start time can not be same as end time","Mahtude planeerimise viga, kavandatud algusaeg ei saa olla sama kui lõpuaeg",
@@ -3812,20 +3792,9 @@
Less Than Amount,Vähem kui summa,
Liabilities,Kohustused,
Loading...,Laadimine ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Laenusumma ületab maksimaalset laenusummat {0} pakutavate väärtpaberite kohta,
Loan Applications from customers and employees.,Klientide ja töötajate laenutaotlused.,
-Loan Disbursement,Laenu väljamaksmine,
Loan Processes,Laenuprotsessid,
-Loan Security,Laenu tagatis,
-Loan Security Pledge,Laenu tagatise pant,
-Loan Security Pledge Created : {0},Loodud laenutagatise pant: {0},
-Loan Security Price,Laenu tagatise hind,
-Loan Security Price overlapping with {0},Laenu tagatise hind kattub {0} -ga,
-Loan Security Unpledge,Laenu tagatise tagamata jätmine,
-Loan Security Value,Laenu tagatisväärtus,
Loan Type for interest and penalty rates,Laenu tüüp intresside ja viivise määrade jaoks,
-Loan amount cannot be greater than {0},Laenusumma ei tohi olla suurem kui {0},
-Loan is mandatory,Laen on kohustuslik,
Loans,Laenud,
Loans provided to customers and employees.,Klientidele ja töötajatele antud laenud.,
Location,Asukoht,
@@ -3894,7 +3863,6 @@
Pay,Maksma,
Payment Document Type,Maksedokumendi tüüp,
Payment Name,Makse nimi,
-Penalty Amount,Trahvisumma,
Pending,Pooleliolev,
Performance,Etendus,
Period based On,Periood põhineb,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Selle üksuse muutmiseks logige sisse Marketplace'i kasutajana.,
Please login as a Marketplace User to report this item.,Selle üksuse teatamiseks logige sisse Marketplace'i kasutajana.,
Please select <b>Template Type</b> to download template,Valige <b>malli</b> allalaadimiseks malli <b>tüüp</b>,
-Please select Applicant Type first,Valige esmalt taotleja tüüp,
Please select Customer first,Valige kõigepealt klient,
Please select Item Code first,Valige kõigepealt üksuse kood,
-Please select Loan Type for company {0},Valige ettevõtte {0} laenutüüp,
Please select a Delivery Note,Valige saateleht,
Please select a Sales Person for item: {0},Valige üksuse jaoks müüja: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Palun valige teine makseviis. Triip ei toeta tehingud sularaha "{0}",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Seadistage ettevõtte {0} vaikekonto arvelduskonto,
Please specify,Palun täpsusta,
Please specify a {0},Palun täpsustage {0},lead
-Pledge Status,Pandi staatus,
-Pledge Time,Pandi aeg,
Printing,Trükkimine,
Priority,Prioriteet,
Priority has been changed to {0}.,Prioriteet on muudetud väärtuseks {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML-failide töötlemine,
Profitability,Tasuvus,
Project,Project,
-Proposed Pledges are mandatory for secured Loans,Kavandatud lubadused on tagatud laenude puhul kohustuslikud,
Provide the academic year and set the starting and ending date.,Esitage õppeaasta ja määrake algus- ja lõppkuupäev.,
Public token is missing for this bank,Selle panga jaoks puudub avalik luba,
Publish,Avalda,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Ostukviitungil pole ühtegi eset, mille jaoks on proovide säilitamine lubatud.",
Purchase Return,Ostutagastus,
Qty of Finished Goods Item,Valmistoodete kogus,
-Qty or Amount is mandatroy for loan security,Kogus või summa on laenutagatise tagamiseks kohustuslik,
Quality Inspection required for Item {0} to submit,Üksuse {0} esitamiseks on vajalik kvaliteedikontroll,
Quantity to Manufacture,Tootmiskogus,
Quantity to Manufacture can not be zero for the operation {0},Tootmiskogus ei saa toimingu ajal olla null,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Vabastamiskuupäev peab olema liitumiskuupäevast suurem või sellega võrdne,
Rename,Nimeta,
Rename Not Allowed,Ümbernimetamine pole lubatud,
-Repayment Method is mandatory for term loans,Tagasimakseviis on tähtajaliste laenude puhul kohustuslik,
-Repayment Start Date is mandatory for term loans,Tagasimakse alguskuupäev on tähtajaliste laenude puhul kohustuslik,
Report Item,Aruande üksus,
Report this Item,Teata sellest elemendist,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Allhanke jaoks reserveeritud kogus: Toorainekogus allhankelepingu sõlmimiseks.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rida ({0}): {1} on juba allahinnatud {2},
Rows Added in {0},{0} lisatud read,
Rows Removed in {0},{0} -st eemaldatud read,
-Sanctioned Amount limit crossed for {0} {1},{0} {1} ületatud karistuslimiit,
-Sanctioned Loan Amount already exists for {0} against company {1},Ettevõtte {1} jaoks on {0} sanktsioneeritud laenusumma juba olemas,
Save,Salvesta,
Save Item,Salvesta üksus,
Saved Items,Salvestatud üksused,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Kasutaja {0} on keelatud,
Users and Permissions,Kasutajad ja reeglid,
Vacancies cannot be lower than the current openings,Vabad töökohad ei saa olla madalamad kui praegused avad,
-Valid From Time must be lesser than Valid Upto Time.,Kehtiv alates ajast peab olema väiksem kui kehtiv kellaaeg.,
Valuation Rate required for Item {0} at row {1},Üksuse {0} real {1} nõutav hindamismäär,
Values Out Of Sync,Väärtused pole sünkroonis,
Vehicle Type is required if Mode of Transport is Road,"Sõidukitüüp on nõutav, kui transpordiliik on maantee",
@@ -4211,7 +4168,6 @@
Add to Cart,Lisa ostukorvi,
Days Since Last Order,Päevad alates viimasest tellimusest,
In Stock,Laos,
-Loan Amount is mandatory,Laenusumma on kohustuslik,
Mode Of Payment,Makseviis,
No students Found,Ühtegi õpilast ei leitud,
Not in Stock,Ei ole laos,
@@ -4240,7 +4196,6 @@
Group by,Group By,
In stock,Laos,
Item name,Toote nimi,
-Loan amount is mandatory,Laenusumma on kohustuslik,
Minimum Qty,Minimaalne kogus,
More details,Rohkem detaile,
Nature of Supplies,Tarnete iseloom,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Kokku valminud kogus,
Qty to Manufacture,Kogus toota,
Repay From Salary can be selected only for term loans,Tagasimakse palgast saab valida ainult tähtajaliste laenude puhul,
-No valid Loan Security Price found for {0},Päringule {0} ei leitud kehtivat laenu tagatishinda,
-Loan Account and Payment Account cannot be same,Laenukonto ja maksekonto ei saa olla ühesugused,
-Loan Security Pledge can only be created for secured loans,Laenutagatise pandiks saab olla ainult tagatud laenud,
Social Media Campaigns,Sotsiaalse meedia kampaaniad,
From Date can not be greater than To Date,Alates kuupäevast ei tohi olla suurem kui kuupäev,
Please set a Customer linked to the Patient,Palun määrake patsiendiga seotud klient,
@@ -6437,7 +6389,6 @@
HR User,HR Kasutaja,
Appointment Letter,Töölevõtu kiri,
Job Applicant,Tööotsija,
-Applicant Name,Taotleja nimi,
Appointment Date,Ametisse nimetamise kuupäev,
Appointment Letter Template,Ametisse nimetamise mall,
Body,Keha,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sünkroonimine käimas,
Hub Seller Name,Rummu müüja nimi,
Custom Data,Kohandatud andmed,
-Member,Liige,
-Partially Disbursed,osaliselt Väljastatud,
-Loan Closure Requested,Taotletud laenu sulgemine,
Repay From Salary,Tagastama alates Palk,
-Loan Details,laenu detailid,
-Loan Type,laenu liik,
-Loan Amount,Laenusumma,
-Is Secured Loan,On tagatud laen,
-Rate of Interest (%) / Year,Intressimäär (%) / Aasta,
-Disbursement Date,Väljamakse kuupäev,
-Disbursed Amount,Väljamakstud summa,
-Is Term Loan,Kas tähtajaline laen,
-Repayment Method,tagasimaksmine meetod,
-Repay Fixed Amount per Period,Maksta kindlaksmääratud summa Periood,
-Repay Over Number of Periods,Tagastama Üle perioodide arv,
-Repayment Period in Months,Tagastamise tähtaeg kuudes,
-Monthly Repayment Amount,Igakuine tagasimakse,
-Repayment Start Date,Tagasimaksmise alguskuupäev,
-Loan Security Details,Laenu tagatise üksikasjad,
-Maximum Loan Value,Laenu maksimaalne väärtus,
-Account Info,Konto andmed,
-Loan Account,Laenukonto,
-Interest Income Account,Intressitulu konto,
-Penalty Income Account,Karistustulu konto,
-Repayment Schedule,maksegraafikut,
-Total Payable Amount,Kokku tasumisele,
-Total Principal Paid,Tasutud põhisumma kokku,
-Total Interest Payable,Kokku intressivõlg,
-Total Amount Paid,Kogusumma tasutud,
-Loan Manager,Laenuhaldur,
-Loan Info,laenu Info,
-Rate of Interest,Intressimäärast,
-Proposed Pledges,Kavandatud lubadused,
-Maximum Loan Amount,Maksimaalne laenusumma,
-Repayment Info,tagasimaksmine Info,
-Total Payable Interest,Kokku intressikulusid,
-Against Loan ,Laenu vastu,
-Loan Interest Accrual,Laenuintresside tekkepõhine,
-Amounts,Summad,
-Pending Principal Amount,Ootel põhisumma,
-Payable Principal Amount,Makstav põhisumma,
-Paid Principal Amount,Tasutud põhisumma,
-Paid Interest Amount,Makstud intressi summa,
-Process Loan Interest Accrual,Protsesslaenu intressi tekkepõhine,
-Repayment Schedule Name,Tagasimakse ajakava nimi,
Regular Payment,Regulaarne makse,
Loan Closure,Laenu sulgemine,
-Payment Details,Makse andmed,
-Interest Payable,Makstav intress,
-Amount Paid,Makstud summa,
-Principal Amount Paid,Makstud põhisumma,
-Repayment Details,Tagasimakse üksikasjad,
-Loan Repayment Detail,Laenu tagasimakse üksikasjad,
-Loan Security Name,Laenu väärtpaberi nimi,
-Unit Of Measure,Mõõtühik,
-Loan Security Code,Laenu turvakood,
-Loan Security Type,Laenu tagatise tüüp,
-Haircut %,Juukselõikus%,
-Loan Details,Laenu üksikasjad,
-Unpledged,Tagatiseta,
-Pledged,Panditud,
-Partially Pledged,Osaliselt panditud,
-Securities,Väärtpaberid,
-Total Security Value,Turvalisuse koguväärtus,
-Loan Security Shortfall,Laenutagatise puudujääk,
-Loan ,Laen,
-Shortfall Time,Puuduse aeg,
-America/New_York,Ameerika / New_York,
-Shortfall Amount,Puudujäägi summa,
-Security Value ,Turvalisuse väärtus,
-Process Loan Security Shortfall,Protsessilaenu tagatise puudujääk,
-Loan To Value Ratio,Laenu ja väärtuse suhe,
-Unpledge Time,Pühitsemise aeg,
-Loan Name,laenu Nimi,
Rate of Interest (%) Yearly,Intressimäär (%) Aastane,
-Penalty Interest Rate (%) Per Day,Trahviintress (%) päevas,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Viivise intressimääraga arvestatakse tasumata viivise korral iga päev pooleliolevat intressisummat,
-Grace Period in Days,Armuperiood päevades,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Päevade arv tähtpäevast, milleni laenu tagasimaksmisega viivitamise korral viivist ei võeta",
-Pledge,Pant,
-Post Haircut Amount,Postituse juukselõikuse summa,
-Process Type,Protsessi tüüp,
-Update Time,Uuendamise aeg,
-Proposed Pledge,Kavandatud lubadus,
-Total Payment,Kokku tasumine,
-Balance Loan Amount,Tasakaal Laenusumma,
-Is Accrued,On kogunenud,
Salary Slip Loan,Palk Slip Laen,
Loan Repayment Entry,Laenu tagasimakse kanne,
-Sanctioned Loan Amount,Sankteeritud laenusumma,
-Sanctioned Amount Limit,Sanktsioonisumma piirmäär,
-Unpledge,Unustamata jätmine,
-Haircut,Juukselõikus,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Loo Graafik,
Schedules,Sõiduplaanid,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekt on kättesaadav veebilehel nendele kasutajatele,
Copied From,kopeeritud,
Start and End Dates,Algus- ja lõppkuupäev,
-Actual Time (in Hours),Tegelik aeg (tundides),
+Actual Time in Hours (via Timesheet),Tegelik aeg (tundides),
Costing and Billing,Kuluarvestus ja arvete,
-Total Costing Amount (via Timesheets),Kogukulude summa (ajaveebide kaudu),
-Total Expense Claim (via Expense Claims),Kogukulude nõue (via kuluaruanded),
+Total Costing Amount (via Timesheet),Kogukulude summa (ajaveebide kaudu),
+Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluaruanded),
Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve),
Total Sales Amount (via Sales Order),Müügi kogusumma (müügitellimuse kaudu),
-Total Billable Amount (via Timesheets),Kogu tasuline kogus (ajaveebide kaudu),
-Total Billed Amount (via Sales Invoices),Kogu tasuline summa (arvete kaudu),
-Total Consumed Material Cost (via Stock Entry),Kokku tarbitud materjalikulud (varude sisestamise kaudu),
+Total Billable Amount (via Timesheet),Kogu tasuline kogus (ajaveebide kaudu),
+Total Billed Amount (via Sales Invoice),Kogu tasuline summa (arvete kaudu),
+Total Consumed Material Cost (via Stock Entry),Kokku tarbitud materjalikulud (varude sisestamise kaudu),
Gross Margin,Gross Margin,
Gross Margin %,Gross Margin%,
Monitor Progress,Jälgida progressi,
@@ -7521,12 +7385,10 @@
Dependencies,Sõltuvused,
Dependent Tasks,Sõltuvad ülesanded,
Depends on Tasks,Oleneb Ülesanded,
-Actual Start Date (via Time Sheet),Tegelik Start Date (via Time Sheet),
-Actual Time (in hours),Tegelik aeg (tundides),
-Actual End Date (via Time Sheet),Tegelik End Date (via Time Sheet),
-Total Costing Amount (via Time Sheet),Kokku kuluarvestus summa (via Time Sheet),
+Actual Start Date (via Timesheet),Tegelik Start Date (via Time Sheet),
+Actual Time in Hours (via Timesheet),Tegelik aeg (tundides),
+Actual End Date (via Timesheet),Tegelik End Date (via Time Sheet),
Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluhüvitussüsteeme),
-Total Billing Amount (via Time Sheet),Arve summa (via Time Sheet),
Review Date,Review Date,
Closing Date,Lõpptähtaeg,
Task Depends On,Task sõltub,
@@ -7887,7 +7749,6 @@
Update Series,Värskenda Series,
Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.,
Prefix,Eesliide,
-Current Value,Praegune väärtus,
This is the number of the last created transaction with this prefix,See on mitmeid viimase loodud tehingu seda prefiksit,
Update Series Number,Värskenda seerianumbri,
Quotation Lost Reason,Tsitaat Lost Reason,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Soovitatav Reorder Level,
Lead Details,Plii Üksikasjad,
Lead Owner Efficiency,Lead Omanik Efficiency,
-Loan Repayment and Closure,Laenu tagasimaksmine ja sulgemine,
-Loan Security Status,Laenu tagatise olek,
Lost Opportunity,Kaotatud võimalus,
Maintenance Schedules,Hooldusgraafikud,
Material Requests for which Supplier Quotations are not created,"Materjal taotlused, mis Tarnija tsitaadid ei ole loodud",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Sihitud arvud: {0},
Payment Account is mandatory,Maksekonto on kohustuslik,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",Selle kontrollimisel arvestatakse enne tulumaksu arvutamist maksustamata tulust maha kogu summa ilma deklaratsiooni ja tõendite esitamiseta.,
-Disbursement Details,Väljamakse üksikasjad,
Material Request Warehouse,Materiaalsete taotluste ladu,
Select warehouse for material requests,Materjalitaotluste jaoks valige ladu,
Transfer Materials For Warehouse {0},Lao materjalide edastamine {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Tagasimakstud summa palgast tagasi maksta,
Deduction from salary,Palgast mahaarvamine,
Expired Leaves,Aegunud lehed,
-Reference No,Viitenumber,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Allahindluse protsent on laenutagatise turuväärtuse ja sellele laenutagatisele omistatud väärtuse protsentuaalne erinevus.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Laenu ja väärtuse suhe väljendab laenusumma suhet panditud väärtpaberi väärtusesse. Laenutagatise puudujääk tekib siis, kui see langeb alla laenu määratud väärtuse",
If this is not checked the loan by default will be considered as a Demand Loan,"Kui seda ei kontrollita, käsitatakse laenu vaikimisi nõudmislaenuna",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Seda kontot kasutatakse laenusaaja tagasimaksete broneerimiseks ja ka laenuvõtjale laenude väljamaksmiseks,
This account is capital account which is used to allocate capital for loan disbursal account ,"See konto on kapitalikonto, mida kasutatakse kapitali eraldamiseks laenu väljamaksekontole",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Toiming {0} ei kuulu töökorralduse juurde {1},
Print UOM after Quantity,Prindi UOM pärast kogust,
Set default {0} account for perpetual inventory for non stock items,Määra mittekaubanduses olevate üksuste püsikomplekti vaikekonto {0} määramine,
-Loan Security {0} added multiple times,Laenutagatis {0} lisati mitu korda,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Erineva LTV suhtega laenuväärtpabereid ei saa ühe laenu vastu pantida,
-Qty or Amount is mandatory for loan security!,Kogus või summa on laenutagatise jaoks kohustuslik!,
-Only submittted unpledge requests can be approved,Ainult esitatud panditaotlusi saab kinnitada,
-Interest Amount or Principal Amount is mandatory,Intressi summa või põhisumma on kohustuslik,
-Disbursed Amount cannot be greater than {0},Väljamakstud summa ei tohi olla suurem kui {0},
-Row {0}: Loan Security {1} added multiple times,Rida {0}: laenutagatis {1} lisati mitu korda,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rida nr {0}: alamüksus ei tohiks olla tootekomplekt. Eemaldage üksus {1} ja salvestage,
Credit limit reached for customer {0},Kliendi {0} krediidilimiit on saavutatud,
Could not auto create Customer due to the following missing mandatory field(s):,Klienti ei saanud automaatselt luua järgmise kohustusliku välja (de) puudumise tõttu:,
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 7d18e27..4021462 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",اگر شرکت SpA ، SApA یا SRL باشد ، قابل اجرا است,
Applicable if the company is a limited liability company,اگر شرکت یک شرکت با مسئولیت محدود باشد قابل اجرا است,
Applicable if the company is an Individual or a Proprietorship,اگر شرکت یک فرد یا مالکیت مالکیت باشد ، قابل اجرا است,
-Applicant,درخواست کننده,
-Applicant Type,نوع متقاضی,
Application of Funds (Assets),استفاده از وجوه (دارایی),
Application period cannot be across two allocation records,دوره درخواست نمی تواند در دو رکورد تخصیص باشد,
Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,لیست سهامداران موجود با شماره های برگه,
Loading Payment System,سیستم پرداخت بارگیری,
Loan,وام,
-Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0},
-Loan Application,درخواست وام,
-Loan Management,مدیریت وام,
-Loan Repayment,بازپرداخت وام,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,تاریخ شروع وام و دوره وام برای صرفه جویی در تخفیف فاکتور الزامی است,
Loans (Liabilities),وام (بدهی),
Loans and Advances (Assets),وام و پیشرفت (دارایی),
@@ -1611,7 +1605,6 @@
Monday,دوشنبه,
Monthly,ماهیانه,
Monthly Distribution,توزیع ماهانه,
-Monthly Repayment Amount cannot be greater than Loan Amount,میزان بازپرداخت ماهانه نمی تواند بیشتر از وام مبلغ,
More,بیش,
More Information,اطلاعات بیشتر,
More than one selection for {0} not allowed,بیش از یک انتخاب برای {0} مجاز نیست,
@@ -1884,11 +1877,9 @@
Pay {0} {1},پرداخت {0} {1},
Payable,قابل پرداخت,
Payable Account,قابل پرداخت حساب,
-Payable Amount,مبلغ قابل پرداخت,
Payment,پرداخت,
Payment Cancelled. Please check your GoCardless Account for more details,پرداخت لغو شد برای اطلاعات بیشتر، لطفا حساب GoCardless خود را بررسی کنید,
Payment Confirmation,تاییدیه پرداخت,
-Payment Date,تاریخ پرداخت,
Payment Days,روز پرداخت,
Payment Document,سند پرداخت,
Payment Due Date,پرداخت با توجه تاریخ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,لطفا ابتدا وارد رسید خرید,
Please enter Receipt Document,لطفا سند دریافت وارد کنید,
Please enter Reference date,لطفا تاریخ مرجع وارد,
-Please enter Repayment Periods,لطفا دوره بازپرداخت وارد کنید,
Please enter Reqd by Date,لطفا Reqd را با تاریخ وارد کنید,
Please enter Woocommerce Server URL,لطفا URL سرور Woocommerce را وارد کنید,
Please enter Write Off Account,لطفا وارد حساب فعال,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,لطفا پدر و مادر مرکز هزینه وارد,
Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0},
Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.,
-Please enter repayment Amount,لطفا مقدار بازپرداخت وارد کنید,
Please enter valid Financial Year Start and End Dates,لطفا معتبر مالی سال تاریخ شروع و پایان را وارد کنید,
Please enter valid email address,لطفا آدرس ایمیل معتبر وارد کنید,
Please enter {0} first,لطفا ابتدا وارد {0},
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است.,
Primary Address Details,جزئیات آدرس اصلی,
Primary Contact Details,اطلاعات تماس اولیه,
-Principal Amount,مقدار اصلی,
Print Format,چاپ فرمت,
Print IRS 1099 Forms,فرم های IRS 1099 را چاپ کنید,
Print Report Card,کارت گزارش چاپ,
@@ -2550,7 +2538,6 @@
Sample Collection,مجموعه نمونه,
Sample quantity {0} cannot be more than received quantity {1},مقدار نمونه {0} نمیتواند بیش از مقدار دریافتی باشد {1},
Sanctioned,تحریم,
-Sanctioned Amount,مقدار تحریم,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.,
Sand,شن,
Saturday,روز شنبه,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} در حال حاضر یک روش والدین {1} دارد.,
API,API,
Annual,سالیانه,
-Approved,تایید,
Change,تغییر,
Contact Email,تماس با ایمیل,
Export Type,نوع صادرات,
@@ -3571,7 +3557,6 @@
Account Value,ارزش حساب,
Account is mandatory to get payment entries,حساب برای دریافت ورودی های پرداخت الزامی است,
Account is not set for the dashboard chart {0},حساب برای نمودار داشبورد {0 set تنظیم نشده است,
-Account {0} does not belong to company {1},حساب {0} به شرکت {1} تعلق ندارد,
Account {0} does not exists in the dashboard chart {1},حساب {0 in در نمودار داشبورد {1 exists موجود نیست,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,حساب: <b>{0}</b> سرمایه در حال انجام است و توسط Journal Entry قابل به روزرسانی نیست,
Account: {0} is not permitted under Payment Entry,حساب: {0 under در ورود پرداخت مجاز نیست,
@@ -3582,7 +3567,6 @@
Activity,فعالیت,
Add / Manage Email Accounts.,افزودن / مدیریت ایمیل ها,
Add Child,اضافه کردن کودک,
-Add Loan Security,امنیت وام را اضافه کنید,
Add Multiple,اضافه کردن چند,
Add Participants,شرکت کنندگان اضافه کردن,
Add to Featured Item,به آیتم مورد علاقه اضافه کنید,
@@ -3593,15 +3577,12 @@
Address Line 1,خط 1 آدرس,
Addresses,نشانی ها,
Admission End Date should be greater than Admission Start Date.,تاریخ پایان پذیرش باید بیشتر از تاریخ شروع پذیرش باشد.,
-Against Loan,در برابر وام,
-Against Loan:,در برابر وام:,
All,همه,
All bank transactions have been created,تمام معاملات بانکی ایجاد شده است,
All the depreciations has been booked,همه استهلاک ها رزرو شده اند,
Allocation Expired!,تخصیص منقضی شده است!,
Allow Resetting Service Level Agreement from Support Settings.,تنظیم مجدد توافق نامه سطح خدمات از تنظیمات پشتیبانی مجاز است.,
Amount of {0} is required for Loan closure,مبلغ {0 برای بسته شدن وام مورد نیاز است,
-Amount paid cannot be zero,مبلغ پرداخت شده نمی تواند صفر باشد,
Applied Coupon Code,کد کوپن کاربردی,
Apply Coupon Code,کد کوپن را اعمال کنید,
Appointment Booking,رزرو قرار ملاقات,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,نمی توان زمان رسیدن را به دلیل گم شدن آدرس راننده محاسبه کرد.,
Cannot Optimize Route as Driver Address is Missing.,نمی توان مسیر را بهینه کرد زیرا آدرس راننده وجود ندارد.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,کار {0} به عنوان وظیفه وابسته به آن {1 complete امکان پذیر نیست / لغو نیست.,
-Cannot create loan until application is approved,تا زمانی که درخواست تأیید نشود ، نمی توانید وام ایجاد کنید,
Cannot find a matching Item. Please select some other value for {0}.,می توانید یک آیتم تطبیق پیدا کند. لطفا برخی از ارزش های دیگر برای {0} را انتخاب کنید.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",برای مورد {0} در ردیف {1} بیش از 2 {بیش از ill امکان پذیر نیست. برای اجازه بیش از صدور صورت حساب ، لطفاً در تنظیمات حساب میزان کمک هزینه را تعیین کنید,
"Capacity Planning Error, planned start time can not be same as end time",خطای برنامه ریزی ظرفیت ، زمان شروع برنامه ریزی شده نمی تواند برابر با زمان پایان باشد,
@@ -3812,20 +3792,9 @@
Less Than Amount,مقدار کمتری از مقدار,
Liabilities,بدهی,
Loading...,در حال بارگذاری ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,مبلغ وام بیش از حداکثر میزان وام {0} به ازای اوراق بهادار پیشنهادی است,
Loan Applications from customers and employees.,برنامه های وام از مشتریان و کارمندان.,
-Loan Disbursement,پرداخت وام,
Loan Processes,فرآیندهای وام,
-Loan Security,امنیت وام,
-Loan Security Pledge,تعهد امنیتی وام,
-Loan Security Pledge Created : {0},تعهد امنیتی وام ایجاد شده: {0,
-Loan Security Price,قیمت امنیت وام,
-Loan Security Price overlapping with {0},همپوشانی قیمت امنیت وام با {0},
-Loan Security Unpledge,اعتراض امنیتی وام,
-Loan Security Value,ارزش امنیتی وام,
Loan Type for interest and penalty rates,نوع وام برای نرخ بهره و مجازات,
-Loan amount cannot be greater than {0},مبلغ وام نمی تواند بیشتر از {0 باشد,
-Loan is mandatory,وام الزامی است,
Loans,وام,
Loans provided to customers and employees.,وامهایی که به مشتریان و کارمندان داده می شود.,
Location,محل,
@@ -3894,7 +3863,6 @@
Pay,پرداخت,
Payment Document Type,نوع سند پرداخت,
Payment Name,نام پرداخت,
-Penalty Amount,میزان مجازات,
Pending,در انتظار,
Performance,کارایی,
Period based On,دوره بر اساس,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,لطفاً برای ویرایش این مورد به عنوان یک کاربر Marketplace وارد شوید.,
Please login as a Marketplace User to report this item.,لطفا برای گزارش این مورد به عنوان یک کاربر Marketplace وارد شوید.,
Please select <b>Template Type</b> to download template,لطفا <b>الگو را</b> برای بارگیری قالب انتخاب کنید,
-Please select Applicant Type first,لطفا ابتدا متقاضی نوع را انتخاب کنید,
Please select Customer first,لطفاً ابتدا مشتری را انتخاب کنید,
Please select Item Code first,لطفا ابتدا کد مورد را انتخاب کنید,
-Please select Loan Type for company {0},لطفا نوع وام را برای شرکت {0 انتخاب کنید,
Please select a Delivery Note,لطفاً یک یادداشت تحویل را انتخاب کنید,
Please select a Sales Person for item: {0},لطفاً یک شخص فروش را برای کالا انتخاب کنید: {0,
Please select another payment method. Stripe does not support transactions in currency '{0}',لطفا روش پرداخت دیگری را انتخاب کنید. خط خطی انجام تراکنش در ارز را پشتیبانی نمی کند '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},لطفاً یک حساب بانکی پیش فرض برای شرکت {0 تنظیم کنید,
Please specify,لطفا مشخص کنید,
Please specify a {0},لطفاً {0 را مشخص کنید,lead
-Pledge Status,وضعیت تعهد,
-Pledge Time,زمان تعهد,
Printing,چاپ,
Priority,اولویت,
Priority has been changed to {0}.,اولویت به {0 تغییر یافته است.,
@@ -3944,7 +3908,6 @@
Processing XML Files,پردازش فایلهای XML,
Profitability,سودآوری,
Project,پروژه,
-Proposed Pledges are mandatory for secured Loans,وعده های پیشنهادی برای وام های مطمئن الزامی است,
Provide the academic year and set the starting and ending date.,سال تحصیلی را تهیه کنید و تاریخ شروع و پایان را تعیین کنید.,
Public token is missing for this bank,نشان عمومی برای این بانک وجود ندارد,
Publish,انتشار,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,رسید خرید هیچ موردی را ندارد که نمونه حفظ آن فعال باشد.,
Purchase Return,بازگشت خرید,
Qty of Finished Goods Item,مقدار کالای تمام شده کالا,
-Qty or Amount is mandatroy for loan security,Qty یا مقدار برای تأمین امنیت وام است,
Quality Inspection required for Item {0} to submit,بازرسی کیفیت مورد نیاز برای ارسال Item 0 مورد نیاز است,
Quantity to Manufacture,مقدار تولید,
Quantity to Manufacture can not be zero for the operation {0},مقدار تولید برای عملیات صفر نمی تواند {0 باشد,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Relieve Date باید بیشتر یا مساوی تاریخ عضویت باشد,
Rename,تغییر نام,
Rename Not Allowed,تغییر نام مجاز نیست,
-Repayment Method is mandatory for term loans,روش بازپرداخت برای وام های کوتاه مدت الزامی است,
-Repayment Start Date is mandatory for term loans,تاریخ شروع بازپرداخت برای وام های کوتاه مدت الزامی است,
Report Item,گزارش مورد,
Report this Item,گزارش این مورد,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty رزرو شده برای قراردادهای فرعی: مقدار مواد اولیه برای ساخت وسایل فرعی.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},ردیف ({0}): 1 {در حال حاضر با 2 {تخفیف,
Rows Added in {0},ردیف اضافه شده در {0},
Rows Removed in {0},ردیف ها در {0 oved حذف شدند,
-Sanctioned Amount limit crossed for {0} {1},حد مجاز مجاز تحریم برای {0 {1,
-Sanctioned Loan Amount already exists for {0} against company {1},مبلغ وام تحریم شده در حال حاضر برای {0} در برابر شرکت 1 {وجود دارد,
Save,ذخیره,
Save Item,ذخیره مورد,
Saved Items,موارد ذخیره شده,
@@ -4135,7 +4093,6 @@
User {0} is disabled,کاربر {0} غیر فعال است,
Users and Permissions,کاربران و ویرایش,
Vacancies cannot be lower than the current openings,جای خالی نمی تواند کمتر از دهانه های فعلی باشد,
-Valid From Time must be lesser than Valid Upto Time.,معتبر از زمان باید کمتر از زمان معتبر معتبر باشد.,
Valuation Rate required for Item {0} at row {1},نرخ ارزیابی مورد نیاز برای {0} در ردیف {1,
Values Out Of Sync,ارزشهای خارج از همگام سازی,
Vehicle Type is required if Mode of Transport is Road,در صورتی که نحوه حمل و نقل جاده ای باشد ، نوع خودرو مورد نیاز است,
@@ -4211,7 +4168,6 @@
Add to Cart,اضافه کردن به سبد,
Days Since Last Order,روزهایی از آخرین سفارش,
In Stock,در انبار,
-Loan Amount is mandatory,مبلغ وام الزامی است,
Mode Of Payment,نحوه پرداخت,
No students Found,هیچ دانشجویی یافت نشد,
Not in Stock,در انبار,
@@ -4240,7 +4196,6 @@
Group by,گروه توسط,
In stock,در انبار,
Item name,نام آیتم,
-Loan amount is mandatory,مبلغ وام الزامی است,
Minimum Qty,حداقل تعداد,
More details,جزئیات بیشتر,
Nature of Supplies,طبیعت لوازم,
@@ -4409,9 +4364,6 @@
Total Completed Qty,تعداد کل تکمیل شده است,
Qty to Manufacture,تعداد برای تولید,
Repay From Salary can be selected only for term loans,بازپرداخت از حقوق فقط برای وام های مدت دار قابل انتخاب است,
-No valid Loan Security Price found for {0},هیچ قیمت امنیتی وام معتبری برای {0} یافت نشد,
-Loan Account and Payment Account cannot be same,حساب وام و حساب پرداخت نمی توانند یکسان باشند,
-Loan Security Pledge can only be created for secured loans,وام تضمین وام فقط برای وام های تضمینی ایجاد می شود,
Social Media Campaigns,کمپین های رسانه های اجتماعی,
From Date can not be greater than To Date,از تاریخ نمی تواند بیشتر از تاریخ باشد,
Please set a Customer linked to the Patient,لطفاً مشتری متصل به بیمار را تنظیم کنید,
@@ -6437,7 +6389,6 @@
HR User,HR کاربر,
Appointment Letter,نامه انتصاب,
Job Applicant,درخواستگر کار,
-Applicant Name,نام متقاضی,
Appointment Date,تاریخ انتصاب,
Appointment Letter Template,الگوی نامه انتصاب,
Body,بدن,
@@ -7059,99 +7010,12 @@
Sync in Progress,همگام سازی در حال پیشرفت,
Hub Seller Name,فروشنده نام توپی,
Custom Data,داده های سفارشی,
-Member,عضو,
-Partially Disbursed,نیمه پرداخت شده,
-Loan Closure Requested,درخواست بسته شدن وام,
Repay From Salary,بازپرداخت از حقوق و دستمزد,
-Loan Details,وام جزییات,
-Loan Type,نوع وام,
-Loan Amount,مبلغ وام,
-Is Secured Loan,وام مطمئن است,
-Rate of Interest (%) / Year,نرخ بهره (٪) / سال,
-Disbursement Date,تاریخ پرداخت,
-Disbursed Amount,مبلغ پرداخت شده,
-Is Term Loan,وام مدت است,
-Repayment Method,روش بازپرداخت,
-Repay Fixed Amount per Period,بازپرداخت مقدار ثابت در هر دوره,
-Repay Over Number of Periods,بازپرداخت تعداد بیش از دوره های,
-Repayment Period in Months,دوره بازپرداخت در ماه,
-Monthly Repayment Amount,میزان بازپرداخت ماهانه,
-Repayment Start Date,تاریخ شروع بازپرداخت,
-Loan Security Details,جزئیات امنیت وام,
-Maximum Loan Value,ارزش وام حداکثر,
-Account Info,اطلاعات حساب,
-Loan Account,حساب وام,
-Interest Income Account,حساب درآمد حاصل از بهره,
-Penalty Income Account,مجازات حساب درآمد,
-Repayment Schedule,برنامه بازپرداخت,
-Total Payable Amount,مجموع مبلغ قابل پرداخت,
-Total Principal Paid,کل مبلغ پرداخت شده,
-Total Interest Payable,منافع کل قابل پرداخت,
-Total Amount Paid,کل مبلغ پرداخت شده,
-Loan Manager,مدیر وام,
-Loan Info,وام اطلاعات,
-Rate of Interest,نرخ بهره,
-Proposed Pledges,تعهدات پیشنهادی,
-Maximum Loan Amount,حداکثر مبلغ وام,
-Repayment Info,اطلاعات بازپرداخت,
-Total Payable Interest,مجموع بهره قابل پرداخت,
-Against Loan ,در برابر وام,
-Loan Interest Accrual,بهره وام تعهدی,
-Amounts,مقدار,
-Pending Principal Amount,در انتظار مبلغ اصلی,
-Payable Principal Amount,مبلغ اصلی قابل پرداخت,
-Paid Principal Amount,مبلغ اصلی پرداخت شده,
-Paid Interest Amount,مبلغ سود پرداخت شده,
-Process Loan Interest Accrual,بهره وام فرآیند تعهدی,
-Repayment Schedule Name,نام برنامه بازپرداخت,
Regular Payment,پرداخت منظم,
Loan Closure,بسته شدن وام,
-Payment Details,جزئیات پرداخت,
-Interest Payable,بهره قابل پرداخت,
-Amount Paid,مبلغ پرداخت شده,
-Principal Amount Paid,مبلغ اصلی پرداخت شده,
-Repayment Details,جزئیات بازپرداخت,
-Loan Repayment Detail,جزئیات بازپرداخت وام,
-Loan Security Name,نام امنیتی وام,
-Unit Of Measure,واحد اندازه گیری,
-Loan Security Code,کد امنیتی وام,
-Loan Security Type,نوع امنیتی وام,
-Haircut %,اصلاح مو ٪,
-Loan Details,جزئیات وام,
-Unpledged,بدون استفاده,
-Pledged,قول داده,
-Partially Pledged,تا حدی تعهد شده,
-Securities,اوراق بهادار,
-Total Security Value,ارزش امنیتی کل,
-Loan Security Shortfall,کمبود امنیت وام,
-Loan ,وام,
-Shortfall Time,زمان کمبود,
-America/New_York,آمریکا / New_York,
-Shortfall Amount,مقدار کمبود,
-Security Value ,ارزش امنیتی,
-Process Loan Security Shortfall,کمبود امنیت وام فرآیند,
-Loan To Value Ratio,نسبت وام به ارزش,
-Unpledge Time,زمان قطع شدن,
-Loan Name,نام وام,
Rate of Interest (%) Yearly,نرخ بهره (٪) سالانه,
-Penalty Interest Rate (%) Per Day,مجازات نرخ بهره (٪) در روز,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,در صورت تأخیر در بازپرداخت ، نرخ بهره مجازات به میزان روزانه مبلغ بهره در نظر گرفته می شود,
-Grace Period in Days,دوره گریس در روزها,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,تعداد روزها از تاریخ سررسید تا زمانی که مجازات در صورت تاخیر در بازپرداخت وام دریافت نمی شود,
-Pledge,سوگند - تعهد,
-Post Haircut Amount,مبلغ کوتاه کردن مو,
-Process Type,نوع فرآیند,
-Update Time,زمان بروزرسانی,
-Proposed Pledge,تعهد پیشنهادی,
-Total Payment,مبلغ کل قابل پرداخت,
-Balance Loan Amount,تعادل وام مبلغ,
-Is Accrued,رمزگذاری شده است,
Salary Slip Loan,وام وام لغزش,
Loan Repayment Entry,ورودی بازپرداخت وام,
-Sanctioned Loan Amount,مبلغ وام تحریم شده,
-Sanctioned Amount Limit,حد مجاز مجاز تحریم,
-Unpledge,ناخواسته,
-Haircut,اصلاح مو,
MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-,
Generate Schedule,تولید برنامه,
Schedules,برنامه,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,پروژه در وب سایت به این کاربران در دسترس خواهد بود,
Copied From,کپی شده از,
Start and End Dates,تاریخ شروع و پایان,
-Actual Time (in Hours),زمان واقعی (چند ساعت),
+Actual Time in Hours (via Timesheet),زمان واقعی (چند ساعت),
Costing and Billing,هزینه یابی و حسابداری,
-Total Costing Amount (via Timesheets),مقدار کل هزینه (از طریق Timesheets),
-Total Expense Claim (via Expense Claims),مجموع ادعای هزینه (از طریق ادعاهای هزینه),
+Total Costing Amount (via Timesheet),مقدار کل هزینه (از طریق Timesheets),
+Total Expense Claim (via Expense Claim),مجموع ادعای هزینه (از طریق ادعاهای هزینه),
Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق فاکتورخرید ),
Total Sales Amount (via Sales Order),کل مبلغ فروش (از طریق سفارش خرید),
-Total Billable Amount (via Timesheets),مجموع مبلغ قابل پرداخت (از طریق Timesheets),
-Total Billed Amount (via Sales Invoices),مجموع مبلغ پرداخت شده (از طریق صورتحساب فروش),
-Total Consumed Material Cost (via Stock Entry),مجموع هزینه مصرف مواد (از طریق ورودی سهام),
+Total Billable Amount (via Timesheet),مجموع مبلغ قابل پرداخت (از طریق Timesheets),
+Total Billed Amount (via Sales Invoice),مجموع مبلغ پرداخت شده (از طریق صورتحساب فروش),
+Total Consumed Material Cost (via Stock Entry),مجموع هزینه مصرف مواد (از طریق ورودی سهام),
Gross Margin,حاشیه ناخالص,
Gross Margin %,حاشیه ناخالص٪,
Monitor Progress,مانیتور پیشرفت,
@@ -7521,12 +7385,10 @@
Dependencies,وابستگی ها,
Dependent Tasks,وظایف وابسته,
Depends on Tasks,بستگی به وظایف,
-Actual Start Date (via Time Sheet),واقعی تاریخ شروع (از طریق زمان ورق),
-Actual Time (in hours),زمان واقعی (در ساعت),
-Actual End Date (via Time Sheet),واقعی پایان تاریخ (از طریق زمان ورق),
-Total Costing Amount (via Time Sheet),مجموع هزینه یابی مقدار (از طریق زمان ورق),
+Actual Start Date (via Timesheet),واقعی تاریخ شروع (از طریق زمان ورق),
+Actual Time in Hours (via Timesheet),زمان واقعی (در ساعت),
+Actual End Date (via Timesheet),واقعی پایان تاریخ (از طریق زمان ورق),
Total Expense Claim (via Expense Claim),ادعای هزینه کل (از طریق ادعای هزینه),
-Total Billing Amount (via Time Sheet),مبلغ کل حسابداری (از طریق زمان ورق),
Review Date,بررسی تاریخ,
Closing Date,اختتامیه عضویت,
Task Depends On,کار بستگی به,
@@ -7887,7 +7749,6 @@
Update Series,به روز رسانی سری,
Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.,
Prefix,پیشوند,
-Current Value,ارزش فعلی,
This is the number of the last created transaction with this prefix,این تعداد از آخرین معامله ایجاد شده با این پیشوند است,
Update Series Number,به روز رسانی سری شماره,
Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح,
Lead Details,مشخصات راهبر,
Lead Owner Efficiency,بهره وری مالک سرب,
-Loan Repayment and Closure,بازپرداخت وام وام,
-Loan Security Status,وضعیت امنیتی وام,
Lost Opportunity,فرصت از دست رفته,
Maintenance Schedules,برنامه های نگهداری و تعمیرات,
Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},تعداد مورد نظر: {0},
Payment Account is mandatory,حساب پرداخت اجباری است,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",در صورت بررسی ، قبل از محاسبه مالیات بر درآمد ، بدون هیچ گونه اظهارنامه یا اثبات اثبات ، کل مبلغ از درآمد مشمول مالیات کسر می شود.,
-Disbursement Details,جزئیات پرداخت,
Material Request Warehouse,انبار درخواست مواد,
Select warehouse for material requests,انبار را برای درخواست های مواد انتخاب کنید,
Transfer Materials For Warehouse {0},انتقال مواد برای انبار {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,مبلغ مطالبه نشده از حقوق را بازپرداخت کنید,
Deduction from salary,کسر از حقوق,
Expired Leaves,برگهای منقضی شده,
-Reference No,شماره مرجع,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,درصد کاهش مو به درصد اختلاف بین ارزش بازار ضمانت وام و ارزشی است که به عنوان وثیقه وام هنگام استفاده به عنوان وثیقه آن وام به آن تعلق می گیرد.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,نسبت وام به ارزش ، نسبت مبلغ وام به ارزش وثیقه تعهد شده را بیان می کند. اگر این مقدار کمتر از مقدار تعیین شده برای هر وام باشد ، کسری امنیت وام ایجاد می شود,
If this is not checked the loan by default will be considered as a Demand Loan,اگر این مورد بررسی نشود ، وام به طور پیش فرض به عنوان وام تقاضا در نظر گرفته می شود,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,این حساب برای رزرو بازپرداخت وام از وام گیرنده و همچنین پرداخت وام به وام گیرنده استفاده می شود,
This account is capital account which is used to allocate capital for loan disbursal account ,این حساب حساب سرمایه ای است که برای تخصیص سرمایه برای حساب پرداخت وام استفاده می شود,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},عملیات {0} به دستور کار تعلق ندارد {1},
Print UOM after Quantity,UOM را بعد از Quantity چاپ کنید,
Set default {0} account for perpetual inventory for non stock items,حساب پیش فرض {0} را برای موجودی دائمی اقلام غیر سهام تنظیم کنید,
-Loan Security {0} added multiple times,امنیت وام {0} چندین بار اضافه شده است,
-Loan Securities with different LTV ratio cannot be pledged against one loan,اوراق بهادار وام با نسبت LTV متفاوت را نمی توان در مقابل یک وام تعهد کرد,
-Qty or Amount is mandatory for loan security!,برای امنیت وام تعداد یا مبلغ اجباری است!,
-Only submittted unpledge requests can be approved,فقط درخواست های بی قید ارسال شده قابل تأیید است,
-Interest Amount or Principal Amount is mandatory,مبلغ بهره یا مبلغ اصلی اجباری است,
-Disbursed Amount cannot be greater than {0},مبلغ پرداختی نمی تواند بیشتر از {0} باشد,
-Row {0}: Loan Security {1} added multiple times,ردیف {0}: امنیت وام {1} چندین بار اضافه شده است,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,ردیف شماره {0}: مورد کودک نباید یک بسته محصول باشد. لطفاً مورد {1} را حذف کرده و ذخیره کنید,
Credit limit reached for customer {0},سقف اعتبار برای مشتری {0} رسیده است,
Could not auto create Customer due to the following missing mandatory field(s):,به دلیل وجود فیلد (های) اجباری زیر ، مشتری به طور خودکار ایجاد نمی شود:,
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index c700f60..b06e5df 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Sovelletaan, jos yritys on SpA, SApA tai SRL",
Applicable if the company is a limited liability company,"Sovelletaan, jos yritys on osakeyhtiö",
Applicable if the company is an Individual or a Proprietorship,"Sovelletaan, jos yritys on yksityishenkilö tai omistaja",
-Applicant,hakija,
-Applicant Type,Hakijan tyyppi,
Application of Funds (Assets),sovellus varat (vastaavat),
Application period cannot be across two allocation records,Sovellusjakso ei voi olla kahden jakotiedon välissä,
Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,"Luettelo osakkeenomistajista, joilla on folionumerot",
Loading Payment System,Maksujärjestelmän lataaminen,
Loan,Lainata,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0},
-Loan Application,Lainahakemus,
-Loan Management,Lainanhallinta,
-Loan Repayment,Lainan takaisinmaksu,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Lainan alkamispäivä ja laina-aika ovat pakollisia laskun diskonttauksen tallentamiseksi,
Loans (Liabilities),lainat (vastattavat),
Loans and Advances (Assets),Lainat ja ennakot (vastaavat),
@@ -1611,7 +1605,6 @@
Monday,Maanantai,
Monthly,Kuukausi,
Monthly Distribution,toimitus kuukaudessa,
-Monthly Repayment Amount cannot be greater than Loan Amount,Kuukauden lyhennyksen määrä ei voi olla suurempi kuin Lainamäärä,
More,Lisää,
More Information,Lisätiedot,
More than one selection for {0} not allowed,Useampi kuin {0} valinta ei ole sallittu,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Maksa {0} {1},
Payable,Maksettava,
Payable Account,Maksettava tili,
-Payable Amount,Maksettava määrä,
Payment,maksu,
Payment Cancelled. Please check your GoCardless Account for more details,Maksu peruutettiin. Tarkista GoCardless-tilisi tarkempia tietoja,
Payment Confirmation,Maksuvahvistus,
-Payment Date,Maksupäivä,
Payment Days,Maksupäivää,
Payment Document,Maksu asiakirja,
Payment Due Date,Maksun eräpäivä,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Anna ostokuitti ensin,
Please enter Receipt Document,Anna kuitti asiakirja,
Please enter Reference date,Anna Viiteajankohta,
-Please enter Repayment Periods,Anna takaisinmaksuajat,
Please enter Reqd by Date,Anna Reqd päivämäärän mukaan,
Please enter Woocommerce Server URL,Anna Woocommerce-palvelimen URL-osoite,
Please enter Write Off Account,Syötä poistotili,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Syötä pääkustannuspaikka,
Please enter quantity for Item {0},Kirjoita kpl määrä tuotteelle {0},
Please enter relieving date.,Syötä lievittää päivämäärä.,
-Please enter repayment Amount,Anna lyhennyksen määrä,
Please enter valid Financial Year Start and End Dates,Anna kelvollinen tilivuoden alkamis- ja päättymispäivä,
Please enter valid email address,Anna voimassa oleva sähköpostiosoite,
Please enter {0} first,Kirjoita {0} ensimmäisen,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Hinnoittelusäännöt on suodatettu määrän mukaan,
Primary Address Details,Ensisijaiset osoitetiedot,
Primary Contact Details,Ensisijaiset yhteystiedot,
-Principal Amount,Lainapääoma,
Print Format,Tulostusmuoto,
Print IRS 1099 Forms,Tulosta IRS 1099 -lomakkeet,
Print Report Card,Tulosta raporttikortti,
@@ -2550,7 +2538,6 @@
Sample Collection,Näytteenottokokoelma,
Sample quantity {0} cannot be more than received quantity {1},Näytteen määrä {0} ei voi olla suurempi kuin vastaanotettu määrä {1},
Sanctioned,seuraamuksia,
-Sanctioned Amount,Hyväksyttävä määrä,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Hyväksyttävän määrä ei voi olla suurempi kuin korvauksen määrä rivillä {0}.,
Sand,Hiekka,
Saturday,Lauantai,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0}: llä on jo vanhempainmenettely {1}.,
API,API,
Annual,Vuotuinen,
-Approved,hyväksytty,
Change,muutos,
Contact Email,"yhteystiedot, sähköposti",
Export Type,Vientityyppi,
@@ -3571,7 +3557,6 @@
Account Value,Tilin arvo,
Account is mandatory to get payment entries,Tili on pakollinen maksumerkintöjen saamiseksi,
Account is not set for the dashboard chart {0},Tiliä ei ole asetettu kojetaulukartalle {0},
-Account {0} does not belong to company {1},tili {0} ei kuulu yritykselle {1},
Account {0} does not exists in the dashboard chart {1},Tiliä {0} ei ole kojetaulun kaaviossa {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Tili: <b>{0}</b> on pääoma Käynnissä oleva työ, jota ei voi päivittää päiväkirjakirjauksella",
Account: {0} is not permitted under Payment Entry,Tili: {0} ei ole sallittu maksamisen yhteydessä,
@@ -3582,7 +3567,6 @@
Activity,Aktiviteettiloki,
Add / Manage Email Accounts.,Lisää / hallitse sähköpostitilejä,
Add Child,lisää alasidos,
-Add Loan Security,Lisää lainaturva,
Add Multiple,Lisää useita,
Add Participants,Lisää osallistujia,
Add to Featured Item,Lisää suositeltavaan tuotteeseen,
@@ -3593,15 +3577,12 @@
Address Line 1,osoiterivi 1,
Addresses,osoitteet,
Admission End Date should be greater than Admission Start Date.,Sisäänpääsyn lopetuspäivän tulisi olla suurempi kuin sisäänpääsyn alkamispäivä.,
-Against Loan,Lainaa vastaan,
-Against Loan:,Lainaa vastaan:,
All,Kaikki,
All bank transactions have been created,Kaikki pankkitapahtumat on luotu,
All the depreciations has been booked,Kaikki poistot on kirjattu,
Allocation Expired!,Jako vanhentunut!,
Allow Resetting Service Level Agreement from Support Settings.,Salli palvelutasosopimuksen palauttaminen tukiasetuksista.,
Amount of {0} is required for Loan closure,Määrä {0} vaaditaan lainan lopettamiseen,
-Amount paid cannot be zero,Maksettu summa ei voi olla nolla,
Applied Coupon Code,Sovellettu kuponkikoodi,
Apply Coupon Code,Käytä kuponkikoodia,
Appointment Booking,Ajanvaraus,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Saapumisaikaa ei voida laskea, koska ohjaimen osoite puuttuu.",
Cannot Optimize Route as Driver Address is Missing.,"Reittiä ei voi optimoida, koska ajurin osoite puuttuu.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Tehtävää {0} ei voida suorittaa loppuun, koska sen riippuvainen tehtävä {1} ei ole suoritettu loppuun / peruutettu.",
-Cannot create loan until application is approved,Lainaa ei voi luoda ennen kuin hakemus on hyväksytty,
Cannot find a matching Item. Please select some other value for {0}.,Nimikettä ei löydy. Valitse jokin muu arvo {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",Tuotteen {0} rivillä {1} ei voida ylilaskuttaa enemmän kuin {2}. Aseta korvaus Tilin asetukset -kohdassa salliaksesi ylilaskutuksen,
"Capacity Planning Error, planned start time can not be same as end time","Kapasiteetin suunnitteluvirhe, suunniteltu aloitusaika ei voi olla sama kuin lopetusaika",
@@ -3812,20 +3792,9 @@
Less Than Amount,Vähemmän kuin määrä,
Liabilities,Velat,
Loading...,Ladataan ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Lainan määrä ylittää enimmäislainan määrän {0} ehdotettuja arvopapereita kohden,
Loan Applications from customers and employees.,Asiakkaiden ja työntekijöiden lainahakemukset.,
-Loan Disbursement,Lainan maksaminen,
Loan Processes,Lainaprosessit,
-Loan Security,Lainan vakuus,
-Loan Security Pledge,Lainan vakuuslupaus,
-Loan Security Pledge Created : {0},Luototurva lupaus luotu: {0},
-Loan Security Price,Lainan vakuushinta,
-Loan Security Price overlapping with {0},Lainan vakuushinta päällekkäin {0} kanssa,
-Loan Security Unpledge,Lainan vakuudettomuus,
-Loan Security Value,Lainan vakuusarvo,
Loan Type for interest and penalty rates,Lainatyyppi korkoihin ja viivästyskorkoihin,
-Loan amount cannot be greater than {0},Lainasumma ei voi olla suurempi kuin {0},
-Loan is mandatory,Laina on pakollinen,
Loans,lainat,
Loans provided to customers and employees.,Asiakkaille ja työntekijöille annetut lainat.,
Location,Sijainti,
@@ -3894,7 +3863,6 @@
Pay,Maksaa,
Payment Document Type,Maksutodistuksen tyyppi,
Payment Name,Maksun nimi,
-Penalty Amount,Rangaistuksen määrä,
Pending,Odottaa,
Performance,Esitys,
Period based On,Kausi perustuu,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Ole hyvä ja kirjaudu sisään Marketplace-käyttäjänä muokataksesi tätä tuotetta.,
Please login as a Marketplace User to report this item.,Ole hyvä ja kirjaudu sisään Marketplace-käyttäjäksi ilmoittaaksesi tästä tuotteesta.,
Please select <b>Template Type</b> to download template,Valitse <b>mallityyppi</b> ladataksesi mallin,
-Please select Applicant Type first,Valitse ensin hakijan tyyppi,
Please select Customer first,Valitse ensin asiakas,
Please select Item Code first,Valitse ensin tuotekoodi,
-Please select Loan Type for company {0},Valitse lainatyyppi yritykselle {0},
Please select a Delivery Note,Ole hyvä ja valitse lähetys,
Please select a Sales Person for item: {0},Valitse tuotteelle myyjä: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Valitse toinen maksutapa. Raita ei tue käteisrahaan '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Aseta oletuspankkitili yritykselle {0},
Please specify,Ilmoitathan,
Please specify a {0},Määritä {0},lead
-Pledge Status,Pantin tila,
-Pledge Time,Pantti aika,
Printing,Tulostus,
Priority,prioriteetti,
Priority has been changed to {0}.,Prioriteetti on muutettu arvoksi {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Käsitellään XML-tiedostoja,
Profitability,kannattavuus,
Project,Projekti,
-Proposed Pledges are mandatory for secured Loans,Ehdotetut lupaukset ovat pakollisia vakuudellisille lainoille,
Provide the academic year and set the starting and ending date.,Anna lukuvuosi ja aseta alkamis- ja päättymispäivä.,
Public token is missing for this bank,Tästä pankista puuttuu julkinen tunnus,
Publish,Julkaista,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Ostosetelillä ei ole nimikettä, jolle säilytä näyte.",
Purchase Return,Osto Return,
Qty of Finished Goods Item,Määrä valmiita tavaroita,
-Qty or Amount is mandatroy for loan security,Määrä tai määrä on pakollinen lainan vakuudelle,
Quality Inspection required for Item {0} to submit,Tuotteen {0} lähettämistä varten vaaditaan laatutarkastus,
Quantity to Manufacture,Valmistusmäärä,
Quantity to Manufacture can not be zero for the operation {0},Valmistusmäärä ei voi olla nolla toiminnolle {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Päivityspäivämäärän on oltava suurempi tai yhtä suuri kuin Liittymispäivä,
Rename,Nimeä uudelleen,
Rename Not Allowed,Nimeä uudelleen ei sallita,
-Repayment Method is mandatory for term loans,Takaisinmaksutapa on pakollinen lainoille,
-Repayment Start Date is mandatory for term loans,Takaisinmaksun alkamispäivä on pakollinen lainoille,
Report Item,Raportoi esine,
Report this Item,Ilmoita asiasta,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Varattu määrä alihankintana: Raaka-aineiden määrä alihankintana olevien tuotteiden valmistamiseksi.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rivi ({0}): {1} on jo alennettu hintaan {2},
Rows Added in {0},Rivit lisätty kohtaan {0},
Rows Removed in {0},Rivit poistettu {0},
-Sanctioned Amount limit crossed for {0} {1},{0} {1} ylitetty pakollinen rajoitus,
-Sanctioned Loan Amount already exists for {0} against company {1},Yritykselle {1} on jo olemassa sanktion lainan määrä yritykselle {0},
Save,Tallenna,
Save Item,Tallenna tuote,
Saved Items,Tallennetut kohteet,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Käyttäjä {0} on poistettu käytöstä,
Users and Permissions,Käyttäjät ja käyttöoikeudet,
Vacancies cannot be lower than the current openings,Avoimet työpaikat eivät voi olla alhaisemmat kuin nykyiset aukot,
-Valid From Time must be lesser than Valid Upto Time.,Voimassa alkaen on oltava pienempi kuin voimassa oleva lisäaika.,
Valuation Rate required for Item {0} at row {1},Kohteen {0} rivillä {1} vaaditaan arvonkorotus,
Values Out Of Sync,Arvot ovat synkronoimattomia,
Vehicle Type is required if Mode of Transport is Road,"Ajoneuvotyyppi vaaditaan, jos kuljetusmuoto on tie",
@@ -4211,7 +4168,6 @@
Add to Cart,Lisää koriin,
Days Since Last Order,Päivät viimeisestä tilauksesta,
In Stock,Varastossa,
-Loan Amount is mandatory,Lainan määrä on pakollinen,
Mode Of Payment,Maksutapa,
No students Found,Ei opiskelijoita,
Not in Stock,Ei varastossa,
@@ -4240,7 +4196,6 @@
Group by,ryhmän,
In stock,Varastossa,
Item name,Nimikkeen nimi,
-Loan amount is mandatory,Lainan määrä on pakollinen,
Minimum Qty,Vähimmäismäärä,
More details,Lisätietoja,
Nature of Supplies,Tavaroiden luonne,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Suoritettu kokonaismäärä,
Qty to Manufacture,Valmistettava yksikkömäärä,
Repay From Salary can be selected only for term loans,Palautus palkkasta voidaan valita vain määräaikaisille lainoille,
-No valid Loan Security Price found for {0},Kohteelle {0} ei löytynyt kelvollista lainan vakuushintaa,
-Loan Account and Payment Account cannot be same,Lainatili ja maksutili eivät voi olla samat,
-Loan Security Pledge can only be created for secured loans,Lainatakauslupa voidaan luoda vain vakuudellisille lainoille,
Social Media Campaigns,Sosiaalisen median kampanjat,
From Date can not be greater than To Date,Aloituspäivä ei voi olla suurempi kuin Päivämäärä,
Please set a Customer linked to the Patient,Määritä potilaan kanssa linkitetty asiakas,
@@ -6437,7 +6389,6 @@
HR User,HR käyttäjä,
Appointment Letter,Nimityskirje,
Job Applicant,Työnhakija,
-Applicant Name,hakijan nimi,
Appointment Date,Nimityspäivämäärä,
Appointment Letter Template,Nimityskirjemalli,
Body,ruumis,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sync in Progress,
Hub Seller Name,Hub Myyjän nimi,
Custom Data,Mukautetut tiedot,
-Member,Jäsen,
-Partially Disbursed,osittain maksettu,
-Loan Closure Requested,Pyydetty lainan sulkeminen,
Repay From Salary,Maksaa maasta Palkka,
-Loan Details,Loan tiedot,
-Loan Type,laina Tyyppi,
-Loan Amount,Lainan määrä,
-Is Secured Loan,On vakuudellinen laina,
-Rate of Interest (%) / Year,Korkokanta (%) / vuosi,
-Disbursement Date,maksupäivä,
-Disbursed Amount,Maksettu määrä,
-Is Term Loan,On laina,
-Repayment Method,lyhennystapa,
-Repay Fixed Amount per Period,Repay kiinteä määrä Period,
-Repay Over Number of Periods,Repay Yli Kausien määrä,
-Repayment Period in Months,Takaisinmaksuaika kuukausina,
-Monthly Repayment Amount,Kuukauden lyhennyksen määrä,
-Repayment Start Date,Takaisinmaksun alkamispäivä,
-Loan Security Details,Lainan vakuustiedot,
-Maximum Loan Value,Lainan enimmäisarvo,
-Account Info,Tilitiedot,
-Loan Account,Laina-tili,
-Interest Income Account,Korkotuotot Account,
-Penalty Income Account,Rangaistustulotili,
-Repayment Schedule,maksuaikataulusta,
-Total Payable Amount,Yhteensä Maksettava määrä,
-Total Principal Paid,Pääoma yhteensä,
-Total Interest Payable,Koko Korkokulut,
-Total Amount Paid,Maksettu kokonaismäärä,
-Loan Manager,Lainanhoitaja,
-Loan Info,laina Info,
-Rate of Interest,Kiinnostuksen taso,
-Proposed Pledges,Ehdotetut lupaukset,
-Maximum Loan Amount,Suurin lainamäärä,
-Repayment Info,takaisinmaksu Info,
-Total Payable Interest,Yhteensä Maksettava korko,
-Against Loan ,Lainaa vastaan,
-Loan Interest Accrual,Lainakorkojen karttuminen,
-Amounts,määrät,
-Pending Principal Amount,Odottaa pääomaa,
-Payable Principal Amount,Maksettava pääoma,
-Paid Principal Amount,Maksettu päämäärä,
-Paid Interest Amount,Maksettu korko,
-Process Loan Interest Accrual,Prosessilainakorkojen karttuminen,
-Repayment Schedule Name,Takaisinmaksuaikataulun nimi,
Regular Payment,Säännöllinen maksu,
Loan Closure,Lainan sulkeminen,
-Payment Details,Maksutiedot,
-Interest Payable,Maksettava korko,
-Amount Paid,maksettu summa,
-Principal Amount Paid,Maksettu päämäärä,
-Repayment Details,Takaisinmaksun yksityiskohdat,
-Loan Repayment Detail,Lainan takaisinmaksutiedot,
-Loan Security Name,Lainan arvopaperi,
-Unit Of Measure,Mittayksikkö,
-Loan Security Code,Lainan turvakoodi,
-Loan Security Type,Lainan vakuustyyppi,
-Haircut %,Hiusten leikkaus,
-Loan Details,Lainan yksityiskohdat,
-Unpledged,Unpledged,
-Pledged,Pantatut,
-Partially Pledged,Osittain luvattu,
-Securities,arvopaperit,
-Total Security Value,Kokonaisarvoarvo,
-Loan Security Shortfall,Lainavakuus,
-Loan ,Lainata,
-Shortfall Time,Puute aika,
-America/New_York,America / New_York,
-Shortfall Amount,Vajeen määrä,
-Security Value ,Turva-arvo,
-Process Loan Security Shortfall,Prosessilainan turvavaje,
-Loan To Value Ratio,Lainan ja arvon suhde,
-Unpledge Time,Luopumisaika,
-Loan Name,laina Name,
Rate of Interest (%) Yearly,Korkokanta (%) Vuotuinen,
-Penalty Interest Rate (%) Per Day,Rangaistuskorko (%) päivässä,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,"Viivästyskorkoa peritään odotettavissa olevasta korkomäärästä päivittäin, jos takaisinmaksu viivästyy",
-Grace Period in Days,Arvonjakso päivinä,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Päivien määrä eräpäivästä, johon mennessä sakkoa ei veloiteta lainan takaisinmaksun viivästyessä",
-Pledge,pantti,
-Post Haircut Amount,Postitusleikkauksen määrä,
-Process Type,Prosessin tyyppi,
-Update Time,Päivitä aika,
-Proposed Pledge,Ehdotettu lupaus,
-Total Payment,Koko maksu,
-Balance Loan Amount,Balance Lainamäärä,
-Is Accrued,On kertynyt,
Salary Slip Loan,Palkkavelkakirjalaina,
Loan Repayment Entry,Lainan takaisinmaksu,
-Sanctioned Loan Amount,Seuraamuslainan määrä,
-Sanctioned Amount Limit,Sanktioitu rajoitus,
-Unpledge,Unpledge,
-Haircut,hiustyyli,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,muodosta aikataulu,
Schedules,Aikataulut,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekti on näiden käyttäjien nähtävissä www-sivustolla,
Copied From,kopioitu,
Start and End Dates,Alkamis- ja päättymisajankohta,
-Actual Time (in Hours),Todellinen aika (tunteina),
+Actual Time in Hours (via Timesheet),Todellinen aika (tunteina),
Costing and Billing,Kustannuslaskenta ja laskutus,
-Total Costing Amount (via Timesheets),Kokonaiskustannusmäärä (aikataulujen mukaan),
-Total Expense Claim (via Expense Claims),Kulukorvaus yhteensä (kulukorvauksesta),
+Total Costing Amount (via Timesheet),Kokonaiskustannusmäärä (aikataulujen mukaan),
+Total Expense Claim (via Expense Claim),Kulukorvaus yhteensä (kulukorvauksesta),
Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista),
Total Sales Amount (via Sales Order),Myyntimäärän kokonaismäärä (myyntitilauksen mukaan),
-Total Billable Amount (via Timesheets),Laskutettava summa yhteensä (kautta aikajaksoja),
-Total Billed Amount (via Sales Invoices),Laskutettu kokonaissumma (myyntilaskut),
-Total Consumed Material Cost (via Stock Entry),Kulutettu kokonaiskustannus (osakemäärällä),
+Total Billable Amount (via Timesheet),Laskutettava summa yhteensä (kautta aikajaksoja),
+Total Billed Amount (via Sales Invoice),Laskutettu kokonaissumma (myyntilaskut),
+Total Consumed Material Cost (via Stock Entry),Kulutettu kokonaiskustannus (osakemäärällä),
Gross Margin,bruttokate,
Gross Margin %,bruttokate %,
Monitor Progress,Seurata edistymistä,
@@ -7521,12 +7385,10 @@
Dependencies,riippuvuudet,
Dependent Tasks,Riippuvat tehtävät,
Depends on Tasks,Riippuu Tehtävät,
-Actual Start Date (via Time Sheet),Todellinen aloituspäivä (via kellokortti),
-Actual Time (in hours),todellinen aika (tunneissa),
-Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti),
-Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet),
+Actual Start Date (via Timesheet),Todellinen aloituspäivä (via kellokortti),
+Actual Time in Hours (via Timesheet),todellinen aika (tunneissa),
+Actual End Date (via Timesheet),Todellinen Lopetuspäivä (via kellokortti),
Total Expense Claim (via Expense Claim),Kulukorvaus yhteensä (kulukorvauksesta),
-Total Billing Amount (via Time Sheet),Total Billing Määrä (via Time Sheet),
Review Date,Review Date,
Closing Date,sulkupäivä,
Task Depends On,Tehtävä riippuu,
@@ -7887,7 +7749,6 @@
Update Series,Päivitä sarjat,
Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille,
Prefix,Etuliite,
-Current Value,Nykyinen arvo,
This is the number of the last created transaction with this prefix,Viimeinen tapahtuma on tehty tällä numerolla ja tällä etuliitteellä,
Update Series Number,Päivitä sarjanumerot,
Quotation Lost Reason,"Tarjous hävitty, syy",
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Tuotekohtainen suositeltu täydennystilaustaso,
Lead Details,Liidin lisätiedot,
Lead Owner Efficiency,Lyijy Omistaja Tehokkuus,
-Loan Repayment and Closure,Lainan takaisinmaksu ja lopettaminen,
-Loan Security Status,Lainan turvataso,
Lost Opportunity,Kadonnut mahdollisuus,
Maintenance Schedules,huoltoaikataulut,
Material Requests for which Supplier Quotations are not created,Materiaalipyynnöt ilman toimituskykytiedustelua,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Kohdennetut määrät: {0},
Payment Account is mandatory,Maksutili on pakollinen,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Jos tämä on valittu, koko summa vähennetään verotettavasta tulosta ennen tuloveron laskemista ilman ilmoitusta tai todisteita.",
-Disbursement Details,Maksutiedot,
Material Request Warehouse,Materiaalipyyntövarasto,
Select warehouse for material requests,Valitse varasto materiaalipyyntöjä varten,
Transfer Materials For Warehouse {0},Siirrä materiaaleja varastoon {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Palauta takaisin perimät palkat,
Deduction from salary,Vähennys palkasta,
Expired Leaves,Vanhentuneet lehdet,
-Reference No,Viitenumero,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Aliarvostusprosentti on prosenttiero Lainapaperin markkina-arvon ja kyseiselle Lainapaperille annetun arvon välillä käytettäessä kyseisen lainan vakuudeksi.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Lainan ja arvon suhde ilmaisee lainan määrän suhde pantatun vakuuden arvoon. Lainan vakuusvajaus syntyy, jos se laskee alle lainan määritetyn arvon",
If this is not checked the loan by default will be considered as a Demand Loan,"Jos tätä ei ole valittu, laina katsotaan oletuksena kysyntälainaksi",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Tätä tiliä käytetään lainan takaisinmaksun varaamiseen luotonsaajalta ja lainojen maksamiseen myös luotonottajalle,
This account is capital account which is used to allocate capital for loan disbursal account ,"Tämä tili on pääomatili, jota käytetään pääoman kohdistamiseen lainan maksamiseen",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operaatio {0} ei kuulu työmääräykseen {1},
Print UOM after Quantity,Tulosta UOM määrän jälkeen,
Set default {0} account for perpetual inventory for non stock items,Aseta oletusarvoinen {0} tili ikuiselle mainosjakaumalle muille kuin varastossa oleville tuotteille,
-Loan Security {0} added multiple times,Lainan vakuus {0} lisätty useita kertoja,
-Loan Securities with different LTV ratio cannot be pledged against one loan,"Lainapapereita, joilla on erilainen LTV-suhde, ei voida pantata yhtä lainaa kohti",
-Qty or Amount is mandatory for loan security!,Määrä tai määrä on pakollinen lainan vakuudeksi!,
-Only submittted unpledge requests can be approved,Vain toimitetut vakuudettomat pyynnöt voidaan hyväksyä,
-Interest Amount or Principal Amount is mandatory,Korkosumma tai pääoma on pakollinen,
-Disbursed Amount cannot be greater than {0},Maksettu summa ei voi olla suurempi kuin {0},
-Row {0}: Loan Security {1} added multiple times,Rivi {0}: Lainan vakuus {1} lisätty useita kertoja,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rivi # {0}: Alatuotteen ei pitäisi olla tuotepaketti. Poista kohde {1} ja tallenna,
Credit limit reached for customer {0},Luottoraja saavutettu asiakkaalle {0},
Could not auto create Customer due to the following missing mandatory field(s):,Asiakasta ei voitu luoda automaattisesti seuraavien pakollisten kenttien puuttuessa:,
diff --git a/erpnext/translations/fr-CA.csv b/erpnext/translations/fr-CA.csv
index 59283ee..0e3ca1f 100644
--- a/erpnext/translations/fr-CA.csv
+++ b/erpnext/translations/fr-CA.csv
@@ -1,14 +1,14 @@
-DocType: Production Plan Item,Ordered Qty,Quantité commandée
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Le Centre de Coûts {2} ne fait pas partie de la Société {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit un montant au débit ou crédit est nécessaire pour {2}
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taux de la Liste de Prix (Devise de la Compagnie)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est requis envers un compte à recevoir {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite qu'en devise: {3}
-DocType: Purchase Invoice Item,Price List Rate,Taux de la Liste de Prix
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est requis envers un compte à payer {2}
-DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique du taux à la Liste de Prix si manquant
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Le compte {2} ne fait pas partie de la Société {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Le compte {2} de type 'Profit et Perte' n'est pas admis dans une Entrée d'Ouverture
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Le compte {2} est inactif
-DocType: Journal Entry,Difference (Dr - Cr),Différence (Dt - Ct )
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}: Le compte {2} ne peut pas être un Groupe
+Ordered Qty,Quantité commandée,
+{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Le Centre de Coûts {2} ne fait pas partie de la Société {3}
+{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit un montant au débit ou crédit est nécessaire pour {2}
+Price List Rate (Company Currency),Taux de la Liste de Prix (Devise de la Compagnie)
+{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est requis envers un compte à recevoir {2}
+{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite qu'en devise: {3}
+Price List Rate,Taux de la Liste de Prix,
+{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est requis envers un compte à payer {2}
+Auto insert Price List rate if missing,Insertion automatique du taux à la Liste de Prix si manquant,
+{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Le compte {2} ne fait pas partie de la Société {3}
+{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Le compte {2} de type 'Profit et Perte' n'est pas admis dans une Entrée d'Ouverture,
+{0} {1}: Account {2} is inactive,{0} {1}: Le compte {2} est inactif,
+Difference (Dr - Cr),Différence (Dt - Ct )
+{0} {1}: Account {2} cannot be a Group,{0} {1}: Le compte {2} ne peut pas être un Groupe,
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index ab9bf7d..0f59345 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -115,7 +115,7 @@
Add Employees,Ajouter des employés,
Add Item,Ajouter un Article,
Add Items,Ajouter des articles,
-Add Leads,Créer des Prospects,
+Add Leads,Créer des Leads,
Add Multiple Tasks,Ajouter plusieurs tâches,
Add Row,Ajouter une Ligne,
Add Sales Partners,Ajouter des partenaires commerciaux,
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Applicable si la société est SpA, SApA ou SRL",
Applicable if the company is a limited liability company,Applicable si la société est une société à responsabilité limitée,
Applicable if the company is an Individual or a Proprietorship,Applicable si la société est un particulier ou une entreprise,
-Applicant,Candidat,
-Applicant Type,Type de demandeur,
Application of Funds (Assets),Emplois des Ressources (Actifs),
Application period cannot be across two allocation records,La période de demande ne peut pas être sur deux périodes d'allocations,
Application period cannot be outside leave allocation period,La période de la demande ne peut pas être hors de la période d'allocation de congé,
@@ -658,8 +656,8 @@
Create Invoices,Créer des factures,
Create Job Card,Créer une carte de travail,
Create Journal Entry,Créer une entrée de journal,
-Create Lead,Créer un Prospect,
-Create Leads,Créer des Prospects,
+Create Lead,Créer un Lead,
+Create Leads,Créer des Lead,
Create Maintenance Visit,Créer une visite de maintenance,
Create Material Request,Créer une demande de matériel,
Create Multiple,Créer plusieurs,
@@ -951,7 +949,7 @@
Ends On date cannot be before Next Contact Date.,La date de fin ne peut pas être avant la prochaine date de contact,
Energy,Énergie,
Engineer,Ingénieur,
-Enough Parts to Build,Pièces Suffisantes pour Construire
+Enough Parts to Build,Pièces Suffisantes pour Construire,
Enroll,Inscrire,
Enrolling student,Inscrire un étudiant,
Enrolling students,Inscription des étudiants,
@@ -1426,13 +1424,12 @@
Last Purchase Rate,Dernier Prix d'Achat,
Latest,Dernier,
Latest price updated in all BOMs,Prix les plus récents mis à jour dans toutes les nomenclatures,
-Lead,Prospect,
-Lead Count,Nombre de Prospects,
+Lead Count,Nombre de Lead,
Lead Owner,Responsable du Prospect,
-Lead Owner cannot be same as the Lead,Le Responsable du Prospect ne peut pas être identique au Prospect,
+Lead Owner cannot be same as the Lead,Le Responsable du Prospect ne peut pas être identique au Lead,
Lead Time Days,Jours de Délai,
Lead to Quotation,Du Prospect au Devis,
-"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects",
+"Leads help you get business, add all your contacts and more as your leads","Les lead vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de lead",
Learn,Apprendre,
Leave Approval Notification,Notification d'approbation de congés,
Leave Blocked,Laisser Verrouillé,
@@ -1471,10 +1468,6 @@
List of available Shareholders with folio numbers,Liste des actionnaires disponibles avec numéros de folio,
Loading Payment System,Chargement du système de paiement,
Loan,Prêt,
-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},
-Loan Application,Demande de prêt,
-Loan Management,Gestion des prêts,
-Loan Repayment,Remboursement de prêt,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,La date de début du prêt et la période du prêt sont obligatoires pour sauvegarder le décompte des factures.,
Loans (Liabilities),Prêts (Passif),
Loans and Advances (Assets),Prêts et avances (actif),
@@ -1596,7 +1589,7 @@
Middle Name (Optional),Deuxième Prénom (Optionnel),
Min Amt can not be greater than Max Amt,Min Amt ne peut pas être supérieur à Max Amt,
Min Qty can not be greater than Max Qty,Qté Min ne peut pas être supérieure à Qté Max,
-Minimum Lead Age (Days),Âge Minimum du Prospect (Jours),
+Minimum Lead Age (Days),Âge Minimum du lead (Jours),
Miscellaneous Expenses,Charges Diverses,
Missing Currency Exchange Rates for {0},Taux de Change Manquant pour {0},
Missing email template for dispatch. Please set one in Delivery Settings.,Modèle de courrier électronique manquant pour l'envoi. Veuillez en définir un dans les paramètres de livraison.,
@@ -1611,7 +1604,6 @@
Monday,Lundi,
Monthly,Mensuel,
Monthly Distribution,Répartition Mensuelle,
-Monthly Repayment Amount cannot be greater than Loan Amount,Montant du Remboursement Mensuel ne peut pas être supérieur au Montant du Prêt,
More,Plus,
More Information,Informations Complémentaires,
More than one selection for {0} not allowed,Plus d'une sélection pour {0} non autorisée,
@@ -1676,7 +1668,7 @@
Newsletters,Newsletters,
Newspaper Publishers,Éditeurs de journaux,
Next,Suivant,
-Next Contact By cannot be same as the Lead Email Address,Prochain Contact Par ne peut être identique à l’Adresse Email du Prospect,
+Next Contact By cannot be same as the Lead Email Address,Prochain Contact Par ne peut être identique à l’Adresse Email du Lead,
Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé,
Next Steps,Prochaines étapes,
No Action,Pas d'action,
@@ -1808,9 +1800,9 @@
Operations,Opérations,
Operations cannot be left blank,Les opérations ne peuvent pas être laissées vides,
Opp Count,Compte d'Opportunités,
-Opp/Lead %,Opp / Prospect %,
+Opp/Lead %,Opp / Lead %,
Opportunities,Opportunités,
-Opportunities by lead source,Opportunités par source de plomb,
+Opportunities by lead source,Opportunités par source de lead,
Opportunity,Opportunité,
Opportunity Amount,Montant de l'opportunité,
Optional Holiday List not set for leave period {0},Une liste de vacances facultative n'est pas définie pour la période de congé {0},
@@ -1884,11 +1876,9 @@
Pay {0} {1},Payer {0} {1},
Payable,Créditeur,
Payable Account,Comptes Créditeurs,
-Payable Amount,Montant payable,
Payment,Paiement,
Payment Cancelled. Please check your GoCardless Account for more details,Paiement annulé. Veuillez vérifier votre compte GoCardless pour plus de détails,
Payment Confirmation,Confirmation de paiement,
-Payment Date,Date de paiement,
Payment Days,Jours de paiement,
Payment Document,Document de paiement,
Payment Due Date,Date d'Échéance de Paiement,
@@ -1982,7 +1972,6 @@
Please enter Purchase Receipt first,Veuillez d’abord entrer un Reçu d'Achat,
Please enter Receipt Document,Veuillez entrer le Document de Réception,
Please enter Reference date,Veuillez entrer la date de Référence,
-Please enter Repayment Periods,Veuillez entrer les Périodes de Remboursement,
Please enter Reqd by Date,Veuillez entrer Reqd par date,
Please enter Woocommerce Server URL,Veuillez entrer l'URL du serveur Woocommerce,
Please enter Write Off Account,Veuillez entrer un Compte de Reprise,
@@ -1994,7 +1983,6 @@
Please enter parent cost center,Veuillez entrer le centre de coût parent,
Please enter quantity for Item {0},Veuillez entrer une quantité pour l'article {0},
Please enter relieving date.,Veuillez entrer la date de relève.,
-Please enter repayment Amount,Veuillez entrer le Montant de remboursement,
Please enter valid Financial Year Start and End Dates,Veuillez entrer des Dates de Début et de Fin d’Exercice Comptable valides,
Please enter valid email address,Entrez une adresse email valide,
Please enter {0} first,Veuillez d’abord entrer {0},
@@ -2007,7 +1995,7 @@
Please mention Round Off Account in Company,Veuillez indiquer le Compte d’Arrondi de la Société,
Please mention Round Off Cost Center in Company,Veuillez indiquer le Centre de Coûts d’Arrondi de la Société,
Please mention no of visits required,Veuillez indiquer le nb de visites requises,
-Please mention the Lead Name in Lead {0},Veuillez mentionner le nom du Prospect dans le Prospect {0},
+Please mention the Lead Name in Lead {0},Veuillez mentionner le nom du Lead dans le Lead {0},
Please pull items from Delivery Note,Veuillez récupérer les articles des Bons de Livraison,
Please register the SIREN number in the company information file,Veuillez enregistrer le numéro SIREN dans la fiche d'information de la société,
Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1},
@@ -2160,7 +2148,6 @@
Pricing Rules are further filtered based on quantity.,Les Règles de Tarification sont d'avantage filtrés en fonction de la quantité.,
Primary Address Details,Détails de l'adresse principale,
Primary Contact Details,Détails du contact principal,
-Principal Amount,Montant Principal,
Print Format,Format d'Impression,
Print IRS 1099 Forms,Imprimer les formulaires IRS 1099,
Print Report Card,Imprimer le rapport,
@@ -2277,7 +2264,7 @@
Queued for updating latest price in all Bill of Materials. It may take a few minutes.,Mise à jour des prix les plus récents dans toutes les nomenclatures en file d'attente. Cela peut prendre quelques minutes.,
Quick Journal Entry,Écriture Rapide dans le Journal,
Quot Count,Compte de Devis,
-Quot/Lead %,Devis / Prospects %,
+Quot/Lead %,Devis / Lead %,
Quotation,Devis,
Quotation {0} is cancelled,Devis {0} est annulée,
Quotation {0} not of type {1},Le devis {0} n'est pas du type {1},
@@ -2285,7 +2272,7 @@
"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients",
Quotations received from Suppliers.,Devis reçus des Fournisseurs.,
Quotations: ,Devis :,
-Quotes to Leads or Customers.,Devis de Prospects ou Clients.,
+Quotes to Leads or Customers.,Devis de Lead ou Clients.,
RFQs are not allowed for {0} due to a scorecard standing of {1},Les Appels d'Offres ne sont pas autorisés pour {0} en raison d'une note de {1} sur la fiche d'évaluation,
Range,Plage,
Rate,Prix,
@@ -2550,7 +2537,6 @@
Sample Collection,Collecte d'Échantillons,
Sample quantity {0} cannot be more than received quantity {1},La quantité d'échantillon {0} ne peut pas dépasser la quantité reçue {1},
Sanctioned,Sanctionné,
-Sanctioned Amount,Montant Approuvé,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le Montant Approuvé ne peut pas être supérieur au Montant Réclamé à la ligne {0}.,
Sand,Le sable,
Saturday,Samedi,
@@ -2888,7 +2874,7 @@
Supplies made to Unregistered Persons,Fournitures faites à des personnes non inscrites,
Suppliies made to Composition Taxable Persons,Suppleies à des personnes assujetties à la composition,
Supply Type,Type d'approvisionnement,
-Support,"Assistance/Support",
+Support,Assistance/Support,
Support Analytics,Analyse de l'assistance,
Support Settings,Paramètres du module Assistance,
Support Tickets,Ticket d'assistance,
@@ -3037,7 +3023,7 @@
To Date should be within the Fiscal Year. Assuming To Date = {0},La Date Finale doit être dans l'exercice. En supposant Date Finale = {0},
To Datetime,À la Date,
To Deliver,À Livrer,
-{} To Deliver,{} à livrer
+{} To Deliver,{} à livrer,
To Deliver and Bill,À Livrer et Facturer,
To Fiscal Year,À l'année fiscale,
To GSTIN,GSTIN (Destination),
@@ -3122,7 +3108,7 @@
Total(Qty),Total (Qté),
Traceability,Traçabilité,
Traceback,Retraçage,
-Track Leads by Lead Source.,Suivre les prospects par sources,
+Track Leads by Lead Source.,Suivre les leads par sources,
Training,Formation,
Training Event,Événement de formation,
Training Events,Événements de formation,
@@ -3243,8 +3229,8 @@
View Fees Records,Voir les honoraires,
View Form,Voir le formulaire,
View Lab Tests,Afficher les tests de laboratoire,
-View Leads,Voir Prospects,
-View Ledger,Voir le Livre,
+View Leads,Voir Lead,
+View Ledger,Voir le Journal,
View Now,Voir maintenant,
View a list of all the help videos,Afficher la liste de toutes les vidéos d'aide,
View in Cart,Voir Panier,
@@ -3541,7 +3527,6 @@
{0} already has a Parent Procedure {1}.,{0} a déjà une procédure parent {1}.,
API,API,
Annual,Annuel,
-Approved,Approuvé,
Change,Changement,
Contact Email,Email du Contact,
Export Type,Type d'Exportation,
@@ -3571,7 +3556,6 @@
Account Value,Valeur du compte,
Account is mandatory to get payment entries,Le compte est obligatoire pour obtenir les entrées de paiement,
Account is not set for the dashboard chart {0},Le compte n'est pas défini pour le graphique du tableau de bord {0},
-Account {0} does not belong to company {1},Compte {0} n'appartient pas à la société {1},
Account {0} does not exists in the dashboard chart {1},Le compte {0} n'existe pas dans le graphique du tableau de bord {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Compte: <b>{0}</b> est un travail capital et ne peut pas être mis à jour par une écriture au journal.,
Account: {0} is not permitted under Payment Entry,Compte: {0} n'est pas autorisé sous Saisie du paiement.,
@@ -3582,7 +3566,6 @@
Activity,Activité,
Add / Manage Email Accounts.,Ajouter / Gérer les Comptes de Messagerie.,
Add Child,Ajouter une Sous-Catégorie,
-Add Loan Security,Ajouter une garantie de prêt,
Add Multiple,Ajout Multiple,
Add Participants,Ajouter des participants,
Add to Featured Item,Ajouter à l'article en vedette,
@@ -3593,15 +3576,12 @@
Address Line 1,Adresse Ligne 1,
Addresses,Adresses,
Admission End Date should be greater than Admission Start Date.,La date de fin d'admission doit être supérieure à la date de début d'admission.,
-Against Loan,Contre le prêt,
-Against Loan:,Contre le prêt:,
All,Tout,
All bank transactions have been created,Toutes les transactions bancaires ont été créées,
All the depreciations has been booked,Toutes les amortissements ont été comptabilisés,
Allocation Expired!,Allocation expirée!,
Allow Resetting Service Level Agreement from Support Settings.,Autoriser la réinitialisation du contrat de niveau de service à partir des paramètres de support.,
Amount of {0} is required for Loan closure,Un montant de {0} est requis pour la clôture du prêt,
-Amount paid cannot be zero,Le montant payé ne peut pas être nul,
Applied Coupon Code,Code de coupon appliqué,
Apply Coupon Code,Appliquer le code de coupon,
Appointment Booking,Prise de rendez-vous,
@@ -3649,7 +3629,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Impossible de calculer l'heure d'arrivée car l'adresse du conducteur est manquante.,
Cannot Optimize Route as Driver Address is Missing.,Impossible d'optimiser l'itinéraire car l'adresse du pilote est manquante.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Impossible de terminer la tâche {0} car sa tâche dépendante {1} n'est pas terminée / annulée.,
-Cannot create loan until application is approved,Impossible de créer un prêt tant que la demande n'est pas approuvée,
Cannot find a matching Item. Please select some other value for {0}.,Impossible de trouver un article similaire. Veuillez sélectionner une autre valeur pour {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","La surfacturation pour le poste {0} dans la ligne {1} ne peut pas dépasser {2}. Pour autoriser la surfacturation, définissez la provision dans les paramètres du compte.",
"Capacity Planning Error, planned start time can not be same as end time","Erreur de planification de capacité, l'heure de début prévue ne peut pas être identique à l'heure de fin",
@@ -3677,7 +3656,7 @@
Country,Pays,
Country Code in File does not match with country code set up in the system,Le code de pays dans le fichier ne correspond pas au code de pays configuré dans le système,
Create New Contact,Créer un nouveau contact,
-Create New Lead,Créer une nouvelle piste,
+Create New Lead,Créer une nouvelle lead,
Create Pick List,Créer une liste de choix,
Create Quality Inspection for Item {0},Créer un contrôle qualité pour l'article {0},
Creating Accounts...,Création de comptes ...,
@@ -3784,7 +3763,7 @@
Help,Aidez-moi,
Help Article,Article d’Aide,
"Helps you keep tracks of Contracts based on Supplier, Customer and Employee","Vous aide à garder une trace des contrats en fonction du fournisseur, client et employé",
-Helps you manage appointments with your leads,Vous aide à gérer les rendez-vous avec vos prospects,
+Helps you manage appointments with your leads,Vous aide à gérer les rendez-vous avec vos leads,
Home,Accueil,
IBAN is not valid,IBAN n'est pas valide,
Import Data from CSV / Excel files.,Importer des données à partir de fichiers CSV / Excel,
@@ -3812,20 +3791,9 @@
Less Than Amount,Moins que le montant,
Liabilities,Passifs,
Loading...,Chargement en Cours ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Le montant du prêt dépasse le montant maximal du prêt de {0} selon les titres proposés,
Loan Applications from customers and employees.,Demandes de prêt des clients et des employés.,
-Loan Disbursement,Déboursement de l'emprunt,
Loan Processes,Processus de prêt,
-Loan Security,Sécurité des prêts,
-Loan Security Pledge,Garantie de prêt,
-Loan Security Pledge Created : {0},Engagement de garantie de prêt créé: {0},
-Loan Security Price,Prix de la sécurité du prêt,
-Loan Security Price overlapping with {0},Le prix du titre de crédit se chevauche avec {0},
-Loan Security Unpledge,Désengagement de garantie de prêt,
-Loan Security Value,Valeur de la sécurité du prêt,
Loan Type for interest and penalty rates,Type de prêt pour les taux d'intérêt et de pénalité,
-Loan amount cannot be greater than {0},Le montant du prêt ne peut pas être supérieur à {0},
-Loan is mandatory,Le prêt est obligatoire,
Loans,Les prêts,
Loans provided to customers and employees.,Prêts accordés aux clients et aux employés.,
Location,Lieu,
@@ -3880,7 +3848,7 @@
Only users with the {0} role can create backdated leave applications,Seuls les utilisateurs avec le rôle {0} peuvent créer des demandes de congé antidatées,
Open,Ouvert,
Open Contact,Contact ouvert,
-Open Lead,Ouvrir le Prospect,
+Open Lead,Ouvrir le Lead,
Opening and Closing,Ouverture et fermeture,
Operating Cost as per Work Order / BOM,Coût d'exploitation selon l'ordre de fabrication / nomenclature,
Order Amount,Montant de la commande,
@@ -3894,7 +3862,6 @@
Pay,Payer,
Payment Document Type,Type de document de paiement,
Payment Name,Nom du paiement,
-Penalty Amount,Montant de la pénalité,
Pending,En Attente,
Performance,Performance,
Period based On,Période basée sur,
@@ -3916,17 +3883,15 @@
Please login as a Marketplace User to edit this item.,Veuillez vous connecter en tant qu'utilisateur Marketplace pour modifier cet article.,
Please login as a Marketplace User to report this item.,Veuillez vous connecter en tant qu'utilisateur de la Marketplace pour signaler cet élément.,
Please select <b>Template Type</b> to download template,Veuillez sélectionner le <b>type</b> de modèle pour télécharger le modèle,
-Please select Applicant Type first,Veuillez d'abord sélectionner le type de demandeur,
Please select Customer first,S'il vous plaît sélectionnez d'abord le client,
Please select Item Code first,Veuillez d'abord sélectionner le code d'article,
-Please select Loan Type for company {0},Veuillez sélectionner le type de prêt pour la société {0},
Please select a Delivery Note,Veuillez sélectionner un bon de livraison,
Please select a Sales Person for item: {0},Veuillez sélectionner un commercial pour l'article: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Veuillez sélectionner une autre méthode de paiement. Stripe ne prend pas en charge les transactions en devise '{0}',
Please select the customer.,S'il vous plaît sélectionner le client.,
Please set a Supplier against the Items to be considered in the Purchase Order.,Veuillez définir un fournisseur par rapport aux articles à prendre en compte dans la Commande d'Achat.,
Please set account heads in GST Settings for Compnay {0},Définissez les en-têtes de compte dans les paramètres de la TPS pour le service {0}.,
-Please set an email id for the Lead {0},Veuillez définir un identifiant de messagerie pour le prospect {0}.,
+Please set an email id for the Lead {0},Veuillez définir un identifiant de messagerie pour le lead {0}.,
Please set default UOM in Stock Settings,Veuillez définir l'UdM par défaut dans les paramètres de stock,
Please set filter based on Item or Warehouse due to a large amount of entries.,Veuillez définir le filtre en fonction de l'article ou de l'entrepôt en raison d'une grande quantité d'entrées.,
Please set up the Campaign Schedule in the Campaign {0},Configurez le calendrier de la campagne dans la campagne {0}.,
@@ -3935,8 +3900,6 @@
Please setup a default bank account for company {0},Veuillez configurer un compte bancaire par défaut pour la société {0}.,
Please specify,Veuillez spécifier,
Please specify a {0},Veuillez spécifier un {0},lead
-Pledge Status,Statut de mise en gage,
-Pledge Time,Pledge Time,
Printing,Impression,
Priority,Priorité,
Priority has been changed to {0}.,La priorité a été changée en {0}.,
@@ -3944,7 +3907,6 @@
Processing XML Files,Traitement des fichiers XML,
Profitability,Rentabilité,
Project,Projet,
-Proposed Pledges are mandatory for secured Loans,Les engagements proposés sont obligatoires pour les prêts garantis,
Provide the academic year and set the starting and ending date.,Indiquez l'année universitaire et définissez la date de début et de fin.,
Public token is missing for this bank,Un jeton public est manquant pour cette banque,
Publish,Publier,
@@ -3960,7 +3922,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Le reçu d’achat ne contient aucun élément pour lequel Conserver échantillon est activé.,
Purchase Return,Retour d'Achat,
Qty of Finished Goods Item,Quantité de produits finis,
-Qty or Amount is mandatroy for loan security,La quantité ou le montant est obligatoire pour la garantie de prêt,
Quality Inspection required for Item {0} to submit,Inspection de qualité requise pour que l'élément {0} soit envoyé,
Quantity to Manufacture,Quantité à fabriquer,
Quantity to Manufacture can not be zero for the operation {0},La quantité à fabriquer ne peut pas être nulle pour l'opération {0},
@@ -3981,8 +3942,6 @@
Relieving Date must be greater than or equal to Date of Joining,La date de libération doit être supérieure ou égale à la date d'adhésion,
Rename,Renommer,
Rename Not Allowed,Renommer non autorisé,
-Repayment Method is mandatory for term loans,La méthode de remboursement est obligatoire pour les prêts à terme,
-Repayment Start Date is mandatory for term loans,La date de début de remboursement est obligatoire pour les prêts à terme,
Report Item,Élément de rapport,
Report this Item,Signaler cet article,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Quantité réservée pour la sous-traitance: quantité de matières premières pour fabriquer des articles sous-traités.,
@@ -4015,8 +3974,6 @@
Row({0}): {1} is already discounted in {2},Ligne ({0}): {1} est déjà réduit dans {2}.,
Rows Added in {0},Lignes ajoutées dans {0},
Rows Removed in {0},Lignes supprimées dans {0},
-Sanctioned Amount limit crossed for {0} {1},Montant sanctionné dépassé pour {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Le montant du prêt sanctionné existe déjà pour {0} contre l'entreprise {1},
Save,sauvegarder,
Save Item,Enregistrer l'élément,
Saved Items,Articles sauvegardés,
@@ -4135,7 +4092,6 @@
User {0} is disabled,Utilisateur {0} est désactivé,
Users and Permissions,Utilisateurs et Autorisations,
Vacancies cannot be lower than the current openings,Les postes vacants ne peuvent pas être inférieurs aux ouvertures actuelles,
-Valid From Time must be lesser than Valid Upto Time.,La période de validité doit être inférieure à la durée de validité.,
Valuation Rate required for Item {0} at row {1},Taux de valorisation requis pour le poste {0} à la ligne {1},
Values Out Of Sync,Valeurs désynchronisées,
Vehicle Type is required if Mode of Transport is Road,Le type de véhicule est requis si le mode de transport est la route,
@@ -4211,7 +4167,6 @@
Add to Cart,Ajouter au Panier,
Days Since Last Order,Jours depuis la dernière commande,
In Stock,En stock,
-Loan Amount is mandatory,Le montant du prêt est obligatoire,
Mode Of Payment,Mode de Paiement,
No students Found,Aucun étudiant trouvé,
Not in Stock,En Rupture de Stock,
@@ -4240,7 +4195,6 @@
Group by,Grouper Par,
In stock,En stock,
Item name,Libellé de l'article,
-Loan amount is mandatory,Le montant du prêt est obligatoire,
Minimum Qty,Quantité minimum,
More details,Plus de détails,
Nature of Supplies,Nature des fournitures,
@@ -4409,9 +4363,6 @@
Total Completed Qty,Total terminé Quantité,
Qty to Manufacture,Quantité À Produire,
Repay From Salary can be selected only for term loans,Le remboursement à partir du salaire ne peut être sélectionné que pour les prêts à terme,
-No valid Loan Security Price found for {0},Aucun prix de garantie de prêt valide trouvé pour {0},
-Loan Account and Payment Account cannot be same,Le compte de prêt et le compte de paiement ne peuvent pas être identiques,
-Loan Security Pledge can only be created for secured loans,Le gage de garantie de prêt ne peut être créé que pour les prêts garantis,
Social Media Campaigns,Campagnes sur les réseaux sociaux,
From Date can not be greater than To Date,La date de début ne peut pas être supérieure à la date,
Please set a Customer linked to the Patient,Veuillez définir un client lié au patient,
@@ -4943,8 +4894,8 @@
Max Qty,Qté Max,
Min Amt,Montant Min,
Max Amt,Montant Max,
-"If rate is zero them item will be treated as ""Free Item""",Si le prix est à 0 alors l'article sera traité comme article gratuit
-Is Recursive,Est récursif
+"If rate is zero them item will be treated as ""Free Item""",Si le prix est à 0 alors l'article sera traité comme article gratuit,
+Is Recursive,Est récursif,
"Discounts to be applied in sequential ranges like buy 1 get 1, buy 2 get 2, buy 3 get 3 and so on","La remise sera appliquée séquentiellement telque : acheter 1 => recupérer 1, acheter 2 => recupérer 2, acheter 3 => recupérer 3, etc..."
Period Settings,Paramètres de période,
Margin,Marge,
@@ -5600,7 +5551,7 @@
Received By,Reçu par,
Caller Information,Informations sur l'appelant,
Contact Name,Nom du Contact,
-Lead Name,Nom du Prospect,
+Lead Name,Nom du Lead,
Ringing,Sonnerie,
Missed,Manqué,
Call Duration in seconds,Durée d'appel en secondes,
@@ -5668,7 +5619,7 @@
Contract Template Fulfilment Terms,Conditions d'exécution du modèle de contrat,
Email Campaign,Campagne Email,
Email Campaign For ,Campagne d'email pour,
-Lead is an Organization,Le prospect est une organisation,
+Lead is an Organization,Le Lead est une organisation,
CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-,
Person Name,Nom de la Personne,
Lost Quotation,Devis Perdu,
@@ -5683,7 +5634,7 @@
Ends On,Se termine le,
Address & Contact,Adresse & Contact,
Mobile No.,N° Mobile.,
-Lead Type,Type de Prospect,
+Lead Type,Type de Lead,
Channel Partner,Partenaire de Canal,
Consultant,Consultant,
Market Segment,Part de Marché,
@@ -5706,7 +5657,7 @@
Potential Sales Deal,Ventes Potentielles,
CRM-OPP-.YYYY.-,CRM-OPP-YYYY.-,
Opportunity From,Opportunité De,
-Customer / Lead Name,Nom du Client / Prospect,
+Customer / Lead Name,Nom du Client / Lead,
Opportunity Type,Type d'Opportunité,
Converted By,Converti par,
Sales Stage,Stade de vente,
@@ -5716,7 +5667,7 @@
With Items,Avec Articles,
Probability (%),Probabilité (%),
Contact Info,Information du Contact,
-Customer / Lead Address,Adresse du Client / Prospect,
+Customer / Lead Address,Adresse du Lead / Prospect,
Contact Mobile No,N° de Portable du Contact,
Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l'enquête est une campagne,
Opportunity Date,Date d'Opportunité,
@@ -6438,7 +6389,6 @@
HR User,Chargé RH,
Appointment Letter,Lettre de nomination,
Job Applicant,Demandeur d'Emploi,
-Applicant Name,Nom du Candidat,
Appointment Date,Date de rendez-vous,
Appointment Letter Template,Modèle de lettre de nomination,
Body,Corps,
@@ -7060,99 +7010,12 @@
Sync in Progress,Synchronisation en cours,
Hub Seller Name,Nom du vendeur,
Custom Data,Données personnalisées,
-Member,Membre,
-Partially Disbursed,Partiellement Décaissé,
-Loan Closure Requested,Clôture du prêt demandée,
Repay From Salary,Rembourser avec le Salaire,
-Loan Details,Détails du Prêt,
-Loan Type,Type de Prêt,
-Loan Amount,Montant du Prêt,
-Is Secured Loan,Est un prêt garanti,
-Rate of Interest (%) / Year,Taux d'Intérêt (%) / Année,
-Disbursement Date,Date de Décaissement,
-Disbursed Amount,Montant décaissé,
-Is Term Loan,Est un prêt à terme,
-Repayment Method,Méthode de Remboursement,
-Repay Fixed Amount per Period,Rembourser un Montant Fixe par Période,
-Repay Over Number of Periods,Rembourser Sur le Nombre de Périodes,
-Repayment Period in Months,Période de Remboursement en Mois,
-Monthly Repayment Amount,Montant du Remboursement Mensuel,
-Repayment Start Date,Date de début du remboursement,
-Loan Security Details,Détails de la sécurité du prêt,
-Maximum Loan Value,Valeur maximale du prêt,
-Account Info,Information du Compte,
-Loan Account,Compte de prêt,
-Interest Income Account,Compte d'Intérêts Créditeurs,
-Penalty Income Account,Compte de revenu de pénalité,
-Repayment Schedule,Échéancier de Remboursement,
-Total Payable Amount,Montant Total Créditeur,
-Total Principal Paid,Total du capital payé,
-Total Interest Payable,Total des Intérêts à Payer,
-Total Amount Paid,Montant total payé,
-Loan Manager,Gestionnaire de prêts,
-Loan Info,Infos sur le Prêt,
-Rate of Interest,Taux d'Intérêt,
-Proposed Pledges,Engagements proposés,
-Maximum Loan Amount,Montant Max du Prêt,
-Repayment Info,Infos de Remboursement,
-Total Payable Interest,Total des Intérêts Créditeurs,
-Against Loan ,Contre prêt,
-Loan Interest Accrual,Accumulation des intérêts sur les prêts,
-Amounts,Les montants,
-Pending Principal Amount,Montant du capital en attente,
-Payable Principal Amount,Montant du capital payable,
-Paid Principal Amount,Montant du capital payé,
-Paid Interest Amount,Montant des intérêts payés,
-Process Loan Interest Accrual,Traitement des intérêts courus sur les prêts,
-Repayment Schedule Name,Nom du calendrier de remboursement,
Regular Payment,Paiement régulier,
Loan Closure,Clôture du prêt,
-Payment Details,Détails de paiement,
-Interest Payable,Intérêts payables,
-Amount Paid,Montant Payé,
-Principal Amount Paid,Montant du capital payé,
-Repayment Details,Détails du remboursement,
-Loan Repayment Detail,Détail du remboursement du prêt,
-Loan Security Name,Nom de la sécurité du prêt,
-Unit Of Measure,Unité de mesure,
-Loan Security Code,Code de sécurité du prêt,
-Loan Security Type,Type de garantie de prêt,
-Haircut %,La Coupe de cheveux %,
-Loan Details,Détails du prêt,
-Unpledged,Non promis,
-Pledged,Promis,
-Partially Pledged,Partiellement promis,
-Securities,Titres,
-Total Security Value,Valeur de sécurité totale,
-Loan Security Shortfall,Insuffisance de la sécurité des prêts,
-Loan ,Prêt,
-Shortfall Time,Temps de déficit,
-America/New_York,Amérique / New_York,
-Shortfall Amount,Montant du déficit,
-Security Value ,Valeur de sécurité,
-Process Loan Security Shortfall,Insuffisance de la sécurité des prêts de processus,
-Loan To Value Ratio,Ratio prêt / valeur,
-Unpledge Time,Désengager le temps,
-Loan Name,Nom du Prêt,
Rate of Interest (%) Yearly,Taux d'Intérêt (%) Annuel,
-Penalty Interest Rate (%) Per Day,Taux d'intérêt de pénalité (%) par jour,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Le taux d'intérêt de pénalité est prélevé quotidiennement sur le montant des intérêts en attente en cas de retard de remboursement,
-Grace Period in Days,Délai de grâce en jours,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Nombre de jours à compter de la date d'échéance jusqu'à laquelle la pénalité ne sera pas facturée en cas de retard dans le remboursement du prêt,
-Pledge,Gage,
-Post Haircut Amount,Montant de la coupe de cheveux,
-Process Type,Type de processus,
-Update Time,Temps de mise à jour,
-Proposed Pledge,Engagement proposé,
-Total Payment,Paiement Total,
-Balance Loan Amount,Solde du Montant du Prêt,
-Is Accrued,Est accumulé,
Salary Slip Loan,Avance sur salaire,
Loan Repayment Entry,Entrée de remboursement de prêt,
-Sanctioned Loan Amount,Montant du prêt sanctionné,
-Sanctioned Amount Limit,Limite de montant sanctionnée,
-Unpledge,Désengager,
-Haircut,la Coupe de cheveux,
MAT-MSH-.YYYY.-,MAT-MSH-YYYY.-,
Generate Schedule,Créer un Échéancier,
Schedules,Horaires,
@@ -7240,7 +7103,7 @@
Update latest price in all BOMs,Mettre à jour le prix le plus récent dans toutes les nomenclatures,
BOM Website Item,Article de nomenclature du Site Internet,
BOM Website Operation,Opération de nomenclature du Site Internet,
-Operation Time,Durée de l'Opération
+Operation Time,Durée de l'Opération,
PO-JOB.#####,PO-JOB. #####,
Timing Detail,Détail du timing,
Time Logs,Time Logs,
@@ -7480,15 +7343,15 @@
Project will be accessible on the website to these users,Le Projet sera accessible sur le site web à ces utilisateurs,
Copied From,Copié Depuis,
Start and End Dates,Dates de Début et de Fin,
-Actual Time (in Hours),Temps réel (en heures),
+Actual Time in Hours (via Timesheet),Temps réel (en heures),
Costing and Billing,Coûts et Facturation,
-Total Costing Amount (via Timesheets),Montant total des coûts (via les feuilles de temps),
-Total Expense Claim (via Expense Claims),Total des Notes de Frais (via Notes de Frais),
+Total Costing Amount (via Timesheet),Montant total des coûts (via les feuilles de temps),
+Total Expense Claim (via Expense Claim),Total des Notes de Frais (via Notes de Frais),
Total Purchase Cost (via Purchase Invoice),Coût d'Achat Total (via Facture d'Achat),
Total Sales Amount (via Sales Order),Montant total des ventes (via la commande client),
-Total Billable Amount (via Timesheets),Montant total facturable (via les feuilles de temps),
-Total Billed Amount (via Sales Invoices),Montant total facturé (via les factures de vente),
-Total Consumed Material Cost (via Stock Entry),Coût total du matériel consommé (via écriture de stock),
+Total Billable Amount (via Timesheet),Montant total facturable (via les feuilles de temps),
+Total Billed Amount (via Sales Invoice),Montant total facturé (via les factures de vente),
+Total Consumed Material Cost (via Stock Entry),Coût total du matériel consommé (via écriture de stock),
Gross Margin,Marge Brute,
Gross Margin %,Marge Brute %,
Monitor Progress,Suivre l'avancement,
@@ -7522,12 +7385,10 @@
Dependencies,Les dépendances,
Dependent Tasks,Tâches dépendantes,
Depends on Tasks,Dépend des Tâches,
-Actual Start Date (via Time Sheet),Date de Début Réelle (via la feuille de temps),
-Actual Time (in hours),Temps Réel (en Heures),
-Actual End Date (via Time Sheet),Date de Fin Réelle (via la Feuille de Temps),
-Total Costing Amount (via Time Sheet),Montant Total des Coûts (via Feuille de Temps),
+Actual Start Date (via Timesheet),Date de Début Réelle (via la feuille de temps),
+Actual Time in Hours (via Timesheet),Temps Réel (en Heures),
+Actual End Date (via Timesheet),Date de Fin Réelle (via la Feuille de Temps),
Total Expense Claim (via Expense Claim),Total des Notes de Frais (via Note de Frais),
-Total Billing Amount (via Time Sheet),Montant Total de Facturation (via Feuille de Temps),
Review Date,Date de Revue,
Closing Date,Date de Clôture,
Task Depends On,Tâche Dépend De,
@@ -7645,7 +7506,7 @@
Buyer of Goods and Services.,Acheteur des Biens et Services.,
CUST-.YYYY.-,CUST-.YYYY.-,
Default Company Bank Account,Compte bancaire d'entreprise par défaut,
-From Lead,Du Prospect,
+From Lead,Du Lead,
Account Manager,Gestionnaire de compte,
Allow Sales Invoice Creation Without Sales Order,Autoriser la création de factures de vente sans commande client,
Allow Sales Invoice Creation Without Delivery Note,Autoriser la création de factures de vente sans bon de livraison,
@@ -7672,7 +7533,7 @@
Installation Time,Temps d'Installation,
Installation Note Item,Article Remarque d'Installation,
Installed Qty,Qté Installée,
-Lead Source,Source du Prospect,
+Lead Source,Source du Lead,
Period Start Date,Date de début de la période,
Period End Date,Date de fin de la période,
Cashier,Caissier,
@@ -7888,7 +7749,6 @@
Update Series,Mettre à Jour les Séries,
Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.,
Prefix,Préfixe,
-Current Value,Valeur actuelle,
This is the number of the last created transaction with this prefix,Numéro de la dernière transaction créée avec ce préfixe,
Update Series Number,Mettre à Jour la Série,
Quotation Lost Reason,Raison de la Perte du Devis,
@@ -8517,10 +8377,8 @@
Items To Be Requested,Articles À Demander,
Reserved,Réservé,
Itemwise Recommended Reorder Level,Renouvellement Recommandé par Article,
-Lead Details,Détails du Prospect,
-Lead Owner Efficiency,Efficacité des Responsables des Prospects,
-Loan Repayment and Closure,Remboursement et clôture de prêts,
-Loan Security Status,État de la sécurité du prêt,
+Lead Details,Détails du Lead,
+Lead Owner Efficiency,Efficacité des Responsables des Leads,
Lost Opportunity,Occasion perdue,
Maintenance Schedules,Échéanciers d'Entretien,
Material Requests for which Supplier Quotations are not created,Demandes de Matériel dont les Devis Fournisseur ne sont pas créés,
@@ -8611,7 +8469,6 @@
Counts Targeted: {0},Nombre ciblé: {0},
Payment Account is mandatory,Le compte de paiement est obligatoire,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Si coché, le montant total sera déduit du revenu imposable avant le calcul de l'impôt sur le revenu sans aucune déclaration ou soumission de preuve.",
-Disbursement Details,Détails des décaissements,
Material Request Warehouse,Entrepôt de demande de matériel,
Select warehouse for material requests,Sélectionnez l'entrepôt pour les demandes de matériel,
Transfer Materials For Warehouse {0},Transférer des matériaux pour l'entrepôt {0},
@@ -8995,9 +8852,6 @@
Repay unclaimed amount from salary,Rembourser le montant non réclamé sur le salaire,
Deduction from salary,Déduction du salaire,
Expired Leaves,Feuilles expirées,
-Reference No,Numéro de référence,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Le pourcentage de coupe de cheveux est la différence en pourcentage entre la valeur marchande de la garantie de prêt et la valeur attribuée à cette garantie de prêt lorsqu'elle est utilisée comme garantie pour ce prêt.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Le ratio prêt / valeur exprime le rapport entre le montant du prêt et la valeur de la garantie mise en gage. Un déficit de garantie de prêt sera déclenché si celui-ci tombe en dessous de la valeur spécifiée pour un prêt,
If this is not checked the loan by default will be considered as a Demand Loan,"Si cette case n'est pas cochée, le prêt par défaut sera considéré comme un prêt à vue",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ce compte est utilisé pour enregistrer les remboursements de prêts de l'emprunteur et également pour décaisser les prêts à l'emprunteur,
This account is capital account which is used to allocate capital for loan disbursal account ,Ce compte est un compte de capital qui est utilisé pour allouer du capital au compte de décaissement du prêt,
@@ -9207,7 +9061,7 @@
From Posting Date,À partir de la date de publication,
To Posting Date,À la date de publication,
No records found,Aucun enregistrement trouvé,
-Customer/Lead Name,Nom du client / prospect,
+Customer/Lead Name,Nom du client / lead,
Unmarked Days,Jours non marqués,
Jan,Jan,
Feb,fév,
@@ -9461,17 +9315,10 @@
Operation {0} does not belong to the work order {1},L'opération {0} ne fait pas partie de l'ordre de fabrication {1},
Print UOM after Quantity,Imprimer UdM après la quantité,
Set default {0} account for perpetual inventory for non stock items,Définir le compte {0} par défaut pour l'inventaire permanent pour les articles hors stock,
-Loan Security {0} added multiple times,Garantie de prêt {0} ajoutée plusieurs fois,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Les titres de prêt avec un ratio LTV différent ne peuvent pas être mis en gage contre un prêt,
-Qty or Amount is mandatory for loan security!,La quantité ou le montant est obligatoire pour la garantie de prêt!,
-Only submittted unpledge requests can be approved,Seules les demandes de non-engagement soumises peuvent être approuvées,
-Interest Amount or Principal Amount is mandatory,Le montant des intérêts ou le capital est obligatoire,
-Disbursed Amount cannot be greater than {0},Le montant décaissé ne peut pas être supérieur à {0},
-Row {0}: Loan Security {1} added multiple times,Ligne {0}: Garantie de prêt {1} ajoutée plusieurs fois,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Ligne n ° {0}: l'élément enfant ne doit pas être un ensemble de produits. Veuillez supprimer l'élément {1} et enregistrer,
Credit limit reached for customer {0},Limite de crédit atteinte pour le client {0},
Could not auto create Customer due to the following missing mandatory field(s):,Impossible de créer automatiquement le client en raison du ou des champs obligatoires manquants suivants:,
-Please create Customer from Lead {0}.,Veuillez créer un client à partir du prospect {0}.,
+Please create Customer from Lead {0}.,Veuillez créer un client à partir du lead {0}.,
Mandatory Missing,Obligatoire manquant,
Please set Payroll based on in Payroll settings,Veuillez définir la paie en fonction des paramètres de paie,
Additional Salary: {0} already exist for Salary Component: {1} for period {2} and {3},Salaire supplémentaire: {0} existe déjà pour le composant de salaire: {1} pour la période {2} et {3},
@@ -9834,92 +9681,92 @@
Creating Purchase Order ...,Création d'une commande d'achat ...,
"Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only.","Sélectionnez un fournisseur parmi les fournisseurs par défaut des articles ci-dessous. Lors de la sélection, une commande d'achat sera effectué contre des articles appartenant uniquement au fournisseur sélectionné.",
Row #{}: You must select {} serial numbers for item {}.,Ligne n ° {}: vous devez sélectionner {} numéros de série pour l'article {}.,
-Update Rate as per Last Purchase,Mettre à jour avec les derniers prix d'achats
-Company Shipping Address,Adresse d'expédition
-Shipping Address Details,Détail d'adresse d'expédition
-Company Billing Address,Adresse de la société de facturation
+Update Rate as per Last Purchase,Mettre à jour avec les derniers prix d'achats,
+Company Shipping Address,Adresse d'expédition,
+Shipping Address Details,Détail d'adresse d'expédition,
+Company Billing Address,Adresse de la société de facturation,
Supplier Address Details,
-Bank Reconciliation Tool,Outil de réconcialiation d'écritures bancaires
-Supplier Contact,Contact fournisseur
-Subcontracting,Sous traitance
-Order Status,Statut de la commande
-Build,Personnalisations avancées
-Dispatch Address Name,Adresse de livraison intermédiaire
-Amount Eligible for Commission,Montant éligible à comission
-Grant Commission,Eligible aux commissions
-Stock Transactions Settings, Paramétre des transactions
-Role Allowed to Over Deliver/Receive, Rôle autorisé à dépasser cette limite
-Users with this role are allowed to over deliver/receive against orders above the allowance percentage,Rôle Utilisateur qui sont autorisé à livrée/commandé au-delà de la limite
-Over Transfer Allowance,Autorisation de limite de transfert
-Quality Inspection Settings,Paramétre de l'inspection qualité
-Action If Quality Inspection Is Rejected,Action si l'inspection qualité est rejetée
-Disable Serial No And Batch Selector,Désactiver le sélecteur de numéro de lot/série
-Is Rate Adjustment Entry (Debit Note),Est un justement du prix de la note de débit
-Issue a debit note with 0 qty against an existing Sales Invoice,Creer une note de débit avec une quatité à O pour la facture
-Control Historical Stock Transactions,Controle de l'historique des stransaction de stock
+Bank Reconciliation Tool,Outil de réconcialiation d'écritures bancaires,
+Supplier Contact,Contact fournisseur,
+Subcontracting,Sous traitance,
+Order Status,Statut de la commande,
+Build,Personnalisations avancées,
+Dispatch Address Name,Adresse de livraison intermédiaire,
+Amount Eligible for Commission,Montant éligible à comission,
+Grant Commission,Eligible aux commissions,
+Stock Transactions Settings, Paramétre des transactions,
+Role Allowed to Over Deliver/Receive, Rôle autorisé à dépasser cette limite,
+Users with this role are allowed to over deliver/receive against orders above the allowance percentage,Rôle Utilisateur qui sont autorisé à livrée/commandé au-delà de la limite,
+Over Transfer Allowance,Autorisation de limite de transfert,
+Quality Inspection Settings,Paramétre de l'inspection qualits,
+Action If Quality Inspection Is Rejected,Action si l'inspection qualité est rejetée,
+Disable Serial No And Batch Selector,Désactiver le sélecteur de numéro de lot/série,
+Is Rate Adjustment Entry (Debit Note),Est un justement du prix de la note de débit,
+Issue a debit note with 0 qty against an existing Sales Invoice,Creer une note de débit avec une quatité à O pour la facture,
+Control Historical Stock Transactions,Controle de l'historique des stransaction de stock,
No stock transactions can be created or modified before this date.,Aucune transaction ne peux être créée ou modifié avant cette date.
-Stock transactions that are older than the mentioned days cannot be modified.,Les transactions de stock plus ancienne que le nombre de jours ci-dessus ne peuvent être modifiées
-Role Allowed to Create/Edit Back-dated Transactions,Rôle autorisé à créer et modifier des transactions anti-datée
-"If mentioned, the system will allow only the users with this Role to create or modify any stock transaction earlier than the latest stock transaction for a specific item and warehouse. If set as blank, it allows all users to create/edit back-dated transactions.","Les utilisateur de ce role pourront creer et modifier des transactions dans le passé. Si vide tout les utilisateurs pourrons le faire"
-Auto Insert Item Price If Missing,Création du prix de l'article dans les listes de prix si abscent
-Update Existing Price List Rate,Mise a jour automatique du prix dans les listes de prix
-Show Barcode Field in Stock Transactions,Afficher le champ Code Barre dans les transactions de stock
-Convert Item Description to Clean HTML in Transactions,Convertir les descriptions d'articles en HTML valide lors des transactions
-Have Default Naming Series for Batch ID?,Nom de série par défaut pour les Lots ou Séries
+Stock transactions that are older than the mentioned days cannot be modified.,Les transactions de stock plus ancienne que le nombre de jours ci-dessus ne peuvent être modifiées,
+Role Allowed to Create/Edit Back-dated Transactions,Rôle autorisé à créer et modifier des transactions anti-datée,
+"If mentioned, the system will allow only the users with this Role to create or modify any stock transaction earlier than the latest stock transaction for a specific item and warehouse. If set as blank, it allows all users to create/edit back-dated transactions.",Les utilisateur de ce role pourront creer et modifier des transactions dans le passé. Si vide tout les utilisateurs pourrons le faire
+Auto Insert Item Price If Missing,Création du prix de l'article dans les listes de prix si abscent,
+Update Existing Price List Rate,Mise a jour automatique du prix dans les listes de prix,
+Show Barcode Field in Stock Transactions,Afficher le champ Code Barre dans les transactions de stock,
+Convert Item Description to Clean HTML in Transactions,Convertir les descriptions d'articles en HTML valide lors des transactions,
+Have Default Naming Series for Batch ID?,Nom de série par défaut pour les Lots ou Séries,
"The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units","Le pourcentage de quantité que vous pourrez réceptionner en plus de la quantité commandée. Par exemple, vous avez commandé 100 unités, votre pourcentage de dépassement est de 10%, vous pourrez réceptionner 110 unités"
-Allowed Items,Articles autorisés
-Party Specific Item,Restriction d'article disponible
-Restrict Items Based On,Type de critére de restriction
-Based On Value,critére de restriction
+Allowed Items,Articles autorisés,
+Party Specific Item,Restriction d'article disponible,
+Restrict Items Based On,Type de critére de restriction,
+Based On Value,critére de restriction,
Unit of Measure (UOM),Unité de mesure (UdM),
Unit Of Measure (UOM),Unité de mesure (UdM),
-CRM Settings,Paramètres CRM
-Do Not Explode,Ne pas décomposer
-Quick Access, Accés rapides
-{} Available,{} Disponible.s
-{} Pending,{} En attente.s
-{} To Bill,{} à facturer
-{} To Receive,{} A recevoir
+CRM Settings,Paramètres CRM,
+Do Not Explode,Ne pas décomposer,
+Quick Access, Accés rapides,
+{} Available,{} Disponible.s,
+{} Pending,{} En attente.s,
+{} To Bill,{} à facturer,
+{} To Receive,{} A recevoir,
{} Active,{} Actif.ve(s)
{} Open,{} Ouvert.e(s)
-Incorrect Data Report,Rapport de données incohérentes
-Incorrect Serial No Valuation,Valorisation inccorecte par Num. Série / Lots
-Incorrect Balance Qty After Transaction,Equilibre des quantités aprés une transaction
-Interview Type,Type d'entretien
-Interview Round,Cycle d'entretien
-Interview,Entretien
-Interview Feedback,Retour d'entretien
-Journal Energy Point,Historique des points d'énergies
+Incorrect Data Report,Rapport de données incohérentes,
+Incorrect Serial No Valuation,Valorisation inccorecte par Num. Série / Lots,
+Incorrect Balance Qty After Transaction,Equilibre des quantités aprés une transaction,
+Interview Type,Type d'entretien,
+Interview Round,Cycle d'entretien,
+Interview,Entretien,
+Interview Feedback,Retour d'entretien,
+Journal Energy Point,Historique des points d'énergies,
Billing Address Details,Adresse de facturation (détails)
Supplier Address Details,Adresse Fournisseur (détails)
-Retail,Commerce
-Users,Utilisateurs
-Permission Manager,Gestion des permissions
-Fetch Timesheet,Récuprer les temps saisis
-Get Supplier Group Details,Appliquer les informations depuis le Groupe de fournisseur
-Quality Inspection(s),Inspection(s) Qualité
-Set Advances and Allocate (FIFO),Affecter les encours au réglement
-Apply Putaway Rule,Appliquer la régle de routage d'entrepot
-Delete Transactions,Supprimer les transactions
-Default Payment Discount Account,Compte par défaut des paiements de remise
-Unrealized Profit / Loss Account,Compte de perte
-Enable Provisional Accounting For Non Stock Items,Activer la provision pour les articles non stockés
-Publish in Website,Publier sur le Site Web
-List View,Vue en liste
-Allow Excess Material Transfer,Autoriser les transfert de stock supérieurs à l'attendue
-Allow transferring raw materials even after the Required Quantity is fulfilled,Autoriser les transfert de matiéres premiére mais si la quantité requise est atteinte
-Add Corrective Operation Cost in Finished Good Valuation,Ajouter des opérations de correction de coût pour la valorisation des produits finis
-Make Serial No / Batch from Work Order,Générer des numéros de séries / lots depuis les Ordres de Fabrications
-System will automatically create the serial numbers / batch for the Finished Good on submission of work order,le systéme va créer des numéros de séries / lots à la validation des produit finis depuis les Ordres de Fabrications
-Allow material consumptions without immediately manufacturing finished goods against a Work Order,Autoriser la consommation sans immédiatement fabriqué les produit fini dans les ordres de fabrication
-Quality Inspection Parameter,Paramétre des Inspection Qualité
-Parameter Group,Groupe de paramétre
-E Commerce Settings,Paramétrage E-Commerce
-Follow these steps to create a landing page for your store:,Suivez les intructions suivantes pour créer votre page d'accueil de boutique en ligne
-Show Price in Quotation,Afficher les prix sur les devis
-Add-ons,Extensions
-Enable Wishlist,Activer la liste de souhaits
-Enable Reviews and Ratings,Activer les avis et notes
-Enable Recommendations,Activer les recommendations
-Item Search Settings,Paramétrage de la recherche d'article
-Purchase demande,Demande de materiel
+Retail,Commerce,
+Users,Utilisateurs,
+Permission Manager,Gestion des permissions,
+Fetch Timesheet,Récuprer les temps saisis,
+Get Supplier Group Details,Appliquer les informations depuis le Groupe de fournisseur,
+Quality Inspection(s),Inspection(s) Qualite,
+Set Advances and Allocate (FIFO),Affecter les encours au réglement,
+Apply Putaway Rule,Appliquer la régle de routage d'entrepot,
+Delete Transactions,Supprimer les transactions,
+Default Payment Discount Account,Compte par défaut des paiements de remise,
+Unrealized Profit / Loss Account,Compte de perte,
+Enable Provisional Accounting For Non Stock Items,Activer la provision pour les articles non stockés,
+Publish in Website,Publier sur le Site Web,
+List View,Vue en liste,
+Allow Excess Material Transfer,Autoriser les transfert de stock supérieurs à l'attendue,
+Allow transferring raw materials even after the Required Quantity is fulfilled,Autoriser les transfert de matiéres premiére mais si la quantité requise est atteinte,
+Add Corrective Operation Cost in Finished Good Valuation,Ajouter des opérations de correction de coût pour la valorisation des produits finis,
+Make Serial No / Batch from Work Order,Générer des numéros de séries / lots depuis les Ordres de Fabrications,
+System will automatically create the serial numbers / batch for the Finished Good on submission of work order,le systéme va créer des numéros de séries / lots à la validation des produit finis depuis les Ordres de Fabrications,
+Allow material consumptions without immediately manufacturing finished goods against a Work Order,Autoriser la consommation sans immédiatement fabriqué les produit fini dans les ordres de fabrication,
+Quality Inspection Parameter,Paramétre des Inspection Qualite,
+Parameter Group,Groupe de paramétre,
+E Commerce Settings,Paramétrage E-Commerce,
+Follow these steps to create a landing page for your store:,Suivez les intructions suivantes pour créer votre page d'accueil de boutique en ligne,
+Show Price in Quotation,Afficher les prix sur les devis,
+Add-ons,Extensions,
+Enable Wishlist,Activer la liste de souhaits,
+Enable Reviews and Ratings,Activer les avis et notes,
+Enable Recommendations,Activer les recommendations,
+Item Search Settings,Paramétrage de la recherche d'article,
+Purchase demande,Demande de materiel,
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index b26d2f3..f229e3b 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","જો કંપની એસપીએ, એસપીએ અથવા એસઆરએલ હોય તો લાગુ પડે છે",
Applicable if the company is a limited liability company,જો કંપની મર્યાદિત જવાબદારીવાળી કંપની હોય તો લાગુ,
Applicable if the company is an Individual or a Proprietorship,જો કંપની વ્યક્તિગત અથવા માલિકીની કંપની હોય તો તે લાગુ પડે છે,
-Applicant,અરજદાર,
-Applicant Type,અરજદારનો પ્રકાર,
Application of Funds (Assets),ફંડ (અસ્ક્યામત) અરજી,
Application period cannot be across two allocation records,એપ્લિકેશન સમયગાળો બે ફાળવણી રેકોર્ડ્સમાં ન હોઈ શકે,
Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ફોલિયો નંબરો ધરાવતા ઉપલબ્ધ શેરધારકોની સૂચિ,
Loading Payment System,ચુકવણી સિસ્ટમ લોડ કરી રહ્યું છે,
Loan,લોન,
-Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0},
-Loan Application,લોન અરજી,
-Loan Management,લોન મેનેજમેન્ટ,
-Loan Repayment,લોન ચુકવણી,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ઇન્વoiceઇસ ડિસ્કાઉન્ટિંગને બચાવવા માટે લોન પ્રારંભ તારીખ અને લોનનો સમયગાળો ફરજિયાત છે,
Loans (Liabilities),લોન્સ (જવાબદારીઓ),
Loans and Advances (Assets),લોન અને એડવાન્સિસ (અસ્ક્યામત),
@@ -1611,7 +1605,6 @@
Monday,સોમવારે,
Monthly,માસિક,
Monthly Distribution,માસિક વિતરણ,
-Monthly Repayment Amount cannot be greater than Loan Amount,માસિક ચુકવણી રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે,
More,વધુ,
More Information,વધુ મહિતી,
More than one selection for {0} not allowed,{0} માટે એક કરતા વધુ પસંદગીની મંજૂરી નથી,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} પે,
Payable,ચૂકવવાપાત્ર,
Payable Account,ચૂકવવાપાત્ર એકાઉન્ટ,
-Payable Amount,ચૂકવવાપાત્ર રકમ,
Payment,ચુકવણી,
Payment Cancelled. Please check your GoCardless Account for more details,ચૂકવણી રદ કરી વધુ વિગતો માટે કૃપા કરીને તમારા GoCardless એકાઉન્ટને તપાસો,
Payment Confirmation,ચુકવણી પુષ્ટિકરણ,
-Payment Date,ચુકવણીની તારીખ,
Payment Days,ચુકવણી દિવસ,
Payment Document,ચુકવણી દસ્તાવેજ,
Payment Due Date,ચુકવણી કારણે તારીખ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,પ્રથમ ખરીદી રસીદ દાખલ કરો,
Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો,
Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો,
-Please enter Repayment Periods,ચુકવણી કાળ દાખલ કરો,
Please enter Reqd by Date,તારીખ દ્વારા Reqd દાખલ કરો,
Please enter Woocommerce Server URL,Woocommerce સર્વર URL દાખલ કરો,
Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,પિતૃ ખર્ચ કેન્દ્રને દાખલ કરો,
Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0},
Please enter relieving date.,તારીખ રાહત દાખલ કરો.,
-Please enter repayment Amount,ચુકવણી રકમ દાખલ કરો,
Please enter valid Financial Year Start and End Dates,માન્ય નાણાકીય વર્ષ શરૂઆત અને અંતિમ તારીખ દાખલ કરો,
Please enter valid email address,કૃપા કરીને માન્ય ઇમેઇલ સરનામું દાખલ,
Please enter {0} first,પ્રથમ {0} દાખલ કરો,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,પ્રાઇસીંગ નિયમો વધુ જથ્થો પર આધારિત ફિલ્ટર કરવામાં આવે છે.,
Primary Address Details,પ્રાથમિક સરનામું વિગતો,
Primary Contact Details,પ્રાથમિક સંપર્ક વિગતો,
-Principal Amount,મુખ્ય રકમ,
Print Format,પ્રિન્ટ ફોર્મેટ,
Print IRS 1099 Forms,આઈઆરએસ 1099 ફોર્મ છાપો,
Print Report Card,રિપોર્ટ કાર્ડ છાપો,
@@ -2550,7 +2538,6 @@
Sample Collection,નમૂનાનો સંગ્રહ,
Sample quantity {0} cannot be more than received quantity {1},નમૂના જથ્થો {0} પ્રાપ્ત જથ્થા કરતા વધુ હોઈ શકતી નથી {1},
Sanctioned,મંજૂર,
-Sanctioned Amount,મંજુર રકમ,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,મંજુર રકમ રો દાવો રકમ કરતાં વધારે ન હોઈ શકે {0}.,
Sand,રેતી,
Saturday,શનિવારે,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} પાસે પહેલેથી જ પિતૃ કાર્યવાહી છે {1}.,
API,API,
Annual,વાર્ષિક,
-Approved,મંજૂર,
Change,બદલો,
Contact Email,સંપર્ક ઇમેઇલ,
Export Type,નિકાસ પ્રકાર,
@@ -3571,7 +3557,6 @@
Account Value,ખાતાનું મૂલ્ય,
Account is mandatory to get payment entries,ચુકવણી પ્રવેશો મેળવવા માટે એકાઉન્ટ ફરજિયાત છે,
Account is not set for the dashboard chart {0},ડેશબોર્ડ ચાર્ટ Account 0 for માટે એકાઉન્ટ સેટ નથી,
-Account {0} does not belong to company {1},એકાઉન્ટ {0} કંપની ને અનુલક્ષતું નથી {1},
Account {0} does not exists in the dashboard chart {1},એકાઉન્ટ {0 the ડેશબોર્ડ ચાર્ટ exists 1} માં અસ્તિત્વમાં નથી,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,એકાઉન્ટ: <b>{0</b> એ મૂડીનું કાર્ય પ્રગતિમાં છે અને જર્નલ એન્ટ્રી દ્વારા અપડેટ કરી શકાતું નથી,
Account: {0} is not permitted under Payment Entry,એકાઉન્ટ: ment 0 ની ચુકવણી એન્ટ્રી હેઠળ મંજૂરી નથી,
@@ -3582,7 +3567,6 @@
Activity,પ્રવૃત્તિ,
Add / Manage Email Accounts.,ઇમેઇલ એકાઉન્ટ્સ મેનેજ / ઉમેરો.,
Add Child,બાળ ઉમેરો,
-Add Loan Security,લોન સુરક્ષા ઉમેરો,
Add Multiple,મલ્ટીપલ ઉમેરો,
Add Participants,સહભાગીઓ ઉમેરો,
Add to Featured Item,ફીચર્ડ આઇટમમાં ઉમેરો,
@@ -3593,15 +3577,12 @@
Address Line 1,સરનામાં રેખા 1,
Addresses,સરનામાંઓ,
Admission End Date should be greater than Admission Start Date.,પ્રવેશ સમાપ્તિ તારીખ પ્રવેશ પ્રારંભ તારીખ કરતા મોટી હોવી જોઈએ.,
-Against Loan,લોનની સામે,
-Against Loan:,લોન સામે:,
All,બધા,
All bank transactions have been created,તમામ બેંક વ્યવહાર બનાવવામાં આવ્યા છે,
All the depreciations has been booked,તમામ અવમૂલ્યન બુક કરાયા છે,
Allocation Expired!,ફાળવણી સમાપ્ત!,
Allow Resetting Service Level Agreement from Support Settings.,સપોર્ટ સેટિંગ્સથી સેવા સ્તરના કરારને ફરીથી સેટ કરવાની મંજૂરી આપો.,
Amount of {0} is required for Loan closure,લોન બંધ કરવા માટે {0} ની રકમ આવશ્યક છે,
-Amount paid cannot be zero,ચૂકવેલ રકમ શૂન્ય હોઈ શકતી નથી,
Applied Coupon Code,લાગુ કુપન કોડ,
Apply Coupon Code,કૂપન કોડ લાગુ કરો,
Appointment Booking,નિમણૂક બુકિંગ,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ડ્રાઇવર સરનામું ખૂટે છે તેથી આગમન સમયની ગણતરી કરી શકાતી નથી.,
Cannot Optimize Route as Driver Address is Missing.,ડ્રાઇવર સરનામું ખૂટે હોવાથી રૂટને Opપ્ટિમાઇઝ કરી શકાતો નથી.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,કાર્ય {0 complete પૂર્ણ કરી શકાતું નથી કારણ કે તેના આશ્રિત કાર્ય {1} કમ્પ્પ્લેટ / રદ નથી.,
-Cannot create loan until application is approved,એપ્લિકેશન મંજૂર થાય ત્યાં સુધી લોન બનાવી શકાતી નથી,
Cannot find a matching Item. Please select some other value for {0}.,બંધબેસતા વસ્તુ શોધી શકાતો નથી. માટે {0} કેટલીક અન્ય કિંમત પસંદ કરો.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","પંક્તિ I 1} tem 2} કરતા વધારે આઇટમ {0 for માટે ઓવરબિલ આપી શકાતી નથી. ઓવર-બિલિંગને મંજૂરી આપવા માટે, કૃપા કરીને એકાઉન્ટ્સ સેટિંગ્સમાં ભથ્થું સેટ કરો",
"Capacity Planning Error, planned start time can not be same as end time","ક્ષમતા આયોજન ભૂલ, આયોજિત પ્રારંભ સમય સમાપ્ત સમય જેટલો હોઈ શકે નહીં",
@@ -3812,20 +3792,9 @@
Less Than Amount,રકમ કરતા ઓછી,
Liabilities,જવાબદારીઓ,
Loading...,લોડ કરી રહ્યું છે ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,સૂચિત સિક્યોરિટીઝ અનુસાર લોનની રકમ loan 0 maximum ની મહત્તમ લોનની રકમ કરતાં વધી ગઈ છે,
Loan Applications from customers and employees.,ગ્રાહકો અને કર્મચારીઓ પાસેથી લોન એપ્લિકેશન.,
-Loan Disbursement,લોન વિતરણ,
Loan Processes,લોન પ્રક્રિયાઓ,
-Loan Security,લોન સુરક્ષા,
-Loan Security Pledge,લોન સુરક્ષા પ્રતિજ્ .ા,
-Loan Security Pledge Created : {0},લોન સુરક્ષા પ્રતિજ્ Creા બનાવેલ: {0},
-Loan Security Price,લોન સુરક્ષા કિંમત,
-Loan Security Price overlapping with {0},લોન સુરક્ષા કિંમત {0 an સાથે ઓવરલેપિંગ,
-Loan Security Unpledge,લોન સુરક્ષા અનપ્લેજ,
-Loan Security Value,લોન સુરક્ષા મૂલ્ય,
Loan Type for interest and penalty rates,વ્યાજ અને દંડ દરો માટે લોનનો પ્રકાર,
-Loan amount cannot be greater than {0},લોનની રકમ {0 than કરતા વધારે ન હોઈ શકે,
-Loan is mandatory,લોન ફરજિયાત છે,
Loans,લોન,
Loans provided to customers and employees.,ગ્રાહકો અને કર્મચારીઓને આપવામાં આવતી લોન.,
Location,સ્થાન,
@@ -3894,7 +3863,6 @@
Pay,પે,
Payment Document Type,ચુકવણી દસ્તાવેજ પ્રકાર,
Payment Name,ચુકવણી નામ,
-Penalty Amount,પેનલ્ટી રકમ,
Pending,બાકી,
Performance,પ્રદર્શન,
Period based On,પીરિયડ ચાલુ,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,કૃપા કરીને આ આઇટમને સંપાદિત કરવા માટે બજારના વપરાશકર્તા તરીકે લ Userગિન કરો.,
Please login as a Marketplace User to report this item.,કૃપા કરીને આ આઇટમની જાણ કરવા માટે બજારના વપરાશકર્તા તરીકે લ Userગિન કરો.,
Please select <b>Template Type</b> to download template,કૃપા કરીને નમૂના ડાઉનલોડ કરવા માટે <b>Templateાંચો પ્રકાર</b> પસંદ કરો,
-Please select Applicant Type first,કૃપા કરીને પહેલા અરજદાર પ્રકાર પસંદ કરો,
Please select Customer first,કૃપા કરીને પહેલા ગ્રાહક પસંદ કરો,
Please select Item Code first,કૃપા કરીને પહેલા આઇટમ કોડ પસંદ કરો,
-Please select Loan Type for company {0},કૃપા કરી કંપની Lo 0} માટે લોનનો પ્રકાર પસંદ કરો,
Please select a Delivery Note,કૃપા કરીને ડિલિવરી નોટ પસંદ કરો,
Please select a Sales Person for item: {0},કૃપા કરીને આઇટમ માટે વેચાણ વ્યક્તિ પસંદ કરો: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',કૃપા કરીને બીજી ચુકવણી પદ્ધતિ પસંદ કરો. ગેરુનો ચલણ વ્યવહારો ટેકો આપતાં નથી '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},કૃપા કરીને કંપની for 0} માટે ડિફ defaultલ્ટ બેંક એકાઉન્ટ સેટ કરો.,
Please specify,કૃપયા ચોક્કસ ઉલ્લેખ કરો,
Please specify a {0},કૃપા કરી {0 specify નો ઉલ્લેખ કરો,lead
-Pledge Status,પ્રતિજ્ Statusાની સ્થિતિ,
-Pledge Time,પ્રતિજ્ Timeા સમય,
Printing,પ્રિન્ટિંગ,
Priority,પ્રાધાન્યતા,
Priority has been changed to {0}.,પ્રાધાન્યતાને બદલીને {0} કરી દેવામાં આવી છે.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML ફાઇલો પર પ્રક્રિયા કરી રહ્યું છે,
Profitability,નફાકારકતા,
Project,પ્રોજેક્ટ,
-Proposed Pledges are mandatory for secured Loans,સુરક્ષિત લોન માટે સૂચિત વચનો ફરજિયાત છે,
Provide the academic year and set the starting and ending date.,શૈક્ષણિક વર્ષ પ્રદાન કરો અને પ્રારંભિક અને અંતિમ તારીખ સેટ કરો.,
Public token is missing for this bank,આ બેંક માટે સાર્વજનિક ટોકન ખૂટે છે,
Publish,પ્રકાશિત કરો,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,ખરીદીની રસીદમાં એવી કોઈ આઇટમ હોતી નથી જેના માટે ફરીથી જાળવવાનો નમૂના સક્ષમ છે.,
Purchase Return,ખરીદી પરત,
Qty of Finished Goods Item,સમાપ્ત માલની આઇટમની માત્રા,
-Qty or Amount is mandatroy for loan security,લોન સિક્યુરિટી માટે ક્વોટી અથવા એમાઉન્ટ મેન્ડેટ્રોય છે,
Quality Inspection required for Item {0} to submit,સબમિટ કરવા માટે આઇટમ {0} માટે ગુણવત્તા નિરીક્ષણ આવશ્યક છે,
Quantity to Manufacture,ઉત્પાદનની માત્રા,
Quantity to Manufacture can not be zero for the operation {0},Manufacture 0} કામગીરી માટે ઉત્પાદનની માત્રા શૂન્ય હોઈ શકતી નથી,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,રાહત આપવાની તારીખ જોડાવાની તારીખથી મોટી અથવા તેના જેટલી હોવી જોઈએ,
Rename,નામ બદલો,
Rename Not Allowed,નામ બદલી મંજૂરી નથી,
-Repayment Method is mandatory for term loans,ટર્મ લોન માટે ચુકવણીની પદ્ધતિ ફરજિયાત છે,
-Repayment Start Date is mandatory for term loans,ટર્મ લોન માટે ચુકવણીની શરૂઆત તારીખ ફરજિયાત છે,
Report Item,રિપોર્ટ આઇટમ,
Report this Item,આ આઇટમની જાણ કરો,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,સબકોન્ટ્રેક્ટ માટે રિઝર્વેટેડ ક્વોટી: પેટા કોન્ટ્રેક્ટ વસ્તુઓ બનાવવા માટે કાચા માલનો જથ્થો.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},પંક્તિ ({0}): {1 પહેલેથી જ {2 ounted માં ડિસ્કાઉન્ટ છે,
Rows Added in {0},પંક્તિઓ {0 in માં ઉમેરી,
Rows Removed in {0},પંક્તિઓ {0 in માં દૂર કરી,
-Sanctioned Amount limit crossed for {0} {1},મંજૂરી રકમની મર્યાદા {0} {1} માટે ઓળંગી ગઈ,
-Sanctioned Loan Amount already exists for {0} against company {1},કંપની {1} સામે Lo 0 for માટે મંજૂર લોનની રકમ પહેલાથી અસ્તિત્વમાં છે,
Save,સેવ કરો,
Save Item,આઇટમ સાચવો,
Saved Items,સાચવેલ વસ્તુઓ,
@@ -4135,7 +4093,6 @@
User {0} is disabled,વપરાશકર્તા {0} અક્ષમ છે,
Users and Permissions,વપરાશકર્તાઓ અને પરવાનગીઓ,
Vacancies cannot be lower than the current openings,ખાલી જગ્યાઓ વર્તમાન ઉદઘાટન કરતા ઓછી હોઈ શકતી નથી,
-Valid From Time must be lesser than Valid Upto Time.,માન્યથી ભાવ સમય સુધી માન્ય કરતા ઓછા હોવા જોઈએ.,
Valuation Rate required for Item {0} at row {1},પંક્તિ {1} પર આઇટમ {0} માટે મૂલ્ય દર જરૂરી છે,
Values Out Of Sync,સમન્વયનના મૂલ્યો,
Vehicle Type is required if Mode of Transport is Road,જો મોડનો ટ્રાન્સપોર્ટ માર્ગ હોય તો વાહનનો પ્રકાર આવશ્યક છે,
@@ -4211,7 +4168,6 @@
Add to Cart,સૂચી માં સામેલ કરો,
Days Since Last Order,છેલ્લા ઓર્ડર પછીના દિવસો,
In Stock,ઉપલબ્ધ છે,
-Loan Amount is mandatory,લોનની રકમ ફરજિયાત છે,
Mode Of Payment,ચૂકવણીની પદ્ધતિ,
No students Found,કોઈ વિદ્યાર્થી મળી નથી,
Not in Stock,સ્ટોક નથી,
@@ -4240,7 +4196,6 @@
Group by,ગ્રુપ દ્વારા,
In stock,ઉપલબ્ધ છે,
Item name,વસ્તુ નામ,
-Loan amount is mandatory,લોનની રકમ ફરજિયાત છે,
Minimum Qty,ન્યૂનતમ જથ્થો,
More details,વધુ વિગતો,
Nature of Supplies,પુરવઠા પ્રકૃતિ,
@@ -4409,9 +4364,6 @@
Total Completed Qty,કુલ પૂર્ણ સંખ્યા,
Qty to Manufacture,ઉત્પાદન Qty,
Repay From Salary can be selected only for term loans,પગારમાંથી ચૂકવણીની રકમ ફક્ત ટર્મ લોન માટે જ પસંદ કરી શકાય છે,
-No valid Loan Security Price found for {0},Valid 0 for માટે કોઈ માન્ય લોન સુરક્ષા કિંમત મળી નથી,
-Loan Account and Payment Account cannot be same,લોન એકાઉન્ટ અને ચુકવણી એકાઉન્ટ સમાન હોઇ શકે નહીં,
-Loan Security Pledge can only be created for secured loans,સુરક્ષિત લોન માટે જ લોન સિક્યુરિટી પ્લેજ બનાવી શકાય છે,
Social Media Campaigns,સોશિયલ મીડિયા અભિયાનો,
From Date can not be greater than To Date,તારીખથી તારીખ કરતાં વધુ ન હોઈ શકે,
Please set a Customer linked to the Patient,કૃપા કરીને પેશન્ટ સાથે જોડાયેલ ગ્રાહક સેટ કરો,
@@ -6437,7 +6389,6 @@
HR User,એચઆર વપરાશકર્તા,
Appointment Letter,નિમણૂક પત્ર,
Job Applicant,જોબ અરજદાર,
-Applicant Name,અરજદારનું નામ,
Appointment Date,નિમણૂક તારીખ,
Appointment Letter Template,નિમણૂક પત્ર Templateાંચો,
Body,શરીર,
@@ -7059,99 +7010,12 @@
Sync in Progress,પ્રગતિ સમન્વયન,
Hub Seller Name,હબ વિક્રેતા નામ,
Custom Data,કસ્ટમ ડેટા,
-Member,સભ્ય,
-Partially Disbursed,આંશિક વિતરિત,
-Loan Closure Requested,લોન બંધ કરવાની વિનંતી,
Repay From Salary,પગારની ચુકવણી,
-Loan Details,લોન વિગતો,
-Loan Type,લોન પ્રકાર,
-Loan Amount,લોન રકમ,
-Is Secured Loan,સુરક્ષિત લોન છે,
-Rate of Interest (%) / Year,વ્યાજ (%) / વર્ષ દર,
-Disbursement Date,વહેંચણી તારીખ,
-Disbursed Amount,વિતરિત રકમ,
-Is Term Loan,ટર્મ લોન છે,
-Repayment Method,ચુકવણી પદ્ધતિ,
-Repay Fixed Amount per Period,ચુકવણી સમય દીઠ નિશ્ચિત રકમ,
-Repay Over Number of Periods,ચુકવણી બોલ કાળ સંખ્યા,
-Repayment Period in Months,મહિના ચુકવણી સમય,
-Monthly Repayment Amount,માસિક ચુકવણી રકમ,
-Repayment Start Date,ચુકવણી પ્રારંભ તારીખ,
-Loan Security Details,લોન સુરક્ષા વિગતો,
-Maximum Loan Value,મહત્તમ લોન મૂલ્ય,
-Account Info,એકાઉન્ટ માહિતી,
-Loan Account,લોન એકાઉન્ટ,
-Interest Income Account,વ્યાજની આવક એકાઉન્ટ,
-Penalty Income Account,પેનલ્ટી આવક ખાતું,
-Repayment Schedule,ચુકવણી શેડ્યૂલ,
-Total Payable Amount,કુલ ચૂકવવાપાત્ર રકમ,
-Total Principal Paid,કુલ આચાર્ય ચૂકવેલ,
-Total Interest Payable,ચૂકવવાપાત્ર કુલ વ્યાજ,
-Total Amount Paid,ચુકવેલ કુલ રકમ,
-Loan Manager,લોન મેનેજર,
-Loan Info,લોન માહિતી,
-Rate of Interest,વ્યાજ દર,
-Proposed Pledges,સૂચિત વચનો,
-Maximum Loan Amount,મહત્તમ લોન રકમ,
-Repayment Info,ચુકવણી માહિતી,
-Total Payable Interest,કુલ ચૂકવવાપાત્ર વ્યાજ,
-Against Loan ,લોનની સામે,
-Loan Interest Accrual,લોન ઇન્ટરેસ્ટ એક્યુઅલ,
-Amounts,રકમ,
-Pending Principal Amount,બાકી રહેલ મુખ્ય રકમ,
-Payable Principal Amount,ચૂકવવાપાત્ર પ્રિન્સિપાલ રકમ,
-Paid Principal Amount,ચૂકવેલ આચાર્ય રકમ,
-Paid Interest Amount,ચૂકવેલ વ્યાજની રકમ,
-Process Loan Interest Accrual,પ્રોસેસ લોન ઇન્ટરેસ્ટ એક્યુઅલ,
-Repayment Schedule Name,ચુકવણી સૂચિ નામ,
Regular Payment,નિયમિત ચુકવણી,
Loan Closure,લોન બંધ,
-Payment Details,ચુકવણી વિગતો,
-Interest Payable,વ્યાજ ચૂકવવાપાત્ર,
-Amount Paid,રકમ ચૂકવવામાં,
-Principal Amount Paid,આચાર્ય રકમ ચૂકવેલ,
-Repayment Details,ચુકવણીની વિગતો,
-Loan Repayment Detail,લોન ચુકવણીની વિગત,
-Loan Security Name,લોન સુરક્ષા નામ,
-Unit Of Measure,માપ નો એકમ,
-Loan Security Code,લોન સુરક્ષા કોડ,
-Loan Security Type,લોન સુરક્ષા પ્રકાર,
-Haircut %,હેરકટ%,
-Loan Details,લોન વિગતો,
-Unpledged,બિનહરીફ,
-Pledged,પ્રતિજ્ .ા લીધી,
-Partially Pledged,આંશિક પ્રતિજ્ .ા,
-Securities,સિક્યોરિટીઝ,
-Total Security Value,કુલ સુરક્ષા મૂલ્ય,
-Loan Security Shortfall,લોન સુરક્ષાની કમી,
-Loan ,લોન,
-Shortfall Time,શોર્ટફોલ સમય,
-America/New_York,અમેરિકા / ન્યુ યોર્ક,
-Shortfall Amount,ખોટ રકમ,
-Security Value ,સુરક્ષા મૂલ્ય,
-Process Loan Security Shortfall,પ્રક્રિયા લોન સુરક્ષાની ઉણપ,
-Loan To Value Ratio,લોન ટુ વેલ્યુ રેશિયો,
-Unpledge Time,અનપ્લેજ સમય,
-Loan Name,લોન નામ,
Rate of Interest (%) Yearly,વ્યાજ દર (%) વાર્ષિક,
-Penalty Interest Rate (%) Per Day,દંડ વ્યાજ દર (%) દીઠ,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,વિલંબિત ચુકવણીના કિસ્સામાં દૈનિક ધોરણે બાકી વ્યાજની રકમ પર પેનલ્ટી વ્યાજ દર વસૂલવામાં આવે છે,
-Grace Period in Days,દિવસોમાં ગ્રેસ પીરિયડ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,નિયત તારીખથી દિવસોની સંખ્યા કે જે લોન ચુકવણીમાં વિલંબના કિસ્સામાં પેનલ્ટી વસૂલશે નહીં,
-Pledge,પ્રતિજ્ .ા,
-Post Haircut Amount,વાળ કાપવાની રકમ,
-Process Type,પ્રક્રિયા પ્રકાર,
-Update Time,સુધારો સમય,
-Proposed Pledge,પ્રસ્તાવિત પ્રતિજ્ .ા,
-Total Payment,કુલ ચુકવણી,
-Balance Loan Amount,બેલેન્સ લોન રકમ,
-Is Accrued,સંચિત થાય છે,
Salary Slip Loan,પગાર કાપલી લોન,
Loan Repayment Entry,લોન ચુકવણીની એન્ટ્રી,
-Sanctioned Loan Amount,મંજૂરી લોન રકમ,
-Sanctioned Amount Limit,માન્ય રકમ મર્યાદા,
-Unpledge,અણધાર્યો,
-Haircut,હેરકટ,
MAT-MSH-.YYYY.-,એમએટી-એમએસએચ-વાય.વાય.વાય.-,
Generate Schedule,સૂચિ બનાવો,
Schedules,ફ્લાઈટ શેડ્યુલ,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,પ્રોજેક્ટ આ વપરાશકર્તાઓ માટે વેબસાઇટ પર સુલભ હશે,
Copied From,નકલ,
Start and End Dates,શરૂ કરો અને તારીખો અંત,
-Actual Time (in Hours),વાસ્તવિક સમય (કલાકોમાં),
+Actual Time in Hours (via Timesheet),વાસ્તવિક સમય (કલાકોમાં),
Costing and Billing,પડતર અને બિલિંગ,
-Total Costing Amount (via Timesheets),કુલ ખર્ચની રકમ (ટાઇમ્સશીટ્સ દ્વારા),
-Total Expense Claim (via Expense Claims),કુલ ખર્ચ દાવો (ખર્ચ દાવાઓ મારફતે),
+Total Costing Amount (via Timesheet),કુલ ખર્ચની રકમ (ટાઇમ્સશીટ્સ દ્વારા),
+Total Expense Claim (via Expense Claim),કુલ ખર્ચ દાવો (ખર્ચ દાવાઓ મારફતે),
Total Purchase Cost (via Purchase Invoice),કુલ ખરીદ કિંમત (ખરીદી ભરતિયું મારફતે),
Total Sales Amount (via Sales Order),કુલ સેલ્સ રકમ (સેલ્સ ઓર્ડર દ્વારા),
-Total Billable Amount (via Timesheets),કુલ બિલવાળી રકમ (ટાઇમ્સશીટ્સ દ્વારા),
-Total Billed Amount (via Sales Invoices),કુલ બિલની રકમ (સેલ્સ ઇન્વૉઇસેસ દ્વારા),
-Total Consumed Material Cost (via Stock Entry),કુલ કન્ઝ્યુમડ મટિરિયલ કોસ્ટ (સ્ટોક એન્ટ્રી દ્વારા),
+Total Billable Amount (via Timesheet),કુલ બિલવાળી રકમ (ટાઇમ્સશીટ્સ દ્વારા),
+Total Billed Amount (via Sales Invoice),કુલ બિલની રકમ (સેલ્સ ઇન્વૉઇસેસ દ્વારા),
+Total Consumed Material Cost (via Stock Entry),કુલ કન્ઝ્યુમડ મટિરિયલ કોસ્ટ (સ્ટોક એન્ટ્રી દ્વારા),
Gross Margin,એકંદર માર્જીન,
Gross Margin %,એકંદર માર્જીન%,
Monitor Progress,મોનિટર પ્રગતિ,
@@ -7521,12 +7385,10 @@
Dependencies,અવલંબન,
Dependent Tasks,આશ્રિત કાર્યો,
Depends on Tasks,કાર્યો પર આધાર રાખે છે,
-Actual Start Date (via Time Sheet),વાસ્તવિક પ્રારંભ તારીખ (સમયનો શીટ મારફતે),
-Actual Time (in hours),(કલાકોમાં) વાસ્તવિક સમય,
-Actual End Date (via Time Sheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે),
-Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે),
+Actual Start Date (via Timesheet),વાસ્તવિક પ્રારંભ તારીખ (સમયનો શીટ મારફતે),
+Actual Time in Hours (via Timesheet),(કલાકોમાં) વાસ્તવિક સમય,
+Actual End Date (via Timesheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે),
Total Expense Claim (via Expense Claim),(ખર્ચ દાવો મારફતે) કુલ ખર્ચ દાવો,
-Total Billing Amount (via Time Sheet),કુલ બિલિંગ રકમ (સમયનો શીટ મારફતે),
Review Date,સમીક્ષા તારીખ,
Closing Date,છેલ્લી તારીખ,
Task Depends On,કાર્ય પર આધાર રાખે છે,
@@ -7887,7 +7749,6 @@
Update Series,સુધારા સિરીઝ,
Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.,
Prefix,પૂર્વગ,
-Current Value,વર્તમાન કિંમત,
This is the number of the last created transaction with this prefix,આ ઉપસર્ગ સાથે છેલ્લા બનાવવામાં વ્યવહાર સંખ્યા છે,
Update Series Number,સુધારા સિરીઝ સંખ્યા,
Quotation Lost Reason,અવતરણ લોસ્ટ કારણ,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ,
Lead Details,લીડ વિગતો,
Lead Owner Efficiency,અગ્ર માલિક કાર્યક્ષમતા,
-Loan Repayment and Closure,લોન ચુકવણી અને બંધ,
-Loan Security Status,લોન સુરક્ષા સ્થિતિ,
Lost Opportunity,ખોવાયેલી તક,
Maintenance Schedules,જાળવણી શેડ્યુલ,
Material Requests for which Supplier Quotations are not created,"પુરવઠોકર્તા સુવાકયો બનાવવામાં આવે છે, જેના માટે સામગ્રી અરજીઓ",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},લક્ષ્યાંકિત ગણતરીઓ: {0},
Payment Account is mandatory,ચુકવણી ખાતું ફરજિયાત છે,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","જો ચકાસાયેલ છે, તો કોઈપણ રકમની ઘોષણા અથવા પુરાવા રજૂઆત કર્યા વિના આવકવેરાની ગણતરી કરતા પહેલાં સંપૂર્ણ રકમ કરપાત્ર આવકમાંથી બાદ કરવામાં આવશે.",
-Disbursement Details,વિતરણ વિગતો,
Material Request Warehouse,સામગ્રી વિનંતી વેરહાઉસ,
Select warehouse for material requests,સામગ્રી વિનંતીઓ માટે વેરહાઉસ પસંદ કરો,
Transfer Materials For Warehouse {0},વેરહાઉસ Material 0 For માટે સામગ્રી સ્થાનાંતરિત કરો,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,પગારમાંથી દાવેદારી રકમ પરત કરો,
Deduction from salary,પગારમાંથી કપાત,
Expired Leaves,સમાપ્ત પાંદડા,
-Reference No,સંદર્ભ ક્રમાંક,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,હેરકટ ટકાવારી એ લોન સિક્યુરિટીના માર્કેટ વેલ્યુ અને તે લોન સિક્યુરિટીને મળેલ મૂલ્ય વચ્ચેની ટકાવારીનો તફાવત છે જ્યારે તે લોન માટે કોલેટરલ તરીકે ઉપયોગ થાય છે.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"લોન ટુ વેલ્યુ ગુણોત્તર, ગીરવે મૂકાયેલ સલામતીના મૂલ્ય માટે લોનની રકમના ગુણોત્તરને વ્યક્ત કરે છે. જો આ કોઈપણ લોન માટેના નિર્ધારિત મૂલ્યથી નીચે આવે તો લોન સલામતીની ખામી સર્જાશે",
If this is not checked the loan by default will be considered as a Demand Loan,જો આને તપાસવામાં નહીં આવે તો ડિફોલ્ટ રૂપે લોનને ડિમાન્ડ લોન માનવામાં આવશે,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,આ એકાઉન્ટનો ઉપયોગ orણ લેનારા પાસેથી લોન ચુકવણી બુક કરવા અને લેનારાને લોન વહેંચવા માટે થાય છે.,
This account is capital account which is used to allocate capital for loan disbursal account ,આ એકાઉન્ટ કેપિટલ એકાઉન્ટ છે જેનો ઉપયોગ લોન વિતરણ ખાતા માટે મૂડી ફાળવવા માટે થાય છે,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ઓપરેશન {0 the વર્ક ઓર્ડર સાથે સંબંધિત નથી {1},
Print UOM after Quantity,જથ્થા પછી યુઓએમ છાપો,
Set default {0} account for perpetual inventory for non stock items,બિન સ્ટોક આઇટમ્સ માટે કાયમી ઇન્વેન્ટરી માટે ડિફ defaultલ્ટ {0} એકાઉન્ટ સેટ કરો,
-Loan Security {0} added multiple times,લોન સુરક્ષા {0} ઘણી વખત ઉમેર્યું,
-Loan Securities with different LTV ratio cannot be pledged against one loan,જુદા જુદા એલટીવી રેશિયોવાળી લોન સિક્યોરિટીઝ એક લોન સામે ગિરવી રાખી શકાતી નથી,
-Qty or Amount is mandatory for loan security!,લોન સુરક્ષા માટે ક્યુટી અથવા રકમ ફરજિયાત છે!,
-Only submittted unpledge requests can be approved,ફક્ત સબમિટ કરેલી અનપ્લેજ વિનંતીઓને જ મંજૂરી આપી શકાય છે,
-Interest Amount or Principal Amount is mandatory,વ્યાજની રકમ અથવા મુખ્ય રકમ ફરજિયાત છે,
-Disbursed Amount cannot be greater than {0},વિતરિત રકમ {0 than કરતા વધારે હોઈ શકતી નથી,
-Row {0}: Loan Security {1} added multiple times,પંક્તિ {0}: લોન સુરક્ષા {1 multiple ઘણી વખત ઉમેરી,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,પંક્તિ # {0}: બાળ વસ્તુ એ પ્રોડક્ટ બંડલ હોવી જોઈએ નહીં. કૃપા કરીને આઇટમ remove 1 remove અને સેવને દૂર કરો,
Credit limit reached for customer {0},ગ્રાહક માટે ક્રેડિટ મર્યાદા reached 0 reached પર પહોંચી,
Could not auto create Customer due to the following missing mandatory field(s):,નીચેના ગુમ થયેલ ફરજિયાત ક્ષેત્ર (ઓ) ને કારણે ગ્રાહક સ્વત create બનાવી શક્યાં નથી:,
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index e40b68e..44edfca 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","ישים אם החברה היא SpA, SApA או SRL",
Applicable if the company is a limited liability company,ישים אם החברה הינה חברה בערבון מוגבל,
Applicable if the company is an Individual or a Proprietorship,ישים אם החברה היא יחיד או בעלות,
-Applicant,מְבַקֵשׁ,
-Applicant Type,סוג המועמד,
Application of Funds (Assets),יישום של קרנות (נכסים),
Application period cannot be across two allocation records,תקופת היישום לא יכולה להיות על פני שני רשומות הקצאה,
Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,רשימת בעלי המניות הזמינים עם מספרי פוליו,
Loading Payment System,טוען מערכת תשלום,
Loan,לְהַלווֹת,
-Loan Amount cannot exceed Maximum Loan Amount of {0},סכום ההלוואה לא יכול לחרוג מסכום ההלוואה המרבי של {0},
-Loan Application,בקשת הלוואה,
-Loan Management,ניהול הלוואות,
-Loan Repayment,פירעון הלוואה,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,מועד התחלת ההלוואה ותקופת ההלוואה חובה לשמור את היוון החשבונית,
Loans (Liabilities),הלוואות (התחייבויות),
Loans and Advances (Assets),הלוואות ומקדמות (נכסים),
@@ -1611,7 +1605,6 @@
Monday,יום שני,
Monthly,חודשי,
Monthly Distribution,בחתך חודשי,
-Monthly Repayment Amount cannot be greater than Loan Amount,סכום ההחזר החודשי אינו יכול להיות גדול מסכום ההלוואה,
More,יותר,
More Information,מידע נוסף,
More than one selection for {0} not allowed,יותר ממבחר אחד עבור {0} אסור,
@@ -1884,11 +1877,9 @@
Pay {0} {1},שלם {0} {1},
Payable,משתלם,
Payable Account,חשבון לתשלום,
-Payable Amount,סכום לתשלום,
Payment,תשלום,
Payment Cancelled. Please check your GoCardless Account for more details,התשלום בוטל. אנא בדוק את חשבון GoCardless שלך לקבלת פרטים נוספים,
Payment Confirmation,אישור תשלום,
-Payment Date,תאריך תשלום,
Payment Days,ימי תשלום,
Payment Document,מסמך תשלום,
Payment Due Date,מועד תשלום,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,אנא ראשון להיכנס קבלת רכישה,
Please enter Receipt Document,נא להזין את מסמך הקבלה,
Please enter Reference date,נא להזין את תאריך הפניה,
-Please enter Repayment Periods,אנא הזן תקופות החזר,
Please enter Reqd by Date,אנא הזן Reqd לפי תאריך,
Please enter Woocommerce Server URL,אנא הזן את כתובת האתר של שרת Woocommerce,
Please enter Write Off Account,נא להזין לכתוב את החשבון,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,נא להזין מרכז עלות הורה,
Please enter quantity for Item {0},נא להזין את הכמות לפריט {0},
Please enter relieving date.,נא להזין את הקלת מועד.,
-Please enter repayment Amount,אנא הזן את סכום ההחזר,
Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום,
Please enter valid email address,אנא הזן כתובת דוא"ל חוקית,
Please enter {0} first,נא להזין את {0} הראשון,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,כללי תמחור מסוננים נוסף המבוססים על כמות.,
Primary Address Details,פרטי כתובת ראשית,
Primary Contact Details,פרטי קשר עיקריים,
-Principal Amount,סכום עיקרי,
Print Format,פורמט הדפסה,
Print IRS 1099 Forms,הדפס טפסים של מס הכנסה 1099,
Print Report Card,הדפסת כרטיס דוח,
@@ -2550,7 +2538,6 @@
Sample Collection,אוסף לדוגמא,
Sample quantity {0} cannot be more than received quantity {1},כמות הדוגמה {0} לא יכולה להיות יותר מהכמות שהתקבלה {1},
Sanctioned,סנקציה,
-Sanctioned Amount,סכום גושפנקא,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.,
Sand,חוֹל,
Saturday,יום שבת,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} כבר יש נוהל הורים {1}.,
API,ממשק API,
Annual,שנתי,
-Approved,אושר,
Change,שינוי,
Contact Email,"דוא""ל ליצירת קשר",
Export Type,סוג ייצוא,
@@ -3571,7 +3557,6 @@
Account Value,ערך חשבון,
Account is mandatory to get payment entries,חובה לקבל חשבונות תשלום,
Account is not set for the dashboard chart {0},החשבון לא הוגדר עבור תרשים לוח המחוונים {0},
-Account {0} does not belong to company {1},חשבון {0} אינו שייך לחברת {1},
Account {0} does not exists in the dashboard chart {1},חשבון {0} אינו קיים בתרשים של לוח המחוונים {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,חשבון: <b>{0}</b> הוא הון בעבודה ולא ניתן לעדכן אותו על ידי כניסה ליומן,
Account: {0} is not permitted under Payment Entry,חשבון: {0} אינו מורשה בכניסה לתשלום,
@@ -3582,7 +3567,6 @@
Activity,פעילות,
Add / Manage Email Accounts.,"הוספה / ניהול חשבונות דוא""ל.",
Add Child,הוסף לילדים,
-Add Loan Security,הוסף אבטחת הלוואות,
Add Multiple,הוסף מרובה,
Add Participants,להוסיף משתתפים,
Add to Featured Item,הוסף לפריט מוצג,
@@ -3593,15 +3577,12 @@
Address Line 1,שורת כתובת 1,
Addresses,כתובות,
Admission End Date should be greater than Admission Start Date.,תאריך הסיום של הקבלה צריך להיות גדול ממועד התחלת הקבלה.,
-Against Loan,נגד הלוואה,
-Against Loan:,נגד הלוואה:,
All,כל,
All bank transactions have been created,כל העסקאות הבנקאיות נוצרו,
All the depreciations has been booked,כל הפחתים הוזמנו,
Allocation Expired!,ההקצאה פגה!,
Allow Resetting Service Level Agreement from Support Settings.,אפשר איפוס של הסכם רמת שירות מהגדרות התמיכה.,
Amount of {0} is required for Loan closure,סכום של {0} נדרש לסגירת הלוואה,
-Amount paid cannot be zero,הסכום ששולם לא יכול להיות אפס,
Applied Coupon Code,קוד קופון מיושם,
Apply Coupon Code,החל קוד קופון,
Appointment Booking,הזמנת פגישה,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,לא ניתן לחשב את זמן ההגעה מכיוון שכתובת הנהג חסרה.,
Cannot Optimize Route as Driver Address is Missing.,לא ניתן לייעל את המסלול מכיוון שכתובת הנהג חסרה.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,לא ניתן להשלים את המשימה {0} מכיוון שהמשימה התלויה שלה {1} לא הושלמה / בוטלה.,
-Cannot create loan until application is approved,לא ניתן ליצור הלוואה עד לאישור הבקשה,
Cannot find a matching Item. Please select some other value for {0}.,לא ניתן למצוא את הפריט מתאים. אנא בחר ערך אחר עבור {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","לא ניתן לחייב יתר על פריט {0} בשורה {1} ביותר מ- {2}. כדי לאפשר חיוב יתר, הגדר קצבה בהגדרות חשבונות",
"Capacity Planning Error, planned start time can not be same as end time","שגיאת תכנון קיבולת, זמן התחלה מתוכנן לא יכול להיות זהה לזמן סיום",
@@ -3812,20 +3792,9 @@
Less Than Amount,פחות מכמות,
Liabilities,התחייבויות,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,סכום ההלוואה עולה על סכום ההלוואה המקסימלי של {0} בהתאם לניירות ערך המוצעים,
Loan Applications from customers and employees.,בקשות להלוואות מלקוחות ועובדים.,
-Loan Disbursement,הוצאות הלוואות,
Loan Processes,תהליכי הלוואה,
-Loan Security,אבטחת הלוואות,
-Loan Security Pledge,משכון ביטחון הלוואות,
-Loan Security Pledge Created : {0},משכון אבטחת הלוואות נוצר: {0},
-Loan Security Price,מחיר ביטחון הלוואה,
-Loan Security Price overlapping with {0},מחיר ביטחון הלוואה חופף עם {0},
-Loan Security Unpledge,Unpledge אבטחת הלוואות,
-Loan Security Value,ערך אבטחת הלוואה,
Loan Type for interest and penalty rates,סוג הלוואה לשיעור ריבית וקנס,
-Loan amount cannot be greater than {0},סכום ההלוואה לא יכול להיות גדול מ- {0},
-Loan is mandatory,הלוואה הינה חובה,
Loans,הלוואות,
Loans provided to customers and employees.,הלוואות הניתנות ללקוחות ולעובדים.,
Location,מיקום,
@@ -3894,7 +3863,6 @@
Pay,שלם,
Payment Document Type,סוג מסמך תשלום,
Payment Name,שם התשלום,
-Penalty Amount,סכום קנס,
Pending,ממתין ל,
Performance,ביצועים,
Period based On,תקופה המבוססת על,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,אנא התחבר כמשתמש Marketplace לעריכת פריט זה.,
Please login as a Marketplace User to report this item.,אנא התחבר כמשתמש Marketplace כדי לדווח על פריט זה.,
Please select <b>Template Type</b> to download template,אנא בחר <b>סוג</b> תבנית להורדת תבנית,
-Please select Applicant Type first,אנא בחר תחילה סוג המועמד,
Please select Customer first,אנא בחר לקוח תחילה,
Please select Item Code first,אנא בחר קוד קוד פריט,
-Please select Loan Type for company {0},בחר סוג הלוואה לחברה {0},
Please select a Delivery Note,אנא בחר תעודת משלוח,
Please select a Sales Person for item: {0},בחר איש מכירות לפריט: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',אנא בחר אמצעי תשלום אחר. פס אינו תומך בעסקאות במטבע '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},הגדר חשבון בנק ברירת מחדל לחברה {0},
Please specify,אנא ציין,
Please specify a {0},אנא ציין {0},lead
-Pledge Status,סטטוס משכון,
-Pledge Time,זמן הבטחה,
Printing,הדפסה,
Priority,עדיפות,
Priority has been changed to {0}.,העדיפות שונתה ל- {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,עיבוד קבצי XML,
Profitability,רווחיות,
Project,פרויקט,
-Proposed Pledges are mandatory for secured Loans,ההתחייבויות המוצעות הינן חובה להלוואות מובטחות,
Provide the academic year and set the starting and ending date.,ספק את שנת הלימודים וקבע את תאריך ההתחלה והסיום.,
Public token is missing for this bank,אסימון ציבורי חסר לבנק זה,
Publish,לְפַרְסֵם,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,בקבלת הרכישה אין שום פריט שעבורו מופעל שמור לדוגמא.,
Purchase Return,חזור רכישה,
Qty of Finished Goods Item,כמות פריטי המוצרים המוגמרים,
-Qty or Amount is mandatroy for loan security,כמות או סכום הם מנדטרוי להבטחת הלוואות,
Quality Inspection required for Item {0} to submit,נדרשת בדיקת איכות לצורך הגשת הפריט {0},
Quantity to Manufacture,כמות לייצור,
Quantity to Manufacture can not be zero for the operation {0},הכמות לייצור לא יכולה להיות אפס עבור הפעולה {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,תאריך הקלה חייב להיות גדול או שווה לתאריך ההצטרפות,
Rename,שינוי שם,
Rename Not Allowed,שינוי שם אסור,
-Repayment Method is mandatory for term loans,שיטת ההחזר הינה חובה עבור הלוואות לתקופה,
-Repayment Start Date is mandatory for term loans,מועד התחלת ההחזר הוא חובה עבור הלוואות לתקופה,
Report Item,פריט דוח,
Report this Item,דווח על פריט זה,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,כמות שמורה לקבלנות משנה: כמות חומרי גלם לייצור פריטים בקבלנות משנה.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},שורה ({0}): {1} כבר מוזל ב- {2},
Rows Added in {0},שורות נוספו ב- {0},
Rows Removed in {0},שורות הוסרו ב- {0},
-Sanctioned Amount limit crossed for {0} {1},מגבלת הסכום הסנקציה עברה עבור {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},סכום הלוואה בעיצום כבר קיים עבור {0} נגד החברה {1},
Save,שמור,
Save Item,שמור פריט,
Saved Items,פריטים שמורים,
@@ -4135,7 +4093,6 @@
User {0} is disabled,משתמש {0} אינו זמין,
Users and Permissions,משתמשים והרשאות,
Vacancies cannot be lower than the current openings,המשרות הפנויות לא יכולות להיות נמוכות מהפתחים הנוכחיים,
-Valid From Time must be lesser than Valid Upto Time.,תקף מהזמן חייב להיות פחות מהזמן תקף.,
Valuation Rate required for Item {0} at row {1},דרוש שיעור הערכה לפריט {0} בשורה {1},
Values Out Of Sync,ערכים שאינם מסונכרנים,
Vehicle Type is required if Mode of Transport is Road,סוג רכב נדרש אם אמצעי התחבורה הוא דרך,
@@ -4211,7 +4168,6 @@
Add to Cart,הוסף לסל,
Days Since Last Order,ימים מאז ההזמנה האחרונה,
In Stock,במלאי,
-Loan Amount is mandatory,סכום ההלוואה הוא חובה,
Mode Of Payment,מצב של תשלום,
No students Found,לא נמצאו סטודנטים,
Not in Stock,לא במלאי,
@@ -4240,7 +4196,6 @@
Group by,קבוצה על ידי,
In stock,במלאי,
Item name,שם פריט,
-Loan amount is mandatory,סכום ההלוואה הוא חובה,
Minimum Qty,כמות מינימלית,
More details,לפרטים נוספים,
Nature of Supplies,אופי האספקה,
@@ -4409,9 +4364,6 @@
Total Completed Qty,סה"כ כמות שהושלמה,
Qty to Manufacture,כמות לייצור,
Repay From Salary can be selected only for term loans,ניתן לבחור בהחזר משכר רק עבור הלוואות לתקופה,
-No valid Loan Security Price found for {0},לא נמצא מחיר אבטחה תקף להלוואות עבור {0},
-Loan Account and Payment Account cannot be same,חשבון ההלוואה וחשבון התשלום אינם יכולים להיות זהים,
-Loan Security Pledge can only be created for secured loans,ניתן ליצור משכון להבטחת הלוואות רק עבור הלוואות מאובטחות,
Social Media Campaigns,קמפיינים למדיה חברתית,
From Date can not be greater than To Date,מהתאריך לא יכול להיות גדול מ- To Date,
Please set a Customer linked to the Patient,אנא הגדר לקוח המקושר לחולה,
@@ -6437,7 +6389,6 @@
HR User,משתמש HR,
Appointment Letter,מכתב מינוי,
Job Applicant,עבודת מבקש,
-Applicant Name,שם מבקש,
Appointment Date,תאריך מינוי,
Appointment Letter Template,תבנית מכתב לפגישה,
Body,גוּף,
@@ -7059,99 +7010,12 @@
Sync in Progress,סנכרון בתהליך,
Hub Seller Name,שם מוכר הרכזות,
Custom Data,נתונים מותאמים אישית,
-Member,חבר,
-Partially Disbursed,מופץ חלקית,
-Loan Closure Requested,מתבקשת סגירת הלוואה,
Repay From Salary,החזר משכר,
-Loan Details,פרטי הלוואה,
-Loan Type,סוג הלוואה,
-Loan Amount,סכום הלוואה,
-Is Secured Loan,הלוואה מאובטחת,
-Rate of Interest (%) / Year,שיעור ריבית (%) לשנה,
-Disbursement Date,תאריך פרסום,
-Disbursed Amount,סכום משולם,
-Is Term Loan,האם הלוואה לתקופה,
-Repayment Method,שיטת החזר,
-Repay Fixed Amount per Period,החזר סכום קבוע לתקופה,
-Repay Over Number of Periods,החזר על מספר התקופות,
-Repayment Period in Months,תקופת הפירעון בחודשים,
-Monthly Repayment Amount,סכום החזר חודשי,
-Repayment Start Date,תאריך התחלה להחזר,
-Loan Security Details,פרטי אבטחת הלוואה,
-Maximum Loan Value,ערך הלוואה מרבי,
-Account Info,פרטי חשבון,
-Loan Account,חשבון הלוואה,
-Interest Income Account,חשבון הכנסות ריבית,
-Penalty Income Account,חשבון הכנסה קנס,
-Repayment Schedule,תזמון התשלום,
-Total Payable Amount,סכום כולל לתשלום,
-Total Principal Paid,סך כל התשלום העיקרי,
-Total Interest Payable,סך הריבית שיש לשלם,
-Total Amount Paid,הסכום הכולל ששולם,
-Loan Manager,מנהל הלוואות,
-Loan Info,מידע על הלוואה,
-Rate of Interest,שיעור העניין,
-Proposed Pledges,הצעות משכון,
-Maximum Loan Amount,סכום הלוואה מקסימלי,
-Repayment Info,מידע על החזר,
-Total Payable Interest,סך הריבית לתשלום,
-Against Loan ,נגד הלוואה,
-Loan Interest Accrual,צבירת ריבית הלוואות,
-Amounts,סכומים,
-Pending Principal Amount,סכום עיקרי ממתין,
-Payable Principal Amount,סכום עיקרי לתשלום,
-Paid Principal Amount,סכום עיקרי בתשלום,
-Paid Interest Amount,סכום ריבית בתשלום,
-Process Loan Interest Accrual,צבירת ריבית בהלוואות,
-Repayment Schedule Name,שם לוח הזמנים להחזר,
Regular Payment,תשלום רגיל,
Loan Closure,סגירת הלוואה,
-Payment Details,פרטי תשלום,
-Interest Payable,יש לשלם ריבית,
-Amount Paid,הסכום ששולם,
-Principal Amount Paid,הסכום העיקרי ששולם,
-Repayment Details,פרטי החזר,
-Loan Repayment Detail,פרטי החזר הלוואה,
-Loan Security Name,שם ביטחון הלוואה,
-Unit Of Measure,יחידת מידה,
-Loan Security Code,קוד אבטחת הלוואות,
-Loan Security Type,סוג אבטחת הלוואה,
-Haircut %,תספורת%,
-Loan Details,פרטי הלוואה,
-Unpledged,ללא פסים,
-Pledged,התחייב,
-Partially Pledged,משועבד חלקית,
-Securities,ניירות ערך,
-Total Security Value,ערך אבטחה כולל,
-Loan Security Shortfall,מחסור בביטחון הלוואות,
-Loan ,לְהַלווֹת,
-Shortfall Time,זמן מחסור,
-America/New_York,אמריקה / ניו_יורק,
-Shortfall Amount,סכום חסר,
-Security Value ,ערך אבטחה,
-Process Loan Security Shortfall,מחסור בביטחון הלוואות בתהליך,
-Loan To Value Ratio,יחס הלוואה לערך,
-Unpledge Time,זמן Unpledge,
-Loan Name,שם הלוואה,
Rate of Interest (%) Yearly,שיעור ריבית (%) שנתי,
-Penalty Interest Rate (%) Per Day,ריבית קנס (%) ליום,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,ריבית קנס מוטלת על סכום הריבית בהמתנה על בסיס יומי במקרה של פירעון מאוחר,
-Grace Period in Days,תקופת החסד בימים,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,מספר הימים ממועד פירעון ועד אשר לא ייגבה מהם קנס במקרה של עיכוב בהחזר ההלוואה,
-Pledge,מַשׁכּוֹן,
-Post Haircut Amount,סכום תספורת פוסט,
-Process Type,סוג התהליך,
-Update Time,עדכון זמן,
-Proposed Pledge,התחייבות מוצעת,
-Total Payment,תשלום כולל,
-Balance Loan Amount,סכום הלוואה יתרה,
-Is Accrued,נצבר,
Salary Slip Loan,הלוואת תלוש משכורת,
Loan Repayment Entry,הכנסת החזר הלוואות,
-Sanctioned Loan Amount,סכום הלוואה בסנקציה,
-Sanctioned Amount Limit,מגבלת סכום בסנקציה,
-Unpledge,Unpledge,
-Haircut,תִספּוֹרֶת,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,צור לוח זמנים,
Schedules,לוחות זמנים,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,הפרויקט יהיה נגיש באתר למשתמשים אלה,
Copied From,הועתק מ,
Start and End Dates,תאריכי התחלה וסיום,
-Actual Time (in Hours),זמן בפועל (בשעות),
+Actual Time in Hours (via Timesheet),זמן בפועל (בשעות),
Costing and Billing,תמחיר וחיובים,
-Total Costing Amount (via Timesheets),סכום עלות כולל (באמצעות גיליונות זמנים),
-Total Expense Claim (via Expense Claims),תביעת הוצאות כוללת (באמצעות תביעות הוצאות),
+Total Costing Amount (via Timesheet),סכום עלות כולל (באמצעות גיליונות זמנים),
+Total Expense Claim (via Expense Claim),תביעת הוצאות כוללת (באמצעות תביעות הוצאות),
Total Purchase Cost (via Purchase Invoice),עלות רכישה כוללת (באמצעות רכישת חשבונית),
Total Sales Amount (via Sales Order),סכום מכירות כולל (באמצעות הזמנת מכירה),
-Total Billable Amount (via Timesheets),הסכום הכולל לחיוב (באמצעות גיליונות זמנים),
-Total Billed Amount (via Sales Invoices),סכום חיוב כולל (באמצעות חשבוניות מכירה),
-Total Consumed Material Cost (via Stock Entry),עלות חומר נצרכת כוללת (באמצעות הזנת מלאי),
+Total Billable Amount (via Timesheet),הסכום הכולל לחיוב (באמצעות גיליונות זמנים),
+Total Billed Amount (via Sales Invoice),סכום חיוב כולל (באמצעות חשבוניות מכירה),
+Total Consumed Material Cost (via Stock Entry),עלות חומר נצרכת כוללת (באמצעות הזנת מלאי),
Gross Margin,שיעור רווח גולמי,
Gross Margin %,% שיעור רווח גולמי,
Monitor Progress,עקוב אחר ההתקדמות,
@@ -7521,12 +7385,10 @@
Dependencies,תלות,
Dependent Tasks,משימות תלויות,
Depends on Tasks,תלוי במשימות,
-Actual Start Date (via Time Sheet),תאריך התחלה בפועל (באמצעות גיליון זמן),
-Actual Time (in hours),זמן בפועל (בשעות),
-Actual End Date (via Time Sheet),תאריך סיום בפועל (באמצעות גיליון זמן),
-Total Costing Amount (via Time Sheet),סה"כ תמחיר הסכום (באמצעות גיליון זמן),
+Actual Start Date (via Timesheet),תאריך התחלה בפועל (באמצעות גיליון זמן),
+Actual Time in Hours (via Timesheet),זמן בפועל (בשעות),
+Actual End Date (via Timesheet),תאריך סיום בפועל (באמצעות גיליון זמן),
Total Expense Claim (via Expense Claim),תביעה סה"כ הוצאות (באמצעות תביעת הוצאות),
-Total Billing Amount (via Time Sheet),סכום לחיוב סה"כ (דרך הזמן גיליון),
Review Date,תאריך סקירה,
Closing Date,תאריך סגירה,
Task Depends On,המשימה תלויה ב,
@@ -7887,7 +7749,6 @@
Update Series,סדרת עדכון,
Change the starting / current sequence number of an existing series.,לשנות את מתחיל / מספר הרצף הנוכחי של סדרות קיימות.,
Prefix,קידומת,
-Current Value,ערך נוכחי,
This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו,
Update Series Number,עדכון סדרת מספר,
Quotation Lost Reason,סיבה אבודה ציטוט,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה,
Lead Details,פרטי לידים,
Lead Owner Efficiency,יעילות בעלים מובילה,
-Loan Repayment and Closure,החזר וסגירת הלוואות,
-Loan Security Status,מצב אבטחת הלוואה,
Lost Opportunity,הזדמנות אבודה,
Maintenance Schedules,לוחות זמנים תחזוקה,
Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ספירות ממוקדות: {0},
Payment Account is mandatory,חשבון תשלום הוא חובה,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","אם מסומן, הסכום המלא ינוכה מההכנסה החייבת לפני חישוב מס הכנסה ללא הצהרה או הגשת הוכחה.",
-Disbursement Details,פרטי התשלום,
Material Request Warehouse,מחסן בקשת חומרים,
Select warehouse for material requests,בחר מחסן לבקשות חומר,
Transfer Materials For Warehouse {0},העברת חומרים למחסן {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,החזר סכום שלא נתבע מהמשכורת,
Deduction from salary,ניכוי משכר,
Expired Leaves,עלים שפג תוקפם,
-Reference No,מספר סימוכין,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,אחוז תספורת הוא אחוז ההפרש בין שווי השוק של נייר הערך לבין הערך המיוחס לאותה נייר ערך בהיותו משמש כבטוחה להלוואה זו.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,יחס הלוואה לערך מבטא את היחס בין סכום ההלוואה לבין ערך הנייר הערבות שהועבד. מחסור בביטחון הלוואות יופעל אם זה יורד מהערך שצוין עבור הלוואה כלשהי,
If this is not checked the loan by default will be considered as a Demand Loan,אם זה לא מסומן ההלוואה כברירת מחדל תיחשב כהלוואת דרישה,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,חשבון זה משמש להזמנת החזרי הלוואות מהלווה וגם להוצאת הלוואות ללווה,
This account is capital account which is used to allocate capital for loan disbursal account ,חשבון זה הוא חשבון הון המשמש להקצאת הון לחשבון פרסום הלוואות,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},פעולה {0} אינה שייכת להזמנת העבודה {1},
Print UOM after Quantity,הדפס UOM לאחר כמות,
Set default {0} account for perpetual inventory for non stock items,הגדר חשבון {0} ברירת מחדל למלאי תמידי עבור פריטים שאינם במלאי,
-Loan Security {0} added multiple times,אבטחת הלוואות {0} נוספה מספר פעמים,
-Loan Securities with different LTV ratio cannot be pledged against one loan,לא ניתן לשעבד ניירות ערך בהלוואות עם יחס LTV שונה כנגד הלוואה אחת,
-Qty or Amount is mandatory for loan security!,כמות או סכום חובה להבטחת הלוואות!,
-Only submittted unpledge requests can be approved,ניתן לאשר רק בקשות שלא הונפקו שלוחה,
-Interest Amount or Principal Amount is mandatory,סכום ריבית או סכום עיקרי הם חובה,
-Disbursed Amount cannot be greater than {0},הסכום המושתל לא יכול להיות גדול מ- {0},
-Row {0}: Loan Security {1} added multiple times,שורה {0}: אבטחת הלוואות {1} נוספה מספר פעמים,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,שורה מספר {0}: פריט ילד לא אמור להיות חבילה של מוצרים. הסר את הפריט {1} ושמור,
Credit limit reached for customer {0},תקרת אשראי הושגה עבור הלקוח {0},
Could not auto create Customer due to the following missing mandatory field(s):,לא ניתן היה ליצור אוטומטית את הלקוח בגלל שדות החובה הבאים חסרים:,
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 78094d7..eee1a64 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","लागू अगर कंपनी SpA, SApA या SRL है",
Applicable if the company is a limited liability company,लागू यदि कंपनी एक सीमित देयता कंपनी है,
Applicable if the company is an Individual or a Proprietorship,लागू अगर कंपनी एक व्यक्ति या एक प्रोपराइटरशिप है,
-Applicant,आवेदक,
-Applicant Type,आवेदक प्रकार,
Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति),
Application period cannot be across two allocation records,एप्लिकेशन की अवधि दो आवंटन रिकॉर्डों में नहीं हो सकती,
Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,फोलिओ नंबर वाले उपलब्ध शेयरधारकों की सूची,
Loading Payment System,भुगतान प्रणाली लोड हो रहा है,
Loan,ऋण,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0},
-Loan Application,ऋण का आवेदन,
-Loan Management,ऋण प्रबंधन,
-Loan Repayment,ऋण भुगतान,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,चालान शुरू होने से बचाने के लिए लोन स्टार्ट डेट और लोन की अवधि अनिवार्य है,
Loans (Liabilities),ऋण (देनदारियों),
Loans and Advances (Assets),ऋण और अग्रिम ( संपत्ति),
@@ -1611,7 +1605,6 @@
Monday,सोमवार,
Monthly,मासिक,
Monthly Distribution,मासिक वितरण,
-Monthly Repayment Amount cannot be greater than Loan Amount,मासिक भुगतान राशि ऋण राशि से अधिक नहीं हो सकता,
More,अधिक,
More Information,अधिक जानकारी,
More than one selection for {0} not allowed,{0} के लिए एक से अधिक चयन की अनुमति नहीं है,
@@ -1884,11 +1877,9 @@
Pay {0} {1},वेतन {0} {1},
Payable,देय,
Payable Account,देय खाता,
-Payable Amount,भुगतान योग्य राशि,
Payment,भुगतान,
Payment Cancelled. Please check your GoCardless Account for more details,भुगतान रद्द किया गया अधिक जानकारी के लिए कृपया अपने GoCardless खाते की जांच करें,
Payment Confirmation,भुगतान की पुष्टि,
-Payment Date,भुगतान तिथि,
Payment Days,भुगतान दिन,
Payment Document,भुगतान दस्तावेज़,
Payment Due Date,भुगतान की नियत तिथि,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,पहली खरीद रसीद दर्ज करें,
Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें,
Please enter Reference date,संदर्भ तिथि दर्ज करें,
-Please enter Repayment Periods,चुकौती अवधि दर्ज करें,
Please enter Reqd by Date,कृपया तिथि के अनुसार रेक्ड दर्ज करें,
Please enter Woocommerce Server URL,कृपया Woocommerce सर्वर URL दर्ज करें,
Please enter Write Off Account,खाता बंद लिखने दर्ज करें,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,माता - पिता लागत केंद्र दर्ज करें,
Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0},
Please enter relieving date.,तारीख से राहत दर्ज करें.,
-Please enter repayment Amount,भुगतान राशि दर्ज करें,
Please enter valid Financial Year Start and End Dates,वैध वित्तीय वर्ष आरंभ और समाप्ति तिथियाँ दर्ज करें,
Please enter valid email address,कृपया मान्य ईमेल पता दर्ज करें,
Please enter {0} first,1 {0} दर्ज करें,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं.,
Primary Address Details,प्राथमिक पता विवरण,
Primary Contact Details,प्राथमिक संपर्क विवरण,
-Principal Amount,मुख्य राशि,
Print Format,प्रारूप प्रिंट,
Print IRS 1099 Forms,आईआरएस 1099 फॉर्म प्रिंट करें,
Print Report Card,प्रिंट रिपोर्ट कार्ड,
@@ -2550,7 +2538,6 @@
Sample Collection,नमूना संग्रह,
Sample quantity {0} cannot be more than received quantity {1},नमूना मात्रा {0} प्राप्त मात्रा से अधिक नहीं हो सकती {1},
Sanctioned,स्वीकृत,
-Sanctioned Amount,स्वीकृत राशि,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।,
Sand,रेत,
Saturday,शनिवार,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} पहले से ही एक पेरेंट प्रोसीजर {1} है।,
API,एपीआई,
Annual,वार्षिक,
-Approved,अनुमोदित,
Change,परिवर्तन,
Contact Email,संपर्क ईमेल,
Export Type,निर्यात प्रकार,
@@ -3571,7 +3557,6 @@
Account Value,खाता मूल्य,
Account is mandatory to get payment entries,भुगतान प्रविष्टियां प्राप्त करने के लिए खाता अनिवार्य है,
Account is not set for the dashboard chart {0},डैशबोर्ड चार्ट {0} के लिए खाता सेट नहीं किया गया है,
-Account {0} does not belong to company {1},खाते {0} कंपनी से संबंधित नहीं है {1},
Account {0} does not exists in the dashboard chart {1},खाता {0} डैशबोर्ड चार्ट में मौजूद नहीं है {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,खाता: <b>{0}</b> पूंजी कार्य प्रगति पर है और जर्नल एंट्री द्वारा अद्यतन नहीं किया जा सकता है,
Account: {0} is not permitted under Payment Entry,खाता: {0} को भुगतान प्रविष्टि के तहत अनुमति नहीं है,
@@ -3582,7 +3567,6 @@
Activity,सक्रियता,
Add / Manage Email Accounts.,ईमेल खातों का प्रबंधन करें / जोड़ें।,
Add Child,बाल जोड़ें,
-Add Loan Security,ऋण सुरक्षा जोड़ें,
Add Multiple,मल्टीपल जोड़ें,
Add Participants,प्रतिभागियों को जोड़ें,
Add to Featured Item,फीचर्ड आइटम में जोड़ें,
@@ -3593,15 +3577,12 @@
Address Line 1,पता पंक्ति 1,
Addresses,पतों,
Admission End Date should be greater than Admission Start Date.,प्रवेश प्रारंभ तिथि प्रवेश प्रारंभ तिथि से अधिक होनी चाहिए।,
-Against Loan,लोन के खिलाफ,
-Against Loan:,ऋण के विरुद्ध:,
All,सब,
All bank transactions have been created,सभी बैंक लेनदेन बनाए गए हैं,
All the depreciations has been booked,सभी मूल्यह्रास बुक किए गए हैं,
Allocation Expired!,आवंटन समाप्त!,
Allow Resetting Service Level Agreement from Support Settings.,समर्थन सेटिंग्स से सेवा स्तर समझौते को रीसेट करने की अनुमति दें।,
Amount of {0} is required for Loan closure,ऋण बंद करने के लिए {0} की राशि आवश्यक है,
-Amount paid cannot be zero,भुगतान की गई राशि शून्य नहीं हो सकती,
Applied Coupon Code,एप्लाइड कूपन कोड,
Apply Coupon Code,कूपन कोड लागू करें,
Appointment Booking,नियुक्ति बुकिंग,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ड्राइवर का पता गुम होने के कारण आगमन समय की गणना नहीं की जा सकती।,
Cannot Optimize Route as Driver Address is Missing.,ड्राइवर का पता नहीं होने के कारण रूट को ऑप्टिमाइज़ नहीं किया जा सकता है।,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,पूर्ण कार्य {0} को निर्भर नहीं कर सकता क्योंकि उसके आश्रित कार्य {1} को अपूर्ण / रद्द नहीं किया गया है।,
-Cannot create loan until application is approved,आवेदन स्वीकृत होने तक ऋण नहीं बना सकते,
Cannot find a matching Item. Please select some other value for {0}.,एक मेल आइटम नहीं मिल सकता। के लिए {0} कुछ अन्य मूल्य का चयन करें।,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","पंक्ति {1} से अधिक {2} में आइटम {0} के लिए ओवरबिल नहीं कर सकते। ओवर-बिलिंग की अनुमति देने के लिए, कृपया खाता सेटिंग में भत्ता निर्धारित करें",
"Capacity Planning Error, planned start time can not be same as end time","क्षमता योजना त्रुटि, नियोजित प्रारंभ समय अंत समय के समान नहीं हो सकता है",
@@ -3812,20 +3792,9 @@
Less Than Amount,इससे कम राशि,
Liabilities,देयताएं,
Loading...,लोड हो रहा है ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,प्रस्तावित प्रतिभूतियों के अनुसार ऋण राशि {0} की अधिकतम ऋण राशि से अधिक है,
Loan Applications from customers and employees.,ग्राहकों और कर्मचारियों से ऋण आवेदन।,
-Loan Disbursement,ऋण भुगतान,
Loan Processes,ऋण प्रक्रियाएँ,
-Loan Security,ऋण सुरक्षा,
-Loan Security Pledge,ऋण सुरक्षा प्रतिज्ञा,
-Loan Security Pledge Created : {0},ऋण सुरक्षा प्रतिज्ञा बनाई गई: {0},
-Loan Security Price,ऋण सुरक्षा मूल्य,
-Loan Security Price overlapping with {0},ऋण सुरक्षा मूल्य {0} के साथ अतिव्यापी,
-Loan Security Unpledge,ऋण सुरक्षा अनप्लग,
-Loan Security Value,ऋण सुरक्षा मूल्य,
Loan Type for interest and penalty rates,ब्याज और जुर्माना दरों के लिए ऋण प्रकार,
-Loan amount cannot be greater than {0},ऋण राशि {0} से अधिक नहीं हो सकती,
-Loan is mandatory,ऋण अनिवार्य है,
Loans,ऋण,
Loans provided to customers and employees.,ग्राहकों और कर्मचारियों को प्रदान किया गया ऋण।,
Location,स्थान,
@@ -3894,7 +3863,6 @@
Pay,वेतन,
Payment Document Type,भुगतान दस्तावेज़ प्रकार,
Payment Name,भुगतान नाम,
-Penalty Amount,जुर्माना राशि,
Pending,अपूर्ण,
Performance,प्रदर्शन,
Period based On,अवधि के आधार पर,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,कृपया इस आइटम को संपादित करने के लिए बाज़ार उपयोगकर्ता के रूप में लॉगिन करें।,
Please login as a Marketplace User to report this item.,कृपया इस आइटम की रिपोर्ट करने के लिए बाज़ार उपयोगकर्ता के रूप में लॉगिन करें।,
Please select <b>Template Type</b> to download template,टेम्प्लेट डाउनलोड करने के लिए <b>टेम्प्लेट टाइप चुनें</b>,
-Please select Applicant Type first,कृपया पहले आवेदक प्रकार का चयन करें,
Please select Customer first,कृपया पहले ग्राहक चुनें,
Please select Item Code first,कृपया आइटम कोड पहले चुनें,
-Please select Loan Type for company {0},कृपया कंपनी के लिए ऋण प्रकार का चयन करें {0},
Please select a Delivery Note,कृपया एक वितरण नोट चुनें,
Please select a Sales Person for item: {0},कृपया आइटम के लिए विक्रय व्यक्ति का चयन करें: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',कृपया कोई अन्य भुगतान विधि चुनें मुद्रा '{0}' में लेनदेन का समर्थन नहीं करता है,
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},कृपया कंपनी के लिए एक डिफ़ॉल्ट बैंक खाता सेट करें {0},
Please specify,कृपया बताएं,
Please specify a {0},कृपया एक {0} निर्दिष्ट करें,lead
-Pledge Status,प्रतिज्ञा की स्थिति,
-Pledge Time,प्रतिज्ञा का समय,
Printing,मुद्रण,
Priority,प्राथमिकता,
Priority has been changed to {0}.,प्राथमिकता को {0} में बदल दिया गया है।,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML फ़ाइलें प्रसंस्करण,
Profitability,लाभप्रदता,
Project,परियोजना,
-Proposed Pledges are mandatory for secured Loans,सुरक्षित ऋणों के लिए प्रस्तावित प्रतिज्ञाएँ अनिवार्य हैं,
Provide the academic year and set the starting and ending date.,शैक्षणिक वर्ष प्रदान करें और आरंभ और समाप्ति तिथि निर्धारित करें।,
Public token is missing for this bank,इस बैंक के लिए सार्वजनिक टोकन गायब है,
Publish,प्रकाशित करना,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,खरीद रसीद में कोई भी आइटम नहीं है जिसके लिए रिटेन नमूना सक्षम है।,
Purchase Return,क्रय वापसी,
Qty of Finished Goods Item,तैयार माल की मात्रा,
-Qty or Amount is mandatroy for loan security,ऋण सुरक्षा के लिए मात्रा या राशि अनिवार्य है,
Quality Inspection required for Item {0} to submit,प्रस्तुत करने के लिए आइटम {0} के लिए गुणवत्ता निरीक्षण आवश्यक है,
Quantity to Manufacture,निर्माण के लिए मात्रा,
Quantity to Manufacture can not be zero for the operation {0},निर्माण की मात्रा ऑपरेशन {0} के लिए शून्य नहीं हो सकती है,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,"राहत की तारीख, ज्वाइनिंग की तारीख से अधिक या उसके बराबर होनी चाहिए",
Rename,नाम बदलें,
Rename Not Allowed,नाम नहीं दिया गया,
-Repayment Method is mandatory for term loans,सावधि ऋण के लिए चुकौती विधि अनिवार्य है,
-Repayment Start Date is mandatory for term loans,सावधि ऋण के लिए चुकौती प्रारंभ तिथि अनिवार्य है,
Report Item,वस्तु की सूचना,
Report this Item,इस मद की रिपोर्ट करें,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,सब-कॉन्ट्रैक्ट के लिए आरक्षित मात्रा: कच्चे माल की मात्रा उप-आइटम बनाने के लिए।,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},पंक्ति ({0}): {1} पहले से ही {2} में छूट दी गई है,
Rows Added in {0},पंक्तियों को {0} में जोड़ा गया,
Rows Removed in {0},पंजे {0} में निकाले गए,
-Sanctioned Amount limit crossed for {0} {1},स्वीकृत राशि सीमा {0} {1} के लिए पार कर गई,
-Sanctioned Loan Amount already exists for {0} against company {1},स्वीकृत ऋण राशि पहले से ही कंपनी के खिलाफ {0} के लिए मौजूद है {1},
Save,सहेजें,
Save Item,आइटम सहेजें,
Saved Items,बची हुई वस्तुएँ,
@@ -4135,7 +4093,6 @@
User {0} is disabled,प्रयोक्ता {0} अक्षम है,
Users and Permissions,उपयोगकर्ता और अनुमतियाँ,
Vacancies cannot be lower than the current openings,रिक्तियां वर्तमान उद्घाटन की तुलना में कम नहीं हो सकती हैं,
-Valid From Time must be lesser than Valid Upto Time.,वैलिड फ्रॉम टाइम वैलिड तक के समय से कम होना चाहिए।,
Valuation Rate required for Item {0} at row {1},पंक्ति {1} पर आइटम {0} के लिए आवश्यक मूल्यांकन दर,
Values Out Of Sync,सिंक से बाहर का मूल्य,
Vehicle Type is required if Mode of Transport is Road,अगर मोड ऑफ रोड है तो वाहन के प्रकार की आवश्यकता है,
@@ -4211,7 +4168,6 @@
Add to Cart,कार्ट में जोड़ें,
Days Since Last Order,अंतिम आदेश के बाद के दिन,
In Stock,स्टॉक में,
-Loan Amount is mandatory,लोन अमाउंट अनिवार्य है,
Mode Of Payment,भुगतान की रीति,
No students Found,कोई छात्र नहीं मिला,
Not in Stock,स्टॉक में नहीं,
@@ -4240,7 +4196,6 @@
Group by,समूह द्वारा,
In stock,स्टॉक में,
Item name,मद का नाम,
-Loan amount is mandatory,लोन अमाउंट अनिवार्य है,
Minimum Qty,न्यूनतम मात्रा,
More details,अधिक जानकारी,
Nature of Supplies,आपूर्ति की प्रकृति,
@@ -4409,9 +4364,6 @@
Total Completed Qty,कुल पूर्ण मात्रा,
Qty to Manufacture,विनिर्माण मात्रा,
Repay From Salary can be selected only for term loans,चुकौती से वेतन केवल टर्म लोन के लिए चुना जा सकता है,
-No valid Loan Security Price found for {0},{0} के लिए कोई वैध ऋण सुरक्षा मूल्य नहीं मिला,
-Loan Account and Payment Account cannot be same,ऋण खाता और भुगतान खाता समान नहीं हो सकते,
-Loan Security Pledge can only be created for secured loans,ऋण सुरक्षा प्रतिज्ञा केवल सुरक्षित ऋण के लिए बनाई जा सकती है,
Social Media Campaigns,सोशल मीडिया अभियान,
From Date can not be greater than To Date,तिथि से दिनांक से बड़ा नहीं हो सकता,
Please set a Customer linked to the Patient,कृपया रोगी से जुड़ा एक ग्राहक सेट करें,
@@ -6437,7 +6389,6 @@
HR User,मानव संसाधन उपयोगकर्ता,
Appointment Letter,नियुक्ति पत्र,
Job Applicant,नौकरी आवेदक,
-Applicant Name,आवेदक के नाम,
Appointment Date,मिलने की तारीख,
Appointment Letter Template,नियुक्ति पत्र टेम्पलेट,
Body,तन,
@@ -7059,99 +7010,12 @@
Sync in Progress,प्रगति में सिंक करें,
Hub Seller Name,हब विक्रेता का नाम,
Custom Data,कस्टम डेटा,
-Member,सदस्य,
-Partially Disbursed,आंशिक रूप से वितरित,
-Loan Closure Requested,ऋण बंद करने का अनुरोध किया,
Repay From Salary,वेतन से बदला,
-Loan Details,ऋण विवरण,
-Loan Type,प्रकार के ऋण,
-Loan Amount,उधार की राशि,
-Is Secured Loan,सुरक्षित ऋण है,
-Rate of Interest (%) / Year,ब्याज (%) / वर्ष की दर,
-Disbursement Date,संवितरण की तारीख,
-Disbursed Amount,वितरित राशि,
-Is Term Loan,टर्म लोन है,
-Repayment Method,चुकौती विधि,
-Repay Fixed Amount per Period,चुकाने अवधि के प्रति निश्चित राशि,
-Repay Over Number of Periods,चुकाने से अधिक अवधि की संख्या,
-Repayment Period in Months,महीने में चुकाने की अवधि,
-Monthly Repayment Amount,मासिक भुगतान राशि,
-Repayment Start Date,पुनर्भुगतान प्रारंभ दिनांक,
-Loan Security Details,ऋण सुरक्षा विवरण,
-Maximum Loan Value,अधिकतम ऋण मूल्य,
-Account Info,खाता जानकारी,
-Loan Account,ऋण खाता,
-Interest Income Account,ब्याज आय खाता,
-Penalty Income Account,दंड आय खाता,
-Repayment Schedule,पुनः भुगतान कार्यक्रम,
-Total Payable Amount,कुल देय राशि,
-Total Principal Paid,कुल प्रिंसिपल पेड,
-Total Interest Payable,देय कुल ब्याज,
-Total Amount Paid,भुगतान की गई कुल राशि,
-Loan Manager,ऋण प्रबंधक,
-Loan Info,ऋण जानकारी,
-Rate of Interest,ब्याज की दर,
-Proposed Pledges,प्रस्तावित प्रतिज्ञाएँ,
-Maximum Loan Amount,अधिकतम ऋण राशि,
-Repayment Info,चुकौती जानकारी,
-Total Payable Interest,कुल देय ब्याज,
-Against Loan ,लोन के खिलाफ,
-Loan Interest Accrual,ऋण का ब्याज क्रमिक,
-Amounts,राशियाँ,
-Pending Principal Amount,लंबित मूल राशि,
-Payable Principal Amount,देय मूलधन राशि,
-Paid Principal Amount,पेड प्रिंसिपल अमाउंट,
-Paid Interest Amount,ब्याज राशि का भुगतान किया,
-Process Loan Interest Accrual,प्रक्रिया ऋण ब्याज क्रमिक,
-Repayment Schedule Name,चुकौती अनुसूची नाम,
Regular Payment,नियमित भुगतान,
Loan Closure,ऋण बंद करना,
-Payment Details,भुगतान विवरण,
-Interest Payable,देय ब्याज,
-Amount Paid,राशि का भुगतान,
-Principal Amount Paid,प्रिंसिपल अमाउंट पेड,
-Repayment Details,चुकौती के लिए विवरण,
-Loan Repayment Detail,ऋण चुकौती विवरण,
-Loan Security Name,ऋण सुरक्षा नाम,
-Unit Of Measure,माप की इकाई,
-Loan Security Code,ऋण सुरक्षा कोड,
-Loan Security Type,ऋण सुरक्षा प्रकार,
-Haircut %,बाल कटवाने का%,
-Loan Details,ऋण का विवरण,
-Unpledged,Unpledged,
-Pledged,गिरवी,
-Partially Pledged,आंशिक रूप से प्रतिज्ञा की गई,
-Securities,प्रतिभूति,
-Total Security Value,कुल सुरक्षा मूल्य,
-Loan Security Shortfall,ऋण सुरक्षा की कमी,
-Loan ,ऋण,
-Shortfall Time,कम समय,
-America/New_York,America / New_York,
-Shortfall Amount,शॉर्टफॉल राशि,
-Security Value ,सुरक्षा मूल्य,
-Process Loan Security Shortfall,प्रक्रिया ऋण सुरक्षा की कमी,
-Loan To Value Ratio,मूल्य अनुपात के लिए ऋण,
-Unpledge Time,अनप्लग टाइम,
-Loan Name,ऋण नाम,
Rate of Interest (%) Yearly,ब्याज दर (%) वार्षिक,
-Penalty Interest Rate (%) Per Day,पेनल्टी ब्याज दर (%) प्रति दिन,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,विलंबित पुनर्भुगतान के मामले में दैनिक आधार पर लंबित ब्याज राशि पर जुर्माना ब्याज दर लगाया जाता है,
-Grace Period in Days,दिनों में अनुग्रह की अवधि,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,ऋण की अदायगी में देरी के मामले में नियत तारीख तक जुर्माना नहीं लगाया जाएगा,
-Pledge,प्रतिज्ञा,
-Post Haircut Amount,पोस्ट बाल कटवाने की राशि,
-Process Type,प्रक्रिया प्रकार,
-Update Time,समय सुधारें,
-Proposed Pledge,प्रस्तावित प्रतिज्ञा,
-Total Payment,कुल भुगतान,
-Balance Loan Amount,शेष ऋण की राशि,
-Is Accrued,माना जाता है,
Salary Slip Loan,वेतन स्लिप ऋण,
Loan Repayment Entry,ऋण चुकौती प्रविष्टि,
-Sanctioned Loan Amount,स्वीकृत ऋण राशि,
-Sanctioned Amount Limit,स्वीकृत राशि सीमा,
-Unpledge,Unpledge,
-Haircut,बाल काटना,
MAT-MSH-.YYYY.-,मेट-MSH-.YYYY.-,
Generate Schedule,कार्यक्रम तय करें उत्पन्न,
Schedules,अनुसूचियों,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,परियोजना इन उपयोगकर्ताओं के लिए वेबसाइट पर सुलभ हो जाएगा,
Copied From,से प्रतिलिपि बनाई गई,
Start and End Dates,आरंभ और अंत तारीखें,
-Actual Time (in Hours),वास्तविक समय (घंटे में),
+Actual Time in Hours (via Timesheet),वास्तविक समय (घंटे में),
Costing and Billing,लागत और बिलिंग,
-Total Costing Amount (via Timesheets),कुल लागत (टाइम्सशीट्स के माध्यम से),
-Total Expense Claim (via Expense Claims),कुल खर्च दावा (खर्च का दावा के माध्यम से),
+Total Costing Amount (via Timesheet),कुल लागत (टाइम्सशीट्स के माध्यम से),
+Total Expense Claim (via Expense Claim),कुल खर्च दावा (खर्च का दावा के माध्यम से),
Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से),
Total Sales Amount (via Sales Order),कुल बिक्री राशि (बिक्री आदेश के माध्यम से),
-Total Billable Amount (via Timesheets),कुल बिल योग्य राशि (टाइम्सशीट्स के माध्यम से),
-Total Billed Amount (via Sales Invoices),कुल बिल राशि (बिक्री चालान के माध्यम से),
-Total Consumed Material Cost (via Stock Entry),कुल उपभोजित सामग्री लागत (स्टॉक प्रविष्टि के माध्यम से),
+Total Billable Amount (via Timesheet),कुल बिल योग्य राशि (टाइम्सशीट्स के माध्यम से),
+Total Billed Amount (via Sales Invoice),कुल बिल राशि (बिक्री चालान के माध्यम से),
+Total Consumed Material Cost (via Stock Entry),कुल उपभोजित सामग्री लागत (स्टॉक प्रविष्टि के माध्यम से),
Gross Margin,सकल मुनाफा,
Gross Margin %,सकल मार्जिन%,
Monitor Progress,प्रगति की निगरानी करें,
@@ -7521,12 +7385,10 @@
Dependencies,निर्भरता,
Dependent Tasks,आश्रित कार्य,
Depends on Tasks,कार्य पर निर्भर करता है,
-Actual Start Date (via Time Sheet),वास्तविक प्रारंभ तिथि (समय पत्रक के माध्यम से),
-Actual Time (in hours),(घंटे में) वास्तविक समय,
-Actual End Date (via Time Sheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से),
-Total Costing Amount (via Time Sheet),कुल लागत राशि (समय पत्रक के माध्यम से),
+Actual Start Date (via Timesheet),वास्तविक प्रारंभ तिथि (समय पत्रक के माध्यम से),
+Actual Time in Hours (via Timesheet),(घंटे में) वास्तविक समय,
+Actual End Date (via Timesheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से),
Total Expense Claim (via Expense Claim),(व्यय दावा) के माध्यम से कुल खर्च का दावा,
-Total Billing Amount (via Time Sheet),कुल बिलिंग राशि (समय पत्रक के माध्यम से),
Review Date,तिथि की समीक्षा,
Closing Date,तिथि समापन,
Task Depends On,काम पर निर्भर करता है,
@@ -7887,7 +7749,6 @@
Update Series,अद्यतन श्रृंखला,
Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.,
Prefix,उपसर्ग,
-Current Value,वर्तमान मान,
This is the number of the last created transaction with this prefix,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या,
Update Series Number,अद्यतन सीरीज नंबर,
Quotation Lost Reason,कोटेशन कारण खोया,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की,
Lead Details,विवरण लीड,
Lead Owner Efficiency,लीड स्वामी क्षमता,
-Loan Repayment and Closure,ऋण चुकौती और समापन,
-Loan Security Status,ऋण सुरक्षा स्थिति,
Lost Opportunity,अवसर खो दिया,
Maintenance Schedules,रखरखाव अनुसूचियों,
Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},लक्षित संख्या: {0},
Payment Account is mandatory,भुगतान खाता अनिवार्य है,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","यदि जाँच की जाती है, तो बिना किसी घोषणा या प्रमाण प्रस्तुत के आयकर की गणना करने से पहले कर योग्य आय से पूरी राशि काट ली जाएगी।",
-Disbursement Details,संवितरण विवरण,
Material Request Warehouse,माल अनुरोध गोदाम,
Select warehouse for material requests,भौतिक अनुरोधों के लिए वेयरहाउस का चयन करें,
Transfer Materials For Warehouse {0},गोदाम {0} के लिए स्थानांतरण सामग्री,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,वेतन से लावारिस राशि को चुकाएं,
Deduction from salary,वेतन से कटौती,
Expired Leaves,समय सीमा समाप्त,
-Reference No,संदर्भ संख्या,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,हेयरकट प्रतिशत ऋण सुरक्षा के बाजार मूल्य और उस ऋण सुरक्षा के लिए दिए गए मूल्य के बीच का अंतर होता है जब उस ऋण के लिए संपार्श्विक के रूप में उपयोग किया जाता है।,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"लोन टू वैल्यू रेशियो, गिरवी रखी गई सिक्योरिटी के मूल्य के लिए लोन राशि के अनुपात को व्यक्त करता है। यदि किसी ऋण के लिए निर्दिष्ट मूल्य से नीचे आता है, तो ऋण सुरक्षा की कमी शुरू हो जाएगी",
If this is not checked the loan by default will be considered as a Demand Loan,"यदि यह डिफ़ॉल्ट रूप से ऋण की जाँच नहीं है, तो इसे डिमांड लोन माना जाएगा",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,इस खाते का उपयोग उधारकर्ता से ऋण चुकौती की बुकिंग के लिए किया जाता है और उधारकर्ता को ऋण का वितरण भी किया जाता है,
This account is capital account which is used to allocate capital for loan disbursal account ,यह खाता पूंजी खाता है जिसका उपयोग ऋण वितरण खाते के लिए पूंजी आवंटित करने के लिए किया जाता है,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ऑपरेशन {0} वर्क ऑर्डर {1} से संबंधित नहीं है,
Print UOM after Quantity,मात्रा के बाद UOM प्रिंट करें,
Set default {0} account for perpetual inventory for non stock items,गैर स्टॉक वस्तुओं के लिए सदा सूची के लिए डिफ़ॉल्ट {0} खाता सेट करें,
-Loan Security {0} added multiple times,ऋण सुरक्षा {0} कई बार जोड़ी गई,
-Loan Securities with different LTV ratio cannot be pledged against one loan,अलग-अलग LTV अनुपात वाले ऋण प्रतिभूतियों को एक ऋण के मुकाबले गिरवी नहीं रखा जा सकता है,
-Qty or Amount is mandatory for loan security!,ऋण सुरक्षा के लिए मात्रा या राशि अनिवार्य है!,
-Only submittted unpledge requests can be approved,केवल विनम्र अनपेक्षित अनुरोधों को मंजूरी दी जा सकती है,
-Interest Amount or Principal Amount is mandatory,ब्याज राशि या मूल राशि अनिवार्य है,
-Disbursed Amount cannot be greater than {0},वितरित राशि {0} से अधिक नहीं हो सकती,
-Row {0}: Loan Security {1} added multiple times,पंक्ति {0}: ऋण सुरक्षा {1} कई बार जोड़ी गई,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,रो # {0}: चाइल्ड आइटम को प्रोडक्ट बंडल नहीं होना चाहिए। कृपया आइटम {1} निकालें और सहेजें,
Credit limit reached for customer {0},ग्राहक के लिए क्रेडिट सीमा {0},
Could not auto create Customer due to the following missing mandatory field(s):,निम्नलिखित लापता अनिवार्य क्षेत्र के कारण ग्राहक को ऑटो नहीं बना सके:,
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 232832f..2da37c5 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Primjenjivo ako je tvrtka SpA, SApA ili SRL",
Applicable if the company is a limited liability company,Primjenjivo ako je društvo s ograničenom odgovornošću,
Applicable if the company is an Individual or a Proprietorship,Primjenjivo ako je tvrtka fizička osoba ili vlasništvo,
-Applicant,podnositelj zahtjeva,
-Applicant Type,Vrsta podnositelja zahtjeva,
Application of Funds (Assets),Primjena sredstava ( aktiva ),
Application period cannot be across two allocation records,Razdoblje primjene ne može se nalaziti na dva zapisa o dodjeli,
Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Popis dostupnih dioničara s folijskim brojevima,
Loading Payment System,Učitavanje sustava plaćanja,
Loan,Zajam,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0},
-Loan Application,Primjena zajma,
-Loan Management,Upravljanje zajmom,
-Loan Repayment,Otplata kredita,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Datum početka i razdoblje zajma obvezni su za spremanje popusta na fakture,
Loans (Liabilities),Zajmovi (pasiva),
Loans and Advances (Assets),Zajmovi i predujmovi (aktiva),
@@ -1611,7 +1605,6 @@
Monday,Ponedjeljak,
Monthly,Mjesečno,
Monthly Distribution,Mjesečna distribucija,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečni iznos otplate ne može biti veća od iznosa kredita,
More,Više,
More Information,Više informacija,
More than one selection for {0} not allowed,Više od jednog izbora za {0} nije dopušteno,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Plaćajte {0} {1},
Payable,plativ,
Payable Account,Obveze prema dobavljačima,
-Payable Amount,Iznos koji se plaća,
Payment,Uplata,
Payment Cancelled. Please check your GoCardless Account for more details,Plaćanje je otkazano. Više pojedinosti potražite u svojem računu za GoCardless,
Payment Confirmation,Potvrda uplate,
-Payment Date,Datum plačanja,
Payment Days,Plaćanja Dana,
Payment Document,Dokument plaćanja,
Payment Due Date,Plaćanje Due Date,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Unesite prvo primku,
Please enter Receipt Document,Unesite primitka dokumenta,
Please enter Reference date,Unesite referentni datum,
-Please enter Repayment Periods,Unesite razdoblja otplate,
Please enter Reqd by Date,Unesite Reqd po datumu,
Please enter Woocommerce Server URL,Unesite Woocommerce URL poslužitelja,
Please enter Write Off Account,Unesite otpis račun,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Unesite roditelj troška,
Please enter quantity for Item {0},Molimo unesite količinu za točku {0},
Please enter relieving date.,Unesite olakšavanja datum .,
-Please enter repayment Amount,Unesite iznos otplate,
Please enter valid Financial Year Start and End Dates,Unesite valjani financijske godine datum početka i kraja,
Please enter valid email address,Unesite valjanu e-adresu,
Please enter {0} first,Unesite {0} prvi,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.,
Primary Address Details,Primarni podaci o adresi,
Primary Contact Details,Primarni podaci za kontakt,
-Principal Amount,iznos glavnice,
Print Format,Format ispisa,
Print IRS 1099 Forms,Ispiši obrasce IRS 1099,
Print Report Card,Ispis izvješća,
@@ -2550,7 +2538,6 @@
Sample Collection,Prikupljanje uzoraka,
Sample quantity {0} cannot be more than received quantity {1},Uzorak {0} ne može biti veći od primljene količine {1},
Sanctioned,kažnjeni,
-Sanctioned Amount,Iznos kažnjeni,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.,
Sand,Pijesak,
Saturday,Subota,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} već ima roditeljski postupak {1}.,
API,API,
Annual,godišnji,
-Approved,Odobren,
Change,Promjena,
Contact Email,Kontakt email,
Export Type,Vrsta izvoza,
@@ -3571,7 +3557,6 @@
Account Value,Vrijednost računa,
Account is mandatory to get payment entries,Račun je obvezan za unos plaćanja,
Account is not set for the dashboard chart {0},Račun nije postavljen za grafikon na nadzornoj ploči {0},
-Account {0} does not belong to company {1},Račun {0} ne pripada tvrtki {1},
Account {0} does not exists in the dashboard chart {1},Račun {0} ne postoji na grafikonu nadzorne ploče {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Račun: <b>{0}</b> je kapital U tijeku je rad i ne može ga ažurirati Entry Journal,
Account: {0} is not permitted under Payment Entry,Račun: {0} nije dopušten unosom plaćanja,
@@ -3582,7 +3567,6 @@
Activity,Aktivnost,
Add / Manage Email Accounts.,Dodaj / uredi email račun.,
Add Child,Dodaj dijete,
-Add Loan Security,Dodajte sigurnost kredita,
Add Multiple,Dodaj više stavki,
Add Participants,Dodaj sudionike,
Add to Featured Item,Dodajte u istaknuti predmet,
@@ -3593,15 +3577,12 @@
Address Line 1,Adresa - linija 1,
Addresses,Adrese,
Admission End Date should be greater than Admission Start Date.,Datum završetka prijema trebao bi biti veći od datuma početka upisa.,
-Against Loan,Protiv zajma,
-Against Loan:,Protiv zajma:,
All,svi,
All bank transactions have been created,Sve su bankovne transakcije stvorene,
All the depreciations has been booked,Sve su amortizacije knjižene,
Allocation Expired!,Raspodjela je istekla!,
Allow Resetting Service Level Agreement from Support Settings.,Dopusti resetiranje sporazuma o razini usluge iz postavki podrške.,
Amount of {0} is required for Loan closure,Za zatvaranje zajma potreban je iznos {0},
-Amount paid cannot be zero,Plaćeni iznos ne može biti nula,
Applied Coupon Code,Primijenjeni kod kupona,
Apply Coupon Code,Primijenite kod kupona,
Appointment Booking,Rezervacija termina,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Ne mogu izračunati vrijeme dolaska jer nedostaje adresa vozača.,
Cannot Optimize Route as Driver Address is Missing.,Ruta se ne može optimizirati jer nedostaje adresa vozača.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Ne mogu dovršiti zadatak {0} jer njegov ovisni zadatak {1} nije dovršen / otkazan.,
-Cannot create loan until application is approved,Zajam nije moguće stvoriti dok aplikacija ne bude odobrena,
Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nije moguće preplatiti za stavku {0} u retku {1} više od {2}. Da biste omogućili prekomjerno naplaćivanje, molimo postavite dodatak u Postavkama računa",
"Capacity Planning Error, planned start time can not be same as end time","Pogreška planiranja kapaciteta, planirano vrijeme početka ne može biti isto vrijeme završetka",
@@ -3812,20 +3792,9 @@
Less Than Amount,Manje od iznosa,
Liabilities,pasiva,
Loading...,Učitavanje ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Iznos zajma premašuje maksimalni iznos zajma od {0} po predloženim vrijednosnim papirima,
Loan Applications from customers and employees.,Prijave za zajmove od kupaca i zaposlenika.,
-Loan Disbursement,Isplata zajma,
Loan Processes,Procesi zajma,
-Loan Security,Zajam zajma,
-Loan Security Pledge,Zalog osiguranja zajma,
-Loan Security Pledge Created : {0},Stvoreno jamstvo zajma: {0},
-Loan Security Price,Cijena osiguranja zajma,
-Loan Security Price overlapping with {0},Cijena osiguranja zajma koji se preklapa s {0},
-Loan Security Unpledge,Bezplatno pozajmljivanje kredita,
-Loan Security Value,Vrijednost kredita zajma,
Loan Type for interest and penalty rates,Vrsta zajma za kamate i zatezne stope,
-Loan amount cannot be greater than {0},Iznos zajma ne može biti veći od {0},
-Loan is mandatory,Zajam je obvezan,
Loans,krediti,
Loans provided to customers and employees.,Krediti kupcima i zaposlenicima.,
Location,Lokacija,
@@ -3894,7 +3863,6 @@
Pay,Platiti,
Payment Document Type,Vrsta dokumenta plaćanja,
Payment Name,Naziv plaćanja,
-Penalty Amount,Iznos kazne,
Pending,Na čekanju,
Performance,Izvođenje,
Period based On,Razdoblje na temelju,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Prijavite se kao Korisnik Marketplacea da biste uredili ovu stavku.,
Please login as a Marketplace User to report this item.,Prijavite se kao korisnik Marketplacea kako biste prijavili ovu stavku.,
Please select <b>Template Type</b> to download template,Odaberite <b>vrstu predloška</b> za preuzimanje predloška,
-Please select Applicant Type first,Prvo odaberite vrstu podnositelja zahtjeva,
Please select Customer first,Prvo odaberite kupca,
Please select Item Code first,Prvo odaberite šifru predmeta,
-Please select Loan Type for company {0},Odaberite vrstu kredita za tvrtku {0},
Please select a Delivery Note,Odaberite bilješku o isporuci,
Please select a Sales Person for item: {0},Odaberite prodajnu osobu za stavku: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Odaberite drugi način plaćanja. Traka ne podržava transakcije u valuti "{0}",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Postavite zadani bankovni račun za tvrtku {0},
Please specify,Navedite,
Please specify a {0},Navedite {0},lead
-Pledge Status,Status zaloga,
-Pledge Time,Vrijeme zaloga,
Printing,Tiskanje,
Priority,Prioritet,
Priority has been changed to {0}.,Prioritet je promijenjen u {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Obrada XML datoteka,
Profitability,rentabilnost,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Predložene zaloge su obavezne za osigurane zajmove,
Provide the academic year and set the starting and ending date.,Navedite akademsku godinu i postavite datum početka i završetka.,
Public token is missing for this bank,Javni token nedostaje za ovu banku,
Publish,Objaviti,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Kupnja potvrde nema stavku za koju je omogućen zadržati uzorak.,
Purchase Return,Kupnja Povratak,
Qty of Finished Goods Item,Količina proizvoda gotove robe,
-Qty or Amount is mandatroy for loan security,Količina ili iznos je mandatroy za osiguranje kredita,
Quality Inspection required for Item {0} to submit,Inspekcija kvalitete potrebna je za predavanje predmeta {0},
Quantity to Manufacture,Količina za proizvodnju,
Quantity to Manufacture can not be zero for the operation {0},Količina za proizvodnju ne može biti nula za operaciju {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Datum oslobađanja mora biti veći ili jednak datumu pridruživanja,
Rename,Preimenuj,
Rename Not Allowed,Preimenovanje nije dopušteno,
-Repayment Method is mandatory for term loans,Način otplate je obvezan za oročene kredite,
-Repayment Start Date is mandatory for term loans,Datum početka otplate je obvezan za oročene kredite,
Report Item,Stavka izvješća,
Report this Item,Prijavite ovu stavku,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Količina rezerviranog za podugovor: Količina sirovina za izradu predmeta koji su predmet podugovora.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Red ({0}): {1} već je snižen u {2},
Rows Added in {0},Redovi dodano u {0},
Rows Removed in {0},Redovi su uklonjeni za {0},
-Sanctioned Amount limit crossed for {0} {1},Granica sankcioniranog iznosa pređena za {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Iznos sankcioniranog zajma već postoji za {0} protiv tvrtke {1},
Save,Spremi,
Save Item,Spremi stavku,
Saved Items,Spremljene stavke,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Korisnik {0} je onemogućen,
Users and Permissions,Korisnici i dozvole,
Vacancies cannot be lower than the current openings,Slobodna radna mjesta ne mogu biti niža od trenutačnih,
-Valid From Time must be lesser than Valid Upto Time.,Vrijedi od vremena mora biti kraće od Važećeg vremena uputa.,
Valuation Rate required for Item {0} at row {1},Stopa vrednovanja potrebna za stavku {0} u retku {1},
Values Out Of Sync,Vrijednosti nisu sinkronizirane,
Vehicle Type is required if Mode of Transport is Road,Vrsta vozila potrebna je ako je način prijevoza cestovni,
@@ -4211,7 +4168,6 @@
Add to Cart,Dodaj u košaricu,
Days Since Last Order,Dana od zadnje narudžbe,
In Stock,Na zalihi,
-Loan Amount is mandatory,Iznos zajma je obvezan,
Mode Of Payment,Nacin placanja,
No students Found,Studenti nisu pronađeni,
Not in Stock,Ne u skladištu,
@@ -4240,7 +4196,6 @@
Group by,Grupiranje prema,
In stock,Na lageru,
Item name,Naziv proizvoda,
-Loan amount is mandatory,Iznos zajma je obvezan,
Minimum Qty,Minimalni broj,
More details,Više pojedinosti,
Nature of Supplies,Priroda potrošnog materijala,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Ukupno završeno Količina,
Qty to Manufacture,Količina za proizvodnju,
Repay From Salary can be selected only for term loans,Otplata plaće može se odabrati samo za oročene zajmove,
-No valid Loan Security Price found for {0},Nije pronađena valjana cijena osiguranja zajma za {0},
-Loan Account and Payment Account cannot be same,Račun zajma i račun za plaćanje ne mogu biti isti,
-Loan Security Pledge can only be created for secured loans,Zalog osiguranja zajma može se stvoriti samo za osigurane zajmove,
Social Media Campaigns,Kampanje na društvenim mrežama,
From Date can not be greater than To Date,Od datuma ne može biti veći od datuma,
Please set a Customer linked to the Patient,Molimo postavite kupca povezanog s pacijentom,
@@ -6437,7 +6389,6 @@
HR User,HR Korisnik,
Appointment Letter,Pismo o sastanku,
Job Applicant,Posao podnositelj,
-Applicant Name,Podnositelj zahtjeva Ime,
Appointment Date,Datum imenovanja,
Appointment Letter Template,Predložak pisma o imenovanju,
Body,Tijelo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinkronizacija u tijeku,
Hub Seller Name,Naziv prodavača u centru,
Custom Data,Prilagođeni podaci,
-Member,Član,
-Partially Disbursed,djelomično Isplaćeno,
-Loan Closure Requested,Zatraženo zatvaranje zajma,
Repay From Salary,Vrati iz plaće,
-Loan Details,zajam Detalji,
-Loan Type,Vrsta kredita,
-Loan Amount,Iznos pozajmice,
-Is Secured Loan,Zajam je osiguran,
-Rate of Interest (%) / Year,Kamatna stopa (%) / godina,
-Disbursement Date,datum isplate,
-Disbursed Amount,Izplaćeni iznos,
-Is Term Loan,Je li Term zajam,
-Repayment Method,Način otplate,
-Repay Fixed Amount per Period,Vratiti fiksni iznos po razdoblju,
-Repay Over Number of Periods,Vrati Preko broj razdoblja,
-Repayment Period in Months,Rok otplate u mjesecima,
-Monthly Repayment Amount,Mjesečni iznos otplate,
-Repayment Start Date,Početni datum otplate,
-Loan Security Details,Pojedinosti o zajmu,
-Maximum Loan Value,Maksimalna vrijednost zajma,
-Account Info,Informacije računa,
-Loan Account,Račun zajma,
-Interest Income Account,Prihod od kamata računa,
-Penalty Income Account,Račun primanja penala,
-Repayment Schedule,Otplata Raspored,
-Total Payable Amount,Ukupno obveze prema dobavljačima iznos,
-Total Principal Paid,Ukupno plaćeno glavnice,
-Total Interest Payable,Ukupna kamata,
-Total Amount Paid,Plaćeni ukupni iznos,
-Loan Manager,Voditelj kredita,
-Loan Info,Informacije o zajmu,
-Rate of Interest,Kamatna stopa,
-Proposed Pledges,Predložena obećanja,
-Maximum Loan Amount,Maksimalni iznos kredita,
-Repayment Info,Informacije otplate,
-Total Payable Interest,Ukupno obveze prema dobavljačima kamata,
-Against Loan ,Protiv Zajma,
-Loan Interest Accrual,Prihodi od kamata na zajmove,
-Amounts,iznosi,
-Pending Principal Amount,Na čekanju glavni iznos,
-Payable Principal Amount,Plativi glavni iznos,
-Paid Principal Amount,Plaćeni iznos glavnice,
-Paid Interest Amount,Iznos plaćene kamate,
-Process Loan Interest Accrual,Obračunska kamata na zajam,
-Repayment Schedule Name,Naziv rasporeda otplate,
Regular Payment,Redovna uplata,
Loan Closure,Zatvaranje zajma,
-Payment Details,Pojedinosti o plaćanju,
-Interest Payable,Kamata se plaća,
-Amount Paid,Plaćeni iznos,
-Principal Amount Paid,Iznos glavnice,
-Repayment Details,Detalji otplate,
-Loan Repayment Detail,Detalji otplate zajma,
-Loan Security Name,Naziv osiguranja zajma,
-Unit Of Measure,Jedinica mjere,
-Loan Security Code,Kôd za sigurnost zajma,
-Loan Security Type,Vrsta osiguranja zajma,
-Haircut %,Šišanje %,
-Loan Details,Pojedinosti o zajmu,
-Unpledged,Unpledged,
-Pledged,obećao,
-Partially Pledged,Djelomično založno,
-Securities,hartije od vrijednosti,
-Total Security Value,Ukupna vrijednost sigurnosti,
-Loan Security Shortfall,Nedostatak sigurnosti zajma,
-Loan ,Zajam,
-Shortfall Time,Vrijeme pada,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Iznos manjka,
-Security Value ,Vrijednost sigurnosti,
-Process Loan Security Shortfall,Nedostatak sigurnosti zajma u procesu,
-Loan To Value Ratio,Omjer zajma prema vrijednosti,
-Unpledge Time,Vrijeme odvrtanja,
-Loan Name,Naziv kredita,
Rate of Interest (%) Yearly,Kamatna stopa (%) godišnje,
-Penalty Interest Rate (%) Per Day,Kazna kamata (%) po danu,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Zatezna kamata se svakodnevno obračunava na viši iznos kamate u slučaju kašnjenja s kašnjenjem,
-Grace Period in Days,Grace razdoblje u danima,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Broj dana od datuma dospijeća do kojeg se neće naplatiti kazna u slučaju kašnjenja u otplati kredita,
-Pledge,Zalog,
-Post Haircut Amount,Iznos pošiljanja frizure,
-Process Type,Vrsta procesa,
-Update Time,Vrijeme ažuriranja,
-Proposed Pledge,Predloženo založno pravo,
-Total Payment,ukupno plaćanja,
-Balance Loan Amount,Stanje Iznos kredita,
-Is Accrued,Pripisuje se,
Salary Slip Loan,Zajmoprimac za plaću,
Loan Repayment Entry,Unos otplate zajma,
-Sanctioned Loan Amount,Iznos sankcije,
-Sanctioned Amount Limit,Odobreni iznos iznosa,
-Unpledge,Unpledge,
-Haircut,Šišanje,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generiranje Raspored,
Schedules,Raspored,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekt će biti dostupan na web-stranici ovih korisnika,
Copied From,Kopiran iz,
Start and End Dates,Datumi početka i završetka,
-Actual Time (in Hours),Stvarno vrijeme (u satima),
+Actual Time in Hours (via Timesheet),Stvarno vrijeme (u satima),
Costing and Billing,Obračun troškova i naplate,
-Total Costing Amount (via Timesheets),Ukupni iznos troškova (putem vremenskih brojeva),
-Total Expense Claim (via Expense Claims),Ukupni rashodi Zatraži (preko Rashodi potraživanja),
+Total Costing Amount (via Timesheet),Ukupni iznos troškova (putem vremenskih brojeva),
+Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi potraživanja),
Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda),
Total Sales Amount (via Sales Order),Ukupni iznos prodaje (putem prodajnog naloga),
-Total Billable Amount (via Timesheets),Ukupan iznos koji se naplaćuje (putem vremenskih brojeva),
-Total Billed Amount (via Sales Invoices),Ukupni iznos naplaćenog računa (putem faktura prodaje),
-Total Consumed Material Cost (via Stock Entry),Ukupni trošak potrošenog materijala (putem stanja na burzi),
+Total Billable Amount (via Timesheet),Ukupan iznos koji se naplaćuje (putem vremenskih brojeva),
+Total Billed Amount (via Sales Invoice),Ukupni iznos naplaćenog računa (putem faktura prodaje),
+Total Consumed Material Cost (via Stock Entry),Ukupni trošak potrošenog materijala (putem stanja na burzi),
Gross Margin,Bruto marža,
Gross Margin %,Bruto marža %,
Monitor Progress,Monitor napredak,
@@ -7521,12 +7385,10 @@
Dependencies,ovisnosti,
Dependent Tasks,Zavisni zadaci,
Depends on Tasks,Ovisi o poslovima,
-Actual Start Date (via Time Sheet),Stvarni datum početka (putem vremenska tablica),
-Actual Time (in hours),Stvarno vrijeme (u satima),
-Actual End Date (via Time Sheet),Stvarni Datum završetka (putem vremenska tablica),
-Total Costing Amount (via Time Sheet),Ukupno troška Iznos (preko vremenska tablica),
+Actual Start Date (via Timesheet),Stvarni datum početka (putem vremenska tablica),
+Actual Time in Hours (via Timesheet),Stvarno vrijeme (u satima),
+Actual End Date (via Timesheet),Stvarni Datum završetka (putem vremenska tablica),
Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi Zahtjeva),
-Total Billing Amount (via Time Sheet),Ukupan iznos za naplatu (preko vremenska tablica),
Review Date,Recenzija Datum,
Closing Date,Datum zatvaranja,
Task Depends On,Zadatak ovisi o,
@@ -7887,7 +7749,6 @@
Update Series,Update serija,
Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.,
Prefix,Prefiks,
-Current Value,Trenutna vrijednost,
This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom,
Update Series Number,Update serije Broj,
Quotation Lost Reason,Razlog nerealizirane ponude,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe,
Lead Details,Detalji potenciajalnog kupca,
Lead Owner Efficiency,Učinkovitost voditelja,
-Loan Repayment and Closure,Otplata i zatvaranje zajma,
-Loan Security Status,Status osiguranja zajma,
Lost Opportunity,Izgubljena prilika,
Maintenance Schedules,Održavanja rasporeda,
Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Broj ciljanih brojeva: {0},
Payment Account is mandatory,Račun za plaćanje je obavezan,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ako se označi, puni iznos odbit će se od oporezivog dohotka prije izračuna poreza na dohodak bez bilo kakve izjave ili podnošenja dokaza.",
-Disbursement Details,Detalji isplate,
Material Request Warehouse,Skladište zahtjeva za materijal,
Select warehouse for material requests,Odaberite skladište za zahtjeve za materijalom,
Transfer Materials For Warehouse {0},Prijenos materijala za skladište {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Otplatite neiskorišteni iznos iz plaće,
Deduction from salary,Odbitak od plaće,
Expired Leaves,Isteklo lišće,
-Reference No,Referenca br,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Postotak šišanja postotna je razlika između tržišne vrijednosti zajma i vrijednosti pripisane tom zajmu kada se koristi kao zalog za taj zajam.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Odnos zajma i vrijednosti izražava omjer iznosa zajma i vrijednosti založenog vrijednosnog papira. Propust osiguranja zajma pokrenut će se ako padne ispod navedene vrijednosti za bilo koji zajam,
If this is not checked the loan by default will be considered as a Demand Loan,"Ako se ovo ne potvrdi, zajam će se prema zadanim postavkama smatrati zajmom na zahtjev",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ovaj se račun koristi za rezerviranje otplate zajma od zajmoprimca i za isplatu zajmova zajmoprimcu,
This account is capital account which is used to allocate capital for loan disbursal account ,Ovaj račun je račun kapitala koji se koristi za raspodjelu kapitala za račun izdvajanja zajma,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operacija {0} ne pripada radnom nalogu {1},
Print UOM after Quantity,Ispis UOM-a nakon količine,
Set default {0} account for perpetual inventory for non stock items,Postavite zadani {0} račun za vječni inventar za stavke koje nisu na zalihi,
-Loan Security {0} added multiple times,Sigurnost zajma {0} dodana je više puta,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Vrijednosni papiri s različitim omjerom LTV ne mogu se založiti za jedan zajam,
-Qty or Amount is mandatory for loan security!,Količina ili iznos obvezni su za osiguranje kredita!,
-Only submittted unpledge requests can be approved,Mogu se odobriti samo podneseni zahtjevi za neupitništvo,
-Interest Amount or Principal Amount is mandatory,Iznos kamate ili iznos glavnice je obvezan,
-Disbursed Amount cannot be greater than {0},Isplaćeni iznos ne može biti veći od {0},
-Row {0}: Loan Security {1} added multiple times,Redak {0}: Sigurnost zajma {1} dodan je više puta,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Redak {0}: Podređena stavka ne smije biti paket proizvoda. Uklonite stavku {1} i spremite,
Credit limit reached for customer {0},Dosegnuto je kreditno ograničenje za kupca {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nije moguće automatski stvoriti kupca zbog sljedećih obaveznih polja koja nedostaju:,
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index e3dcd61..e277856 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Alkalmazható, ha a társaság SpA, SApA vagy SRL",
Applicable if the company is a limited liability company,"Alkalmazandó, ha a társaság korlátolt felelősségű társaság",
Applicable if the company is an Individual or a Proprietorship,"Alkalmazandó, ha a társaság magánszemély vagy vállalkozó",
-Applicant,Pályázó,
-Applicant Type,Pályázó típusa,
Application of Funds (Assets),Vagyon tárgyak alkalmazás (tárgyi eszközök),
Application period cannot be across two allocation records,Alkalmazási időszak nem lehet két elosztási rekord között,
Application period cannot be outside leave allocation period,Jelentkezési határidő nem eshet a távolléti időn kívülre,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Az elérhető fóliaszámú részvényes tulajdonosok listája,
Loading Payment System,Fizetési rendszer betöltés,
Loan,Hitel,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0},
-Loan Application,Hiteligénylés,
-Loan Management,Hitelkezelés,
-Loan Repayment,Hitel visszafizetés,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,A hitel kezdő dátuma és a hitelidőszak kötelező a számla diszkontációjának mentéséhez,
Loans (Liabilities),Hitelek (kötelezettségek),
Loans and Advances (Assets),A hitelek és előlegek (Tárgyi eszközök),
@@ -1611,7 +1605,6 @@
Monday,Hétfő,
Monthly,Havi,
Monthly Distribution,Havi Felbontás,
-Monthly Repayment Amount cannot be greater than Loan Amount,"Havi törlesztés összege nem lehet nagyobb, mint a hitel összege",
More,Tovább,
More Information,Több információ,
More than one selection for {0} not allowed,A (z) {0} közül egynél több választás nem engedélyezett,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Fizetés: {0} {1},
Payable,Kifizetendő,
Payable Account,Beszállítói követelések fizetendő számla,
-Payable Amount,Fizetendő összeg,
Payment,Fizetés,
Payment Cancelled. Please check your GoCardless Account for more details,Fizetés törölve. További részletekért tekintse meg GoCardless fiókját,
Payment Confirmation,Fizetés visszaigazolása,
-Payment Date,Fizetés dátuma,
Payment Days,Fizetés napjai,
Payment Document,Fizetési dokumentum,
Payment Due Date,Fizetési határidő,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Kérjük, adjon meg Vásárlási nyugtát először",
Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt",
Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot",
-Please enter Repayment Periods,"Kérjük, írja be a törlesztési időszakokat",
Please enter Reqd by Date,"Kérjük, adja meg az igénylés dátumát",
Please enter Woocommerce Server URL,"Kérjük, adja meg a Woocommerce kiszolgáló URL-jét",
Please enter Write Off Account,"Kérjük, adja meg a Leíráshoz használt számlát",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Kérjük, adjon meg szülő költséghelyet",
Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget erre a tételre: {0}",
Please enter relieving date.,"Kérjük, adjon meg a mentesítési dátumot.",
-Please enter repayment Amount,"Kérjük, adja meg törlesztés összegét",
Please enter valid Financial Year Start and End Dates,"Kérjük, adjon meg egy érvényes költségvetési év kezdeti és befejezési időpontjait",
Please enter valid email address,Kérem adjon meg egy érvényes e-mail címet,
Please enter {0} first,"Kérjük, adja be: {0} először",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább szűrhetők a mennyiség alapján.,
Primary Address Details,Elsődleges cím adatok,
Primary Contact Details,Elsődleges kapcsolattartási adatok,
-Principal Amount,Tőkeösszeg,
Print Format,Nyomtatvány sablon,
Print IRS 1099 Forms,Nyomtassa ki az IRS 1099 űrlapokat,
Print Report Card,Jelentéskártya nyomtató,
@@ -2550,7 +2538,6 @@
Sample Collection,Mintagyűjtés,
Sample quantity {0} cannot be more than received quantity {1},"A minta {0} mennyisége nem lehet több, mint a kapott {1} mennyiség",
Sanctioned,Szankcionált,
-Sanctioned Amount,Szentesített Összeg,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összeg nem lehet nagyobb, mint az igény összege ebben a sorban {0}.",
Sand,Homok,
Saturday,Szombat,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,A (z) {0} már rendelkezik szülői eljárással {1}.,
API,API,
Annual,Éves,
-Approved,Jóváhagyott,
Change,Változás,
Contact Email,Kapcsolattartó e-mailcíme,
Export Type,Export típusa,
@@ -3571,7 +3557,6 @@
Account Value,Számlaérték,
Account is mandatory to get payment entries,A fizetési bejegyzéshez a számla kötelező,
Account is not set for the dashboard chart {0},A fiók nincs beállítva az irányítópult diagramjára: {0},
-Account {0} does not belong to company {1},A {0}számlához nem tartozik a {1} Vállalat,
Account {0} does not exists in the dashboard chart {1},A (z) {0} fiók nem létezik az {1} irányítópult-táblán,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Fiók: A (z) <b>{0}</b> tőke folyamatban van. Folyamatban van, és a Naplóbejegyzés nem frissítheti",
Account: {0} is not permitted under Payment Entry,Fiók: A (z) {0} nem engedélyezett a fizetési bejegyzés alatt,
@@ -3582,7 +3567,6 @@
Activity,Tevékenység,
Add / Manage Email Accounts.,E-mail fiókok hozzáadása / szerkesztése.,
Add Child,Al csoport hozzáadása,
-Add Loan Security,Adja hozzá a hitelbiztonságot,
Add Multiple,Többszörös hozzáadás,
Add Participants,Résztvevők hozzáadása,
Add to Featured Item,Hozzáadás a Kiemelt elemhez,
@@ -3593,15 +3577,12 @@
Address Line 1,1. cím sor,
Addresses,Címek,
Admission End Date should be greater than Admission Start Date.,"A felvételi záró dátumnak nagyobbnak kell lennie, mint a felvételi kezdő dátum.",
-Against Loan,Hitel ellen,
-Against Loan:,Kölcsön ellen:,
All,Összes,
All bank transactions have been created,Minden banki tranzakció létrejött,
All the depreciations has been booked,Az összes értékcsökkenést lekötötték,
Allocation Expired!,Az allokáció lejárt!,
Allow Resetting Service Level Agreement from Support Settings.,Engedélyezze a szolgáltatási szintű megállapodás visszaállítását a támogatási beállításokból.,
Amount of {0} is required for Loan closure,A hitel lezárásához {0} összeg szükséges,
-Amount paid cannot be zero,A kifizetett összeg nem lehet nulla,
Applied Coupon Code,Alkalmazott kuponkód,
Apply Coupon Code,Alkalmazza a kuponkódot,
Appointment Booking,Kinevezés Foglalás,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Nem lehet kiszámítani az érkezési időt, mivel hiányzik az illesztőprogram címe.",
Cannot Optimize Route as Driver Address is Missing.,"Nem lehet optimalizálni az útvonalat, mivel hiányzik az illesztőprogram címe.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"A (z) {0} feladat nem fejezhető be, mivel a függő {1} feladat nem fejeződött be / nem lett megszakítva.",
-Cannot create loan until application is approved,"Nem lehet hitelt létrehozni, amíg az alkalmazást jóvá nem hagyják",
Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik értéket erre {0}.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","A (z) {1} sorban a (z) {0} tételnél nem lehet túlterhelni, mint {2}. A túlszámlázás engedélyezéséhez kérjük, állítsa be a kedvezményt a Fiókbeállítások között",
"Capacity Planning Error, planned start time can not be same as end time","Kapacitástervezési hiba, a tervezett indulási idő nem lehet azonos a befejezési idővel",
@@ -3812,20 +3792,9 @@
Less Than Amount,"Kevesebb, mint összeg",
Liabilities,Kötelezettségek,
Loading...,Betöltés...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,A hitelösszeg meghaladja a javasolt értékpapírok szerinti {0} maximális hitelösszeget,
Loan Applications from customers and employees.,Hitelkérelmek az ügyfelek és az alkalmazottak részéről.,
-Loan Disbursement,Hitel folyósítása,
Loan Processes,Hitel folyamatok,
-Loan Security,Hitelbiztosítás,
-Loan Security Pledge,Hitelbiztosítási zálogjog,
-Loan Security Pledge Created : {0},Létrehozott hitelbiztosítási zálogjog: {0},
-Loan Security Price,Hitelbiztosítási ár,
-Loan Security Price overlapping with {0},A kölcsönbiztosítási ár átfedésben a (z) {0} -gal,
-Loan Security Unpledge,Hitelbiztosítási fedezetlenség,
-Loan Security Value,Hitelbiztosítási érték,
Loan Type for interest and penalty rates,Hitel típusa a kamat és a büntetési ráta számára,
-Loan amount cannot be greater than {0},"A hitel összege nem lehet nagyobb, mint {0}",
-Loan is mandatory,A hitel kötelező,
Loans,Kölcsönök,
Loans provided to customers and employees.,Az ügyfelek és az alkalmazottak számára nyújtott kölcsönök.,
Location,Tartózkodási hely,
@@ -3894,7 +3863,6 @@
Pay,Fizet,
Payment Document Type,Fizetési okmány típusa,
Payment Name,Fizetés neve,
-Penalty Amount,Büntetés összege,
Pending,Függő,
Performance,Teljesítmény,
Period based On,Periódus alapján,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Kérjük, jelentkezzen be Marketplace felhasználóként, hogy szerkeszthesse ezt az elemet.",
Please login as a Marketplace User to report this item.,"Kérjük, jelentkezzen be egy Marketplace-felhasználóként, hogy jelentse ezt az elemet.",
Please select <b>Template Type</b> to download template,A <b>sablon</b> letöltéséhez válassza a <b>Sablon típusa</b> lehetőséget,
-Please select Applicant Type first,Először válassza a Jelentkező típusát,
Please select Customer first,Először válassza az Ügyfél lehetőséget,
Please select Item Code first,Először válassza az Elem kódot,
-Please select Loan Type for company {0},Válassza ki a (z) {0} vállalat hitel típusát,
Please select a Delivery Note,"Kérjük, válasszon szállítólevelet",
Please select a Sales Person for item: {0},"Kérjük, válasszon egy értékesítőt az elemhez: {0}",
Please select another payment method. Stripe does not support transactions in currency '{0}',"Kérjük, válasszon más fizetési módot. Csíkos nem támogatja a tranzakciót ebben a pénznemben '{0}'",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},"Kérjük, állítson be egy alapértelmezett bankszámlát a (z) {0} cég számára",
Please specify,"Kérjük, határozza meg",
Please specify a {0},"Kérjük, adjon meg egy {0}",lead
-Pledge Status,Zálogállapot,
-Pledge Time,Ígéret ideje,
Printing,Nyomtatás,
Priority,Prioritás,
Priority has been changed to {0}.,A prioritás {0} -re változott.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML fájlok feldolgozása,
Profitability,Jövedelmezőség,
Project,Projekt téma,
-Proposed Pledges are mandatory for secured Loans,A javasolt biztosítékok kötelezőek a fedezett kölcsönöknél,
Provide the academic year and set the starting and ending date.,"Adja meg a tanévet, és állítsa be a kezdő és záró dátumot.",
Public token is missing for this bank,Hiányzik a bank nyilvános tokenje,
Publish,közzétesz,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"A beszerzési nyugtán nincs olyan elem, amelyre a minta megőrzése engedélyezve van.",
Purchase Return,Beszerzési megrendelés visszárú,
Qty of Finished Goods Item,Darab késztermék,
-Qty or Amount is mandatroy for loan security,A Mennyiség vagy az összeg kötelezővé teszi a hitelbiztosítást,
Quality Inspection required for Item {0} to submit,A (z) {0} tétel benyújtásához minőségi ellenőrzés szükséges,
Quantity to Manufacture,Gyártási mennyiség,
Quantity to Manufacture can not be zero for the operation {0},A gyártási mennyiség nem lehet nulla a műveletnél {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,A megváltás dátumának legalább a csatlakozás dátumával kell egyenlőnek lennie,
Rename,Átnevezés,
Rename Not Allowed,Átnevezés nem megengedett,
-Repayment Method is mandatory for term loans,A visszafizetési módszer kötelező a lejáratú kölcsönök esetében,
-Repayment Start Date is mandatory for term loans,A visszafizetés kezdete kötelező a lejáratú hiteleknél,
Report Item,Jelentés elem,
Report this Item,Jelentse ezt az elemet,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Alvállalkozók számára fenntartott mennyiség: Nyersanyagmennyiség alvállalkozásba vett termékek előállításához.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},({0} sor): A (z) {1} már kedvezményes a (z) {2} -ben.,
Rows Added in {0},Sorok hozzáadva a (z) {0} -hoz,
Rows Removed in {0},Sorok eltávolítva a (z) {0} -ban,
-Sanctioned Amount limit crossed for {0} {1},A (z) {0} {1} áthúzott szankcionált összeghatár,
-Sanctioned Loan Amount already exists for {0} against company {1},A (z) {0} szankcionált hitelösszeg már létezik a (z) {1} társasággal szemben,
Save,Mentés,
Save Item,Elem mentése,
Saved Items,Mentett elemek,
@@ -4135,7 +4093,6 @@
User {0} is disabled,A(z) {0} felhasználó letiltva,
Users and Permissions,Felhasználók és engedélyek,
Vacancies cannot be lower than the current openings,A betöltetlen álláshelyek nem lehetnek alacsonyabbak a jelenlegi nyitóknál,
-Valid From Time must be lesser than Valid Upto Time.,"Az érvényes időtől kevesebbnek kell lennie, mint az érvényes érvényességi időnek.",
Valuation Rate required for Item {0} at row {1},A (z) {0} tételhez az {1} sorban szükséges értékelési arány,
Values Out Of Sync,Értékek szinkronban,
Vehicle Type is required if Mode of Transport is Road,"Járműtípust kell megadni, ha a szállítási mód közúti",
@@ -4211,7 +4168,6 @@
Add to Cart,Adja a kosárhoz,
Days Since Last Order,Napok az utolsó rendelés óta,
In Stock,Készletben,
-Loan Amount is mandatory,A hitelösszeg kötelező,
Mode Of Payment,Fizetési mód,
No students Found,Nem található diák,
Not in Stock,Nincs készleten,
@@ -4240,7 +4196,6 @@
Group by,Csoportosítva,
In stock,Raktáron,
Item name,Tétel neve,
-Loan amount is mandatory,A hitelösszeg kötelező,
Minimum Qty,Minimális mennyiség,
More details,Részletek,
Nature of Supplies,Kellékek jellege,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Összesen elkészült,
Qty to Manufacture,Menny. gyártáshoz,
Repay From Salary can be selected only for term loans,A fizetésből történő visszafizetés csak futamidejű kölcsönöknél választható,
-No valid Loan Security Price found for {0},Nem található érvényes hitelbiztosítási ár a következőnél: {0},
-Loan Account and Payment Account cannot be same,A hitelszámla és a fizetési számla nem lehet azonos,
-Loan Security Pledge can only be created for secured loans,Hitelbiztosítási zálogjog csak fedezett hitelek esetén hozható létre,
Social Media Campaigns,Közösségi média kampányok,
From Date can not be greater than To Date,"A kezdő dátum nem lehet nagyobb, mint a dátum",
Please set a Customer linked to the Patient,"Kérjük, állítson be egy ügyfelet a beteghez",
@@ -6437,7 +6389,6 @@
HR User,HR Felhasználó,
Appointment Letter,Kinevezési levél,
Job Applicant,Állásra pályázó,
-Applicant Name,Pályázó neve,
Appointment Date,Kinevezés időpontja,
Appointment Letter Template,Kinevezési levél sablonja,
Body,Test,
@@ -7059,99 +7010,12 @@
Sync in Progress,Szinkronizálás folyamatban,
Hub Seller Name,Hub eladó neve,
Custom Data,Egyéni adatok,
-Member,Tag,
-Partially Disbursed,Részben folyosított,
-Loan Closure Requested,Igényelt kölcsön lezárás,
Repay From Salary,Bérből törleszteni,
-Loan Details,Hitel részletei,
-Loan Type,Hitel típus,
-Loan Amount,Hitelösszeg,
-Is Secured Loan,Biztosított hitel,
-Rate of Interest (%) / Year,Kamatláb (%) / év,
-Disbursement Date,Folyósítás napja,
-Disbursed Amount,Kifizetett összeg,
-Is Term Loan,A lejáratú hitel,
-Repayment Method,Törlesztési mód,
-Repay Fixed Amount per Period,Fix összeg visszafizetése időszakonként,
-Repay Over Number of Periods,Törleszteni megadott számú időszakon belül,
-Repayment Period in Months,Törlesztési időszak hónapokban,
-Monthly Repayment Amount,Havi törlesztés összege,
-Repayment Start Date,Visszafizetési kezdőnap,
-Loan Security Details,Hitelbiztonsági részletek,
-Maximum Loan Value,Hitel maximális értéke,
-Account Info,Számlainformáció,
-Loan Account,Hitelszámla,
-Interest Income Account,Kamatbevétel főkönyvi számla,
-Penalty Income Account,Büntetési jövedelem számla,
-Repayment Schedule,Törlesztés ütemezése,
-Total Payable Amount,Összesen fizetendő összeg,
-Total Principal Paid,Fizetett teljes összeg,
-Total Interest Payable,Összes fizetendő kamat,
-Total Amount Paid,Összes fizetett összeg,
-Loan Manager,Hitelkezelő,
-Loan Info,Hitel információja,
-Rate of Interest,Kamatláb,
-Proposed Pledges,Javasolt ígéretek,
-Maximum Loan Amount,Maximális hitel összeg,
-Repayment Info,Törlesztési Info,
-Total Payable Interest,Összesen fizetendő kamat,
-Against Loan ,Hitel ellen,
-Loan Interest Accrual,Hitel kamat elhatárolása,
-Amounts,összegek,
-Pending Principal Amount,Függőben lévő főösszeg,
-Payable Principal Amount,Fizetendő alapösszeg,
-Paid Principal Amount,Fizetett főösszeg,
-Paid Interest Amount,Kifizetett összeg,
-Process Loan Interest Accrual,Folyamatban lévő hitelkamat elhatárolása,
-Repayment Schedule Name,Visszafizetési ütemezés neve,
Regular Payment,Rendszeres fizetés,
Loan Closure,Hitel lezárása,
-Payment Details,Fizetés részletei,
-Interest Payable,Fizetendő kamat,
-Amount Paid,Kifizetett Összeg,
-Principal Amount Paid,Fizetett főösszeg,
-Repayment Details,Visszafizetés részletei,
-Loan Repayment Detail,Hitel-visszafizetés részletei,
-Loan Security Name,Hitelbiztonsági név,
-Unit Of Measure,Mértékegység,
-Loan Security Code,Hitelbiztonsági kód,
-Loan Security Type,Hitelbiztosítási típus,
-Haircut %,Hajvágás%,
-Loan Details,Hitel részletei,
-Unpledged,Unpledged,
-Pledged,elzálogosított,
-Partially Pledged,Részben ígéretet tett,
-Securities,Értékpapír,
-Total Security Value,Teljes biztonsági érték,
-Loan Security Shortfall,Hitelbiztonsági hiány,
-Loan ,Hitel,
-Shortfall Time,Hiányidő,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Hiányos összeg,
-Security Value ,Biztonsági érték,
-Process Loan Security Shortfall,Folyamathitel-biztonsági hiány,
-Loan To Value Ratio,Hitel és érték arány,
-Unpledge Time,Lefedettség ideje,
-Loan Name,Hitel neve,
Rate of Interest (%) Yearly,Kamatláb (%) Éves,
-Penalty Interest Rate (%) Per Day,Büntetési kamatláb (%) naponta,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,A késedelmi visszafizetés esetén a késedelmi kamatlábat napi alapon számítják a függőben lévő kamatösszegre,
-Grace Period in Days,Türelmi idő napokban,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Az esedékesség napjától számított napok száma, amelyekig nem számolunk fel kötbért a hitel törlesztésének késedelme esetén",
-Pledge,Fogadalom,
-Post Haircut Amount,Hajvágás utáni összeg,
-Process Type,Folyamat típusa,
-Update Time,Frissítési idő,
-Proposed Pledge,Javasolt ígéret,
-Total Payment,Teljes fizetés,
-Balance Loan Amount,Hitel összeg mérlege,
-Is Accrued,Felhalmozott,
Salary Slip Loan,Bérpapír kölcsön,
Loan Repayment Entry,Hitel-visszafizetési tétel,
-Sanctioned Loan Amount,Szankcionált hitelösszeg,
-Sanctioned Amount Limit,Szankcionált összeghatár,
-Unpledge,Unpledge,
-Haircut,Hajvágás,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Ütemezés létrehozás,
Schedules,Ütemezések,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,"Project téma elérhető lesz a honlapon, ezeknek a felhasználóknak",
Copied From,Innen másolt,
Start and End Dates,Kezdetének és befejezésének időpontjai,
-Actual Time (in Hours),Tényleges idő (órában),
+Actual Time in Hours (via Timesheet),Tényleges idő (órában),
Costing and Billing,Költség- és számlázás,
-Total Costing Amount (via Timesheets),Összköltség összege (időnyilvántartó alapján),
-Total Expense Claim (via Expense Claims),Teljes Költség Követelés (költségtérítési igényekkel),
+Total Costing Amount (via Timesheet),Összköltség összege (időnyilvántartó alapján),
+Total Expense Claim (via Expense Claim),Teljes Költség Követelés (költségtérítési igényekkel),
Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költsége (Beszerzési számla alapján),
Total Sales Amount (via Sales Order),Értékesítési összérték (értékesítési rendelés szerint),
-Total Billable Amount (via Timesheets),Összesen számlázható összeg (Jelenléti ív alapján),
-Total Billed Amount (via Sales Invoices),Összesen számlázott összeg (értékesítési számlák alapján),
-Total Consumed Material Cost (via Stock Entry),Összesített anyagköltség (raktári bejegyzés útján),
+Total Billable Amount (via Timesheet),Összesen számlázható összeg (Jelenléti ív alapján),
+Total Billed Amount (via Sales Invoice),Összesen számlázott összeg (értékesítési számlák alapján),
+Total Consumed Material Cost (via Stock Entry),Összesített anyagköltség (raktári bejegyzés útján),
Gross Margin,Bruttó árkülönbözet,
Gross Margin %,Bruttó árkülönbözet %,
Monitor Progress,Folyamatok nyomonkövetése,
@@ -7521,12 +7385,10 @@
Dependencies,Dependencies,
Dependent Tasks,Függő feladatok,
Depends on Tasks,Függ a Feladatoktól,
-Actual Start Date (via Time Sheet),Tényleges kezdési dátum (Idő nyilvántartó szerint),
-Actual Time (in hours),Tényleges idő (óra),
-Actual End Date (via Time Sheet),Tényleges befejezés dátuma (Idő nyilvántartó szerint),
-Total Costing Amount (via Time Sheet),Összes költség összeg ((Idő nyilvántartó szerint),
+Actual Start Date (via Timesheet),Tényleges kezdési dátum (Idő nyilvántartó szerint),
+Actual Time in Hours (via Timesheet),Tényleges idő (óra),
+Actual End Date (via Timesheet),Tényleges befejezés dátuma (Idő nyilvántartó szerint),
Total Expense Claim (via Expense Claim),Teljes Költség Követelés (költségtérítési igényekkel),
-Total Billing Amount (via Time Sheet),Összesen számlázási összeg ((Idő nyilvántartó szerint),
Review Date,Megtekintés dátuma,
Closing Date,Benyújtási határidő,
Task Depends On,A feladat ettől függ:,
@@ -7887,7 +7749,6 @@
Update Series,Sorszámozás frissítése,
Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszámot egy meglévő sorozatban.,
Prefix,Előtag,
-Current Value,Jelenlegi érték,
This is the number of the last created transaction with this prefix,"Ez az a szám, az ilyen előtaggal utoljára létrehozott tranzakciónak",
Update Series Number,Széria szám frissítése,
Quotation Lost Reason,Árajánlat elutasításának oka,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Tételenkénti Ajánlott újrarendelési szint,
Lead Details,Érdeklődés adatai,
Lead Owner Efficiency,Érdeklődés Tulajdonos Hatékonysága,
-Loan Repayment and Closure,Hitel visszafizetése és lezárása,
-Loan Security Status,Hitelbiztosítási állapot,
Lost Opportunity,Elveszett lehetőség,
Maintenance Schedules,Karbantartási ütemezések,
Material Requests for which Supplier Quotations are not created,"Anyag igénylések, amelyekre Beszállítói árajánlatokat nem hoztak létre",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Célzott számlák: {0},
Payment Account is mandatory,A fizetési számla kötelező,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ha be van jelölve, a teljes összeget bevallás vagy igazolás benyújtása nélkül levonják az adóköteles jövedelemből a jövedelemadó kiszámítása előtt.",
-Disbursement Details,A folyósítás részletei,
Material Request Warehouse,Anyagigény-raktár,
Select warehouse for material requests,Válassza ki a raktárt az anyagkérésekhez,
Transfer Materials For Warehouse {0},Anyagok átadása raktárhoz {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Visszafizetni az igényelt összeget a fizetésből,
Deduction from salary,A fizetés levonása,
Expired Leaves,Lejárt levelek,
-Reference No,referencia szám,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"A hajvágási százalék a hitelbiztosíték piaci értéke és az adott hitelbiztosítéknak tulajdonított érték közötti százalékos különbség, ha az adott kölcsön fedezetéül szolgál.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"A hitel / érték arány kifejezi a kölcsön összegének és a zálogjog értékének arányát. A hitelbiztosítási hiány akkor lép fel, ha ez bármely hitel esetében a megadott érték alá csökken",
If this is not checked the loan by default will be considered as a Demand Loan,"Ha ez nincs bejelölve, akkor a hitelt alapértelmezés szerint Igény szerinti kölcsönnek kell tekinteni",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Ezt a számlát arra használják, hogy foglalják le a hiteltől származó hiteltörlesztéseket, és kölcsönöket is folyósítanak a hitelfelvevőnek",
This account is capital account which is used to allocate capital for loan disbursal account ,"Ez a számla tőkeszámla, amelyet a hitel folyósítási számlájához szükséges tőke allokálására használnak",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},A (z) {0} művelet nem tartozik a (z) {1} munkarendhez,
Print UOM after Quantity,Az UOM nyomtatása a mennyiség után,
Set default {0} account for perpetual inventory for non stock items,Állítsa be az alapértelmezett {0} fiókot az állandó készlethez a nem raktári cikkekhez,
-Loan Security {0} added multiple times,Hitelbiztosítás {0} többször is hozzáadva,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Különböző LTV aránnyal rendelkező hitelbiztosítékokat nem lehet egy kölcsön ellenében zálogba adni,
-Qty or Amount is mandatory for loan security!,Mennyiség vagy összeg kötelező a hitelbiztosításhoz!,
-Only submittted unpledge requests can be approved,"Csak a benyújtott, zálogjog nélküli kérelmeket lehet jóváhagyni",
-Interest Amount or Principal Amount is mandatory,Kamatösszeg vagy tőkeösszeg kötelező,
-Disbursed Amount cannot be greater than {0},"A folyósított összeg nem lehet nagyobb, mint {0}",
-Row {0}: Loan Security {1} added multiple times,{0} sor: Hitelbiztosítás {1} többször hozzáadva,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,"{0}. Sor: Az alárendelt elem nem lehet termékcsomag. Távolítsa el a (z) {1} elemet, és mentse",
Credit limit reached for customer {0},Elért hitelkeret a (z) {0} ügyfél számára,
Could not auto create Customer due to the following missing mandatory field(s):,Nem sikerült automatikusan létrehozni az Ügyfelet a következő hiányzó kötelező mezők miatt:,
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index ccbb002..adf9622 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Berlaku jika perusahaannya adalah SpA, SApA atau SRL",
Applicable if the company is a limited liability company,Berlaku jika perusahaan tersebut merupakan perseroan terbatas,
Applicable if the company is an Individual or a Proprietorship,Berlaku jika perusahaan adalah Perorangan atau Kepemilikan,
-Applicant,Pemohon,
-Applicant Type,Jenis Pemohon,
Application of Funds (Assets),Penerapan Dana (Aset),
Application period cannot be across two allocation records,Periode aplikasi tidak dapat melewati dua catatan alokasi,
Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Daftar Pemegang Saham yang tersedia dengan nomor folio,
Loading Payment System,Memuat Sistem Pembayaran,
Loan,Pinjaman,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0},
-Loan Application,Permohonan pinjaman,
-Loan Management,Manajemen Pinjaman,
-Loan Repayment,Pembayaran pinjaman,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Tanggal Mulai Pinjaman dan Periode Pinjaman wajib untuk menyimpan Diskon Faktur,
Loans (Liabilities),Kredit (Kewajiban),
Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset),
@@ -1611,7 +1605,6 @@
Monday,Senin,
Monthly,Bulanan,
Monthly Distribution,Distribusi Bulanan,
-Monthly Repayment Amount cannot be greater than Loan Amount,Bulanan Pembayaran Jumlah tidak dapat lebih besar dari Jumlah Pinjaman,
More,Lanjut,
More Information,Informasi lebih,
More than one selection for {0} not allowed,Lebih dari satu pilihan untuk {0} tidak diizinkan,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Bayar {0} {1},
Payable,Hutang,
Payable Account,Akun Hutang,
-Payable Amount,Jumlah Hutang,
Payment,Pembayaran,
Payment Cancelled. Please check your GoCardless Account for more details,Pembayaran dibatalkan. Silakan periksa Akun GoCardless Anda untuk lebih jelasnya,
Payment Confirmation,Konfirmasi pembayaran,
-Payment Date,Tanggal pembayaran,
Payment Days,Hari Jeda Pembayaran,
Payment Document,Dokumen Pembayaran,
Payment Due Date,Tanggal Jatuh Tempo Pembayaran,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Cukup masukkan Nota Penerimaan terlebih dahulu,
Please enter Receipt Document,Masukkan Dokumen Penerimaan,
Please enter Reference date,Harap masukkan tanggal Referensi,
-Please enter Repayment Periods,Masukkan Periode Pembayaran,
Please enter Reqd by Date,Masukkan Reqd menurut Tanggal,
Please enter Woocommerce Server URL,Silakan masukkan URL Woocommerce Server,
Please enter Write Off Account,Cukup masukkan Write Off Akun,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Entrikan pusat biaya orang tua,
Please enter quantity for Item {0},Mohon masukkan untuk Item {0},
Please enter relieving date.,Silahkan masukkan menghilangkan date.,
-Please enter repayment Amount,Masukkan pembayaran Jumlah,
Please enter valid Financial Year Start and End Dates,Entrikan Tahun Mulai berlaku Keuangan dan Tanggal Akhir,
Please enter valid email address,Harap masukkan alamat email yang benar,
Please enter {0} first,Entrikan {0} terlebih dahulu,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Aturan Harga selanjutnya disaring berdasarkan kuantitas.,
Primary Address Details,Rincian Alamat Utama,
Primary Contact Details,Rincian Kontak Utama,
-Principal Amount,Jumlah Pokok,
Print Format,Format Cetak,
Print IRS 1099 Forms,Cetak Formulir IRS 1099,
Print Report Card,Cetak Kartu Laporan,
@@ -2550,7 +2538,6 @@
Sample Collection,Koleksi Sampel,
Sample quantity {0} cannot be more than received quantity {1},Kuantitas sampel {0} tidak boleh lebih dari jumlah yang diterima {1},
Sanctioned,Sanksi,
-Sanctioned Amount,Jumlah sanksi,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.,
Sand,Pasir,
Saturday,Sabtu,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} sudah memiliki Prosedur Induk {1}.,
API,API,
Annual,Tahunan,
-Approved,Disetujui,
Change,Perubahan,
Contact Email,Email Kontak,
Export Type,Jenis ekspor,
@@ -3571,7 +3557,6 @@
Account Value,Nilai Akun,
Account is mandatory to get payment entries,Akun wajib untuk mendapatkan entri pembayaran,
Account is not set for the dashboard chart {0},Akun tidak disetel untuk bagan dasbor {0},
-Account {0} does not belong to company {1},Akun {0} bukan milik perusahaan {1},
Account {0} does not exists in the dashboard chart {1},Akun {0} tidak ada dalam bagan dasbor {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Akun: <b>{0}</b> adalah modal sedang dalam proses dan tidak dapat diperbarui oleh Entri Jurnal,
Account: {0} is not permitted under Payment Entry,Akun: {0} tidak diizinkan di bawah Entri Pembayaran,
@@ -3582,7 +3567,6 @@
Activity,Aktivitas,
Add / Manage Email Accounts.,Tambah / Kelola Akun Email.,
Add Child,Tambah Anak,
-Add Loan Security,Tambahkan Keamanan Pinjaman,
Add Multiple,Tambahkan Beberapa,
Add Participants,Tambahkan Peserta,
Add to Featured Item,Tambahkan ke Item Unggulan,
@@ -3593,15 +3577,12 @@
Address Line 1,Alamat Baris 1,
Addresses,Daftar Alamat,
Admission End Date should be greater than Admission Start Date.,Tanggal Akhir Penerimaan harus lebih besar dari Tanggal Mulai Penerimaan.,
-Against Loan,Terhadap Pinjaman,
-Against Loan:,Terhadap Pinjaman:,
All,Semua,
All bank transactions have been created,Semua transaksi bank telah dibuat,
All the depreciations has been booked,Semua penyusutan telah dipesan,
Allocation Expired!,Alokasi Berakhir!,
Allow Resetting Service Level Agreement from Support Settings.,Izinkan Mengatur Ulang Perjanjian Tingkat Layanan dari Pengaturan Dukungan.,
Amount of {0} is required for Loan closure,Diperlukan jumlah {0} untuk penutupan Pinjaman,
-Amount paid cannot be zero,Jumlah yang dibayarkan tidak boleh nol,
Applied Coupon Code,Kode Kupon Terapan,
Apply Coupon Code,Terapkan Kode Kupon,
Appointment Booking,Pemesanan janji temu,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Tidak Dapat Menghitung Waktu Kedatangan karena Alamat Pengemudi Tidak Ada.,
Cannot Optimize Route as Driver Address is Missing.,Tidak Dapat Mengoptimalkan Rute karena Alamat Driver Tidak Ada.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Tidak dapat menyelesaikan tugas {0} karena tugas dependennya {1} tidak selesai / dibatalkan.,
-Cannot create loan until application is approved,Tidak dapat membuat pinjaman sampai permohonan disetujui,
Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Tidak dapat menagih berlebih untuk Item {0} di baris {1} lebih dari {2}. Untuk memungkinkan penagihan berlebih, harap setel kelonggaran di Pengaturan Akun",
"Capacity Planning Error, planned start time can not be same as end time","Perencanaan Kapasitas Kesalahan, waktu mulai yang direncanakan tidak dapat sama dengan waktu akhir",
@@ -3812,20 +3792,9 @@
Less Than Amount,Jumlah Kurang Dari,
Liabilities,Kewajiban,
Loading...,Memuat...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Jumlah Pinjaman melebihi jumlah maksimum pinjaman {0} sesuai dengan sekuritas yang diusulkan,
Loan Applications from customers and employees.,Aplikasi Pinjaman dari pelanggan dan karyawan.,
-Loan Disbursement,Pencairan Pinjaman,
Loan Processes,Proses Pinjaman,
-Loan Security,Keamanan Pinjaman,
-Loan Security Pledge,Ikrar Keamanan Pinjaman,
-Loan Security Pledge Created : {0},Ikrar Keamanan Pinjaman Dibuat: {0},
-Loan Security Price,Harga Keamanan Pinjaman,
-Loan Security Price overlapping with {0},Harga Keamanan Pinjaman tumpang tindih dengan {0},
-Loan Security Unpledge,Jaminan Keamanan Pinjaman,
-Loan Security Value,Nilai Keamanan Pinjaman,
Loan Type for interest and penalty rates,Jenis Pinjaman untuk suku bunga dan penalti,
-Loan amount cannot be greater than {0},Jumlah pinjaman tidak boleh lebih dari {0},
-Loan is mandatory,Pinjaman wajib,
Loans,Pinjaman,
Loans provided to customers and employees.,Pinjaman diberikan kepada pelanggan dan karyawan.,
Location,Lokasi,
@@ -3894,7 +3863,6 @@
Pay,Membayar,
Payment Document Type,Jenis Dokumen Pembayaran,
Payment Name,Nama Pembayaran,
-Penalty Amount,Jumlah Penalti,
Pending,Menunggu,
Performance,Performa,
Period based On,Periode berdasarkan,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Silakan masuk sebagai Pengguna Marketplace untuk mengedit item ini.,
Please login as a Marketplace User to report this item.,Silakan masuk sebagai Pengguna Marketplace untuk melaporkan item ini.,
Please select <b>Template Type</b> to download template,Silakan pilih <b>Jenis Templat</b> untuk mengunduh templat,
-Please select Applicant Type first,Silakan pilih Jenis Pemohon terlebih dahulu,
Please select Customer first,Silakan pilih Pelanggan terlebih dahulu,
Please select Item Code first,Silakan pilih Kode Barang terlebih dahulu,
-Please select Loan Type for company {0},Silakan pilih Jenis Pinjaman untuk perusahaan {0},
Please select a Delivery Note,Silakan pilih Catatan Pengiriman,
Please select a Sales Person for item: {0},Silakan pilih Tenaga Penjual untuk item: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Silahkan pilih metode pembayaran lain. Stripe tidak mendukung transaksi dalam mata uang '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Harap siapkan rekening bank default untuk perusahaan {0},
Please specify,Silakan tentukan,
Please specify a {0},Silakan tentukan {0},lead
-Pledge Status,Status Ikrar,
-Pledge Time,Waktu Ikrar,
Printing,Pencetakan,
Priority,Prioritas,
Priority has been changed to {0}.,Prioritas telah diubah menjadi {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Memproses File XML,
Profitability,Profitabilitas,
Project,Proyek,
-Proposed Pledges are mandatory for secured Loans,Janji yang Diusulkan adalah wajib untuk Pinjaman yang dijamin,
Provide the academic year and set the starting and ending date.,Berikan tahun akademik dan tetapkan tanggal mulai dan berakhir.,
Public token is missing for this bank,Token publik tidak ada untuk bank ini,
Publish,Menerbitkan,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Kwitansi Pembelian tidak memiliki Barang yang Retain Sampel diaktifkan.,
Purchase Return,Pembelian Kembali,
Qty of Finished Goods Item,Jumlah Barang Jadi,
-Qty or Amount is mandatroy for loan security,Jumlah atau Jumlah adalah mandatroy untuk keamanan pinjaman,
Quality Inspection required for Item {0} to submit,Diperlukan Pemeriksaan Kualitas untuk Barang {0} untuk dikirimkan,
Quantity to Manufacture,Kuantitas untuk Memproduksi,
Quantity to Manufacture can not be zero for the operation {0},Kuantitas untuk Pembuatan tidak boleh nol untuk operasi {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Tanggal pelepasan harus lebih besar dari atau sama dengan Tanggal Bergabung,
Rename,Ubah nama,
Rename Not Allowed,Ganti nama Tidak Diizinkan,
-Repayment Method is mandatory for term loans,Metode Pembayaran wajib untuk pinjaman berjangka,
-Repayment Start Date is mandatory for term loans,Tanggal Mulai Pembayaran wajib untuk pinjaman berjangka,
Report Item,Laporkan Item,
Report this Item,Laporkan Item ini,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Jumlah Pesanan untuk Subkontrak: Jumlah bahan baku untuk membuat barang yang disubkontrakkan.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Baris ({0}): {1} sudah didiskon dalam {2},
Rows Added in {0},Baris Ditambahkan dalam {0},
Rows Removed in {0},Baris Dihapus dalam {0},
-Sanctioned Amount limit crossed for {0} {1},Batas Jumlah yang disetujui terlampaui untuk {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Jumlah Pinjaman yang Diberi Sanksi sudah ada untuk {0} melawan perusahaan {1},
Save,Simpan,
Save Item,Simpan Barang,
Saved Items,Item Tersimpan,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Pengguna {0} dinonaktifkan,
Users and Permissions,Pengguna dan Perizinan,
Vacancies cannot be lower than the current openings,Lowongan tidak boleh lebih rendah dari pembukaan saat ini,
-Valid From Time must be lesser than Valid Upto Time.,Berlaku Dari Waktu harus lebih kecil dari Waktu Berlaku yang Valid.,
Valuation Rate required for Item {0} at row {1},Diperlukan Tingkat Penilaian untuk Item {0} di baris {1},
Values Out Of Sync,Nilai Tidak Disinkronkan,
Vehicle Type is required if Mode of Transport is Road,Jenis Kendaraan diperlukan jika Mode Transportasi adalah Jalan,
@@ -4211,7 +4168,6 @@
Add to Cart,Tambahkan ke Keranjang Belanja,
Days Since Last Order,Hari Sejak Pemesanan Terakhir,
In Stock,Dalam Persediaan,
-Loan Amount is mandatory,Jumlah pinjaman adalah wajib,
Mode Of Payment,Mode Pembayaran,
No students Found,Tidak ada siswa yang ditemukan,
Not in Stock,Tidak tersedia,
@@ -4240,7 +4196,6 @@
Group by,Kelompok Dengan,
In stock,Persediaan,
Item name,Nama Item,
-Loan amount is mandatory,Jumlah pinjaman adalah wajib,
Minimum Qty,Minimum Qty,
More details,Detail Lebih,
Nature of Supplies,Sifat Pasokan,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Total Qty yang Diselesaikan,
Qty to Manufacture,Kuantitas untuk diproduksi,
Repay From Salary can be selected only for term loans,Bayar Dari Gaji hanya dapat dipilih untuk pinjaman berjangka,
-No valid Loan Security Price found for {0},Tidak ada Harga Jaminan Pinjaman yang valid untuk {0},
-Loan Account and Payment Account cannot be same,Rekening Pinjaman dan Rekening Pembayaran tidak boleh sama,
-Loan Security Pledge can only be created for secured loans,Janji Keamanan Pinjaman hanya dapat dibuat untuk pinjaman dengan jaminan,
Social Media Campaigns,Kampanye Media Sosial,
From Date can not be greater than To Date,From Date tidak boleh lebih dari To Date,
Please set a Customer linked to the Patient,Harap tetapkan Pelanggan yang ditautkan ke Pasien,
@@ -6437,7 +6389,6 @@
HR User,HR Pengguna,
Appointment Letter,Surat Pengangkatan,
Job Applicant,Pemohon Kerja,
-Applicant Name,Nama Pemohon,
Appointment Date,Tanggal Pengangkatan,
Appointment Letter Template,Templat Surat Pengangkatan,
Body,Tubuh,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinkron Sedang Berlangsung,
Hub Seller Name,Nama Penjual Hub,
Custom Data,Data Khusus,
-Member,Anggota,
-Partially Disbursed,sebagian Dicairkan,
-Loan Closure Requested,Penutupan Pinjaman Diminta,
Repay From Salary,Membayar dari Gaji,
-Loan Details,Detail pinjaman,
-Loan Type,Jenis pinjaman,
-Loan Amount,Jumlah pinjaman,
-Is Secured Loan,Apakah Pinjaman Terjamin,
-Rate of Interest (%) / Year,Tingkat bunga (%) / Tahun,
-Disbursement Date,pencairan Tanggal,
-Disbursed Amount,Jumlah yang Dicairkan,
-Is Term Loan,Apakah Term Loan,
-Repayment Method,Metode pembayaran,
-Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode,
-Repay Over Number of Periods,Membayar Lebih dari Jumlah Periode,
-Repayment Period in Months,Periode pembayaran di Bulan,
-Monthly Repayment Amount,Bulanan Pembayaran Jumlah,
-Repayment Start Date,Tanggal Mulai Pembayaran Kembali,
-Loan Security Details,Detail Keamanan Pinjaman,
-Maximum Loan Value,Nilai Pinjaman Maksimal,
-Account Info,Info akun,
-Loan Account,Rekening Pinjaman,
-Interest Income Account,Akun Pendapatan Bunga,
-Penalty Income Account,Akun Penghasilan Denda,
-Repayment Schedule,Jadwal pembayaran,
-Total Payable Amount,Jumlah Total Hutang,
-Total Principal Paid,Total Pokok yang Dibayar,
-Total Interest Payable,Total Utang Bunga,
-Total Amount Paid,Jumlah Total yang Dibayar,
-Loan Manager,Manajer Pinjaman,
-Loan Info,Info kredit,
-Rate of Interest,Tingkat Tujuan,
-Proposed Pledges,Janji yang Diusulkan,
-Maximum Loan Amount,Maksimum Jumlah Pinjaman,
-Repayment Info,Info pembayaran,
-Total Payable Interest,Total Utang Bunga,
-Against Loan ,Melawan Pinjaman,
-Loan Interest Accrual,Bunga Kredit Akrual,
-Amounts,Jumlah,
-Pending Principal Amount,Jumlah Pokok Tertunda,
-Payable Principal Amount,Jumlah Pokok Hutang,
-Paid Principal Amount,Jumlah Pokok yang Dibayar,
-Paid Interest Amount,Jumlah Bunga yang Dibayar,
-Process Loan Interest Accrual,Memproses Bunga Pinjaman Akrual,
-Repayment Schedule Name,Nama Jadwal Pembayaran,
Regular Payment,Pembayaran Reguler,
Loan Closure,Penutupan Pinjaman,
-Payment Details,Rincian Pembayaran,
-Interest Payable,Hutang bunga,
-Amount Paid,Jumlah Dibayar,
-Principal Amount Paid,Jumlah Pokok yang Dibayar,
-Repayment Details,Rincian Pembayaran,
-Loan Repayment Detail,Detail Pembayaran Pinjaman,
-Loan Security Name,Nama Keamanan Pinjaman,
-Unit Of Measure,Satuan ukuran,
-Loan Security Code,Kode Keamanan Pinjaman,
-Loan Security Type,Jenis Keamanan Pinjaman,
-Haircut %,Potongan rambut%,
-Loan Details,Rincian Pinjaman,
-Unpledged,Tidak dijanjikan,
-Pledged,Dijanjikan,
-Partially Pledged,Diagunkan Sebagian,
-Securities,Efek,
-Total Security Value,Nilai Keamanan Total,
-Loan Security Shortfall,Kekurangan Keamanan Pinjaman,
-Loan ,Pinjaman,
-Shortfall Time,Waktu Kekurangan,
-America/New_York,America / New_York,
-Shortfall Amount,Jumlah Shortfall,
-Security Value ,Nilai Keamanan,
-Process Loan Security Shortfall,Proses Kekurangan Keamanan Pinjaman,
-Loan To Value Ratio,Rasio Pinjaman Terhadap Nilai,
-Unpledge Time,Unpledge Time,
-Loan Name,pinjaman Nama,
Rate of Interest (%) Yearly,Tingkat bunga (%) Tahunan,
-Penalty Interest Rate (%) Per Day,Tingkat Bunga Penalti (%) Per Hari,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Suku Bunga Denda dikenakan pada jumlah bunga tertunda setiap hari jika terjadi keterlambatan pembayaran,
-Grace Period in Days,Periode Rahmat dalam hitungan Hari,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Jumlah hari dari tanggal jatuh tempo hingga denda tidak akan dibebankan jika terjadi keterlambatan pembayaran pinjaman,
-Pledge,Janji,
-Post Haircut Amount,Posting Jumlah Potong Rambut,
-Process Type,Jenis Proses,
-Update Time,Perbarui Waktu,
-Proposed Pledge,Usulan Ikrar,
-Total Payment,Total pembayaran,
-Balance Loan Amount,Saldo Jumlah Pinjaman,
-Is Accrued,Dikumpulkan,
Salary Slip Loan,Pinjaman Saldo Gaji,
Loan Repayment Entry,Entri Pembayaran Pinjaman,
-Sanctioned Loan Amount,Jumlah Pinjaman Yang Diberi Sanksi,
-Sanctioned Amount Limit,Batas Jumlah Yang Diberi Sanksi,
-Unpledge,Tidak ada janji,
-Haircut,Potong rambut,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Hasilkan Jadwal,
Schedules,Jadwal,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Proyek akan dapat diakses di website pengguna ini,
Copied From,Disalin dari,
Start and End Dates,Mulai dan Akhir Tanggal,
-Actual Time (in Hours),Waktu Aktual (dalam Jam),
+Actual Time in Hours (via Timesheet),Waktu Aktual (dalam Jam),
Costing and Billing,Biaya dan Penagihan,
-Total Costing Amount (via Timesheets),Total Costing Amount (melalui Timesheets),
-Total Expense Claim (via Expense Claims),Jumlah Klaim Beban (via Klaim Beban),
+Total Costing Amount (via Timesheet),Total Costing Amount (melalui Timesheets),
+Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Klaim Beban),
Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via),
Total Sales Amount (via Sales Order),Total Jumlah Penjualan (via Sales Order),
-Total Billable Amount (via Timesheets),Total Jumlah yang Dapat Ditagih (via Timesheets),
-Total Billed Amount (via Sales Invoices),Total Jumlah Bills (via Faktur Penjualan),
-Total Consumed Material Cost (via Stock Entry),Total Biaya Bahan yang Dikonsumsi (melalui Entri Stok),
+Total Billable Amount (via Timesheet),Total Jumlah yang Dapat Ditagih (via Timesheets),
+Total Billed Amount (via Sales Invoice),Total Jumlah Bills (via Faktur Penjualan),
+Total Consumed Material Cost (via Stock Entry),Total Biaya Bahan yang Dikonsumsi (melalui Entri Stok),
Gross Margin,Margin kotor,
Gross Margin %,Gross Margin%,
Monitor Progress,Pantau Kemajuan,
@@ -7521,12 +7385,10 @@
Dependencies,Ketergantungan,
Dependent Tasks,Tugas Tanggungan,
Depends on Tasks,Tergantung pada Tugas,
-Actual Start Date (via Time Sheet),Aktual Mulai Tanggal (via Waktu Lembar),
-Actual Time (in hours),Waktu Aktual (dalam Jam),
-Actual End Date (via Time Sheet),Tanggal Akhir Aktual (dari Lembar Waktu),
-Total Costing Amount (via Time Sheet),Total Costing Jumlah (via Waktu Lembar),
+Actual Start Date (via Timesheet),Aktual Mulai Tanggal (via Waktu Lembar),
+Actual Time in Hours (via Timesheet),Waktu Aktual (dalam Jam),
+Actual End Date (via Timesheet),Tanggal Akhir Aktual (dari Lembar Waktu),
Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Beban Klaim),
-Total Billing Amount (via Time Sheet),Jumlah Total Penagihan (via Waktu Lembar),
Review Date,Tanggal Ulasan,
Closing Date,Tanggal Penutupan,
Task Depends On,Tugas Tergantung Pada,
@@ -7887,7 +7749,6 @@
Update Series,Perbarui Seri,
Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.,
Prefix,Awalan,
-Current Value,Nilai saat ini,
This is the number of the last created transaction with this prefix,Ini adalah jumlah transaksi yang diciptakan terakhir dengan awalan ini,
Update Series Number,Perbarui Nomor Seri,
Quotation Lost Reason,Alasan Kalah Penawaran,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat,
Lead Details,Rincian Prospek,
Lead Owner Efficiency,Efisiensi Pemilik Prospek,
-Loan Repayment and Closure,Pembayaran dan Penutupan Pinjaman,
-Loan Security Status,Status Keamanan Pinjaman,
Lost Opportunity,Peluang Hilang,
Maintenance Schedules,Jadwal pemeliharaan,
Material Requests for which Supplier Quotations are not created,Permintaan Material yang Supplier Quotation tidak diciptakan,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Jumlah yang Ditargetkan: {0},
Payment Account is mandatory,Akun Pembayaran adalah wajib,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Jika dicentang, jumlah penuh akan dipotong dari penghasilan kena pajak sebelum menghitung pajak penghasilan tanpa pernyataan atau penyerahan bukti.",
-Disbursement Details,Detail Pencairan,
Material Request Warehouse,Gudang Permintaan Material,
Select warehouse for material requests,Pilih gudang untuk permintaan material,
Transfer Materials For Warehouse {0},Mentransfer Bahan Untuk Gudang {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Membayar kembali jumlah gaji yang belum diklaim,
Deduction from salary,Pemotongan gaji,
Expired Leaves,Daun kadaluarsa,
-Reference No,nomor referensi,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Persentase potongan rambut adalah perbedaan persentase antara nilai pasar dari Jaminan Pinjaman dan nilai yang dianggap berasal dari Jaminan Pinjaman tersebut ketika digunakan sebagai jaminan untuk pinjaman tersebut.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Loan To Value Ratio mengungkapkan rasio jumlah pinjaman dengan nilai jaminan yang dijaminkan. Kekurangan jaminan pinjaman akan dipicu jika jumlahnya di bawah nilai yang ditentukan untuk pinjaman apa pun,
If this is not checked the loan by default will be considered as a Demand Loan,"Jika tidak dicentang, pinjaman secara default akan dianggap sebagai Pinjaman Permintaan",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Rekening ini digunakan untuk membukukan pembayaran pinjaman dari peminjam dan juga menyalurkan pinjaman kepada peminjam,
This account is capital account which is used to allocate capital for loan disbursal account ,Akun ini adalah akun modal yang digunakan untuk mengalokasikan modal ke akun pencairan pinjaman,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operasi {0} bukan milik perintah kerja {1},
Print UOM after Quantity,Cetak UOM setelah Kuantitas,
Set default {0} account for perpetual inventory for non stock items,Tetapkan akun {0} default untuk persediaan perpetual untuk item non-stok,
-Loan Security {0} added multiple times,Jaminan Pinjaman {0} ditambahkan beberapa kali,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Efek Pinjaman dengan rasio LTV berbeda tidak dapat dijaminkan untuk satu pinjaman,
-Qty or Amount is mandatory for loan security!,Qty atau Amount wajib untuk keamanan pinjaman!,
-Only submittted unpledge requests can be approved,Hanya permintaan unpledge yang dikirim yang dapat disetujui,
-Interest Amount or Principal Amount is mandatory,Jumlah Bunga atau Jumlah Pokok wajib diisi,
-Disbursed Amount cannot be greater than {0},Jumlah yang Dicairkan tidak boleh lebih dari {0},
-Row {0}: Loan Security {1} added multiple times,Baris {0}: Jaminan Pinjaman {1} ditambahkan beberapa kali,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Baris # {0}: Item Anak tidak boleh menjadi Paket Produk. Harap hapus Item {1} dan Simpan,
Credit limit reached for customer {0},Batas kredit tercapai untuk pelanggan {0},
Could not auto create Customer due to the following missing mandatory field(s):,Tidak dapat membuat Pelanggan secara otomatis karena bidang wajib berikut tidak ada:,
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 5f11c63..c5843ac 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Gildir ef fyrirtækið er SpA, SApA eða SRL",
Applicable if the company is a limited liability company,Gildir ef fyrirtækið er hlutafélag,
Applicable if the company is an Individual or a Proprietorship,Gildir ef fyrirtækið er einstaklingur eða eignaraðild,
-Applicant,Umsækjandi,
-Applicant Type,Umsækjandi Tegund,
Application of Funds (Assets),Umsókn um Funds (eignum),
Application period cannot be across two allocation records,Umsóknarfrestur getur ekki verið yfir tveimur úthlutunarskrám,
Application period cannot be outside leave allocation period,Umsókn tímabil getur ekki verið úti leyfi úthlutun tímabil,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Listi yfir tiltæka hluthafa með folíumnúmerum,
Loading Payment System,Hleðsla greiðslukerfis,
Loan,Lán,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0},
-Loan Application,Lán umsókn,
-Loan Management,Lánastjórnun,
-Loan Repayment,Lán endurgreiðslu,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Upphafsdagur og lánstímabil lána er skylt að vista reikningsafslátt,
Loans (Liabilities),Lán (skulda),
Loans and Advances (Assets),Útlán og kröfur (inneign),
@@ -1611,7 +1605,6 @@
Monday,Mánudagur,
Monthly,Mánaðarleg,
Monthly Distribution,Mánaðarleg dreifing,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mánaðarlega endurgreiðslu Upphæð má ekki vera meiri en lánsfjárhæð,
More,meira,
More Information,Meiri upplýsingar,
More than one selection for {0} not allowed,Fleiri en eitt val fyrir {0} er ekki leyfilegt,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Borga {0} {1},
Payable,greiðist,
Payable Account,greiðist Reikningur,
-Payable Amount,Greiðslufjárhæð,
Payment,Greiðsla,
Payment Cancelled. Please check your GoCardless Account for more details,Greiðsla hætt. Vinsamlegast athugaðu GoCardless reikninginn þinn til að fá frekari upplýsingar,
Payment Confirmation,Greiðsla staðfestingar,
-Payment Date,Greiðsludagur,
Payment Days,Greiðsla Days,
Payment Document,greiðsla Document,
Payment Due Date,Greiðsla Due Date,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Vinsamlegast sláðu inn kvittun fyrst,
Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal,
Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur,
-Please enter Repayment Periods,Vinsamlegast sláðu inn lánstíma,
Please enter Reqd by Date,Vinsamlegast sláðu inn Reqd eftir dagsetningu,
Please enter Woocommerce Server URL,Vinsamlegast sláðu inn slóðina á Woocommerce Server,
Please enter Write Off Account,Vinsamlegast sláðu afskrifa reikning,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Vinsamlegast sláðu foreldri kostnaðarstað,
Please enter quantity for Item {0},Vinsamlegast sláðu inn magn fyrir lið {0},
Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.,
-Please enter repayment Amount,Vinsamlegast sláðu endurgreiðslu Upphæð,
Please enter valid Financial Year Start and End Dates,Vinsamlegast sláðu inn fjárhagsári upphafs- og lokadagsetningar,
Please enter valid email address,Vinsamlegast sláðu inn gilt netfang,
Please enter {0} first,Vinsamlegast sláðu inn {0} fyrst,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Verðlagning Reglurnar eru frekar síuð miðað við magn.,
Primary Address Details,Aðalupplýsingaupplýsingar,
Primary Contact Details,Aðal upplýsingar um tengilið,
-Principal Amount,höfuðstóll,
Print Format,Print Format,
Print IRS 1099 Forms,Prentaðu IRS 1099 eyðublöð,
Print Report Card,Prenta skýrslukort,
@@ -2550,7 +2538,6 @@
Sample Collection,Sýnishorn,
Sample quantity {0} cannot be more than received quantity {1},Sýni magn {0} getur ekki verið meira en móttekin magn {1},
Sanctioned,bundnar,
-Sanctioned Amount,bundnar Upphæð,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bundnar Upphæð má ekki vera meiri en bótafjárhæðir í Row {0}.,
Sand,Sandur,
Saturday,laugardagur,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} er þegar með foreldraferli {1}.,
API,API,
Annual,Árleg,
-Approved,samþykkt,
Change,Breyta,
Contact Email,Netfang tengiliðar,
Export Type,Útflutningsgerð,
@@ -3571,7 +3557,6 @@
Account Value,Reikningsgildi,
Account is mandatory to get payment entries,Reikningur er nauðsynlegur til að fá greiðslufærslur,
Account is not set for the dashboard chart {0},Reikningur er ekki stilltur fyrir stjórnborðið {0},
-Account {0} does not belong to company {1},Reikningur {0} ekki tilheyra félaginu {1},
Account {0} does not exists in the dashboard chart {1},Reikningur {0} er ekki til í stjórnborði töflunnar {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Reikningur: <b>{0}</b> er höfuðborg Vinna í vinnslu og ekki er hægt að uppfæra hana með færslu dagbókar,
Account: {0} is not permitted under Payment Entry,Reikningur: {0} er ekki leyfður samkvæmt greiðslufærslu,
@@ -3582,7 +3567,6 @@
Activity,virkni,
Add / Manage Email Accounts.,Bæta við / stjórna email reikningur.,
Add Child,Bæta Child,
-Add Loan Security,Bættu við lánsöryggi,
Add Multiple,Bæta við mörgum,
Add Participants,Bæta við þátttakendum,
Add to Featured Item,Bæta við valinn hlut,
@@ -3593,15 +3577,12 @@
Address Line 1,Heimilisfang lína 1,
Addresses,Heimilisföng,
Admission End Date should be greater than Admission Start Date.,Lokadagsetning inntöku ætti að vera meiri en upphafsdagur inntöku.,
-Against Loan,Gegn láni,
-Against Loan:,Gegn láni:,
All,Allt,
All bank transactions have been created,Öll bankaviðskipti hafa verið búin til,
All the depreciations has been booked,Allar afskriftirnar hafa verið bókaðar,
Allocation Expired!,Úthlutun rann út!,
Allow Resetting Service Level Agreement from Support Settings.,Leyfa að endurstilla þjónustustigssamning frá stuðningsstillingum.,
Amount of {0} is required for Loan closure,Fjárhæð {0} er nauðsynleg vegna lokunar lána,
-Amount paid cannot be zero,Upphæð greidd getur ekki verið núll,
Applied Coupon Code,Beitt afsláttarmiða kóða,
Apply Coupon Code,Notaðu afsláttarmiða kóða,
Appointment Booking,Ráðningabókun,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Ekki hægt að reikna komutíma þar sem netfang ökumanns vantar.,
Cannot Optimize Route as Driver Address is Missing.,Ekki hægt að fínstilla leið þar sem heimilisfang ökumanns vantar.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Ekki hægt að ljúka verkefni {0} þar sem háð verkefni {1} þess eru ekki felld / hætt.,
-Cannot create loan until application is approved,Get ekki stofnað lán fyrr en umsóknin hefur verið samþykkt,
Cannot find a matching Item. Please select some other value for {0}.,Get ekki fundið samsvörun hlut. Vinsamlegast veldu einhverja aðra verðmæti fyrir {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Ekki hægt að of mikið af hlut {0} í röð {1} meira en {2}. Til að leyfa ofinnheimtu, vinsamlegast stilltu vasapeninga í reikningum",
"Capacity Planning Error, planned start time can not be same as end time","Villa við skipulagsgetu, áætlaður upphafstími getur ekki verið sá sami og lokatími",
@@ -3812,20 +3792,9 @@
Less Than Amount,Minna en upphæð,
Liabilities,Skuldir,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Lánsfjárhæð er hærri en hámarks lánsfjárhæð {0} samkvæmt fyrirhuguðum verðbréfum,
Loan Applications from customers and employees.,Lánaforrit frá viðskiptavinum og starfsmönnum.,
-Loan Disbursement,Útborgun lána,
Loan Processes,Lánaferli,
-Loan Security,Lánöryggi,
-Loan Security Pledge,Veðlán við lánsöryggi,
-Loan Security Pledge Created : {0},Veðtryggingarlán til útlána búið til: {0},
-Loan Security Price,Lánaöryggisverð,
-Loan Security Price overlapping with {0},Öryggisverð lána skarast við {0},
-Loan Security Unpledge,Útilokun lánaöryggis,
-Loan Security Value,Öryggisgildi lána,
Loan Type for interest and penalty rates,Lántegund fyrir vexti og dráttarvexti,
-Loan amount cannot be greater than {0},Lánsfjárhæð getur ekki verið meiri en {0},
-Loan is mandatory,Lán er skylt,
Loans,Lán,
Loans provided to customers and employees.,Lán veitt viðskiptavinum og starfsmönnum.,
Location,Staðsetning,
@@ -3894,7 +3863,6 @@
Pay,Greitt,
Payment Document Type,Tegund greiðslu skjals,
Payment Name,Greiðsluheiti,
-Penalty Amount,Vítaspyrna,
Pending,Bíður,
Performance,Frammistaða,
Period based On,Tímabil byggt á,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Vinsamlegast skráðu þig inn sem notandi Marketplace til að breyta þessu atriði.,
Please login as a Marketplace User to report this item.,Vinsamlegast skráðu þig inn sem notandi Marketplace til að tilkynna þetta.,
Please select <b>Template Type</b> to download template,Vinsamlegast veldu <b>sniðmát</b> til að hlaða niður sniðmáti,
-Please select Applicant Type first,Vinsamlegast veldu gerð umsækjanda fyrst,
Please select Customer first,Vinsamlegast veldu viðskiptavin fyrst,
Please select Item Code first,Vinsamlegast veldu hlutakóða fyrst,
-Please select Loan Type for company {0},Vinsamlegast veldu Lántegund fyrir fyrirtæki {0},
Please select a Delivery Note,Vinsamlegast veldu afhendingarskilaboð,
Please select a Sales Person for item: {0},Veldu söluaðila fyrir hlutinn: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Vinsamlegast veldu annan greiðsluaðferð. Rönd styður ekki viðskipti í gjaldmiðli '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Settu upp sjálfgefinn bankareikning fyrir {0} fyrirtæki,
Please specify,vinsamlegast tilgreindu,
Please specify a {0},Vinsamlegast tilgreindu {0},lead
-Pledge Status,Veðréttarstaða,
-Pledge Time,Veðsetningartími,
Printing,Prentun,
Priority,Forgangur,
Priority has been changed to {0}.,Forgangi hefur verið breytt í {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Vinnsla XML skrár,
Profitability,Arðsemi,
Project,Project,
-Proposed Pledges are mandatory for secured Loans,Fyrirhugaðar veðsetningar eru skylda vegna tryggðra lána,
Provide the academic year and set the starting and ending date.,Veittu námsárið og stilltu upphafs- og lokadagsetningu.,
Public token is missing for this bank,Það vantar opinberan tákn fyrir þennan banka,
Publish,Birta,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Innkaupakvittun er ekki með neinn hlut sem varðveita sýnishorn er virkt fyrir.,
Purchase Return,kaup Return,
Qty of Finished Goods Item,Magn fullunninna vara,
-Qty or Amount is mandatroy for loan security,Magn eða fjárhæð er mandatroy fyrir lánsöryggi,
Quality Inspection required for Item {0} to submit,Gæðaskoðun þarf til að skila inn hlut {0},
Quantity to Manufacture,Magn til framleiðslu,
Quantity to Manufacture can not be zero for the operation {0},Magn til framleiðslu getur ekki verið núll fyrir aðgerðina {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Slökunardagur verður að vera meiri en eða jafn og dagsetningardagur,
Rename,endurnefna,
Rename Not Allowed,Endurnefna ekki leyfilegt,
-Repayment Method is mandatory for term loans,Endurgreiðsluaðferð er skylda fyrir tíma lán,
-Repayment Start Date is mandatory for term loans,Upphafsdagur endurgreiðslu er skylda vegna lánstíma,
Report Item,Tilkynna hlut,
Report this Item,Tilkynna þetta atriði,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Frátekið magn fyrir undirverktaka: Magn hráefna til að búa til undirverktaka hluti.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Röð ({0}): {1} er nú þegar afsláttur af {2},
Rows Added in {0},Raðir bætt við í {0},
Rows Removed in {0},Raðir fjarlægðar á {0},
-Sanctioned Amount limit crossed for {0} {1},Viðurkennd fjárhæðarmörk yfir {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Viðurkennd lánsfjárhæð er þegar til fyrir {0} gegn fyrirtæki {1},
Save,Vista,
Save Item,Vista hlut,
Saved Items,Vistaðir hlutir,
@@ -4135,7 +4093,6 @@
User {0} is disabled,User {0} er óvirk,
Users and Permissions,Notendur og heimildir,
Vacancies cannot be lower than the current openings,Laus störf geta ekki verið lægri en núverandi opnun,
-Valid From Time must be lesser than Valid Upto Time.,Gildur frá tíma verður að vera minni en gildur fram að tíma.,
Valuation Rate required for Item {0} at row {1},Matshluti krafist fyrir lið {0} í röð {1},
Values Out Of Sync,Gildi utan samstillingar,
Vehicle Type is required if Mode of Transport is Road,Gerð ökutækis er krafist ef flutningsmáti er vegur,
@@ -4211,7 +4168,6 @@
Add to Cart,Bæta í körfu,
Days Since Last Order,Dagar frá síðustu pöntun,
In Stock,Á lager,
-Loan Amount is mandatory,Lánsfjárhæð er skylt,
Mode Of Payment,Háttur á greiðslu,
No students Found,Engir nemendur fundnir,
Not in Stock,Ekki til á lager,
@@ -4240,7 +4196,6 @@
Group by,Hópa eftir,
In stock,Á lager,
Item name,Item Name,
-Loan amount is mandatory,Lánsfjárhæð er skylt,
Minimum Qty,Lágmarksfjöldi,
More details,Nánari upplýsingar,
Nature of Supplies,Eðli birgða,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Heildar lokið fjölda,
Qty to Manufacture,Magn To Framleiðsla,
Repay From Salary can be selected only for term loans,Endurgreiðsla frá launum er aðeins hægt að velja fyrir lán til lengri tíma,
-No valid Loan Security Price found for {0},Ekkert gilt öryggisverð lána fannst fyrir {0},
-Loan Account and Payment Account cannot be same,Lánsreikningur og greiðslureikningur geta ekki verið eins,
-Loan Security Pledge can only be created for secured loans,Lánsöryggisloforð er aðeins hægt að búa til vegna tryggðra lána,
Social Media Campaigns,Herferðir samfélagsmiðla,
From Date can not be greater than To Date,Frá dagsetningu má ekki vera meira en til dags,
Please set a Customer linked to the Patient,Vinsamlegast stilltu viðskiptavin sem er tengdur við sjúklinginn,
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Ráðningarbréf,
Job Applicant,Atvinna umsækjanda,
-Applicant Name,umsækjandi Nafn,
Appointment Date,Skipunardagur,
Appointment Letter Template,Skipunarsniðmát,
Body,Líkami,
@@ -7059,99 +7010,12 @@
Sync in Progress,Samstilling í framvindu,
Hub Seller Name,Hub seljanda nafn,
Custom Data,Sérsniðin gögn,
-Member,Meðlimur,
-Partially Disbursed,hluta ráðstafað,
-Loan Closure Requested,Óskað er eftir lokun lána,
Repay From Salary,Endurgreiða frá Laun,
-Loan Details,lán Nánar,
-Loan Type,lán Type,
-Loan Amount,lánsfjárhæð,
-Is Secured Loan,Er tryggt lán,
-Rate of Interest (%) / Year,Vextir (%) / Ár,
-Disbursement Date,útgreiðsludagur,
-Disbursed Amount,Útborgað magn,
-Is Term Loan,Er tíma lán,
-Repayment Method,endurgreiðsla Aðferð,
-Repay Fixed Amount per Period,Endurgreiða Föst upphæð á hvern Tímabil,
-Repay Over Number of Periods,Endurgreiða yfir fjölda tímum,
-Repayment Period in Months,Lánstími í mánuði,
-Monthly Repayment Amount,Mánaðarlega endurgreiðslu Upphæð,
-Repayment Start Date,Endurgreiðsla upphafsdagur,
-Loan Security Details,Upplýsingar um öryggi lána,
-Maximum Loan Value,Hámarkslánagildi,
-Account Info,Reikningur Upplýsingar,
-Loan Account,Lánreikningur,
-Interest Income Account,Vaxtatekjur Reikningur,
-Penalty Income Account,Vítisreikning,
-Repayment Schedule,endurgreiðsla Dagskrá,
-Total Payable Amount,Alls Greiðist Upphæð,
-Total Principal Paid,Heildargreiðsla greidd,
-Total Interest Payable,Samtals vaxtagjöld,
-Total Amount Paid,Heildarfjárhæð greitt,
-Loan Manager,Lánastjóri,
-Loan Info,lán Info,
-Rate of Interest,Vöxtum,
-Proposed Pledges,Fyrirhugaðar veðsetningar,
-Maximum Loan Amount,Hámarkslán,
-Repayment Info,endurgreiðsla Upplýsingar,
-Total Payable Interest,Alls Greiðist Vextir,
-Against Loan ,Gegn láni,
-Loan Interest Accrual,Uppsöfnun vaxtalána,
-Amounts,Fjárhæðir,
-Pending Principal Amount,Aðalupphæð í bið,
-Payable Principal Amount,Greiðilegt aðalupphæð,
-Paid Principal Amount,Greitt aðalupphæð,
-Paid Interest Amount,Greidd vaxtaupphæð,
-Process Loan Interest Accrual,Að vinna úr áföllum vaxtalána,
-Repayment Schedule Name,Nafn endurgreiðsluáætlunar,
Regular Payment,Regluleg greiðsla,
Loan Closure,Lánalokun,
-Payment Details,Greiðsluupplýsingar,
-Interest Payable,Vextir sem greiða ber,
-Amount Paid,Greidd upphæð,
-Principal Amount Paid,Aðalupphæð greidd,
-Repayment Details,Upplýsingar um endurgreiðslu,
-Loan Repayment Detail,Upplýsingar um endurgreiðslu lána,
-Loan Security Name,Öryggisheiti láns,
-Unit Of Measure,Mælieining,
-Loan Security Code,Öryggisnúmer lána,
-Loan Security Type,Tegund öryggis,
-Haircut %,Hárskera%,
-Loan Details,Upplýsingar um lán,
-Unpledged,Óléttað,
-Pledged,Veðsett,
-Partially Pledged,Veðsett að hluta,
-Securities,Verðbréf,
-Total Security Value,Heildaröryggisgildi,
-Loan Security Shortfall,Skortur á lánsöryggi,
-Loan ,Lán,
-Shortfall Time,Skortur tími,
-America/New_York,Ameríka / New_York,
-Shortfall Amount,Fjárhæð,
-Security Value ,Öryggisgildi,
-Process Loan Security Shortfall,Að vinna úr öryggisskorti,
-Loan To Value Ratio,Hlutfall lána,
-Unpledge Time,Tímasetning,
-Loan Name,lán Name,
Rate of Interest (%) Yearly,Rate of Interest (%) Árleg,
-Penalty Interest Rate (%) Per Day,Dráttarvextir (%) á dag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Dráttarvextir eru lagðir á vaxtaupphæðina í bið daglega ef seinkað er um endurgreiðslu,
-Grace Period in Days,Náðstímabil á dögum,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Fjöldi daga frá gjalddaga þar til refsing verður ekki innheimt ef tafir verða á endurgreiðslu lána,
-Pledge,Veð,
-Post Haircut Amount,Fjárhæð hárskera,
-Process Type,Ferlategund,
-Update Time,Uppfærslutími,
-Proposed Pledge,Fyrirhugað veð,
-Total Payment,Samtals greiðsla,
-Balance Loan Amount,Balance lánsfjárhæð,
-Is Accrued,Er safnað,
Salary Slip Loan,Launasala,
Loan Repayment Entry,Endurgreiðsla lána,
-Sanctioned Loan Amount,Viðurkennt lánsfjárhæð,
-Sanctioned Amount Limit,Viðurkennd fjárhæðarmörk,
-Unpledge,Fjarlægja,
-Haircut,Hárskera,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,búa Stundaskrá,
Schedules,Skrár,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Verkefnið verður aðgengilegur á vef þessara notenda,
Copied From,Afritað frá,
Start and End Dates,Upphafs- og lokadagsetningar,
-Actual Time (in Hours),Raunverulegur tími (í klukkustundum),
+Actual Time in Hours (via Timesheet),Raunverulegur tími (í klukkustundum),
Costing and Billing,Kosta og innheimtu,
-Total Costing Amount (via Timesheets),Samtals kostnaðarverð (með tímariti),
-Total Expense Claim (via Expense Claims),Total Expense Krafa (með kostnað kröfum),
+Total Costing Amount (via Timesheet),Samtals kostnaðarverð (með tímariti),
+Total Expense Claim (via Expense Claim),Total Expense Krafa (með kostnað kröfum),
Total Purchase Cost (via Purchase Invoice),Total Kaup Kostnaður (í gegnum kaupa Reikningar),
Total Sales Amount (via Sales Order),Samtals sölugjald (með sölupöntun),
-Total Billable Amount (via Timesheets),Samtals reikningshæft magn (með tímariti),
-Total Billed Amount (via Sales Invoices),Samtals innheimt upphæð (með sölutölum),
-Total Consumed Material Cost (via Stock Entry),Heildarkostnaður neyslukostnaðar (í gegnum vöruskipti),
+Total Billable Amount (via Timesheet),Samtals reikningshæft magn (með tímariti),
+Total Billed Amount (via Sales Invoice),Samtals innheimt upphæð (með sölutölum),
+Total Consumed Material Cost (via Stock Entry),Heildarkostnaður neyslukostnaðar (í gegnum vöruskipti),
Gross Margin,Heildarframlegð,
Gross Margin %,Heildarframlegð %,
Monitor Progress,Skjár framfarir,
@@ -7521,12 +7385,10 @@
Dependencies,Ósjálfstæði,
Dependent Tasks,Ósjálfstætt verkefni,
Depends on Tasks,Fer á Verkefni,
-Actual Start Date (via Time Sheet),Raunbyrjunardagsetning (með Time Sheet),
-Actual Time (in hours),Tíminn (í klst),
-Actual End Date (via Time Sheet),Raunveruleg End Date (með Time Sheet),
-Total Costing Amount (via Time Sheet),Total kostnaðarútreikninga Magn (með Time Sheet),
+Actual Start Date (via Timesheet),Raunbyrjunardagsetning (með Time Sheet),
+Actual Time in Hours (via Timesheet),Tíminn (í klst),
+Actual End Date (via Timesheet),Raunveruleg End Date (með Time Sheet),
Total Expense Claim (via Expense Claim),Total Expense Krafa (með kostnað kröfu),
-Total Billing Amount (via Time Sheet),Total Billing Magn (með Time Sheet),
Review Date,Review Date,
Closing Date,lokadegi,
Task Depends On,Verkefni veltur á,
@@ -7887,7 +7749,6 @@
Update Series,Uppfæra Series,
Change the starting / current sequence number of an existing series.,Breyta upphafsdegi / núverandi raðnúmer núverandi röð.,
Prefix,forskeyti,
-Current Value,Núverandi Value,
This is the number of the last created transaction with this prefix,Þetta er fjöldi síðustu búin færslu með þessu forskeyti,
Update Series Number,Uppfæra Series Number,
Quotation Lost Reason,Tilvitnun Lost Ástæða,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Mælt Uppröðun Level,
Lead Details,Lead Upplýsingar,
Lead Owner Efficiency,Lead Owner Efficiency,
-Loan Repayment and Closure,Endurgreiðsla og lokun lána,
-Loan Security Status,Staða lánaöryggis,
Lost Opportunity,Týnt tækifæri,
Maintenance Schedules,viðhald Skrár,
Material Requests for which Supplier Quotations are not created,Efni Beiðnir sem Birgir tilvitnanir eru ekki stofnað,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Talningar miðaðar: {0},
Payment Account is mandatory,Greiðslureikningur er lögboðinn,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",Ef hakað er við verður heildarupphæðin dregin frá skattskyldum tekjum áður en tekjuskattur er reiknaður út án þess að yfirlýsing eða sönnun sé lögð fram.,
-Disbursement Details,Upplýsingar um útgreiðslu,
Material Request Warehouse,Vöruhús fyrir beiðni um efni,
Select warehouse for material requests,Veldu lager fyrir efnisbeiðnir,
Transfer Materials For Warehouse {0},Flytja efni fyrir lager {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Endurgreiða óheimta upphæð af launum,
Deduction from salary,Frádráttur frá launum,
Expired Leaves,Útrunnið lauf,
-Reference No,Tilvísun nr,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Hárgreiðsluprósenta er hlutfallsmunur á markaðsvirði lánsverðtryggingarinnar og því gildi sem því lánsbréfi er kennt þegar það er notað sem trygging fyrir því láni.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Hlutfall láns og verðmætis lýsir hlutfalli lánsfjárhæðar af andvirði tryggingarinnar. Skortur á öryggisláni verður af stað ef þetta fer undir tilgreint gildi fyrir lán,
If this is not checked the loan by default will be considered as a Demand Loan,Ef ekki er hakað við þetta verður lánið sjálfgefið litið á sem eftirspurnarlán,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Þessi reikningur er notaður til að bóka endurgreiðslur lána frá lántakanda og einnig til að greiða út lán til lántakanda,
This account is capital account which is used to allocate capital for loan disbursal account ,Þessi reikningur er fjármagnsreikningur sem er notaður til að úthluta fjármagni til útborgunarreiknings lána,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Aðgerð {0} tilheyrir ekki vinnupöntuninni {1},
Print UOM after Quantity,Prentaðu UOM eftir magni,
Set default {0} account for perpetual inventory for non stock items,Stilltu sjálfgefinn {0} reikning fyrir ævarandi birgðir fyrir hluti sem ekki eru birgðir,
-Loan Security {0} added multiple times,Lánaöryggi {0} bætt við mörgum sinnum,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Ekki er hægt að veðsetja verðbréf með mismunandi lántökuhlutfalli gegn einu láni,
-Qty or Amount is mandatory for loan security!,Magn eða upphæð er skylda til að tryggja lán!,
-Only submittted unpledge requests can be approved,Einungis er hægt að samþykkja sendar óskað um loforð,
-Interest Amount or Principal Amount is mandatory,Vaxtaupphæð eða aðalupphæð er lögboðin,
-Disbursed Amount cannot be greater than {0},Útborgað magn má ekki vera meira en {0},
-Row {0}: Loan Security {1} added multiple times,Röð {0}: Lánaöryggi {1} bætt við mörgum sinnum,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Röð nr. {0}: Barnaburður ætti ekki að vera vörubúnt. Vinsamlegast fjarlægðu hlutinn {1} og vistaðu,
Credit limit reached for customer {0},Lánshámarki náð fyrir viðskiptavin {0},
Could not auto create Customer due to the following missing mandatory field(s):,Gat ekki sjálfkrafa stofnað viðskiptavin vegna eftirfarandi vantar lögboðna reita (s):,
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 0dbde45..ab3f2ed 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Applicabile se la società è SpA, SApA o SRL",
Applicable if the company is a limited liability company,Applicabile se la società è una società a responsabilità limitata,
Applicable if the company is an Individual or a Proprietorship,Applicabile se la società è un individuo o una proprietà,
-Applicant,Richiedente,
-Applicant Type,Tipo di candidato,
Application of Funds (Assets),Applicazione dei fondi ( Assets ),
Application period cannot be across two allocation records,Il periodo di applicazione non può essere su due record di allocazione,
Application period cannot be outside leave allocation period,La data richiesta è fuori dal periodo di assegnazione,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Elenco di azionisti disponibili con numeri di folio,
Loading Payment System,Caricamento del sistema di pagamento,
Loan,Prestito,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0},
-Loan Application,Domanda di prestito,
-Loan Management,Gestione dei prestiti,
-Loan Repayment,Rimborso del prestito,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,La data di inizio del prestito e il periodo del prestito sono obbligatori per salvare lo sconto fattura,
Loans (Liabilities),Prestiti (passività ),
Loans and Advances (Assets),Crediti ( Assets ),
@@ -1611,7 +1605,6 @@
Monday,Lunedi,
Monthly,Mensile,
Monthly Distribution,Distribuzione mensile,
-Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo,
More,Più,
More Information,Maggiori informazioni,
More than one selection for {0} not allowed,Non è consentita più di una selezione per {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Paga {0} {1},
Payable,pagabile,
Payable Account,Conto pagabile,
-Payable Amount,Importo da pagare,
Payment,Pagamento,
Payment Cancelled. Please check your GoCardless Account for more details,Pagamento annullato. Controlla il tuo account GoCardless per maggiori dettagli,
Payment Confirmation,Conferma di pagamento,
-Payment Date,Data di pagamento,
Payment Days,Giorni di pagamento,
Payment Document,Documento di pagamento,
Payment Due Date,Scadenza,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Si prega di inserire prima la Ricevuta di Acquisto,
Please enter Receipt Document,Si prega di inserire prima il Documento di Ricevimento,
Please enter Reference date,Inserisci Data di riferimento,
-Please enter Repayment Periods,Si prega di inserire periodi di rimborso,
Please enter Reqd by Date,Si prega di inserire la data di consegna richiesta,
Please enter Woocommerce Server URL,Inserisci l'URL del server Woocommerce,
Please enter Write Off Account,Inserisci Conto per Svalutazioni,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Inserisci il centro di costo genitore,
Please enter quantity for Item {0},Inserite la quantità per articolo {0},
Please enter relieving date.,Inserisci la data alleviare .,
-Please enter repayment Amount,Si prega di inserire l'importo di rimborso,
Please enter valid Financial Year Start and End Dates,Si prega di inserire valido Esercizio inizio e di fine,
Please enter valid email address,Inserisci indirizzo email valido,
Please enter {0} first,Si prega di inserire {0} prima,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità.,
Primary Address Details,Dettagli indirizzo primario,
Primary Contact Details,Dettagli del contatto principale,
-Principal Amount,Quota capitale,
Print Format,Formato Stampa,
Print IRS 1099 Forms,Stampa moduli IRS 1099,
Print Report Card,Stampa la pagella,
@@ -2550,7 +2538,6 @@
Sample Collection,Raccolta di campioni,
Sample quantity {0} cannot be more than received quantity {1},La quantità di esempio {0} non può essere superiore alla quantità ricevuta {1},
Sanctioned,sanzionato,
-Sanctioned Amount,Importo sanzionato,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.,
Sand,Sabbia,
Saturday,Sabato,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ha già una procedura padre {1}.,
API,API,
Annual,Annuale,
-Approved,Approvato,
Change,Cambia,
Contact Email,Email Contatto,
Export Type,Tipo di esportazione,
@@ -3571,7 +3557,6 @@
Account Value,Valore del conto,
Account is mandatory to get payment entries,L'account è obbligatorio per ottenere voci di pagamento,
Account is not set for the dashboard chart {0},L'account non è impostato per il grafico del dashboard {0},
-Account {0} does not belong to company {1},Il Conto {0} non appartiene alla società {1},
Account {0} does not exists in the dashboard chart {1},L'account {0} non esiste nel grafico del dashboard {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Conto: <b>{0}</b> è capitale Lavori in corso e non può essere aggiornato dalla registrazione prima nota,
Account: {0} is not permitted under Payment Entry,Account: {0} non è consentito in Voce pagamento,
@@ -3582,7 +3567,6 @@
Activity,Attività,
Add / Manage Email Accounts.,Aggiungere / Gestire accounts email.,
Add Child,Aggiungi una sottovoce,
-Add Loan Security,Aggiungi protezione prestito,
Add Multiple,Aggiunta multipla,
Add Participants,Aggiungi partecipanti,
Add to Featured Item,Aggiungi all'elemento in evidenza,
@@ -3593,15 +3577,12 @@
Address Line 1,Indirizzo,
Addresses,Indirizzi,
Admission End Date should be greater than Admission Start Date.,La data di fine dell'ammissione deve essere maggiore della data di inizio dell'ammissione.,
-Against Loan,Contro il prestito,
-Against Loan:,Contro il prestito:,
All,Tutti,
All bank transactions have been created,Tutte le transazioni bancarie sono state create,
All the depreciations has been booked,Tutti gli ammortamenti sono stati registrati,
Allocation Expired!,Allocazione scaduta!,
Allow Resetting Service Level Agreement from Support Settings.,Consenti il ripristino del contratto sul livello di servizio dalle impostazioni di supporto.,
Amount of {0} is required for Loan closure,Per la chiusura del prestito è richiesto un importo di {0},
-Amount paid cannot be zero,L'importo pagato non può essere zero,
Applied Coupon Code,Codice coupon applicato,
Apply Coupon Code,Applica il codice coupon,
Appointment Booking,Prenotazione appuntamenti,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Impossibile calcolare l'orario di arrivo poiché l'indirizzo del conducente è mancante.,
Cannot Optimize Route as Driver Address is Missing.,Impossibile ottimizzare il percorso poiché manca l'indirizzo del driver.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Impossibile completare l'attività {0} poiché l'attività dipendente {1} non è stata completata / annullata.,
-Cannot create loan until application is approved,Impossibile creare un prestito fino all'approvazione della domanda,
Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Impossibile eseguire l'overbilling per l'articolo {0} nella riga {1} più di {2}. Per consentire l'eccessiva fatturazione, imposta l'indennità in Impostazioni account",
"Capacity Planning Error, planned start time can not be same as end time","Errore di pianificazione della capacità, l'ora di inizio pianificata non può coincidere con l'ora di fine",
@@ -3812,20 +3792,9 @@
Less Than Amount,Meno dell'importo,
Liabilities,passivo,
Loading...,Caricamento in corso ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,L'importo del prestito supera l'importo massimo del prestito di {0} come da titoli proposti,
Loan Applications from customers and employees.,Domande di prestito da parte di clienti e dipendenti.,
-Loan Disbursement,Prestito,
Loan Processes,Processi di prestito,
-Loan Security,Sicurezza del prestito,
-Loan Security Pledge,Impegno di sicurezza del prestito,
-Loan Security Pledge Created : {0},Pegno di sicurezza del prestito creato: {0},
-Loan Security Price,Prezzo di sicurezza del prestito,
-Loan Security Price overlapping with {0},Prezzo del prestito sovrapposto con {0},
-Loan Security Unpledge,Prestito Unpledge di sicurezza,
-Loan Security Value,Valore di sicurezza del prestito,
Loan Type for interest and penalty rates,Tipo di prestito per tassi di interesse e penalità,
-Loan amount cannot be greater than {0},L'importo del prestito non può essere superiore a {0},
-Loan is mandatory,Il prestito è obbligatorio,
Loans,prestiti,
Loans provided to customers and employees.,Prestiti erogati a clienti e dipendenti.,
Location,Posizione,
@@ -3894,7 +3863,6 @@
Pay,Paga,
Payment Document Type,Tipo di documento di pagamento,
Payment Name,Nome pagamento,
-Penalty Amount,Importo della penalità,
Pending,In attesa,
Performance,Prestazione,
Period based On,Periodo basato su,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Effettua il login come utente del marketplace per modificare questo elemento.,
Please login as a Marketplace User to report this item.,Effettua il login come utente del marketplace per segnalare questo articolo.,
Please select <b>Template Type</b> to download template,Seleziona <b>Tipo</b> di modello per scaricare il modello,
-Please select Applicant Type first,Seleziona prima il tipo di candidato,
Please select Customer first,Seleziona prima il cliente,
Please select Item Code first,Seleziona prima il codice articolo,
-Please select Loan Type for company {0},Seleziona il tipo di prestito per la società {0},
Please select a Delivery Note,Seleziona una bolla di consegna,
Please select a Sales Person for item: {0},Seleziona un addetto alle vendite per l'articolo: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Seleziona un altro metodo di pagamento. Stripe non supporta transazioni in valuta '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Configura un conto bancario predefinito per la società {0},
Please specify,Si prega di specificare,
Please specify a {0},Si prega di specificare un {0},lead
-Pledge Status,Pledge Status,
-Pledge Time,Pledge Time,
Printing,Stampa,
Priority,Priorità,
Priority has been changed to {0}.,La priorità è stata cambiata in {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Elaborazione di file XML,
Profitability,Redditività,
Project,Progetto,
-Proposed Pledges are mandatory for secured Loans,Gli impegni proposti sono obbligatori per i prestiti garantiti,
Provide the academic year and set the starting and ending date.,Fornire l'anno accademico e impostare la data di inizio e di fine.,
Public token is missing for this bank,Token pubblico mancante per questa banca,
Publish,Pubblicare,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,La ricevuta di acquisto non ha articoli per i quali è abilitato Conserva campione.,
Purchase Return,Acquisto Ritorno,
Qty of Finished Goods Item,Qtà di articoli finiti,
-Qty or Amount is mandatroy for loan security,Qtà o importo è obbligatorio per la sicurezza del prestito,
Quality Inspection required for Item {0} to submit,Ispezione di qualità richiesta per l'invio dell'articolo {0},
Quantity to Manufacture,Quantità da produrre,
Quantity to Manufacture can not be zero for the operation {0},La quantità da produrre non può essere zero per l'operazione {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,La data di rilascio deve essere maggiore o uguale alla data di iscrizione,
Rename,Rinomina,
Rename Not Allowed,Rinomina non consentita,
-Repayment Method is mandatory for term loans,Il metodo di rimborso è obbligatorio per i prestiti a termine,
-Repayment Start Date is mandatory for term loans,La data di inizio del rimborso è obbligatoria per i prestiti a termine,
Report Item,Segnala articolo,
Report this Item,Segnala questo elemento,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qtà riservata per conto lavoro: quantità di materie prime per la fabbricazione di articoli in conto lavoro.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Riga ({0}): {1} è già scontato in {2},
Rows Added in {0},Righe aggiunte in {0},
Rows Removed in {0},Righe rimosse in {0},
-Sanctioned Amount limit crossed for {0} {1},Limite di importo sanzionato superato per {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},L'importo del prestito sanzionato esiste già per {0} contro la società {1},
Save,Salva,
Save Item,Salva articolo,
Saved Items,Articoli salvati,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Utente {0} è disattivato,
Users and Permissions,Utenti e Permessi,
Vacancies cannot be lower than the current openings,I posti vacanti non possono essere inferiori alle aperture correnti,
-Valid From Time must be lesser than Valid Upto Time.,Valido da tempo deve essere inferiore a Valido fino a tempo.,
Valuation Rate required for Item {0} at row {1},Tasso di valutazione richiesto per l'articolo {0} alla riga {1},
Values Out Of Sync,Valori non sincronizzati,
Vehicle Type is required if Mode of Transport is Road,Il tipo di veicolo è richiesto se la modalità di trasporto è su strada,
@@ -4211,7 +4168,6 @@
Add to Cart,Aggiungi al carrello,
Days Since Last Order,Giorni dall'ultimo ordine,
In Stock,In Magazzino,
-Loan Amount is mandatory,L'importo del prestito è obbligatorio,
Mode Of Payment,Modalità di pagamento,
No students Found,Nessuno studente trovato,
Not in Stock,Non in Stock,
@@ -4240,7 +4196,6 @@
Group by,Raggruppa per,
In stock,disponibile,
Item name,Nome Articolo,
-Loan amount is mandatory,L'importo del prestito è obbligatorio,
Minimum Qty,Qtà minima,
More details,Maggiori dettagli,
Nature of Supplies,Natura dei rifornimenti,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Qtà totale completata,
Qty to Manufacture,Qtà da Produrre,
Repay From Salary can be selected only for term loans,Il rimborso dallo stipendio può essere selezionato solo per i prestiti a termine,
-No valid Loan Security Price found for {0},Nessun prezzo di garanzia del prestito valido trovato per {0},
-Loan Account and Payment Account cannot be same,Conto prestito e Conto di pagamento non possono essere gli stessi,
-Loan Security Pledge can only be created for secured loans,Loan Security Pledge può essere creato solo per prestiti garantiti,
Social Media Campaigns,Campagne sui social media,
From Date can not be greater than To Date,Dalla data non può essere maggiore di Alla data,
Please set a Customer linked to the Patient,Impostare un cliente collegato al paziente,
@@ -6437,7 +6389,6 @@
HR User,HR utente,
Appointment Letter,Lettera di appuntamento,
Job Applicant,Candidati,
-Applicant Name,Nome del Richiedente,
Appointment Date,Data dell'appuntamento,
Appointment Letter Template,Modello di lettera di appuntamento,
Body,Corpo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sincronizzazione in corso,
Hub Seller Name,Nome venditore Hub,
Custom Data,Dati personalizzati,
-Member,Membro,
-Partially Disbursed,parzialmente erogato,
-Loan Closure Requested,Chiusura del prestito richiesta,
Repay From Salary,Rimborsare da Retribuzione,
-Loan Details,prestito Dettagli,
-Loan Type,Tipo di prestito,
-Loan Amount,Ammontare del prestito,
-Is Secured Loan,È un prestito garantito,
-Rate of Interest (%) / Year,Tasso di interesse (%) / anno,
-Disbursement Date,L'erogazione Data,
-Disbursed Amount,Importo erogato,
-Is Term Loan,È prestito a termine,
-Repayment Method,Metodo di rimborso,
-Repay Fixed Amount per Period,Rimborsare importo fisso per Periodo,
-Repay Over Number of Periods,Rimborsare corso Numero di periodi,
-Repayment Period in Months,Il rimborso Periodo in mese,
-Monthly Repayment Amount,Ammontare Rimborso Mensile,
-Repayment Start Date,Data di inizio del rimborso,
-Loan Security Details,Dettagli sulla sicurezza del prestito,
-Maximum Loan Value,Valore massimo del prestito,
-Account Info,Informazioni sull'account,
-Loan Account,Conto del prestito,
-Interest Income Account,Conto Interessi attivi,
-Penalty Income Account,Conto del reddito di sanzione,
-Repayment Schedule,Piano di rimborso,
-Total Payable Amount,Totale passività,
-Total Principal Paid,Totale principale pagato,
-Total Interest Payable,Totale interessi passivi,
-Total Amount Paid,Importo totale pagato,
-Loan Manager,Responsabile del prestito,
-Loan Info,Info prestito,
-Rate of Interest,Tasso di interesse,
-Proposed Pledges,Impegni proposti,
-Maximum Loan Amount,Importo massimo del prestito,
-Repayment Info,Info rimborso,
-Total Payable Interest,Totale interessi passivi,
-Against Loan ,Contro prestito,
-Loan Interest Accrual,Rateo interessi attivi,
-Amounts,importi,
-Pending Principal Amount,Importo principale in sospeso,
-Payable Principal Amount,Importo principale pagabile,
-Paid Principal Amount,Importo principale pagato,
-Paid Interest Amount,Importo degli interessi pagati,
-Process Loan Interest Accrual,Accantonamento per interessi su prestiti di processo,
-Repayment Schedule Name,Nome programma di rimborso,
Regular Payment,Pagamento regolare,
Loan Closure,Chiusura del prestito,
-Payment Details,Dettagli del pagamento,
-Interest Payable,Interessi da pagare,
-Amount Paid,Importo pagato,
-Principal Amount Paid,Importo principale pagato,
-Repayment Details,Dettagli sul rimborso,
-Loan Repayment Detail,Dettaglio rimborso prestito,
-Loan Security Name,Nome di sicurezza del prestito,
-Unit Of Measure,Unità di misura,
-Loan Security Code,Codice di sicurezza del prestito,
-Loan Security Type,Tipo di sicurezza del prestito,
-Haircut %,Taglio di capelli %,
-Loan Details,Dettagli del prestito,
-Unpledged,Unpledged,
-Pledged,impegnati,
-Partially Pledged,Parzialmente promesso,
-Securities,valori,
-Total Security Value,Valore di sicurezza totale,
-Loan Security Shortfall,Mancanza di sicurezza del prestito,
-Loan ,Prestito,
-Shortfall Time,Scadenza,
-America/New_York,America / New_York,
-Shortfall Amount,Importo del deficit,
-Security Value ,Valore di sicurezza,
-Process Loan Security Shortfall,Mancanza di sicurezza del prestito di processo,
-Loan To Value Ratio,Rapporto prestito / valore,
-Unpledge Time,Unpledge Time,
-Loan Name,Nome prestito,
Rate of Interest (%) Yearly,Tasso di interesse (%) Performance,
-Penalty Interest Rate (%) Per Day,Tasso di interesse di penalità (%) al giorno,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Il tasso di interesse di penalità viene riscosso su un importo di interessi in sospeso su base giornaliera in caso di rimborso ritardato,
-Grace Period in Days,Grace Period in Days,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,N. giorni dalla scadenza fino ai quali non verrà addebitata la penale in caso di ritardo nel rimborso del prestito,
-Pledge,Impegno,
-Post Haircut Amount,Importo post taglio,
-Process Type,Tipo di processo,
-Update Time,Tempo di aggiornamento,
-Proposed Pledge,Pegno proposto,
-Total Payment,Pagamento totale,
-Balance Loan Amount,Importo del prestito di bilancio,
-Is Accrued,È maturato,
Salary Slip Loan,Salario Slip Loan,
Loan Repayment Entry,Iscrizione rimborso prestiti,
-Sanctioned Loan Amount,Importo del prestito sanzionato,
-Sanctioned Amount Limit,Limite di importo sanzionato,
-Unpledge,Unpledge,
-Haircut,Taglio di capelli,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Genera Programma,
Schedules,Orari,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Progetto sarà accessibile sul sito web per questi utenti,
Copied From,Copiato da,
Start and End Dates,Date di inizio e fine,
-Actual Time (in Hours),Tempo effettivo (in ore),
+Actual Time in Hours (via Timesheet),Tempo effettivo (in ore),
Costing and Billing,Costi e Fatturazione,
-Total Costing Amount (via Timesheets),Total Costing Amount (via Timesheets),
-Total Expense Claim (via Expense Claims),Total Expense Claim (via rimborsi spese),
+Total Costing Amount (via Timesheet),Total Costing Amount (via Timesheet),
+Total Expense Claim (via Expense Claim),Total Expense Claim (via rimborsi spese),
Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura),
Total Sales Amount (via Sales Order),Importo totale vendite (tramite ordine cliente),
-Total Billable Amount (via Timesheets),Importo totale fatturabile (tramite Timesheets),
-Total Billed Amount (via Sales Invoices),Importo fatturato totale (tramite fatture di vendita),
-Total Consumed Material Cost (via Stock Entry),Costo totale del materiale consumato (tramite stock),
+Total Billable Amount (via Timesheet),Importo totale fatturabile (tramite Timesheets),
+Total Billed Amount (via Sales Invoice),Importo fatturato totale (tramite fatture di vendita),
+Total Consumed Material Cost (via Stock Entry),Costo totale del materiale consumato (tramite stock),
Gross Margin,Margine lordo,
Gross Margin %,Margine lordo %,
Monitor Progress,Monitorare i progressi,
@@ -7521,12 +7385,10 @@
Dependencies,dipendenze,
Dependent Tasks,Attività dipendenti,
Depends on Tasks,Dipende Compiti,
-Actual Start Date (via Time Sheet),Data di inizio effettiva (da Time Sheet),
-Actual Time (in hours),Tempo reale (in ore),
-Actual End Date (via Time Sheet),Data di fine effettiva (da Time Sheet),
-Total Costing Amount (via Time Sheet),Totale Costing Importo (tramite Time Sheet),
+Actual Start Date (via Timesheet),Data di inizio effettiva (da Time Sheet),
+Actual Time in Hours (via Timesheet),Tempo reale (in ore),
+Actual End Date (via Timesheet),Data di fine effettiva (da Time Sheet),
Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim),
-Total Billing Amount (via Time Sheet),Importo totale di fatturazione (tramite Time Sheet),
Review Date,Data di revisione,
Closing Date,Data Chiusura,
Task Depends On,L'attività dipende da,
@@ -7887,7 +7749,6 @@
Update Series,Aggiorna Serie,
Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente,
Prefix,Prefisso,
-Current Value,Valore Corrente,
This is the number of the last created transaction with this prefix,Questo è il numero dell'ultimo transazione creata con questo prefisso,
Update Series Number,Aggiorna Numero della Serie,
Quotation Lost Reason,Motivo per la mancata vendita,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello,
Lead Details,Dettagli Lead,
Lead Owner Efficiency,Efficienza del proprietario del cavo,
-Loan Repayment and Closure,Rimborso e chiusura del prestito,
-Loan Security Status,Stato di sicurezza del prestito,
Lost Opportunity,Opportunità persa,
Maintenance Schedules,Programmi di manutenzione,
Material Requests for which Supplier Quotations are not created,Richieste di materiale per le quali non sono state create Quotazioni dal Fornitore,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Conteggi targetizzati: {0},
Payment Account is mandatory,Il conto di pagamento è obbligatorio,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Se selezionato, l'intero importo verrà detratto dal reddito imponibile prima del calcolo dell'imposta sul reddito senza alcuna dichiarazione o presentazione di prove.",
-Disbursement Details,Dettagli sull'erogazione,
Material Request Warehouse,Magazzino richiesta materiale,
Select warehouse for material requests,Seleziona il magazzino per le richieste di materiale,
Transfer Materials For Warehouse {0},Trasferisci materiali per magazzino {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Rimborsare l'importo non reclamato dallo stipendio,
Deduction from salary,Detrazione dallo stipendio,
Expired Leaves,Foglie scadute,
-Reference No,Riferimento n,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,La percentuale di scarto di garanzia è la differenza percentuale tra il valore di mercato del Titolo del prestito e il valore attribuito a tale Titolo del prestito quando utilizzato come garanzia per quel prestito.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Loan To Value Ratio esprime il rapporto tra l'importo del prestito e il valore del titolo in pegno. Se questo scende al di sotto del valore specificato per qualsiasi prestito, verrà attivato un deficit di sicurezza del prestito",
If this is not checked the loan by default will be considered as a Demand Loan,"Se questa opzione non è selezionata, il prestito di default sarà considerato come un prestito a vista",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Questo conto viene utilizzato per la prenotazione del rimborso del prestito dal mutuatario e anche per l'erogazione dei prestiti al mutuatario,
This account is capital account which is used to allocate capital for loan disbursal account ,Questo conto è un conto capitale utilizzato per allocare il capitale per il conto di erogazione del prestito,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},L'operazione {0} non appartiene all'ordine di lavoro {1},
Print UOM after Quantity,Stampa UOM dopo la quantità,
Set default {0} account for perpetual inventory for non stock items,Imposta l'account {0} predefinito per l'inventario perpetuo per gli articoli non in stock,
-Loan Security {0} added multiple times,Prestito sicurezza {0} aggiunto più volte,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Titoli in prestito con diverso rapporto LTV non possono essere costituiti in pegno su un prestito,
-Qty or Amount is mandatory for loan security!,La quantità o l'importo è obbligatorio per la garanzia del prestito!,
-Only submittted unpledge requests can be approved,Possono essere approvate solo le richieste di mancato impegno inviate,
-Interest Amount or Principal Amount is mandatory,L'importo degli interessi o l'importo del capitale è obbligatorio,
-Disbursed Amount cannot be greater than {0},L'importo erogato non può essere maggiore di {0},
-Row {0}: Loan Security {1} added multiple times,Riga {0}: Prestito sicurezza {1} aggiunta più volte,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Riga n. {0}: l'elemento secondario non deve essere un pacchetto di prodotti. Rimuovi l'elemento {1} e salva,
Credit limit reached for customer {0},Limite di credito raggiunto per il cliente {0},
Could not auto create Customer due to the following missing mandatory field(s):,Impossibile creare automaticamente il cliente a causa dei seguenti campi obbligatori mancanti:,
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 210c78e..227fe59 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",会社がSpA、SApAまたはSRLの場合に適用可能,
Applicable if the company is a limited liability company,会社が有限責任会社である場合に適用可能,
Applicable if the company is an Individual or a Proprietorship,会社が個人または所有者の場合,
-Applicant,応募者,
-Applicant Type,出願者タイプ,
Application of Funds (Assets),資金運用（資産）,
Application period cannot be across two allocation records,適用期間は2つの割り当てレコードにまたがることはできません,
Application period cannot be outside leave allocation period,申請期間は休暇割当期間外にすることはできません,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,フォリオ番号を持つ利用可能な株主のリスト,
Loading Payment System,支払いシステムの読み込み,
Loan,ローン,
-Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。,
-Loan Application,ローン申し込み,
-Loan Management,ローン管理,
-Loan Repayment,ローン返済,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,請求書割引を保存するには、ローン開始日とローン期間が必須です。,
Loans (Liabilities),ローン（負債）,
Loans and Advances (Assets),ローンと貸付金（資産）,
@@ -1611,7 +1605,6 @@
Monday,月曜日,
Monthly,月次,
Monthly Distribution,月次配分,
-Monthly Repayment Amount cannot be greater than Loan Amount,月返済額は融資額を超えることはできません,
More,続き,
More Information,詳細,
More than one selection for {0} not allowed,{0}に対する複数の選択は許可されていません,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1}を支払う,
Payable,買掛,
Payable Account,買掛金勘定,
-Payable Amount,支払金額,
Payment,支払,
Payment Cancelled. Please check your GoCardless Account for more details,支払いがキャンセルされました。詳細はGoCardlessアカウントで確認してください,
Payment Confirmation,支払確認,
-Payment Date,支払期日,
Payment Days,支払日,
Payment Document,支払ドキュメント,
Payment Due Date,支払期日,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,領収書を入力してください,
Please enter Receipt Document,領収書の文書を入力してください。,
Please enter Reference date,基準日を入力してください,
-Please enter Repayment Periods,返済期間を入力してください。,
Please enter Reqd by Date,Reqd by Dateを入力してください,
Please enter Woocommerce Server URL,Woocommerce ServerのURLを入力してください,
Please enter Write Off Account,償却勘定を入力してください,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,親コストセンターを入力してください,
Please enter quantity for Item {0},アイテム{0}の数量を入力してください,
Please enter relieving date.,退職日を入力してください。,
-Please enter repayment Amount,返済金額を入力してください。,
Please enter valid Financial Year Start and End Dates,有効な会計年度開始日と終了日を入力してください,
Please enter valid email address,有効なメールアドレスを入力してください,
Please enter {0} first,先に{0}を入力してください,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます,
Primary Address Details,優先アドレスの詳細,
Primary Contact Details,優先連絡先の詳細,
-Principal Amount,元本金額,
Print Format,印刷書式,
Print IRS 1099 Forms,IRS 1099フォームを印刷する,
Print Report Card,レポートカードを印刷する,
@@ -2550,7 +2538,6 @@
Sample Collection,サンプル収集,
Sample quantity {0} cannot be more than received quantity {1},サンプル数{0}は受信数量{1}を超えることはできません,
Sanctioned,認可済,
-Sanctioned Amount,承認予算額,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。,
Sand,砂,
Saturday,土曜日,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0}にはすでに親プロシージャー{1}があります。,
API,API,
Annual,年次,
-Approved,承認済,
Change,変更,
Contact Email,連絡先 メール,
Export Type,輸出タイプ,
@@ -3571,7 +3557,6 @@
Account Value,アカウント価値,
Account is mandatory to get payment entries,支払いエントリを取得するにはアカウントが必須です,
Account is not set for the dashboard chart {0},ダッシュボードチャート{0}にアカウントが設定されていません,
-Account {0} does not belong to company {1},アカウント{0}は会社{1}に属していません,
Account {0} does not exists in the dashboard chart {1},アカウント{0}はダッシュボードチャート{1}に存在しません,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,アカウント： <b>{0}</b>は進行中の資本であり、仕訳入力では更新できません,
Account: {0} is not permitted under Payment Entry,アカウント：{0}は支払いエントリでは許可されていません,
@@ -3582,7 +3567,6 @@
Activity,活動,
Add / Manage Email Accounts.,メールアカウントの追加／管理,
Add Child,子を追加,
-Add Loan Security,ローンセキュリティの追加,
Add Multiple,複数追加,
Add Participants,参加者を追加,
Add to Featured Item,注目アイテムに追加,
@@ -3593,15 +3577,12 @@
Address Line 1,住所 1行目,
Addresses,住所,
Admission End Date should be greater than Admission Start Date.,入場終了日は入場開始日よりも大きくする必要があります。,
-Against Loan,ローンに対して,
-Against Loan:,ローンに対して：,
All,すべて,
All bank transactions have been created,すべての銀行取引が登録されました,
All the depreciations has been booked,すべての減価償却が予約されました,
Allocation Expired!,割り当てが期限切れです！,
Allow Resetting Service Level Agreement from Support Settings.,サポート設定からのサービスレベルアグリーメントのリセットを許可します。,
Amount of {0} is required for Loan closure,ローン閉鎖には{0}の金額が必要です,
-Amount paid cannot be zero,支払額をゼロにすることはできません,
Applied Coupon Code,適用されたクーポンコード,
Apply Coupon Code,クーポンコードを適用,
Appointment Booking,予定の予約,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ドライバーの住所が見つからないため、到着時間を計算できません。,
Cannot Optimize Route as Driver Address is Missing.,ドライバーの住所が見つからないため、ルートを最適化できません。,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,依存タスク{1}が未完了/キャンセルされていないため、タスク{0}を完了できません。,
-Cannot create loan until application is approved,申請が承認されるまでローンを作成できません,
Cannot find a matching Item. Please select some other value for {0}.,一致する項目が見つかりません。 {0}のために他の値を選択してください。,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",行{1}のアイテム{0}に対して{2}を超えて超過請求することはできません。超過請求を許可するには、アカウント設定で許可を設定してください,
"Capacity Planning Error, planned start time can not be same as end time",容量計画エラー、計画された開始時間は終了時間と同じにはできません,
@@ -3812,20 +3792,9 @@
Less Than Amount,金額未満,
Liabilities,負債,
Loading...,読み込んでいます...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,ローン額は、提案された証券によると、最大ローン額{0}を超えています,
Loan Applications from customers and employees.,顧客および従業員からの融資申し込み。,
-Loan Disbursement,ローンの支払い,
Loan Processes,ローンプロセス,
-Loan Security,ローンセキュリティ,
-Loan Security Pledge,ローン保証誓約,
-Loan Security Pledge Created : {0},ローン保証誓約の作成：{0},
-Loan Security Price,ローン保証価格,
-Loan Security Price overlapping with {0},ローンのセキュリティ価格が{0}と重複しています,
-Loan Security Unpledge,ローンのセキュリティ解除,
-Loan Security Value,ローンのセキュリティ価値,
Loan Type for interest and penalty rates,利率とペナルティ率のローンタイプ,
-Loan amount cannot be greater than {0},ローン額は{0}を超えることはできません,
-Loan is mandatory,ローンは必須です,
Loans,ローン,
Loans provided to customers and employees.,顧客および従業員に提供されるローン。,
Location,場所,
@@ -3894,7 +3863,6 @@
Pay,支払,
Payment Document Type,支払伝票タイプ,
Payment Name,支払い名,
-Penalty Amount,ペナルティ額,
Pending,保留,
Performance,パフォーマンス,
Period based On,に基づく期間,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,このアイテムを編集するには、Marketplaceユーザーとしてログインしてください。,
Please login as a Marketplace User to report this item.,このアイテムを報告するには、Marketplaceユーザーとしてログインしてください。,
Please select <b>Template Type</b> to download template,<b>テンプレートの種類</b>を選択して、 <b>テンプレート</b>をダウンロードしてください,
-Please select Applicant Type first,最初に申請者タイプを選択してください,
Please select Customer first,最初に顧客を選択してください,
Please select Item Code first,最初に商品コードを選択してください,
-Please select Loan Type for company {0},会社{0}のローンタイプを選択してください,
Please select a Delivery Note,納品書を選択してください,
Please select a Sales Person for item: {0},アイテムの営業担当者を選択してください：{0},
Please select another payment method. Stripe does not support transactions in currency '{0}',別のお支払い方法を選択してください。Stripe は通貨「{0}」での取引をサポートしていません,
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},会社{0}のデフォルトの銀行口座を設定してください,
Please specify,指定してください,
Please specify a {0},{0}を指定してください,lead
-Pledge Status,誓約状況,
-Pledge Time,誓約時間,
Printing,印刷,
Priority,優先度,
Priority has been changed to {0}.,優先順位が{0}に変更されました。,
@@ -3944,7 +3908,6 @@
Processing XML Files,XMLファイルの処理,
Profitability,収益性,
Project,プロジェクト,
-Proposed Pledges are mandatory for secured Loans,担保ローンには提案された誓約が必須です,
Provide the academic year and set the starting and ending date.,学年を入力し、開始日と終了日を設定します。,
Public token is missing for this bank,この銀行の公開トークンがありません,
Publish,公開,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,領収書には、サンプルの保持が有効になっているアイテムがありません。,
Purchase Return,仕入返品,
Qty of Finished Goods Item,完成品の数量,
-Qty or Amount is mandatroy for loan security,数量または金額はローン保証の義務,
Quality Inspection required for Item {0} to submit,提出する商品{0}には品質検査が必要です,
Quantity to Manufacture,製造数量,
Quantity to Manufacture can not be zero for the operation {0},操作{0}の製造する数量をゼロにすることはできません,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,免除日は参加日以上でなければなりません,
Rename,名称変更,
Rename Not Allowed,許可されていない名前の変更,
-Repayment Method is mandatory for term loans,タームローンには返済方法が必須,
-Repayment Start Date is mandatory for term loans,定期ローンの返済開始日は必須です,
Report Item,レポートアイテム,
Report this Item,このアイテムを報告する,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,外注の予約数量：外注品目を作成するための原材料の数量。,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},行（{0}）：{1}はすでに{2}で割引されています,
Rows Added in {0},{0}に追加された行,
Rows Removed in {0},{0}で削除された行,
-Sanctioned Amount limit crossed for {0} {1},{0} {1}の認可額の制限を超えました,
-Sanctioned Loan Amount already exists for {0} against company {1},会社{1}に対する{0}の認可済み融資額は既に存在します,
Save,保存,
Save Item,アイテムを保存,
Saved Items,保存したアイテム,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ユーザー{0}無効になっています,
Users and Permissions,ユーザーと権限,
Vacancies cannot be lower than the current openings,欠員は現在の開始より低くすることはできません,
-Valid From Time must be lesser than Valid Upto Time.,有効開始時間は有効終了時間よりも短くする必要があります。,
Valuation Rate required for Item {0} at row {1},行{1}の品目{0}に必要な評価率,
Values Out Of Sync,同期していない値,
Vehicle Type is required if Mode of Transport is Road,交通機関が道路の場合は車種が必要,
@@ -4211,7 +4168,6 @@
Add to Cart,カートに追加,
Days Since Last Order,最終注文からの日数,
In Stock,在庫中,
-Loan Amount is mandatory,ローン額は必須です,
Mode Of Payment,支払方法,
No students Found,生徒が見つかりません,
Not in Stock,在庫にありません,
@@ -4240,7 +4196,6 @@
Group by,グループ化,
In stock,在庫あり,
Item name,アイテム名,
-Loan amount is mandatory,ローン額は必須です,
Minimum Qty,最小数量,
More details,詳細,
Nature of Supplies,供給の性質,
@@ -4409,9 +4364,6 @@
Total Completed Qty,完了した合計数量,
Qty to Manufacture,製造数,
Repay From Salary can be selected only for term loans,給与からの返済は、タームローンに対してのみ選択できます,
-No valid Loan Security Price found for {0},{0}の有効なローンセキュリティ価格が見つかりません,
-Loan Account and Payment Account cannot be same,ローン口座と支払い口座を同じにすることはできません,
-Loan Security Pledge can only be created for secured loans,ローン担保質は、担保付ローンに対してのみ作成できます,
Social Media Campaigns,ソーシャルメディアキャンペーン,
From Date can not be greater than To Date,開始日は終了日より大きくすることはできません,
Please set a Customer linked to the Patient,患者にリンクされている顧客を設定してください,
@@ -6437,7 +6389,6 @@
HR User,人事ユーザー,
Appointment Letter,任命状,
Job Applicant,求職者,
-Applicant Name,申請者名,
Appointment Date,予約日,
Appointment Letter Template,アポイントメントレターテンプレート,
Body,体,
@@ -7059,99 +7010,12 @@
Sync in Progress,進行中の同期,
Hub Seller Name,ハブの販売者名,
Custom Data,カスタムデータ,
-Member,メンバー,
-Partially Disbursed,部分的に支払わ,
-Loan Closure Requested,ローン閉鎖のリクエスト,
Repay From Salary,給与から返済,
-Loan Details,ローン詳細,
-Loan Type,ローンの種類,
-Loan Amount,融資額,
-Is Secured Loan,担保付きローン,
-Rate of Interest (%) / Year,利子率（％）/年,
-Disbursement Date,支払い日,
-Disbursed Amount,支払額,
-Is Term Loan,タームローン,
-Repayment Method,返済方法,
-Repay Fixed Amount per Period,期間ごとの固定額を返済,
-Repay Over Number of Periods,期間数を超える返済,
-Repayment Period in Months,ヶ月間における償還期間,
-Monthly Repayment Amount,毎月返済額,
-Repayment Start Date,返済開始日,
-Loan Security Details,ローンセキュリティの詳細,
-Maximum Loan Value,最大ローン額,
-Account Info,アカウント情報,
-Loan Account,ローン口座,
-Interest Income Account,受取利息のアカウント,
-Penalty Income Account,ペナルティ収入勘定,
-Repayment Schedule,返済スケジュール,
-Total Payable Amount,総支払金額,
-Total Principal Paid,総プリンシパルペイド,
-Total Interest Payable,買掛金利息合計,
-Total Amount Paid,合計金額,
-Loan Manager,ローンマネージャー,
-Loan Info,ローン情報,
-Rate of Interest,金利,
-Proposed Pledges,提案された誓約,
-Maximum Loan Amount,最大融資額,
-Repayment Info,返済情報,
-Total Payable Interest,総支払利息,
-Against Loan ,ローンに対して,
-Loan Interest Accrual,貸付利息発生,
-Amounts,金額,
-Pending Principal Amount,保留中の元本金額,
-Payable Principal Amount,未払元本,
-Paid Principal Amount,支払った元本,
-Paid Interest Amount,支払利息額,
-Process Loan Interest Accrual,ローン利息発生額の処理,
-Repayment Schedule Name,返済スケジュール名,
Regular Payment,定期支払い,
Loan Closure,ローン閉鎖,
-Payment Details,支払詳細,
-Interest Payable,支払利息,
-Amount Paid,支払額,
-Principal Amount Paid,支払額,
-Repayment Details,返済の詳細,
-Loan Repayment Detail,ローン返済の詳細,
-Loan Security Name,ローンセキュリティ名,
-Unit Of Measure,測定単位,
-Loan Security Code,ローンセキュリティコード,
-Loan Security Type,ローンセキュリティタイプ,
-Haircut %,散髪率,
-Loan Details,ローン詳細,
-Unpledged,約束されていない,
-Pledged,誓約,
-Partially Pledged,部分的に誓約,
-Securities,証券,
-Total Security Value,トータルセキュリティバリュー,
-Loan Security Shortfall,ローンのセキュリティ不足,
-Loan ,ローン,
-Shortfall Time,不足時間,
-America/New_York,アメリカ/ニューヨーク,
-Shortfall Amount,不足額,
-Security Value ,セキュリティ値,
-Process Loan Security Shortfall,プロセスローンのセキュリティ不足,
-Loan To Value Ratio,ローン対価値比率,
-Unpledge Time,約束時間,
-Loan Name,ローン名前,
Rate of Interest (%) Yearly,利子率（％）年間,
-Penalty Interest Rate (%) Per Day,1日あたりの罰金利率（％）,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,返済が遅れた場合、ペナルティレートは保留中の利息に対して毎日課税されます。,
-Grace Period in Days,日単位の猶予期間,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,期日からローン返済が遅れた場合に違約金が請求されない日数,
-Pledge,誓約,
-Post Haircut Amount,散髪後の金額,
-Process Type,プロセスタイプ,
-Update Time,更新時間,
-Proposed Pledge,提案された誓約,
-Total Payment,お支払い総額,
-Balance Loan Amount,残高貸付額,
-Is Accrued,未収,
Salary Slip Loan,給与スリップローン,
Loan Repayment Entry,ローン返済エントリ,
-Sanctioned Loan Amount,認可されたローン額,
-Sanctioned Amount Limit,認可額の制限,
-Unpledge,誓約,
-Haircut,散髪,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,スケジュールを生成,
Schedules,スケジュール,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,プロジェクトでは、これらのユーザーにウェブサイト上でアクセスできるようになります,
Copied From,コピー元,
Start and End Dates,開始・終了日,
-Actual Time (in Hours),実際の時間（時間単位）,
+Actual Time in Hours (via Timesheet),実際の時間（時間単位）,
Costing and Billing,原価計算と請求,
-Total Costing Amount (via Timesheets),合計原価計算（タイムシートから）,
-Total Expense Claim (via Expense Claims),総経費請求（経費請求経由）,
+Total Costing Amount (via Timesheet),合計原価計算（タイムシートから）,
+Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）,
Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）,
Total Sales Amount (via Sales Order),合計売上金額（受注による）,
-Total Billable Amount (via Timesheets),請求可能総額（タイムシートから）,
-Total Billed Amount (via Sales Invoices),総請求金額（請求書による）,
-Total Consumed Material Cost (via Stock Entry),総消費材料費（入庫による）,
+Total Billable Amount (via Timesheet),請求可能総額（タイムシートから）,
+Total Billed Amount (via Sales Invoice),総請求金額（請求書による）,
+Total Consumed Material Cost (via Stock Entry),総消費材料費（入庫による）,
Gross Margin,売上総利益,
Gross Margin %,粗利益率％,
Monitor Progress,モニターの進捗状況,
@@ -7521,12 +7385,10 @@
Dependencies,依存関係,
Dependent Tasks,依存タスク,
Depends on Tasks,タスクに依存,
-Actual Start Date (via Time Sheet),実際の開始日（勤務表による）,
-Actual Time (in hours),実際の時間（時）,
-Actual End Date (via Time Sheet),実際の終了日（勤務表による）,
-Total Costing Amount (via Time Sheet),総原価計算量（勤務表による）,
+Actual Start Date (via Timesheet),実際の開始日（勤務表による）,
+Actual Time in Hours (via Timesheet),実際の時間（時）,
+Actual End Date (via Timesheet),実際の終了日（勤務表による）,
Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）,
-Total Billing Amount (via Time Sheet),合計請求金額（勤務表による）,
Review Date,レビュー日,
Closing Date,締切日,
Task Depends On,依存するタスク,
@@ -7887,7 +7749,6 @@
Update Series,シリーズ更新,
Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始／現在の連続番号を変更します。,
Prefix,接頭辞,
-Current Value,現在の値,
This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です,
Update Series Number,シリーズ番号更新,
Quotation Lost Reason,失注理由,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル,
Lead Details,リード詳細,
Lead Owner Efficiency,リードオーナーの効率,
-Loan Repayment and Closure,ローンの返済と閉鎖,
-Loan Security Status,ローンのセキュリティステータス,
Lost Opportunity,機会を失った,
Maintenance Schedules,保守スケジュール,
Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},対象となるカウント：{0},
Payment Account is mandatory,支払いアカウントは必須です,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",チェックした場合、申告や証明の提出なしに所得税を計算する前に、全額が課税所得から差し引かれます。,
-Disbursement Details,支払いの詳細,
Material Request Warehouse,資材依頼倉庫,
Select warehouse for material requests,資材依頼用の倉庫を選択,
Transfer Materials For Warehouse {0},倉庫{0}の転送資材,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,未請求額を給与から返済する,
Deduction from salary,給与からの控除,
Expired Leaves,期限切れの葉,
-Reference No,参照番号,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ヘアカットの割合は、ローン証券の市場価値と、そのローンの担保として使用された場合のそのローン証券に帰属する価値との差の割合です。,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,ローン・トゥ・バリュー・レシオは、質権設定された証券の価値に対するローン金額の比率を表します。これがいずれかのローンの指定された値を下回ると、ローンのセキュリティ不足がトリガーされます,
If this is not checked the loan by default will be considered as a Demand Loan,これがチェックされていない場合、デフォルトでローンはデマンドローンと見なされます,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,このアカウントは、借り手からのローン返済の予約と、借り手へのローンの支払いに使用されます。,
This account is capital account which is used to allocate capital for loan disbursal account ,この口座は、ローン実行口座に資本を割り当てるために使用される資本口座です。,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},操作{0}は作業指示書{1}に属していません,
Print UOM after Quantity,数量の後に単位を印刷する,
Set default {0} account for perpetual inventory for non stock items,非在庫アイテムの永続的な在庫のデフォルトの{0}アカウントを設定します,
-Loan Security {0} added multiple times,ローンセキュリティ{0}が複数回追加されました,
-Loan Securities with different LTV ratio cannot be pledged against one loan,LTVレシオの異なるローン証券は1つのローンに対して差し入れることはできません,
-Qty or Amount is mandatory for loan security!,ローンの担保には、数量または金額が必須です。,
-Only submittted unpledge requests can be approved,提出された誓約解除リクエストのみが承認されます,
-Interest Amount or Principal Amount is mandatory,利息額または元本額は必須です,
-Disbursed Amount cannot be greater than {0},支払額は{0}を超えることはできません,
-Row {0}: Loan Security {1} added multiple times,行{0}：ローンセキュリティ{1}が複数回追加されました,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,行＃{0}：子アイテムは商品バンドルであってはなりません。アイテム{1}を削除して保存してください,
Credit limit reached for customer {0},顧客{0}の与信限度額に達しました,
Could not auto create Customer due to the following missing mandatory field(s):,次の必須フィールドがないため、顧客を自動作成できませんでした。,
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 1eb85cc..0776994 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","អាចអនុវត្តបានប្រសិនបើក្រុមហ៊ុននេះជា SpA, SApA ឬ SRL ។",
Applicable if the company is a limited liability company,អាចអនុវត្តបានប្រសិនបើក្រុមហ៊ុនជាក្រុមហ៊ុនទទួលខុសត្រូវមានកម្រិត។,
Applicable if the company is an Individual or a Proprietorship,អាចអនុវត្តបានប្រសិនបើក្រុមហ៊ុននេះជាបុគ្គលឬជាកម្មសិទ្ធិ។,
-Applicant,បេក្ខជន,
-Applicant Type,ប្រភេទបេក្ខជន,
Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម),
Application period cannot be across two allocation records,អំឡុងពេលដាក់ពាក្យស្នើសុំមិនអាចឆ្លងកាត់កំណត់ត្រាបែងចែកពីរ,
Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,បញ្ជីឈ្មោះម្ចាស់ហ៊ុនដែលមានលេខទូរស័ព្ទ,
Loading Payment System,កំពុងផ្ទុកប្រព័ន្ធទូទាត់,
Loan,ឥណទាន,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0},
-Loan Application,ពាក្យស្នើសុំឥណទាន,
-Loan Management,ការគ្រប់គ្រងប្រាក់កម្ចី,
-Loan Repayment,ការទូទាត់សងប្រាក់កម្ចី,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,កាលបរិច្ឆេទចាប់ផ្តើមប្រាក់កម្ចីនិងរយៈពេលប្រាក់កម្ចីគឺចាំបាច់ដើម្បីរក្សាទុកការបញ្ចុះតម្លៃវិក្កយបត្រ។,
Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល),
Loans and Advances (Assets),ឥណទាននិងបុរេប្រទាន (ទ្រព្យសម្បត្តិ),
@@ -1611,7 +1605,6 @@
Monday,កាលពីថ្ងៃចន្ទ,
Monthly,ប្រចាំខែ,
Monthly Distribution,ចែកចាយប្រចាំខែ,
-Monthly Repayment Amount cannot be greater than Loan Amount,ចំនួនទឹកប្រាក់ដែលត្រូវសងប្រចាំខែមិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឥណទាន,
More,ច្រើនទៀត,
More Information,ព័ត៌មានបន្ថែម,
More than one selection for {0} not allowed,ជម្រើសច្រើនជាងមួយសម្រាប់ {0} មិនត្រូវបានអនុញ្ញាតទេ។,
@@ -1884,11 +1877,9 @@
Pay {0} {1},បង់ {0} {1},
Payable,បង់,
Payable Account,គណនីត្រូវបង់,
-Payable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវបង់។,
Payment,ការទូទាត់,
Payment Cancelled. Please check your GoCardless Account for more details,បានបោះបង់ការបង់ប្រាក់។ សូមពិនិត្យមើលគណនី GoCardless របស់អ្នកសម្រាប់ព័ត៌មានលម្អិត,
Payment Confirmation,ការបញ្ជាក់ការទូទាត់,
-Payment Date,កាលបរិច្ឆេទការទូទាត់,
Payment Days,ថ្ងៃការទូទាត់,
Payment Document,ឯកសារការទូទាត់,
Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,សូមបញ្ចូលបង្កាន់ដៃទិញលើកដំបូង,
Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ,
Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង,
-Please enter Repayment Periods,សូមបញ្ចូលរយៈពេលសងប្រាក់,
Please enter Reqd by Date,សូមបញ្ចូល Reqd តាមកាលបរិច្ឆេទ,
Please enter Woocommerce Server URL,សូមបញ្ចូលអាសយដ្ឋានម៉ាស៊ីនបម្រើ Woocommerce,
Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ,
Please enter quantity for Item {0},សូមបញ្ចូលបរិមាណសម្រាប់ធាតុ {0},
Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។,
-Please enter repayment Amount,សូមបញ្ចូលចំនួនទឹកប្រាក់ដែលការទូទាត់សង,
Please enter valid Financial Year Start and End Dates,សូមបញ្ចូលឆ្នាំដែលមានសុពលភាពហិរញ្ញវត្ថុកាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់,
Please enter valid email address,សូមបញ្ចូលអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវ,
Please enter {0} first,សូមបញ្ចូល {0} ដំបូង,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។,
Primary Address Details,ព័ត៌មានលំអិតអាស័យដ្ឋានបឋម,
Primary Contact Details,ព័ត៌មានលម្អិតទំនាក់ទំនងចម្បង,
-Principal Amount,ប្រាក់ដើម,
Print Format,ការបោះពុម្ពទ្រង់ទ្រាយ,
Print IRS 1099 Forms,បោះពុម្ពទម្រង់ IRS 1099 ។,
Print Report Card,បោះពុម្ពរបាយការណ៍កាត,
@@ -2550,7 +2538,6 @@
Sample Collection,ការប្រមូលគំរូ,
Sample quantity {0} cannot be more than received quantity {1},បរិមាណគំរូ {0} មិនអាចច្រើនជាងបរិមាណដែលទទួលបាននោះទេ {1},
Sanctioned,អនុញ្ញាត,
-Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ចំនួនទឹកប្រាក់បានអនុញ្ញាតមិនអាចជាចំនួនទឹកប្រាក់ធំជាងក្នុងជួរដេកណ្តឹងទាមទារសំណង {0} ។,
Sand,ខ្សាច់,
Saturday,ថ្ងៃសៅរ៍,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} មាននីតិវិធីឪពុកម្តាយរួចហើយ {1} ។,
API,API,
Annual,ប្រចាំឆ្នាំ,
-Approved,បានអនុម័ត,
Change,ការផ្លាស់ប្តូរ,
Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល,
Export Type,នាំចេញប្រភេទ,
@@ -3571,7 +3557,6 @@
Account Value,តម្លៃគណនី,
Account is mandatory to get payment entries,គណនីគឺចាំបាច់ដើម្បីទទួលបានធាតុបង់ប្រាក់,
Account is not set for the dashboard chart {0},គណនីមិនត្រូវបានកំណត់សម្រាប់ផ្ទាំងព័ត៌មានផ្ទាំងគ្រប់គ្រង {0},
-Account {0} does not belong to company {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1},
Account {0} does not exists in the dashboard chart {1},គណនី {0} មិនមាននៅក្នុងតារាងផ្ទាំងគ្រប់គ្រង {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,គណនី៖ <b>{០}</b> គឺជាដើមទុនការងារកំពុងដំណើរការហើយមិនអាចធ្វើបច្ចុប្បន្នភាពដោយទិនានុប្បវត្តិចូលបានទេ,
Account: {0} is not permitted under Payment Entry,គណនី៖ {០} មិនត្រូវបានអនុញ្ញាតនៅក្រោមការបង់ប្រាក់,
@@ -3582,7 +3567,6 @@
Activity,សកម្មភាព,
Add / Manage Email Accounts.,បន្ថែម / គ្រប់គ្រងគណនីអ៊ីម៉ែល។,
Add Child,បន្ថែមកុមារ,
-Add Loan Security,បន្ថែមសន្តិសុខឥណទាន,
Add Multiple,បន្ថែមច្រើន,
Add Participants,បន្ថែមអ្នកចូលរួម,
Add to Featured Item,បន្ថែមទៅធាតុពិសេស។,
@@ -3593,15 +3577,12 @@
Address Line 1,អាសយដ្ឋានបន្ទាត់ 1,
Addresses,អាសយដ្ឋាន,
Admission End Date should be greater than Admission Start Date.,កាលបរិច្ឆេទបញ្ចប់ការចូលរៀនគួរតែធំជាងកាលបរិច្ឆេទចាប់ផ្តើមចូលរៀន។,
-Against Loan,ប្រឆាំងនឹងប្រាក់កម្ចី,
-Against Loan:,ប្រឆាំងនឹងប្រាក់កម្ចី៖,
All,ទាំងអស់,
All bank transactions have been created,ប្រតិបត្តិការធនាគារទាំងអស់ត្រូវបានបង្កើតឡើង។,
All the depreciations has been booked,រាល់ការរំលោះត្រូវបានកក់។,
Allocation Expired!,ការបែងចែកផុតកំណត់!,
Allow Resetting Service Level Agreement from Support Settings.,អនុញ្ញាតឱ្យកំណត់កិច្ចព្រមព្រៀងកម្រិតសេវាកម្មឡើងវិញពីការកំណត់គាំទ្រ។,
Amount of {0} is required for Loan closure,ចំនួនទឹកប្រាក់នៃ {0} ត្រូវបានទាមទារសម្រាប់ការបិទប្រាក់កម្ចី,
-Amount paid cannot be zero,ចំនួនទឹកប្រាក់ដែលបានបង់មិនអាចជាសូន្យទេ,
Applied Coupon Code,អនុវត្តលេខកូដគូប៉ុង,
Apply Coupon Code,អនុវត្តលេខកូដគូប៉ុង,
Appointment Booking,ការកក់ការណាត់ជួប,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,មិនអាចគណនាពេលវេលាមកដល់បានទេព្រោះអាស័យដ្ឋានអ្នកបើកបរបាត់។,
Cannot Optimize Route as Driver Address is Missing.,មិនអាចបង្កើនប្រសិទ្ធភាពផ្លូវព្រោះអាសយដ្ឋានរបស់អ្នកបើកបរបាត់។,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,មិនអាចបំពេញការងារ {០} បានទេព្រោះការងារដែលពឹងផ្អែករបស់ខ្លួន {១} មិនត្រូវបានបង្ហើយ / លុបចោលទេ។,
-Cannot create loan until application is approved,មិនអាចបង្កើតប្រាក់កម្ចីបានទេរហូតដល់មានការយល់ព្រម,
Cannot find a matching Item. Please select some other value for {0}.,មិនអាចរកឃើញធាតុផ្គូផ្គងជាមួយ។ សូមជ្រើសតម្លៃមួយចំនួនផ្សេងទៀតសម្រាប់ {0} ។,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",មិនអាចលើសថ្លៃសម្រាប់ធាតុ {0} ក្នុងជួរ {1} លើសពី {2} ។ ដើម្បីអនុញ្ញាតវិក័យប័ត្រលើសសូមកំណត់ប្រាក់ឧបត្ថម្ភនៅក្នុងការកំណត់គណនី,
"Capacity Planning Error, planned start time can not be same as end time",កំហុសក្នុងការរៀបចំផែនការសមត្ថភាពពេលវេលាចាប់ផ្តើមដែលបានគ្រោងទុកមិនអាចដូចគ្នានឹងពេលវេលាបញ្ចប់ទេ,
@@ -3812,20 +3792,9 @@
Less Than Amount,តិចជាងចំនួនទឹកប្រាក់។,
Liabilities,បំណុល។,
Loading...,កំពុងផ្ទុក ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,ចំនួនប្រាក់កម្ចីមានចំនួនលើសពីចំនួនប្រាក់កម្ចីអតិបរិមានៃ {០} យោងតាមមូលបត្រដែលបានស្នើសុំ,
Loan Applications from customers and employees.,ពាក្យសុំកំចីពីអតិថិជននិងនិយោជិក។,
-Loan Disbursement,ការផ្តល់ប្រាក់កម្ចី,
Loan Processes,ដំណើរការកំចី,
-Loan Security,សន្តិសុខឥណទាន,
-Loan Security Pledge,ការសន្យាផ្តល់ប្រាក់កម្ចី,
-Loan Security Pledge Created : {0},ការសន្យាផ្តល់ប្រាក់កម្ចីត្រូវបានបង្កើត: {០},
-Loan Security Price,តម្លៃសេវាប្រាក់កម្ចី,
-Loan Security Price overlapping with {0},ថ្លៃសេវាកំចីលើកំចីលើកំចីជាមួយ {0},
-Loan Security Unpledge,ការធានាសុវត្ថិភាពប្រាក់កម្ចី,
-Loan Security Value,តម្លៃសុវត្ថិភាពប្រាក់កម្ចី,
Loan Type for interest and penalty rates,ប្រភេទប្រាក់កម្ចីសម្រាប់ការប្រាក់និងអត្រាការប្រាក់,
-Loan amount cannot be greater than {0},ចំនួនប្រាក់កម្ចីមិនអាចធំជាង {0},
-Loan is mandatory,ប្រាក់កម្ចីគឺជាកាតព្វកិច្ច,
Loans,ប្រាក់កម្ចី។,
Loans provided to customers and employees.,ប្រាក់កម្ចីត្រូវបានផ្តល់ជូនអតិថិជននិងនិយោជិក។,
Location,ទីតាំង,
@@ -3894,7 +3863,6 @@
Pay,បង់ប្រាក់,
Payment Document Type,ប្រភេទឯកសារបង់ប្រាក់។,
Payment Name,ឈ្មោះទូទាត់ប្រាក់។,
-Penalty Amount,ចំនួនទឹកប្រាក់ពិន័យ,
Pending,ឡុងេពល,
Performance,ការសម្តែង។,
Period based On,រយៈពេលផ្អែកលើ។,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,សូមចូលជាអ្នកប្រើប្រាស់ទីផ្សារដើម្បីកែសម្រួលធាតុនេះ។,
Please login as a Marketplace User to report this item.,សូមចូលជាអ្នកប្រើប្រាស់ទីផ្សារដើម្បីរាយការណ៍អំពីធាតុនេះ។,
Please select <b>Template Type</b> to download template,សូមជ្រើសរើស <b>ប្រភេទគំរូ</b> ដើម្បីទាញយកគំរូ,
-Please select Applicant Type first,សូមជ្រើសរើសប្រភេទអ្នកដាក់ពាក្យជាមុនសិន,
Please select Customer first,សូមជ្រើសរើសអតិថិជនជាមុនសិន។,
Please select Item Code first,សូមជ្រើសរើសលេខកូដ Item ជាមុនសិន,
-Please select Loan Type for company {0},សូមជ្រើសរើសប្រភេទកំចីសំរាប់ក្រុមហ៊ុន {0},
Please select a Delivery Note,សូមជ្រើសរើសកំណត់ត្រាដឹកជញ្ជូន។,
Please select a Sales Person for item: {0},សូមជ្រើសរើសបុគ្គលិកផ្នែកលក់សម្រាប់ទំនិញ៖ {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',សូមជ្រើសវិធីសាស្ត្រទូទាត់ផ្សេងទៀត។ ឆ្នូតមិនគាំទ្រការតិបត្តិការនៅក្នុងរូបិយប័ណ្ណ '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},សូមរៀបចំគណនីធនាគារលំនាំដើមសម្រាប់ក្រុមហ៊ុន {0},
Please specify,សូមបញ្ជាក់,
Please specify a {0},សូមបញ្ជាក់ {0},lead
-Pledge Status,ស្ថានភាពសន្យា,
-Pledge Time,ពេលវេលាសន្យា,
Printing,ការបោះពុម្ព,
Priority,អាទិភាព,
Priority has been changed to {0}.,អាទិភាពត្រូវបានផ្លាស់ប្តូរទៅ {0} ។,
@@ -3944,7 +3908,6 @@
Processing XML Files,ដំណើរការឯកសារ XML,
Profitability,ផលចំណេញ។,
Project,គម្រោង,
-Proposed Pledges are mandatory for secured Loans,កិច្ចសន្យាដែលបានស្នើសុំគឺចាំបាច់សម្រាប់ប្រាក់កម្ចីមានសុវត្ថិភាព,
Provide the academic year and set the starting and ending date.,ផ្តល់ឆ្នាំសិក្សានិងកំណត់កាលបរិច្ឆេទចាប់ផ្តើមនិងបញ្ចប់។,
Public token is missing for this bank,បាត់ថូខឹនសាធារណៈសម្រាប់ធនាគារនេះ។,
Publish,ផ្សាយ,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,វិក័យប័ត្រទិញមិនមានធាតុដែលអាចរកបានគំរូ។,
Purchase Return,ត្រឡប់ទិញ,
Qty of Finished Goods Item,Qty នៃទំនិញដែលបានបញ្ចប់។,
-Qty or Amount is mandatroy for loan security,Qty ឬចំនួនទឹកប្រាក់គឺជាកាតព្វកិច្ចសម្រាប់សុវត្ថិភាពប្រាក់កម្ចី,
Quality Inspection required for Item {0} to submit,ទាមទារការត្រួតពិនិត្យគុណភាពសម្រាប់ធាតុ {0} ដើម្បីដាក់ស្នើ។,
Quantity to Manufacture,បរិមាណផលិតកម្ម,
Quantity to Manufacture can not be zero for the operation {0},បរិមាណនៃការផលិតមិនអាចជាសូន្យសម្រាប់ប្រតិបត្តិការ {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,កាលបរិច្ឆេទដែលទុកចិត្តត្រូវតែធំជាងឬស្មើកាលបរិច្ឆេទនៃការចូលរួម,
Rename,ប្តូរឈ្មោះ,
Rename Not Allowed,មិនប្តូរឈ្មោះមិនអនុញ្ញាត។,
-Repayment Method is mandatory for term loans,វិធីសាស្រ្តទូទាត់សងគឺចាំបាច់សម្រាប់ប្រាក់កម្ចីរយៈពេល,
-Repayment Start Date is mandatory for term loans,កាលបរិច្ឆេទចាប់ផ្តើមសងគឺចាំបាច់សម្រាប់ប្រាក់កម្ចីមានកាលកំណត់,
Report Item,រាយការណ៍អំពីធាតុ។,
Report this Item,រាយការណ៍ពីធាតុនេះ,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty ដែលបានបម្រុងទុកសម្រាប់កិច្ចសន្យារង៖ បរិមាណវត្ថុធាតុដើមដើម្បីផលិតរបស់របរជាប់កិច្ចសន្យា។,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},ជួរដេក ({០})៖ {១} ត្រូវបានបញ្ចុះរួចហើយនៅក្នុង {២},
Rows Added in {0},បានបន្ថែមជួរដេកក្នុង {0},
Rows Removed in {0},បានលុបជួរដេកចេញក្នុង {0},
-Sanctioned Amount limit crossed for {0} {1},ដែនកំណត់ចំនួនទឹកប្រាក់ដែលត្រូវបានកាត់ចេញសម្រាប់ {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},ចំនួនប្រាក់កម្ចីដែលត្រូវបានដាក់ទណ្ឌកម្មមានរួចហើយសម្រាប់ {0} ប្រឆាំងនឹងក្រុមហ៊ុន {1},
Save,រក្សាទុក,
Save Item,រក្សាទុកធាតុ។,
Saved Items,ធាតុបានរក្សាទុក។,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ប្រើ {0} ត្រូវបានបិទ,
Users and Permissions,អ្នកប្រើនិងសិទ្ធិ,
Vacancies cannot be lower than the current openings,ដំណឹងជ្រើសរើសបុគ្គលិកមិនអាចទាបជាងការបើកបច្ចុប្បន្នទេ។,
-Valid From Time must be lesser than Valid Upto Time.,មានសុពលភាពពីពេលវេលាត្រូវតែតិចជាងពេលវេលាដែលមានសុពលភាព Upto ។,
Valuation Rate required for Item {0} at row {1},អត្រាវាយតំលៃដែលត្រូវការសំរាប់មុខទំនិញ {0} នៅជួរទី {1},
Values Out Of Sync,គុណតម្លៃក្រៅសមកាលកម្ម,
Vehicle Type is required if Mode of Transport is Road,ប្រភេទយានយន្តត្រូវមានប្រសិនបើប្រភេទនៃការដឹកជញ្ជូនតាមផ្លូវ។,
@@ -4211,7 +4168,6 @@
Add to Cart,បញ្ចូលទៅក្នុងរទេះ,
Days Since Last Order,ថ្ងៃចាប់តាំងពីការបញ្ជាទិញចុងក្រោយ,
In Stock,នៅក្នុងផ្សារ,
-Loan Amount is mandatory,ចំនួនប្រាក់កម្ចីគឺជាកាតព្វកិច្ច,
Mode Of Payment,របៀបបង់ប្រាក់,
No students Found,រកមិនឃើញនិស្សិត,
Not in Stock,មិនមែននៅក្នុងផ្សារ,
@@ -4240,7 +4196,6 @@
Group by,ក្រុមតាម,
In stock,នៅក្នុងស្តុក,
Item name,ឈ្មោះធាតុ,
-Loan amount is mandatory,ចំនួនប្រាក់កម្ចីគឺជាកាតព្វកិច្ច,
Minimum Qty,ចំនួនអប្បបរមា,
More details,លម្អិតបន្ថែមទៀត,
Nature of Supplies,ធម្មជាតិនៃការផ្គត់ផ្គង់។,
@@ -4409,9 +4364,6 @@
Total Completed Qty,ចំនួនសរុបបានបញ្ចប់ Qty ។,
Qty to Manufacture,qty ដើម្បីផលិត,
Repay From Salary can be selected only for term loans,ទូទាត់សងពីប្រាក់ខែអាចត្រូវបានជ្រើសរើសសម្រាប់តែប្រាក់កម្ចីរយៈពេលប៉ុណ្ណោះ,
-No valid Loan Security Price found for {0},រកមិនឃើញតម្លៃសុវត្ថិភាពឥណទានត្រឹមត្រូវសម្រាប់ {0},
-Loan Account and Payment Account cannot be same,គណនីប្រាក់កម្ចីនិងគណនីបង់ប្រាក់មិនអាចដូចគ្នាទេ,
-Loan Security Pledge can only be created for secured loans,ការសន្យាផ្តល់ប្រាក់កម្ចីអាចត្រូវបានបង្កើតឡើងសម្រាប់តែប្រាក់កម្ចីមានសុវត្ថិភាព,
Social Media Campaigns,យុទ្ធនាការប្រព័ន្ធផ្សព្វផ្សាយសង្គម,
From Date can not be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចធំជាងកាលបរិច្ឆេទ,
Please set a Customer linked to the Patient,សូមកំណត់អតិថិជនដែលភ្ជាប់ទៅនឹងអ្នកជម្ងឺ,
@@ -6437,7 +6389,6 @@
HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់,
Appointment Letter,សំបុត្រណាត់ជួប,
Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ,
-Applicant Name,ឈ្មោះកម្មវិធី,
Appointment Date,កាលបរិច្ឆេទណាត់ជួប,
Appointment Letter Template,គំរូលិខិតណាត់ជួប,
Body,រាងកាយ,
@@ -7059,99 +7010,12 @@
Sync in Progress,ធ្វើសមកាលកម្មក្នុងដំណើរការ,
Hub Seller Name,ឈ្មោះអ្នកលក់ហាប់,
Custom Data,ទិន្នន័យផ្ទាល់ខ្លួន,
-Member,សមាជិក,
-Partially Disbursed,ផ្តល់ឱ្រយអតិថិជនដោយផ្នែក,
-Loan Closure Requested,ស្នើសុំបិទការផ្តល់ប្រាក់កម្ចី,
Repay From Salary,សងពីប្រាក់ខែ,
-Loan Details,សេចក្ដីលម្អិតប្រាក់កម្ចី,
-Loan Type,ប្រភេទសេវាឥណទាន,
-Loan Amount,ចំនួនប្រាក់កម្ចី,
-Is Secured Loan,គឺជាប្រាក់កម្ចីមានសុវត្ថិភាព,
-Rate of Interest (%) / Year,អត្រានៃការប្រាក់ (%) / ឆ្នាំ,
-Disbursement Date,កាលបរិច្ឆេទបញ្ចេញឥណទាន,
-Disbursed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្តល់ឱ្យ,
-Is Term Loan,គឺជាប្រាក់កម្ចីមានកាលកំណត់,
-Repayment Method,វិធីសាស្រ្តការទូទាត់សង,
-Repay Fixed Amount per Period,សងចំនួនថេរក្នុងមួយរយៈពេល,
-Repay Over Number of Periods,សងចំនួនជាងនៃរយៈពេល,
-Repayment Period in Months,រយៈពេលសងប្រាក់ក្នុងខែ,
-Monthly Repayment Amount,ចំនួនទឹកប្រាក់សងប្រចាំខែ,
-Repayment Start Date,ថ្ងៃចាប់ផ្តើមសង,
-Loan Security Details,ព័ត៌មានលម្អិតអំពីប្រាក់កម្ចី,
-Maximum Loan Value,តម្លៃប្រាក់កម្ចីអតិបរមា,
-Account Info,ព័តគណនី,
-Loan Account,គណនីប្រាក់កម្ចី,
-Interest Income Account,គណនីប្រាក់ចំណូលការប្រាក់,
-Penalty Income Account,គណនីប្រាក់ចំណូលពិន័យ,
-Repayment Schedule,កាលវិភាគសងប្រាក់,
-Total Payable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវបង់សរុប,
-Total Principal Paid,ប្រាក់ខែសរុបរបស់នាយកសាលា,
-Total Interest Payable,ការប្រាក់ត្រូវបង់សរុប,
-Total Amount Paid,ចំនួនទឹកប្រាក់សរុបបង់,
-Loan Manager,អ្នកគ្រប់គ្រងប្រាក់កម្ចី,
-Loan Info,ព័តមានប្រាក់កម្ចី,
-Rate of Interest,អត្រាការប្រាក់,
-Proposed Pledges,ពាក្យសន្យាដែលបានស្នើ,
-Maximum Loan Amount,ចំនួនទឹកប្រាក់កម្ចីអតិបរមា,
-Repayment Info,ព័តសងប្រាក់,
-Total Payable Interest,ការប្រាក់ត្រូវបង់សរុប,
-Against Loan ,ប្រឆាំងនឹងប្រាក់កម្ចី,
-Loan Interest Accrual,អត្រាការប្រាក់កម្ចី,
-Amounts,បរិមាណ,
-Pending Principal Amount,ចំនួនប្រាក់ដើមដែលនៅសល់,
-Payable Principal Amount,ចំនួនទឹកប្រាក់ដែលនាយកសាលាត្រូវបង់,
-Paid Principal Amount,ចំនួនទឹកប្រាក់នាយកសាលាដែលបានបង់,
-Paid Interest Amount,ចំនួនទឹកប្រាក់ការប្រាក់ដែលបានបង់,
-Process Loan Interest Accrual,ដំណើរការការប្រាក់កម្ចីមានចំនួនកំណត់,
-Repayment Schedule Name,ឈ្មោះកាលវិភាគសងប្រាក់,
Regular Payment,ការទូទាត់ទៀងទាត់,
Loan Closure,ការបិទប្រាក់កម្ចី,
-Payment Details,សេចក្ដីលម្អិតការបង់ប្រាក់,
-Interest Payable,ការប្រាក់ត្រូវបង់,
-Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់,
-Principal Amount Paid,ប្រាក់ដើមចម្បង,
-Repayment Details,ព័ត៌មានលម្អិតការទូទាត់សង,
-Loan Repayment Detail,ព័ត៌មានលំអិតនៃការសងប្រាក់កម្ចី,
-Loan Security Name,ឈ្មោះសុវត្ថិភាពប្រាក់កម្ចី,
-Unit Of Measure,ឯកតារង្វាស់,
-Loan Security Code,កូដសុវត្ថិភាពប្រាក់កម្ចី,
-Loan Security Type,ប្រភេទសុវត្ថិភាពប្រាក់កម្ចី,
-Haircut %,កាត់សក់%,
-Loan Details,ព័ត៌មានលំអិតប្រាក់កម្ចី,
-Unpledged,គ្មានការគ្រោងទុក,
-Pledged,បានសន្យា,
-Partially Pledged,ការសន្យាផ្នែកខ្លះ,
-Securities,មូលបត្រ,
-Total Security Value,តម្លៃសន្តិសុខសរុប,
-Loan Security Shortfall,កង្វះខាតប្រាក់កម្ចី,
-Loan ,ឥណទាន,
-Shortfall Time,ពេលវេលាខ្វះខាត,
-America/New_York,អាមេរិក / ញូវយ៉ក,
-Shortfall Amount,ចំនួនខ្វះខាត,
-Security Value ,តម្លៃសុវត្ថិភាព,
-Process Loan Security Shortfall,កង្វះខាតឥណទានសម្រាប់ដំណើរការ,
-Loan To Value Ratio,សមាមាត្រប្រាក់កម្ចី,
-Unpledge Time,មិនបង្ហាញពេលវេលា,
-Loan Name,ឈ្មោះសេវាឥណទាន,
Rate of Interest (%) Yearly,អត្រានៃការប្រាក់ (%) ប្រចាំឆ្នាំ,
-Penalty Interest Rate (%) Per Day,អត្រាការប្រាក់ពិន័យ (%) ក្នុងមួយថ្ងៃ,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,អត្រាការប្រាក់ពិន័យត្រូវបានគិតតាមចំនួនការប្រាក់ដែលមិនទាន់បានបង់ជារៀងរាល់ថ្ងៃក្នុងករណីមានការសងយឺតយ៉ាវ,
-Grace Period in Days,រយៈពេលព្រះគុណនៅក្នុងថ្ងៃ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,ចំនួនថ្ងៃចាប់ពីថ្ងៃកំណត់រហូតដល់ការពិន័យដែលមិនត្រូវបានចោទប្រកាន់ក្នុងករណីមានការពន្យាពេលក្នុងការសងប្រាក់កម្ចី,
-Pledge,សន្យា,
-Post Haircut Amount,ចំនួនកាត់សក់កាត់សក់,
-Process Type,ប្រភេទដំណើរការ,
-Update Time,ពេលវេលាធ្វើបច្ចុប្បន្នភាព,
-Proposed Pledge,សន្យាសន្យា,
-Total Payment,ការទូទាត់សរុប,
-Balance Loan Amount,តុល្យភាពប្រាក់កម្ចីចំនួនទឹកប្រាក់,
-Is Accrued,ត្រូវបានអនុម័ត,
Salary Slip Loan,ប្រាក់កម្ចីប្រាក់កម្ចី,
Loan Repayment Entry,ការបញ្ចូលប្រាក់កម្ចី,
-Sanctioned Loan Amount,ចំនួនប្រាក់កម្ចីដែលបានដាក់ទណ្ឌកម្ម,
-Sanctioned Amount Limit,ដែនកំណត់ចំនួនទឹកប្រាក់ដែលត្រូវបានដាក់ទណ្ឌកម្ម,
-Unpledge,មិនសន្យា,
-Haircut,កាត់សក់,
MAT-MSH-.YYYY.-,MAT-MSH -YYYY.-,
Generate Schedule,បង្កើតកាលវិភាគ,
Schedules,កាលវិភាគ,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,គម្រោងនឹងត្រូវបានចូលដំណើរការបាននៅលើគេហទំព័រទាំងនេះដល់អ្នកប្រើ,
Copied From,ចម្លងពី,
Start and End Dates,ចាប់ផ្តើមនិងបញ្ចប់កាលបរិច្ឆេទ,
-Actual Time (in Hours),ពេលវេលាជាក់ស្តែង (គិតជាម៉ោង),
+Actual Time in Hours (via Timesheet),ពេលវេលាជាក់ស្តែង (គិតជាម៉ោង),
Costing and Billing,និងវិក័យប័ត្រមានតម្លៃ,
-Total Costing Amount (via Timesheets),ចំនួនទឹកប្រាក់សរុបសរុប (តាមរយៈសន្លឹកកិច្ចការ),
-Total Expense Claim (via Expense Claims),ពាក្យបណ្តឹងលើការចំណាយសរុប (តាមរយៈការប្តឹងទាមទារសំណងលើការចំណាយ),
+Total Costing Amount (via Timesheet),ចំនួនទឹកប្រាក់សរុបសរុប (តាមរយៈសន្លឹកកិច្ចការ),
+Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងលើការចំណាយសរុប (តាមរយៈការប្តឹងទាមទារសំណងលើការចំណាយ),
Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ),
Total Sales Amount (via Sales Order),បរិមាណលក់សរុប (តាមរយៈការបញ្ជាទិញ),
-Total Billable Amount (via Timesheets),បរិមាណសរុបដែលអាចចេញវិក្កយបត្រ (តាមរយៈកម្រងសន្លឹកកិច្ចការ),
-Total Billed Amount (via Sales Invoices),បរិមាណសរុបដែលបានចេញវិក្កយបត្រ (តាមវិក័យប័ត្រលក់),
-Total Consumed Material Cost (via Stock Entry),ចំណាយសម្ភារៈប្រើប្រាស់សរុប (តាមរយៈធាតុចូល),
+Total Billable Amount (via Timesheet),បរិមាណសរុបដែលអាចចេញវិក្កយបត្រ (តាមរយៈកម្រងសន្លឹកកិច្ចការ),
+Total Billed Amount (via Sales Invoice),បរិមាណសរុបដែលបានចេញវិក្កយបត្រ (តាមវិក័យប័ត្រលក់),
+Total Consumed Material Cost (via Stock Entry),ចំណាយសម្ភារៈប្រើប្រាស់សរុប (តាមរយៈធាតុចូល),
Gross Margin,ប្រាក់ចំណេញដុល,
Gross Margin %,រឹម% សរុបបាន,
Monitor Progress,វឌ្ឍនភាពម៉ូនីទ័រ,
@@ -7521,12 +7385,10 @@
Dependencies,ភាពអាស្រ័យ។,
Dependent Tasks,ភារកិច្ចដែលពឹងផ្អែក។,
Depends on Tasks,អាស្រ័យលើភារកិច្ច,
-Actual Start Date (via Time Sheet),ពិតប្រាកដចាប់ផ្តើមកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង),
-Actual Time (in hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ),
-Actual End Date (via Time Sheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង),
-Total Costing Amount (via Time Sheet),សរុបការចំណាយចំនួនទឹកប្រាក់ (តាមរយៈសន្លឹកម៉ោង),
+Actual Start Date (via Timesheet),ពិតប្រាកដចាប់ផ្តើមកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង),
+Actual Time in Hours (via Timesheet),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ),
+Actual End Date (via Timesheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង),
Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ),
-Total Billing Amount (via Time Sheet),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈសន្លឹកម៉ោង),
Review Date,ពិនិត្យឡើងវិញកាលបរិច្ឆេទ,
Closing Date,ថ្ងៃផុតកំណត់,
Task Depends On,ភារកិច្ចអាស្រ័យលើ,
@@ -7887,7 +7749,6 @@
Update Series,កម្រងឯកសារធ្វើឱ្យទាន់សម័យ,
Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។,
Prefix,បុព្វបទ,
-Current Value,តម្លៃបច្ចុប្បន្ន,
This is the number of the last created transaction with this prefix,នេះជាចំនួននៃការប្រតិបត្តិការបង្កើតចុងក្រោយជាមួយបុព្វបទនេះ,
Update Series Number,កម្រងឯកសារលេខធ្វើឱ្យទាន់សម័យ,
Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ,
Lead Details,ពត៌មានលំអិតនាំមុខ,
Lead Owner Efficiency,ប្រសិទ្ធភាពម្ចាស់ការនាំមុខ,
-Loan Repayment and Closure,ការសងប្រាក់កម្ចីនិងការបិទទ្វារ,
-Loan Security Status,ស្ថានភាពសុវត្ថិភាពប្រាក់កម្ចី,
Lost Opportunity,បាត់បង់ឱកាស។,
Maintenance Schedules,កាលវិភាគថែរក្សា,
Material Requests for which Supplier Quotations are not created,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ចំនួនគោលដៅ៖ {0},
Payment Account is mandatory,គណនីទូទាត់គឺចាំបាច់,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",ប្រសិនបើបានគូសធីកចំនួនទឹកប្រាក់សរុបនឹងត្រូវបានកាត់ចេញពីប្រាក់ចំណូលដែលអាចជាប់ពន្ធបានមុនពេលគណនាពន្ធលើប្រាក់ចំណូលដោយគ្មានការប្រកាសរឺការដាក់ភស្តុតាង។,
-Disbursement Details,ព័ត៌មានលម្អិតនៃការចែកចាយ,
Material Request Warehouse,ឃ្លាំងស្នើសុំសម្ភារៈ,
Select warehouse for material requests,ជ្រើសរើសឃ្លាំងសម្រាប់ការស្នើសុំសម្ភារៈ,
Transfer Materials For Warehouse {0},ផ្ទេរសម្ភារៈសម្រាប់ឃ្លាំង {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,សងចំនួនទឹកប្រាក់ដែលមិនបានទាមទារពីប្រាក់ខែ,
Deduction from salary,ការកាត់បន្ថយពីប្រាក់ខែ,
Expired Leaves,ស្លឹកផុតកំណត់,
-Reference No,លេខយោងទេ,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ភាគរយកាត់សក់គឺជាភាពខុសគ្នាជាភាគរយរវាងតម្លៃទីផ្សារនៃប្រាក់កម្ចីសន្តិសុខនិងតម្លៃដែលបានបញ្ចូលទៅនឹងសន្តិសុខឥណទាននៅពេលប្រើជាវត្ថុបញ្ចាំសម្រាប់ប្រាក់កម្ចីនោះ។,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,អនុបាតឥណទានធៀបនឹងតម្លៃបង្ហាញពីសមាមាត្រនៃចំនួនប្រាក់កម្ចីទៅនឹងតម្លៃនៃមូលប័ត្រដែលបានសន្យា។ កង្វះសន្តិសុខប្រាក់កម្ចីនឹងត្រូវបានបង្កឡើងប្រសិនបើវាស្ថិតនៅក្រោមតម្លៃដែលបានបញ្ជាក់សម្រាប់ប្រាក់កម្ចីណាមួយ,
If this is not checked the loan by default will be considered as a Demand Loan,ប្រសិនបើនេះមិនត្រូវបានពិនិត្យប្រាក់កម្ចីតាមលំនាំដើមនឹងត្រូវបានចាត់ទុកថាជាប្រាក់កម្ចីតម្រូវការ,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,គណនីនេះត្រូវបានប្រើសម្រាប់ការកក់ការសងប្រាក់កម្ចីពីអ្នកខ្ចីហើយថែមទាំងផ្តល់ប្រាក់កម្ចីដល់អ្នកខ្ចីផងដែរ,
This account is capital account which is used to allocate capital for loan disbursal account ,គណនីនេះគឺជាគណនីដើមទុនដែលត្រូវបានប្រើដើម្បីបែងចែកដើមទុនសម្រាប់គណនីប្រាក់កម្ចី,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ប្រតិបត្ដិការ {0} មិនមែនជារបស់បទបញ្ជាការងារ {1},
Print UOM after Quantity,បោះពុម្ព UOM បន្ទាប់ពីបរិមាណ,
Set default {0} account for perpetual inventory for non stock items,កំណត់គណនី {០} លំនាំដើមសម្រាប់បញ្ជីសារពើភណ្ឌសំរាប់ផលិតផលមិនមែនស្តុក,
-Loan Security {0} added multiple times,សន្តិសុខកំចី {0} បានបន្ថែមច្រើនដង,
-Loan Securities with different LTV ratio cannot be pledged against one loan,មូលប័ត្រប្រាក់កម្ចីដែលមានសមាមាត្រអិលធីអូខុសគ្នាមិនអាចសន្យានឹងប្រាក់កម្ចីតែមួយបានទេ,
-Qty or Amount is mandatory for loan security!,Qty ឬចំនួនទឹកប្រាក់គឺជាកាតព្វកិច្ចសម្រាប់សុវត្ថិភាពប្រាក់កម្ចី!,
-Only submittted unpledge requests can be approved,មានតែសំណើរដែលមិនបានសន្យាបញ្ជូនមកអាចត្រូវបានយល់ព្រម,
-Interest Amount or Principal Amount is mandatory,ចំនួនទឹកប្រាក់ការប្រាក់ឬចំនួនទឹកប្រាក់គោលគឺចាំបាច់,
-Disbursed Amount cannot be greater than {0},ចំនួនទឹកប្រាក់ដែលបានផ្តល់ជូនមិនអាចធំជាង {0},
-Row {0}: Loan Security {1} added multiple times,ជួរដេក {0}៖ សន្តិសុខប្រាក់កម្ចី {1} បានបន្ថែមច្រើនដង,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,ជួរដេក # {០}៖ របស់កុមារមិនគួរជាកញ្ចប់ផលិតផលទេ។ សូមលុបធាតុ {1} ហើយរក្សាទុក,
Credit limit reached for customer {0},កំរិតឥណទានបានដល់អតិថិជន {0},
Could not auto create Customer due to the following missing mandatory field(s):,មិនអាចបង្កើតអតិថិជនដោយស្វ័យប្រវត្តិដោយសារតែវាលចាំបាច់ដូចខាងក្រោមបាត់:,
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 4e40c63..bc07051 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","ಕಂಪನಿಯು ಎಸ್ಪಿಎ, ಎಸ್ಪಿಎ ಅಥವಾ ಎಸ್ಆರ್ಎಲ್ ಆಗಿದ್ದರೆ ಅನ್ವಯವಾಗುತ್ತದೆ",
Applicable if the company is a limited liability company,ಕಂಪನಿಯು ಸೀಮಿತ ಹೊಣೆಗಾರಿಕೆ ಕಂಪನಿಯಾಗಿದ್ದರೆ ಅನ್ವಯಿಸುತ್ತದೆ,
Applicable if the company is an Individual or a Proprietorship,ಕಂಪನಿಯು ವೈಯಕ್ತಿಕ ಅಥವಾ ಮಾಲೀಕತ್ವದಲ್ಲಿದ್ದರೆ ಅನ್ವಯಿಸುತ್ತದೆ,
-Applicant,ಅರ್ಜಿದಾರ,
-Applicant Type,ಅರ್ಜಿದಾರರ ಪ್ರಕಾರ,
Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು ),
Application period cannot be across two allocation records,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿ ಎರಡು ಹಂಚಿಕೆ ದಾಖಲೆಗಳಾದ್ಯಂತ ಇರುವಂತಿಲ್ಲ,
Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ಪೋಲಿಯೊ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಲಭ್ಯವಿರುವ ಷೇರುದಾರರ ಪಟ್ಟಿ,
Loading Payment System,ಪಾವತಿ ವ್ಯವಸ್ಥೆಯನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ,
Loan,ಸಾಲ,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0},
-Loan Application,ಸಾಲದ ಅರ್ಜಿ,
-Loan Management,ಸಾಲ ನಿರ್ವಹಣೆ,
-Loan Repayment,ಸಾಲ ಮರುಪಾವತಿ,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ಸರಕುಪಟ್ಟಿ ರಿಯಾಯಿತಿಯನ್ನು ಉಳಿಸಲು ಸಾಲ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಸಾಲದ ಅವಧಿ ಕಡ್ಡಾಯವಾಗಿದೆ,
Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು ),
Loans and Advances (Assets),ಸಾಲ ಮತ್ತು ಅಡ್ವಾನ್ಸಸ್ ( ಆಸ್ತಿಗಳು ),
@@ -1611,7 +1605,6 @@
Monday,ಸೋಮವಾರ,
Monthly,ಮಾಸಿಕ,
Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ,
-Monthly Repayment Amount cannot be greater than Loan Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ,
More,ಇನ್ನಷ್ಟು,
More Information,ಹೆಚ್ಚಿನ ಮಾಹಿತಿ,
More than one selection for {0} not allowed,{0} ಗಾಗಿ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಆಯ್ಕೆ ಅನುಮತಿಸಲಾಗಿಲ್ಲ,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} ಪಾವತಿಸಿ,
Payable,ಕೊಡಬೇಕಾದ,
Payable Account,ಕೊಡಬೇಕಾದ ಖಾತೆ,
-Payable Amount,ಪಾವತಿಸಬೇಕಾದ ಮೊತ್ತ,
Payment,ಪಾವತಿ,
Payment Cancelled. Please check your GoCardless Account for more details,ಪಾವತಿ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ GoCardless ಖಾತೆಯನ್ನು ಪರಿಶೀಲಿಸಿ,
Payment Confirmation,ಹಣ ಪಾವತಿ ದೃಢೀಕರಣ,
-Payment Date,ಪಾವತಿ ದಿನಾಂಕ,
Payment Days,ಪಾವತಿ ಡೇಸ್,
Payment Document,ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್,
Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,ಮೊದಲ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನಮೂದಿಸಿ,
Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ,
Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ,
-Please enter Repayment Periods,ದಯವಿಟ್ಟು ಮರುಪಾವತಿಯ ಅವಧಿಗಳು ನಮೂದಿಸಿ,
Please enter Reqd by Date,ದಯವಿಟ್ಟು ದಿನಾಂಕದಂದು Reqd ಯನ್ನು ನಮೂದಿಸಿ,
Please enter Woocommerce Server URL,ದಯವಿಟ್ಟು Woocommerce ಸರ್ವರ್ URL ಅನ್ನು ನಮೂದಿಸಿ,
Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,ಮೂಲ ವೆಚ್ಚ ಸೆಂಟರ್ ನಮೂದಿಸಿ,
Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0},
Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.,
-Please enter repayment Amount,ದಯವಿಟ್ಟು ಮರುಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ,
Please enter valid Financial Year Start and End Dates,ಮಾನ್ಯ ಹಣಕಾಸು ವರ್ಷದ ಆರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕ ನಮೂದಿಸಿ,
Please enter valid email address,ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ,
Please enter {0} first,ಮೊದಲ {0} ನಮೂದಿಸಿ,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್.,
Primary Address Details,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ ವಿವರಗಳು,
Primary Contact Details,ಪ್ರಾಥಮಿಕ ಸಂಪರ್ಕ ವಿವರಗಳು,
-Principal Amount,ಪ್ರಮುಖ ಪ್ರಮಾಣವನ್ನು,
Print Format,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್,
Print IRS 1099 Forms,ಐಆರ್ಎಸ್ 1099 ಫಾರ್ಮ್ಗಳನ್ನು ಮುದ್ರಿಸಿ,
Print Report Card,ವರದಿ ಕಾರ್ಡ್ ಮುದ್ರಿಸು,
@@ -2550,7 +2538,6 @@
Sample Collection,ಮಾದರಿ ಸಂಗ್ರಹ,
Sample quantity {0} cannot be more than received quantity {1},ಮಾದರಿ ಪ್ರಮಾಣ {0} ಪಡೆದಿರುವ ಪ್ರಮಾಣಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಲು ಸಾಧ್ಯವಿಲ್ಲ {1},
Sanctioned,ಮಂಜೂರು,
-Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.,
Sand,ಮರಳು,
Saturday,ಶನಿವಾರ,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ಈಗಾಗಲೇ ಪೋಷಕ ವಿಧಾನವನ್ನು ಹೊಂದಿದೆ {1}.,
API,API,
Annual,ವಾರ್ಷಿಕ,
-Approved,Approved,
Change,ಬದಲಾವಣೆ,
Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ,
Export Type,ರಫ್ತು ಕೌಟುಂಬಿಕತೆ,
@@ -3571,7 +3557,6 @@
Account Value,ಖಾತೆ ಮೌಲ್ಯ,
Account is mandatory to get payment entries,ಪಾವತಿ ನಮೂದುಗಳನ್ನು ಪಡೆಯಲು ಖಾತೆ ಕಡ್ಡಾಯವಾಗಿದೆ,
Account is not set for the dashboard chart {0},ಡ್ಯಾಶ್ಬೋರ್ಡ್ ಚಾರ್ಟ್ {0 for ಗೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ,
-Account {0} does not belong to company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1},
Account {0} does not exists in the dashboard chart {1},ಖಾತೆ {0 the ಡ್ಯಾಶ್ಬೋರ್ಡ್ ಚಾರ್ಟ್ {1 in ನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ಖಾತೆ: <b>{0</b> capital ಬಂಡವಾಳದ ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿದೆ ಮತ್ತು ಜರ್ನಲ್ ಎಂಟ್ರಿಯಿಂದ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ,
Account: {0} is not permitted under Payment Entry,ಖಾತೆ: ಪಾವತಿ ಪ್ರವೇಶದ ಅಡಿಯಲ್ಲಿ {0 ಅನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ,
@@ -3582,7 +3567,6 @@
Activity,ಚಟುವಟಿಕೆ,
Add / Manage Email Accounts.,ಇಮೇಲ್ ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸು / ಸೇರಿಸಿ.,
Add Child,ಮಕ್ಕಳ ಸೇರಿಸಿ,
-Add Loan Security,ಸಾಲ ಭದ್ರತೆಯನ್ನು ಸೇರಿಸಿ,
Add Multiple,ಬಹು ಸೇರಿಸಿ,
Add Participants,ಪಾಲ್ಗೊಳ್ಳುವವರನ್ನು ಸೇರಿಸಿ,
Add to Featured Item,ವೈಶಿಷ್ಟ್ಯಗೊಳಿಸಿದ ಐಟಂಗೆ ಸೇರಿಸಿ,
@@ -3593,15 +3577,12 @@
Address Line 1,ಲೈನ್ 1 ವಿಳಾಸ,
Addresses,ವಿಳಾಸಗಳು,
Admission End Date should be greater than Admission Start Date.,ಪ್ರವೇಶ ಅಂತಿಮ ದಿನಾಂಕ ಪ್ರವೇಶ ಪ್ರಾರಂಭ ದಿನಾಂಕಕ್ಕಿಂತ ಹೆಚ್ಚಾಗಿರಬೇಕು.,
-Against Loan,ಸಾಲದ ವಿರುದ್ಧ,
-Against Loan:,ಸಾಲದ ವಿರುದ್ಧ:,
All,ಎಲ್ಲಾ,
All bank transactions have been created,ಎಲ್ಲಾ ಬ್ಯಾಂಕ್ ವಹಿವಾಟುಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ,
All the depreciations has been booked,ಎಲ್ಲಾ ಸವಕಳಿಗಳನ್ನು ಬುಕ್ ಮಾಡಲಾಗಿದೆ,
Allocation Expired!,ಹಂಚಿಕೆ ಅವಧಿ ಮುಗಿದಿದೆ!,
Allow Resetting Service Level Agreement from Support Settings.,ಬೆಂಬಲ ಸೆಟ್ಟಿಂಗ್ಗಳಿಂದ ಸೇವಾ ಮಟ್ಟದ ಒಪ್ಪಂದವನ್ನು ಮರುಹೊಂದಿಸಲು ಅನುಮತಿಸಿ.,
Amount of {0} is required for Loan closure,ಸಾಲ ಮುಚ್ಚಲು {0 of ಅಗತ್ಯವಿದೆ,
-Amount paid cannot be zero,ಪಾವತಿಸಿದ ಮೊತ್ತ ಶೂನ್ಯವಾಗಿರಬಾರದು,
Applied Coupon Code,ಅನ್ವಯಿಕ ಕೂಪನ್ ಕೋಡ್,
Apply Coupon Code,ಕೂಪನ್ ಕೋಡ್ ಅನ್ನು ಅನ್ವಯಿಸಿ,
Appointment Booking,ನೇಮಕಾತಿ ಬುಕಿಂಗ್,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ಚಾಲಕ ವಿಳಾಸ ಕಾಣೆಯಾಗಿರುವುದರಿಂದ ಆಗಮನದ ಸಮಯವನ್ನು ಲೆಕ್ಕಹಾಕಲು ಸಾಧ್ಯವಿಲ್ಲ.,
Cannot Optimize Route as Driver Address is Missing.,ಚಾಲಕ ವಿಳಾಸ ಕಾಣೆಯಾದ ಕಾರಣ ಮಾರ್ಗವನ್ನು ಅತ್ಯುತ್ತಮವಾಗಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,ಅವಲಂಬಿತ ಕಾರ್ಯ {1 c ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ / ರದ್ದುಗೊಳಿಸಲಾಗಿಲ್ಲ.,
-Cannot create loan until application is approved,ಅರ್ಜಿಯನ್ನು ಅನುಮೋದಿಸುವವರೆಗೆ ಸಾಲವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ,
Cannot find a matching Item. Please select some other value for {0}.,ಮ್ಯಾಚಿಂಗ್ ಐಟಂ ಸಿಗುವುದಿಲ್ಲ. ಫಾರ್ {0} ಕೆಲವು ಇತರ ಮೌಲ್ಯ ಆಯ್ಕೆಮಾಡಿ.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{1 row ಸಾಲಿನಲ್ಲಿ {0 item ಐಟಂ over 2 than ಗಿಂತ ಹೆಚ್ಚು ಓವರ್ಬಿಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಓವರ್ ಬಿಲ್ಲಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸಲು, ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಭತ್ಯೆಯನ್ನು ಹೊಂದಿಸಿ",
"Capacity Planning Error, planned start time can not be same as end time","ಸಾಮರ್ಥ್ಯ ಯೋಜನೆ ದೋಷ, ಯೋಜಿತ ಪ್ರಾರಂಭದ ಸಮಯವು ಅಂತಿಮ ಸಮಯದಂತೆಯೇ ಇರಬಾರದು",
@@ -3812,20 +3792,9 @@
Less Than Amount,ಮೊತ್ತಕ್ಕಿಂತ ಕಡಿಮೆ,
Liabilities,ಬಾಧ್ಯತೆಗಳು,
Loading...,ಲೋಡ್ ಆಗುತ್ತಿದೆ ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,ಪ್ರಸ್ತಾವಿತ ಸೆಕ್ಯೂರಿಟಿಗಳ ಪ್ರಕಾರ ಸಾಲದ ಮೊತ್ತವು ಗರಿಷ್ಠ ಸಾಲದ ಮೊತ್ತವನ್ನು {0 ಮೀರಿದೆ,
Loan Applications from customers and employees.,ಗ್ರಾಹಕರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳಿಂದ ಸಾಲ ಅರ್ಜಿಗಳು.,
-Loan Disbursement,ಸಾಲ ವಿತರಣೆ,
Loan Processes,ಸಾಲ ಪ್ರಕ್ರಿಯೆಗಳು,
-Loan Security,ಸಾಲ ಭದ್ರತೆ,
-Loan Security Pledge,ಸಾಲ ಭದ್ರತಾ ಪ್ರತಿಜ್ಞೆ,
-Loan Security Pledge Created : {0},ಸಾಲ ಭದ್ರತಾ ಪ್ರತಿಜ್ಞೆಯನ್ನು ರಚಿಸಲಾಗಿದೆ: {0},
-Loan Security Price,ಸಾಲ ಭದ್ರತಾ ಬೆಲೆ,
-Loan Security Price overlapping with {0},ಭದ್ರತಾ ಭದ್ರತಾ ಬೆಲೆ {0 with ನೊಂದಿಗೆ ಅತಿಕ್ರಮಿಸುತ್ತದೆ,
-Loan Security Unpledge,ಸಾಲ ಭದ್ರತೆ ಅನ್ಪ್ಲೆಡ್ಜ್,
-Loan Security Value,ಸಾಲ ಭದ್ರತಾ ಮೌಲ್ಯ,
Loan Type for interest and penalty rates,ಬಡ್ಡಿ ಮತ್ತು ದಂಡದ ದರಗಳಿಗಾಗಿ ಸಾಲದ ಪ್ರಕಾರ,
-Loan amount cannot be greater than {0},ಸಾಲದ ಮೊತ್ತ {0 than ಗಿಂತ ಹೆಚ್ಚಿರಬಾರದು,
-Loan is mandatory,ಸಾಲ ಕಡ್ಡಾಯ,
Loans,ಸಾಲಗಳು,
Loans provided to customers and employees.,ಗ್ರಾಹಕರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳಿಗೆ ಸಾಲ ಒದಗಿಸಲಾಗಿದೆ.,
Location,ಸ್ಥಳ,
@@ -3894,7 +3863,6 @@
Pay,ಪೇ,
Payment Document Type,ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ,
Payment Name,ಪಾವತಿ ಹೆಸರು,
-Penalty Amount,ದಂಡದ ಮೊತ್ತ,
Pending,ಬಾಕಿ,
Performance,ಪ್ರದರ್ಶನ,
Period based On,ಅವಧಿ ಆಧಾರಿತವಾಗಿದೆ,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,ಈ ಐಟಂ ಅನ್ನು ಸಂಪಾದಿಸಲು ದಯವಿಟ್ಟು ಮಾರುಕಟ್ಟೆ ಬಳಕೆದಾರರಾಗಿ ಲಾಗಿನ್ ಮಾಡಿ.,
Please login as a Marketplace User to report this item.,ಈ ಐಟಂ ಅನ್ನು ವರದಿ ಮಾಡಲು ದಯವಿಟ್ಟು ಮಾರುಕಟ್ಟೆ ಬಳಕೆದಾರರಾಗಿ ಲಾಗಿನ್ ಮಾಡಿ.,
Please select <b>Template Type</b> to download template,<b>ಟೆಂಪ್ಲೇಟ್</b> ಡೌನ್ಲೋಡ್ ಮಾಡಲು ದಯವಿಟ್ಟು <b>ಟೆಂಪ್ಲೇಟು ಪ್ರಕಾರವನ್ನು</b> ಆಯ್ಕೆ ಮಾಡಿ,
-Please select Applicant Type first,ದಯವಿಟ್ಟು ಮೊದಲು ಅರ್ಜಿದಾರರ ಪ್ರಕಾರವನ್ನು ಆರಿಸಿ,
Please select Customer first,ದಯವಿಟ್ಟು ಮೊದಲು ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ,
Please select Item Code first,ದಯವಿಟ್ಟು ಮೊದಲು ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆಮಾಡಿ,
-Please select Loan Type for company {0},ದಯವಿಟ್ಟು ಕಂಪನಿ {0 for ಗಾಗಿ ಸಾಲ ಪ್ರಕಾರವನ್ನು ಆರಿಸಿ,
Please select a Delivery Note,ದಯವಿಟ್ಟು ವಿತರಣಾ ಟಿಪ್ಪಣಿ ಆಯ್ಕೆಮಾಡಿ,
Please select a Sales Person for item: {0},ಐಟಂಗೆ ದಯವಿಟ್ಟು ಮಾರಾಟ ವ್ಯಕ್ತಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',ಮತ್ತೊಂದು ಪಾವತಿ ವಿಧಾನವನ್ನು ಅನುಸರಿಸಿ. ಪಟ್ಟಿ ಚಲಾವಣೆಯ ವ್ಯವಹಾರದಲ್ಲಿ ಬೆಂಬಲಿಸದಿರುವುದರಿಂದ '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},ದಯವಿಟ್ಟು ಕಂಪನಿ for 0 for ಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ,
Please specify,ಸೂಚಿಸಲು ದಯವಿಟ್ಟು,
Please specify a {0},ದಯವಿಟ್ಟು {0} ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿ,lead
-Pledge Status,ಪ್ರತಿಜ್ಞೆ ಸ್ಥಿತಿ,
-Pledge Time,ಪ್ರತಿಜ್ಞೆ ಸಮಯ,
Printing,ಮುದ್ರಣ,
Priority,ಆದ್ಯತೆ,
Priority has been changed to {0}.,ಆದ್ಯತೆಯನ್ನು {0 to ಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML ಫೈಲ್ಗಳನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲಾಗುತ್ತಿದೆ,
Profitability,ಲಾಭದಾಯಕತೆ,
Project,ಯೋಜನೆ,
-Proposed Pledges are mandatory for secured Loans,ಸುರಕ್ಷಿತ ಸಾಲಗಳಿಗೆ ಪ್ರಸ್ತಾವಿತ ಪ್ರತಿಜ್ಞೆಗಳು ಕಡ್ಡಾಯವಾಗಿದೆ,
Provide the academic year and set the starting and ending date.,ಶೈಕ್ಷಣಿಕ ವರ್ಷವನ್ನು ಒದಗಿಸಿ ಮತ್ತು ಪ್ರಾರಂಭ ಮತ್ತು ಅಂತ್ಯದ ದಿನಾಂಕವನ್ನು ನಿಗದಿಪಡಿಸಿ.,
Public token is missing for this bank,ಈ ಬ್ಯಾಂಕ್ಗೆ ಸಾರ್ವಜನಿಕ ಟೋಕನ್ ಕಾಣೆಯಾಗಿದೆ,
Publish,ಪ್ರಕಟಿಸು,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,ಖರೀದಿ ರಶೀದಿಯಲ್ಲಿ ಉಳಿಸಿಕೊಳ್ಳುವ ಮಾದರಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿದ ಯಾವುದೇ ಐಟಂ ಇಲ್ಲ.,
Purchase Return,ಖರೀದಿ ರಿಟರ್ನ್,
Qty of Finished Goods Item,ಮುಗಿದ ಸರಕುಗಳ ಐಟಂ,
-Qty or Amount is mandatroy for loan security,ಸಾಲ ಭದ್ರತೆಗಾಗಿ ಕ್ಯೂಟಿ ಅಥವಾ ಮೊತ್ತವು ಮ್ಯಾಂಡಟ್ರಾಯ್ ಆಗಿದೆ,
Quality Inspection required for Item {0} to submit,ಸಲ್ಲಿಸಲು ಐಟಂ {0 for ಗೆ ಗುಣಮಟ್ಟದ ಪರಿಶೀಲನೆ ಅಗತ್ಯವಿದೆ,
Quantity to Manufacture,ಉತ್ಪಾದನೆಗೆ ಪ್ರಮಾಣ,
Quantity to Manufacture can not be zero for the operation {0},To 0 operation ಕಾರ್ಯಾಚರಣೆಗೆ ಉತ್ಪಾದನೆಯ ಪ್ರಮಾಣ ಶೂನ್ಯವಾಗಿರಲು ಸಾಧ್ಯವಿಲ್ಲ,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,ಪರಿಹಾರ ದಿನಾಂಕವು ಸೇರುವ ದಿನಾಂಕಕ್ಕಿಂತ ದೊಡ್ಡದಾಗಿರಬೇಕು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು,
Rename,ಹೊಸ ಹೆಸರಿಡು,
Rename Not Allowed,ಮರುಹೆಸರಿಸಲು ಅನುಮತಿಸಲಾಗಿಲ್ಲ,
-Repayment Method is mandatory for term loans,ಟರ್ಮ್ ಸಾಲಗಳಿಗೆ ಮರುಪಾವತಿ ವಿಧಾನ ಕಡ್ಡಾಯವಾಗಿದೆ,
-Repayment Start Date is mandatory for term loans,ಅವಧಿ ಸಾಲಗಳಿಗೆ ಮರುಪಾವತಿ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡ್ಡಾಯವಾಗಿದೆ,
Report Item,ಐಟಂ ವರದಿ ಮಾಡಿ,
Report this Item,ಈ ಐಟಂ ಅನ್ನು ವರದಿ ಮಾಡಿ,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,ಉಪಗುತ್ತಿಗೆಗಾಗಿ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ: ಉಪಗುತ್ತಿಗೆ ವಸ್ತುಗಳನ್ನು ತಯಾರಿಸಲು ಕಚ್ಚಾ ವಸ್ತುಗಳ ಪ್ರಮಾಣ.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},ಸಾಲು ({0}): {1 already ಅನ್ನು ಈಗಾಗಲೇ {2 in ನಲ್ಲಿ ರಿಯಾಯಿತಿ ಮಾಡಲಾಗಿದೆ,
Rows Added in {0},ಸಾಲುಗಳನ್ನು {0 in ನಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ,
Rows Removed in {0},{0 in ನಲ್ಲಿ ಸಾಲುಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ,
-Sanctioned Amount limit crossed for {0} {1},ಅನುಮೋದಿತ ಮೊತ್ತದ ಮಿತಿಯನ್ನು {0} {1 for ಗೆ ದಾಟಿದೆ,
-Sanctioned Loan Amount already exists for {0} against company {1},ಕಂಪೆನಿ {1 against ವಿರುದ್ಧ {0 for ಗೆ ಅನುಮೋದಿತ ಸಾಲ ಮೊತ್ತವು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ,
Save,ಉಳಿಸಿ,
Save Item,ಐಟಂ ಉಳಿಸಿ,
Saved Items,ಉಳಿಸಿದ ವಸ್ತುಗಳು,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ಬಳಕೆದಾರ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ,
Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು,
Vacancies cannot be lower than the current openings,ಖಾಲಿ ಹುದ್ದೆಗಳು ಪ್ರಸ್ತುತ ತೆರೆಯುವಿಕೆಗಳಿಗಿಂತ ಕಡಿಮೆಯಿರಬಾರದು,
-Valid From Time must be lesser than Valid Upto Time.,ಸಮಯದಿಂದ ಮಾನ್ಯವು ಸಮಯಕ್ಕಿಂತ ಮಾನ್ಯಕ್ಕಿಂತ ಕಡಿಮೆಯಿರಬೇಕು.,
Valuation Rate required for Item {0} at row {1},{1 row ಸಾಲಿನಲ್ಲಿ ಐಟಂ {0 for ಗೆ ಮೌಲ್ಯಮಾಪನ ದರ ಅಗತ್ಯವಿದೆ,
Values Out Of Sync,ಮೌಲ್ಯಗಳು ಸಿಂಕ್ನಿಂದ ಹೊರಗಿದೆ,
Vehicle Type is required if Mode of Transport is Road,ಸಾರಿಗೆ ವಿಧಾನವು ರಸ್ತೆಯಾಗಿದ್ದರೆ ವಾಹನ ಪ್ರಕಾರದ ಅಗತ್ಯವಿದೆ,
@@ -4211,7 +4168,6 @@
Add to Cart,ಕಾರ್ಟ್ ಸೇರಿಸಿ,
Days Since Last Order,ಕೊನೆಯ ಆದೇಶದ ದಿನಗಳು,
In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ,
-Loan Amount is mandatory,ಸಾಲದ ಮೊತ್ತ ಕಡ್ಡಾಯ,
Mode Of Payment,ಪಾವತಿಯ ಮೋಡ್,
No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ,
Not in Stock,ಮಾಡಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್,
@@ -4240,7 +4196,6 @@
Group by,ಗುಂಪಿನ,
In stock,ಉಪಲಬ್ದವಿದೆ,
Item name,ಐಟಂ ಹೆಸರು,
-Loan amount is mandatory,ಸಾಲದ ಮೊತ್ತ ಕಡ್ಡಾಯ,
Minimum Qty,ಕನಿಷ್ಠ ಕ್ಯೂಟಿ,
More details,ಇನ್ನಷ್ಟು ವಿವರಗಳು,
Nature of Supplies,ನೇಚರ್ ಆಫ್ ಸಪ್ಲೈಸ್,
@@ -4409,9 +4364,6 @@
Total Completed Qty,ಒಟ್ಟು ಪೂರ್ಣಗೊಂಡ ಕ್ಯೂಟಿ,
Qty to Manufacture,ತಯಾರಿಸಲು ಪ್ರಮಾಣ,
Repay From Salary can be selected only for term loans,ಟರ್ಮ್ ಸಾಲಗಳಿಗೆ ಮಾತ್ರ ಸಂಬಳದಿಂದ ಮರುಪಾವತಿ ಆಯ್ಕೆ ಮಾಡಬಹುದು,
-No valid Loan Security Price found for {0},ಮಾನ್ಯ ಸಾಲ ಭದ್ರತಾ ಬೆಲೆ {0 for ಗೆ ಕಂಡುಬಂದಿಲ್ಲ,
-Loan Account and Payment Account cannot be same,ಸಾಲ ಖಾತೆ ಮತ್ತು ಪಾವತಿ ಖಾತೆ ಒಂದೇ ಆಗಿರಬಾರದು,
-Loan Security Pledge can only be created for secured loans,ಸುರಕ್ಷಿತ ಸಾಲಗಳಿಗೆ ಮಾತ್ರ ಸಾಲ ಭದ್ರತಾ ಪ್ರತಿಜ್ಞೆಯನ್ನು ರಚಿಸಬಹುದು,
Social Media Campaigns,ಸಾಮಾಜಿಕ ಮಾಧ್ಯಮ ಪ್ರಚಾರಗಳು,
From Date can not be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕಕ್ಕಿಂತ ದೊಡ್ಡದಾಗಿರಬಾರದು,
Please set a Customer linked to the Patient,ದಯವಿಟ್ಟು ರೋಗಿಗೆ ಲಿಂಕ್ ಮಾಡಲಾದ ಗ್ರಾಹಕರನ್ನು ಹೊಂದಿಸಿ,
@@ -6437,7 +6389,6 @@
HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ,
Appointment Letter,ನೇಮಕಾತಿ ಪತ್ರ,
Job Applicant,ಜಾಬ್ ಸಂ,
-Applicant Name,ಅರ್ಜಿದಾರರ ಹೆಸರು,
Appointment Date,ನೇಮಕಾತಿ ದಿನಾಂಕ,
Appointment Letter Template,ನೇಮಕಾತಿ ಪತ್ರ ಟೆಂಪ್ಲೇಟು,
Body,ದೇಹ,
@@ -7059,99 +7010,12 @@
Sync in Progress,ಸಿಂಕ್ ಪ್ರಗತಿಯಲ್ಲಿದೆ,
Hub Seller Name,ಹಬ್ ಮಾರಾಟಗಾರ ಹೆಸರು,
Custom Data,ಕಸ್ಟಮ್ ಡೇಟಾ,
-Member,ಸದಸ್ಯರು,
-Partially Disbursed,ಭಾಗಶಃ ಪಾವತಿಸಲಾಗುತ್ತದೆ,
-Loan Closure Requested,ಸಾಲ ಮುಚ್ಚುವಿಕೆ ವಿನಂತಿಸಲಾಗಿದೆ,
Repay From Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ,
-Loan Details,ಸಾಲ ವಿವರಗಳು,
-Loan Type,ಸಾಲದ ಬಗೆಯ,
-Loan Amount,ಸಾಲದ ಪ್ರಮಾಣ,
-Is Secured Loan,ಸುರಕ್ಷಿತ ಸಾಲವಾಗಿದೆ,
-Rate of Interest (%) / Year,ಬಡ್ಡಿ (%) / ವರ್ಷದ ದರ,
-Disbursement Date,ವಿತರಣೆ ದಿನಾಂಕ,
-Disbursed Amount,ವಿತರಿಸಿದ ಮೊತ್ತ,
-Is Term Loan,ಟರ್ಮ್ ಸಾಲ,
-Repayment Method,ಮರುಪಾವತಿಯ ವಿಧಾನ,
-Repay Fixed Amount per Period,ಅವಧಿಯ ಪ್ರತಿ ಸ್ಥಿರ ಪ್ರಮಾಣದ ಮರುಪಾವತಿ,
-Repay Over Number of Periods,ಓವರ್ ಸಂಖ್ಯೆ ಅವಧಿಗಳು ಮರುಪಾವತಿ,
-Repayment Period in Months,ತಿಂಗಳಲ್ಲಿ ಮರುಪಾವತಿಯ ಅವಧಿಯ,
-Monthly Repayment Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ,
-Repayment Start Date,ಮರುಪಾವತಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕ,
-Loan Security Details,ಸಾಲ ಭದ್ರತಾ ವಿವರಗಳು,
-Maximum Loan Value,ಗರಿಷ್ಠ ಸಾಲ ಮೌಲ್ಯ,
-Account Info,ಖಾತೆಯ ಮಾಹಿತಿ,
-Loan Account,ಸಾಲ ಖಾತೆ,
-Interest Income Account,ಬಡ್ಡಿಯ ಖಾತೆ,
-Penalty Income Account,ದಂಡ ಆದಾಯ ಖಾತೆ,
-Repayment Schedule,ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ,
-Total Payable Amount,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಪ್ರಮಾಣ,
-Total Principal Paid,ಒಟ್ಟು ಪ್ರಾಂಶುಪಾಲರು ಪಾವತಿಸಿದ್ದಾರೆ,
-Total Interest Payable,ಪಾವತಿಸಲಾಗುವುದು ಒಟ್ಟು ಬಡ್ಡಿ,
-Total Amount Paid,ಒಟ್ಟು ಮೊತ್ತ ಪಾವತಿಸಿದೆ,
-Loan Manager,ಸಾಲ ವ್ಯವಸ್ಥಾಪಕ,
-Loan Info,ಸಾಲ ಮಾಹಿತಿ,
-Rate of Interest,ಬಡ್ಡಿ ದರ,
-Proposed Pledges,ಪ್ರಸ್ತಾವಿತ ಪ್ರತಿಜ್ಞೆಗಳು,
-Maximum Loan Amount,ಗರಿಷ್ಠ ಸಾಲದ,
-Repayment Info,ಮರುಪಾವತಿಯ ಮಾಹಿತಿ,
-Total Payable Interest,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಬಡ್ಡಿ,
-Against Loan ,ಸಾಲದ ವಿರುದ್ಧ,
-Loan Interest Accrual,ಸಾಲ ಬಡ್ಡಿ ಸಂಚಯ,
-Amounts,ಮೊತ್ತಗಳು,
-Pending Principal Amount,ಪ್ರಧಾನ ಮೊತ್ತ ಬಾಕಿ ಉಳಿದಿದೆ,
-Payable Principal Amount,ಪಾವತಿಸಬೇಕಾದ ಪ್ರಧಾನ ಮೊತ್ತ,
-Paid Principal Amount,ಪಾವತಿಸಿದ ಪ್ರಧಾನ ಮೊತ್ತ,
-Paid Interest Amount,ಪಾವತಿಸಿದ ಬಡ್ಡಿ ಮೊತ್ತ,
-Process Loan Interest Accrual,ಪ್ರಕ್ರಿಯೆ ಸಾಲ ಬಡ್ಡಿ ಸಂಚಯ,
-Repayment Schedule Name,ಮರುಪಾವತಿ ವೇಳಾಪಟ್ಟಿ ಹೆಸರು,
Regular Payment,ನಿಯಮಿತ ಪಾವತಿ,
Loan Closure,ಸಾಲ ಮುಚ್ಚುವಿಕೆ,
-Payment Details,ಪಾವತಿ ವಿವರಗಳು,
-Interest Payable,ಪಾವತಿಸಬೇಕಾದ ಬಡ್ಡಿ,
-Amount Paid,ಮೊತ್ತವನ್ನು,
-Principal Amount Paid,ಪಾವತಿಸಿದ ಪ್ರಧಾನ ಮೊತ್ತ,
-Repayment Details,ಮರುಪಾವತಿ ವಿವರಗಳು,
-Loan Repayment Detail,ಸಾಲ ಮರುಪಾವತಿ ವಿವರ,
-Loan Security Name,ಸಾಲ ಭದ್ರತಾ ಹೆಸರು,
-Unit Of Measure,ಅಳತೆಯ ಘಟಕ,
-Loan Security Code,ಸಾಲ ಭದ್ರತಾ ಕೋಡ್,
-Loan Security Type,ಸಾಲ ಭದ್ರತಾ ಪ್ರಕಾರ,
-Haircut %,ಕ್ಷೌರ%,
-Loan Details,ಸಾಲದ ವಿವರಗಳು,
-Unpledged,ಪೂರ್ಣಗೊಳಿಸಲಾಗಿಲ್ಲ,
-Pledged,ವಾಗ್ದಾನ,
-Partially Pledged,ಭಾಗಶಃ ವಾಗ್ದಾನ,
-Securities,ಸೆಕ್ಯುರಿಟೀಸ್,
-Total Security Value,ಒಟ್ಟು ಭದ್ರತಾ ಮೌಲ್ಯ,
-Loan Security Shortfall,ಸಾಲ ಭದ್ರತಾ ಕೊರತೆ,
-Loan ,ಸಾಲ,
-Shortfall Time,ಕೊರತೆಯ ಸಮಯ,
-America/New_York,ಅಮೇರಿಕಾ / ನ್ಯೂಯಾರ್ಕ್_ಯಾರ್ಕ್,
-Shortfall Amount,ಕೊರತೆ ಮೊತ್ತ,
-Security Value ,ಭದ್ರತಾ ಮೌಲ್ಯ,
-Process Loan Security Shortfall,ಪ್ರಕ್ರಿಯೆ ಸಾಲ ಭದ್ರತಾ ಕೊರತೆ,
-Loan To Value Ratio,ಮೌಲ್ಯ ಅನುಪಾತಕ್ಕೆ ಸಾಲ,
-Unpledge Time,ಅನ್ಪ್ಲೆಡ್ಜ್ ಸಮಯ,
-Loan Name,ಸಾಲ ಹೆಸರು,
Rate of Interest (%) Yearly,ಬಡ್ಡಿ ದರ (%) ವಾರ್ಷಿಕ,
-Penalty Interest Rate (%) Per Day,ದಂಡ ಬಡ್ಡಿದರ (%) ದಿನಕ್ಕೆ,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,ಮರುಪಾವತಿ ವಿಳಂಬವಾದರೆ ಪ್ರತಿದಿನ ಬಾಕಿ ಇರುವ ಬಡ್ಡಿ ಮೊತ್ತದ ಮೇಲೆ ದಂಡ ಬಡ್ಡಿ ದರವನ್ನು ವಿಧಿಸಲಾಗುತ್ತದೆ,
-Grace Period in Days,ದಿನಗಳಲ್ಲಿ ಗ್ರೇಸ್ ಅವಧಿ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,ಸಾಲ ಮರುಪಾವತಿಯಲ್ಲಿ ವಿಳಂಬವಾದರೆ ದಂಡ ವಿಧಿಸಲಾಗದ ದಿನಾಂಕದಿಂದ ನಿಗದಿತ ದಿನಾಂಕದಿಂದ ದಿನಗಳ ಸಂಖ್ಯೆ,
-Pledge,ಪ್ರತಿಜ್ಞೆ,
-Post Haircut Amount,ಕ್ಷೌರ ಮೊತ್ತವನ್ನು ಪೋಸ್ಟ್ ಮಾಡಿ,
-Process Type,ಪ್ರಕ್ರಿಯೆ ಪ್ರಕಾರ,
-Update Time,ನವೀಕರಣ ಸಮಯ,
-Proposed Pledge,ಪ್ರಸ್ತಾವಿತ ಪ್ರತಿಜ್ಞೆ,
-Total Payment,ಒಟ್ಟು ಪಾವತಿ,
-Balance Loan Amount,ಬ್ಯಾಲೆನ್ಸ್ ಸಾಲದ ಪ್ರಮಾಣ,
-Is Accrued,ಸಂಚಿತವಾಗಿದೆ,
Salary Slip Loan,ವೇತನ ಸ್ಲಿಪ್ ಸಾಲ,
Loan Repayment Entry,ಸಾಲ ಮರುಪಾವತಿ ಪ್ರವೇಶ,
-Sanctioned Loan Amount,ಮಂಜೂರಾದ ಸಾಲದ ಮೊತ್ತ,
-Sanctioned Amount Limit,ಅನುಮೋದಿತ ಮೊತ್ತ ಮಿತಿ,
-Unpledge,ಅನ್ಪ್ಲೆಡ್ಜ್,
-Haircut,ಕ್ಷೌರ,
MAT-MSH-.YYYY.-,MAT-MSH -YYYY.-,
Generate Schedule,ವೇಳಾಪಟ್ಟಿ ರಚಿಸಿ,
Schedules,ವೇಳಾಪಟ್ಟಿಗಳು,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,ಪ್ರಾಜೆಕ್ಟ್ ಈ ಬಳಕೆದಾರರಿಗೆ ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾಗಿದೆ,
Copied From,ನಕಲು,
Start and End Dates,ಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ದಿನಾಂಕ ಎಂಡ್,
-Actual Time (in Hours),ನಿಜವಾದ ಸಮಯ (ಗಂಟೆಗಳಲ್ಲಿ),
+Actual Time in Hours (via Timesheet),ನಿಜವಾದ ಸಮಯ (ಗಂಟೆಗಳಲ್ಲಿ),
Costing and Billing,ಕಾಸ್ಟಿಂಗ್ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್,
-Total Costing Amount (via Timesheets),ಒಟ್ಟು ವೆಚ್ಚದ ಮೊತ್ತ (ಟೈಮ್ಸ್ಶೀಟ್ಗಳು ಮೂಲಕ),
-Total Expense Claim (via Expense Claims),ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು (ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ),
+Total Costing Amount (via Timesheet),ಒಟ್ಟು ವೆಚ್ಚದ ಮೊತ್ತ (ಟೈಮ್ಸ್ಶೀಟ್ಗಳು ಮೂಲಕ),
+Total Expense Claim (via Expense Claim),ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು (ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ),
Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ),
Total Sales Amount (via Sales Order),ಒಟ್ಟು ಮಾರಾಟದ ಮೊತ್ತ (ಸೇಲ್ಸ್ ಆರ್ಡರ್ ಮೂಲಕ),
-Total Billable Amount (via Timesheets),ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಮೊತ್ತ (ಟೈಮ್ಸ್ಶೀಟ್ಗಳು ಮೂಲಕ),
-Total Billed Amount (via Sales Invoices),ಒಟ್ಟು ಬಿಲ್ ಮಾಡಿದ ಮೊತ್ತ (ಸೇಲ್ಸ್ ಇನ್ವಾಯ್ಸ್ ಮೂಲಕ),
-Total Consumed Material Cost (via Stock Entry),ಒಟ್ಟು ಸಂಭಾವ್ಯ ವಸ್ತು ವೆಚ್ಚ (ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಮೂಲಕ),
+Total Billable Amount (via Timesheet),ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಮೊತ್ತ (ಟೈಮ್ಸ್ಶೀಟ್ಗಳು ಮೂಲಕ),
+Total Billed Amount (via Sales Invoice),ಒಟ್ಟು ಬಿಲ್ ಮಾಡಿದ ಮೊತ್ತ (ಸೇಲ್ಸ್ ಇನ್ವಾಯ್ಸ್ ಮೂಲಕ),
+Total Consumed Material Cost (via Stock Entry),ಒಟ್ಟು ಸಂಭಾವ್ಯ ವಸ್ತು ವೆಚ್ಚ (ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಮೂಲಕ),
Gross Margin,ಒಟ್ಟು ಅಂಚು,
Gross Margin %,ಒಟ್ಟು ಅಂಚು %,
Monitor Progress,ಪ್ರೋಗ್ರೆಸ್ ಮೇಲ್ವಿಚಾರಣೆ,
@@ -7521,12 +7385,10 @@
Dependencies,ಅವಲಂಬನೆಗಳು,
Dependent Tasks,ಅವಲಂಬಿತ ಕಾರ್ಯಗಳು,
Depends on Tasks,ಕಾರ್ಯಗಳು ಅವಲಂಬಿಸಿದೆ,
-Actual Start Date (via Time Sheet),ನಿಜವಾದ ಪ್ರಾರಂಭ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ),
-Actual Time (in hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್,
-Actual End Date (via Time Sheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ),
-Total Costing Amount (via Time Sheet),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ),
+Actual Start Date (via Timesheet),ನಿಜವಾದ ಪ್ರಾರಂಭ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ),
+Actual Time in Hours (via Timesheet),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್,
+Actual End Date (via Timesheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ),
Total Expense Claim (via Expense Claim),(ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ) ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು,
-Total Billing Amount (via Time Sheet),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ),
Review Date,ರಿವ್ಯೂ ದಿನಾಂಕ,
Closing Date,ದಿನಾಂಕ ಕ್ಲೋಸಿಂಗ್,
Task Depends On,ಟಾಸ್ಕ್ ಅವಲಂಬಿಸಿರುತ್ತದೆ,
@@ -7887,7 +7749,6 @@
Update Series,ಅಪ್ಡೇಟ್ ಸರಣಿ,
Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.,
Prefix,ಮೊದಲೇ ಜೋಡಿಸು,
-Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ,
This is the number of the last created transaction with this prefix,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ,
Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ,
Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು,
Lead Details,ಲೀಡ್ ವಿವರಗಳು,
Lead Owner Efficiency,ಲೀಡ್ ಮಾಲೀಕ ದಕ್ಷತೆ,
-Loan Repayment and Closure,ಸಾಲ ಮರುಪಾವತಿ ಮತ್ತು ಮುಚ್ಚುವಿಕೆ,
-Loan Security Status,ಸಾಲ ಭದ್ರತಾ ಸ್ಥಿತಿ,
Lost Opportunity,ಕಳೆದುಹೋದ ಅವಕಾಶ,
Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು,
Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ಎಣಿಕೆಗಳು ಉದ್ದೇಶಿಸಲಾಗಿದೆ: {0},
Payment Account is mandatory,ಪಾವತಿ ಖಾತೆ ಕಡ್ಡಾಯವಾಗಿದೆ,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","ಪರಿಶೀಲಿಸಿದರೆ, ಯಾವುದೇ ಘೋಷಣೆ ಅಥವಾ ಪುರಾವೆ ಸಲ್ಲಿಕೆ ಇಲ್ಲದೆ ಆದಾಯ ತೆರಿಗೆಯನ್ನು ಲೆಕ್ಕಾಚಾರ ಮಾಡುವ ಮೊದಲು ಪೂರ್ಣ ಮೊತ್ತವನ್ನು ತೆರಿಗೆಗೆ ಒಳಪಡುವ ಆದಾಯದಿಂದ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ.",
-Disbursement Details,ವಿತರಣಾ ವಿವರಗಳು,
Material Request Warehouse,ವಸ್ತು ವಿನಂತಿ ಗೋದಾಮು,
Select warehouse for material requests,ವಸ್ತು ವಿನಂತಿಗಳಿಗಾಗಿ ಗೋದಾಮು ಆಯ್ಕೆಮಾಡಿ,
Transfer Materials For Warehouse {0},ಗೋದಾಮಿನ ಸಾಮಗ್ರಿಗಳನ್ನು ವರ್ಗಾಯಿಸಿ {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,ಹಕ್ಕು ಪಡೆಯದ ಮೊತ್ತವನ್ನು ಸಂಬಳದಿಂದ ಮರುಪಾವತಿ ಮಾಡಿ,
Deduction from salary,ಸಂಬಳದಿಂದ ಕಡಿತ,
Expired Leaves,ಅವಧಿ ಮುಗಿದ ಎಲೆಗಳು,
-Reference No,ಉಲ್ಲೇಖ ಸಂಖ್ಯೆ,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ಕ್ಷೌರ ಶೇಕಡಾವಾರು ಎಂದರೆ ಸಾಲ ಭದ್ರತೆಯ ಮಾರುಕಟ್ಟೆ ಮೌಲ್ಯ ಮತ್ತು ಆ ಸಾಲಕ್ಕೆ ಮೇಲಾಧಾರವಾಗಿ ಬಳಸಿದಾಗ ಆ ಸಾಲ ಭದ್ರತೆಗೆ ಸೂಚಿಸಲಾದ ಮೌಲ್ಯದ ನಡುವಿನ ಶೇಕಡಾವಾರು ವ್ಯತ್ಯಾಸ.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,ಸಾಲಕ್ಕೆ ಮೌಲ್ಯ ಅನುಪಾತವು ವಾಗ್ದಾನ ಮಾಡಿದ ಭದ್ರತೆಯ ಮೌಲ್ಯಕ್ಕೆ ಸಾಲದ ಮೊತ್ತದ ಅನುಪಾತವನ್ನು ವ್ಯಕ್ತಪಡಿಸುತ್ತದೆ. ಇದು ಯಾವುದೇ ಸಾಲಕ್ಕೆ ನಿಗದಿತ ಮೌಲ್ಯಕ್ಕಿಂತ ಕಡಿಮೆಯಿದ್ದರೆ ಸಾಲ ಭದ್ರತೆಯ ಕೊರತೆಯನ್ನು ಪ್ರಚೋದಿಸುತ್ತದೆ,
If this is not checked the loan by default will be considered as a Demand Loan,ಇದನ್ನು ಪರಿಶೀಲಿಸದಿದ್ದರೆ ಸಾಲವನ್ನು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಬೇಡಿಕೆ ಸಾಲವೆಂದು ಪರಿಗಣಿಸಲಾಗುತ್ತದೆ,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,ಈ ಖಾತೆಯನ್ನು ಸಾಲಗಾರರಿಂದ ಸಾಲ ಮರುಪಾವತಿಯನ್ನು ಕಾಯ್ದಿರಿಸಲು ಮತ್ತು ಸಾಲಗಾರನಿಗೆ ಸಾಲವನ್ನು ವಿತರಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ,
This account is capital account which is used to allocate capital for loan disbursal account ,"ಈ ಖಾತೆಯು ಬಂಡವಾಳ ಖಾತೆಯಾಗಿದ್ದು, ಸಾಲ ವಿತರಣಾ ಖಾತೆಗೆ ಬಂಡವಾಳವನ್ನು ನಿಯೋಜಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ಕಾರ್ಯಾಚರಣೆ {0 the ಕೆಲಸದ ಆದೇಶ {1 to ಗೆ ಸೇರಿಲ್ಲ,
Print UOM after Quantity,ಪ್ರಮಾಣದ ನಂತರ UOM ಅನ್ನು ಮುದ್ರಿಸಿ,
Set default {0} account for perpetual inventory for non stock items,ಸ್ಟಾಕ್ ಅಲ್ಲದ ವಸ್ತುಗಳಿಗೆ ಶಾಶ್ವತ ದಾಸ್ತಾನುಗಾಗಿ ಡೀಫಾಲ್ಟ್ {0} ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ,
-Loan Security {0} added multiple times,ಸಾಲ ಭದ್ರತೆ {0 multiple ಅನೇಕ ಬಾರಿ ಸೇರಿಸಲಾಗಿದೆ,
-Loan Securities with different LTV ratio cannot be pledged against one loan,ವಿಭಿನ್ನ ಎಲ್ಟಿವಿ ಅನುಪಾತ ಹೊಂದಿರುವ ಸಾಲ ಭದ್ರತೆಗಳನ್ನು ಒಂದು ಸಾಲದ ವಿರುದ್ಧ ವಾಗ್ದಾನ ಮಾಡಲಾಗುವುದಿಲ್ಲ,
-Qty or Amount is mandatory for loan security!,ಸಾಲದ ಸುರಕ್ಷತೆಗಾಗಿ ಕ್ಯೂಟಿ ಅಥವಾ ಮೊತ್ತ ಕಡ್ಡಾಯವಾಗಿದೆ!,
-Only submittted unpledge requests can be approved,ಸಲ್ಲಿಸಿದ ಅನ್ಪ್ಲೆಡ್ಜ್ ವಿನಂತಿಗಳನ್ನು ಮಾತ್ರ ಅನುಮೋದಿಸಬಹುದು,
-Interest Amount or Principal Amount is mandatory,ಬಡ್ಡಿ ಮೊತ್ತ ಅಥವಾ ಪ್ರಧಾನ ಮೊತ್ತ ಕಡ್ಡಾಯ,
-Disbursed Amount cannot be greater than {0},ವಿತರಿಸಿದ ಮೊತ್ತವು {0 than ಗಿಂತ ಹೆಚ್ಚಿರಬಾರದು,
-Row {0}: Loan Security {1} added multiple times,ಸಾಲು {0}: ಸಾಲ ಭದ್ರತೆ {1 multiple ಅನೇಕ ಬಾರಿ ಸೇರಿಸಲಾಗಿದೆ,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,ಸಾಲು # {0}: ಮಕ್ಕಳ ಐಟಂ ಉತ್ಪನ್ನ ಬಂಡಲ್ ಆಗಿರಬಾರದು. ದಯವಿಟ್ಟು ಐಟಂ {1 ತೆಗೆದುಹಾಕಿ ಮತ್ತು ಉಳಿಸಿ,
Credit limit reached for customer {0},ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ {0},
Could not auto create Customer due to the following missing mandatory field(s):,ಈ ಕೆಳಗಿನ ಕಡ್ಡಾಯ ಕ್ಷೇತ್ರ (ಗಳು) ಕಾಣೆಯಾದ ಕಾರಣ ಗ್ರಾಹಕರನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ:,
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 36ec3af..8a148ef 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","회사가 SpA, SApA 또는 SRL 인 경우 적용 가능",
Applicable if the company is a limited liability company,회사가 유한 책임 회사 인 경우 적용 가능,
Applicable if the company is an Individual or a Proprietorship,회사가 개인 또는 사업주 인 경우 적용 가능,
-Applicant,응모자,
-Applicant Type,신청자 유형,
Application of Funds (Assets),펀드의 응용 프로그램 (자산),
Application period cannot be across two allocation records,신청 기간은 2 개의 배정 기록에 걸쳐있을 수 없습니다.,
Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Folio 번호가있는 사용 가능한 주주 목록,
Loading Payment System,결제 시스템로드 중,
Loan,차관,
-Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0},
-Loan Application,대출 지원서,
-Loan Management,대출 관리,
-Loan Repayment,대출 상환,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,인보이스 할인을 저장하려면 대출 시작일 및 대출 기간이 필수입니다.,
Loans (Liabilities),대출 (부채),
Loans and Advances (Assets),대출 및 선수금 (자산),
@@ -1611,7 +1605,6 @@
Monday,월요일,
Monthly,월,
Monthly Distribution,예산 월간 배분,
-Monthly Repayment Amount cannot be greater than Loan Amount,월별 상환 금액은 대출 금액보다 클 수 없습니다,
More,더,
More Information,추가 정보,
More than one selection for {0} not allowed,{0}에 대한 하나 이상의 선택 사항이 허용되지 않습니다.,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} 지불,
Payable,지급,
Payable Account,채무 계정,
-Payable Amount,지불 가능 금액,
Payment,지불,
Payment Cancelled. Please check your GoCardless Account for more details,지불이 취소되었습니다. 자세한 내용은 GoCardless 계정을 확인하십시오.,
Payment Confirmation,지불 확인서,
-Payment Date,지불 날짜,
Payment Days,지불 일,
Payment Document,결제 문서,
Payment Due Date,지불 기한,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,첫 구매 영수증을 입력하세요,
Please enter Receipt Document,수신 문서를 입력하세요,
Please enter Reference date,참고 날짜를 입력 해주세요,
-Please enter Repayment Periods,상환 기간을 입력하세요,
Please enter Reqd by Date,Reqd by Date를 입력하십시오.,
Please enter Woocommerce Server URL,Woocommerce Server URL을 입력하십시오.,
Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,부모의 비용 센터를 입력 해주십시오,
Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0},
Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.,
-Please enter repayment Amount,상환 금액을 입력하세요,
Please enter valid Financial Year Start and End Dates,유효한 회계 연도 시작 및 종료 날짜를 입력하십시오,
Please enter valid email address,유효한 이메일 주소를 입력하십시오.,
Please enter {0} first,첫 번째 {0}을 입력하세요,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다.,
Primary Address Details,기본 주소 정보,
Primary Contact Details,기본 연락처 세부 정보,
-Principal Amount,원금,
Print Format,인쇄 형식,
Print IRS 1099 Forms,IRS 1099 양식 인쇄,
Print Report Card,성적표 인쇄,
@@ -2550,7 +2538,6 @@
Sample Collection,샘플 수집,
Sample quantity {0} cannot be more than received quantity {1},샘플 수량 {0}은 (는) 수신 수량 {1}을 초과 할 수 없습니다.,
Sanctioned,제재,
-Sanctioned Amount,제재 금액,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.,
Sand,모래,
Saturday,토요일,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0}에 이미 상위 절차 {1}이 있습니다.,
API,API,
Annual,연간,
-Approved,인가 된,
Change,변경,
Contact Email,담당자 이메일,
Export Type,수출 유형,
@@ -3571,7 +3557,6 @@
Account Value,계정 가치,
Account is mandatory to get payment entries,지불 항목을 받으려면 계정이 필수입니다,
Account is not set for the dashboard chart {0},대시 보드 차트 {0}에 계정이 설정되지 않았습니다.,
-Account {0} does not belong to company {1},계정 {0}이 회사에 속하지 않는 {1},
Account {0} does not exists in the dashboard chart {1},계정 {0}이 (가) 대시 보드 차트 {1}에 없습니다.,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,계정 : <b>{0}</b> 은 (는) 진행중인 자본 작업이며 업무 일지 항목으로 업데이트 할 수 없습니다.,
Account: {0} is not permitted under Payment Entry,계정 : {0}은 (는) 결제 입력에서 허용되지 않습니다,
@@ -3582,7 +3567,6 @@
Activity,활동 내역,
Add / Manage Email Accounts.,이메일 계정 추가/관리,
Add Child,자식 추가,
-Add Loan Security,대출 보안 추가,
Add Multiple,여러 항목 추가,
Add Participants,참가자 추가,
Add to Featured Item,추천 상품에 추가,
@@ -3593,15 +3577,12 @@
Address Line 1,1 호선 주소,
Addresses,주소,
Admission End Date should be greater than Admission Start Date.,입학 종료일은 입학 시작일보다 커야합니다.,
-Against Loan,대출에 대하여,
-Against Loan:,대출에 대하여 :,
All,모두,
All bank transactions have been created,모든 은행 거래가 생성되었습니다.,
All the depreciations has been booked,모든 감가 상각이 예약되었습니다,
Allocation Expired!,할당 만료!,
Allow Resetting Service Level Agreement from Support Settings.,지원 설정에서 서비스 수준 계약 재설정 허용.,
Amount of {0} is required for Loan closure,대출 폐쇄에는 {0}의 금액이 필요합니다,
-Amount paid cannot be zero,지불 금액은 0이 될 수 없습니다,
Applied Coupon Code,적용 쿠폰 코드,
Apply Coupon Code,쿠폰 코드 적용,
Appointment Booking,약속 예약,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,드라이버 주소가 누락되어 도착 시간을 계산할 수 없습니다.,
Cannot Optimize Route as Driver Address is Missing.,드라이버 주소가 누락되어 경로를 최적화 할 수 없습니다.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,종속 태스크 {1}이 (가) 완료 / 취소되지 않았으므로 {0} 태스크를 완료 할 수 없습니다.,
-Cannot create loan until application is approved,신청이 승인 될 때까지 대출을 만들 수 없습니다,
Cannot find a matching Item. Please select some other value for {0}.,일치하는 항목을 찾을 수 없습니다. 에 대한 {0} 다른 값을 선택하십시오.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",{1} 행의 {0} 항목에 {2}보다 많은 비용을 청구 할 수 없습니다. 초과 청구를 허용하려면 계정 설정에서 허용 한도를 설정하십시오.,
"Capacity Planning Error, planned start time can not be same as end time","용량 계획 오류, 계획된 시작 시간은 종료 시간과 같을 수 없습니다",
@@ -3812,20 +3792,9 @@
Less Than Amount,적은 금액,
Liabilities,부채,
Loading...,로딩 중...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,대출 금액이 제안 된 유가 증권에 따라 최대 대출 금액 {0}을 (를) 초과 함,
Loan Applications from customers and employees.,고객 및 직원의 대출 신청.,
-Loan Disbursement,대출 지급,
Loan Processes,대출 프로세스,
-Loan Security,대출 보안,
-Loan Security Pledge,대출 담보,
-Loan Security Pledge Created : {0},대출 담보 약정 작성 : {0},
-Loan Security Price,대출 담보 가격,
-Loan Security Price overlapping with {0},{0}과 (와) 겹치는 대출 보안 가격,
-Loan Security Unpledge,대출 보안 약속,
-Loan Security Value,대출 보안 가치,
Loan Type for interest and penalty rates,이자 및 페널티 비율에 대한 대출 유형,
-Loan amount cannot be greater than {0},대출 금액은 {0}보다 클 수 없습니다,
-Loan is mandatory,대출은 필수입니다,
Loans,융자,
Loans provided to customers and employees.,고객 및 직원에게 대출 제공.,
Location,위치,
@@ -3894,7 +3863,6 @@
Pay,지불,
Payment Document Type,지급 문서 유형,
Payment Name,지불 이름,
-Penalty Amount,페널티 금액,
Pending,대기 중,
Performance,공연,
Period based On,기준 기간,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,이 항목을 편집하려면 마켓 플레이스 사용자로 로그인하십시오.,
Please login as a Marketplace User to report this item.,이 아이템을보고하려면 마켓 플레이스 사용자로 로그인하십시오.,
Please select <b>Template Type</b> to download template,<b>템플릿</b> 을 다운로드하려면 <b>템플릿 유형</b> 을 선택하십시오,
-Please select Applicant Type first,먼저 신청자 유형을 선택하십시오,
Please select Customer first,먼저 고객을 선택하십시오,
Please select Item Code first,먼저 상품 코드를 선택하십시오,
-Please select Loan Type for company {0},회사 {0}의 대출 유형을 선택하십시오,
Please select a Delivery Note,배송 메모를 선택하십시오,
Please select a Sales Person for item: {0},품목을 판매원으로 선택하십시오 : {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',다른 지불 방법을 선택하십시오. Stripe은 통화 '{0}'의 트랜잭션을 지원하지 않습니다.,
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},{0} 회사의 기본 은행 계좌를 설정하십시오.,
Please specify,지정하십시오,
Please specify a {0},{0}을 지정하십시오,lead
-Pledge Status,서약 상태,
-Pledge Time,서약 시간,
Printing,인쇄,
Priority,우선순위,
Priority has been changed to {0}.,우선 순위가 {0} (으)로 변경되었습니다.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML 파일 처리,
Profitability,수익성,
Project,프로젝트,
-Proposed Pledges are mandatory for secured Loans,제안 된 서약은 담보 대출에 필수적입니다,
Provide the academic year and set the starting and ending date.,학년을 제공하고 시작일과 종료일을 설정하십시오.,
Public token is missing for this bank,이 은행에 공개 토큰이 없습니다.,
Publish,게시,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,구매 영수증에 샘플 보관이 활성화 된 품목이 없습니다.,
Purchase Return,구매 돌아 가기,
Qty of Finished Goods Item,완제품 수량,
-Qty or Amount is mandatroy for loan security,수량 또는 금액은 대출 담보를 위해 강제입니다,
Quality Inspection required for Item {0} to submit,{0} 항목을 제출하기 위해 품질 검사가 필요합니다.,
Quantity to Manufacture,제조 수량,
Quantity to Manufacture can not be zero for the operation {0},{0} 작업의 제조 수량은 0 일 수 없습니다.,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,완화 날짜는 가입 날짜보다 크거나 같아야합니다.,
Rename,이름,
Rename Not Allowed,허용되지 않는 이름 바꾸기,
-Repayment Method is mandatory for term loans,상환 방법은 기간 대출에 필수적입니다,
-Repayment Start Date is mandatory for term loans,상환 시작 날짜는 기간 대출에 필수입니다,
Report Item,보고서 항목,
Report this Item,이 항목 신고,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,외주 계약 수량 : 외주 품목을 만들기위한 원자재 수량,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},행 ({0}) : {1}은 (는) 이미 {2}에서 할인되었습니다,
Rows Added in {0},{0}에 추가 된 행,
Rows Removed in {0},{0}에서 행이 제거되었습니다.,
-Sanctioned Amount limit crossed for {0} {1},승인 된 금액 한도가 {0} {1}에 대해 초과되었습니다.,
-Sanctioned Loan Amount already exists for {0} against company {1},회사 {1}에 대해 {0}에 대해 승인 된 대출 금액이 이미 존재합니다.,
Save,저장,
Save Item,아이템 저장,
Saved Items,저장된 아이템,
@@ -4135,7 +4093,6 @@
User {0} is disabled,{0} 사용자가 비활성화되어 있습니다,
Users and Permissions,사용자 및 권한,
Vacancies cannot be lower than the current openings,공석은 현재 공석보다 낮을 수 없습니다,
-Valid From Time must be lesser than Valid Upto Time.,유효 시작 시간은 유효 가동 시간보다 작아야합니다.,
Valuation Rate required for Item {0} at row {1},{1} 행의 항목 {0}에 필요한 평가율,
Values Out Of Sync,동기화되지 않은 값,
Vehicle Type is required if Mode of Transport is Road,운송 수단 모드가 도로 인 경우 차량 유형이 필요합니다.,
@@ -4211,7 +4168,6 @@
Add to Cart,쇼핑 카트에 담기,
Days Since Last Order,마지막 주문 이후 일,
In Stock,재고 있음,
-Loan Amount is mandatory,대출 금액은 필수입니다,
Mode Of Payment,결제 방식,
No students Found,학생이 없습니다,
Not in Stock,재고에,
@@ -4240,7 +4196,6 @@
Group by,그룹으로,
In stock,재고,
Item name,품명,
-Loan amount is mandatory,대출 금액은 필수입니다,
Minimum Qty,최소 수량,
More details,세부정보 더보기,
Nature of Supplies,자연의 공급,
@@ -4409,9 +4364,6 @@
Total Completed Qty,총 완성 된 수량,
Qty to Manufacture,제조하는 수량,
Repay From Salary can be selected only for term loans,Repay From Salary는 기간 대출에 대해서만 선택할 수 있습니다.,
-No valid Loan Security Price found for {0},{0}에 대한 유효한 대출 담보 가격이 없습니다.,
-Loan Account and Payment Account cannot be same,대출 계정과 결제 계정은 동일 할 수 없습니다.,
-Loan Security Pledge can only be created for secured loans,대출 담보 서약은 담보 대출에 대해서만 생성 할 수 있습니다.,
Social Media Campaigns,소셜 미디어 캠페인,
From Date can not be greater than To Date,시작 날짜는 종료 날짜보다 클 수 없습니다.,
Please set a Customer linked to the Patient,환자와 연결된 고객을 설정하십시오,
@@ -6437,7 +6389,6 @@
HR User,HR 사용자,
Appointment Letter,약속 편지,
Job Applicant,구직자,
-Applicant Name,신청자 이름,
Appointment Date,약속 날짜,
Appointment Letter Template,편지지 템플릿-약속,
Body,몸,
@@ -7059,99 +7010,12 @@
Sync in Progress,진행중인 동기화,
Hub Seller Name,허브 판매자 이름,
Custom Data,맞춤 데이터,
-Member,회원,
-Partially Disbursed,부분적으로 지급,
-Loan Closure Requested,대출 마감 요청,
Repay From Salary,급여에서 상환,
-Loan Details,대출 세부 사항,
-Loan Type,대출 유형,
-Loan Amount,대출금,
-Is Secured Loan,담보 대출,
-Rate of Interest (%) / Year,이자 (%) / 년의 속도,
-Disbursement Date,지급 날짜,
-Disbursed Amount,지불 금액,
-Is Term Loan,임기 대출,
-Repayment Method,상환 방법,
-Repay Fixed Amount per Period,기간 당 고정 금액을 상환,
-Repay Over Number of Periods,기간의 동안 수 상환,
-Repayment Period in Months,개월의 상환 기간,
-Monthly Repayment Amount,월별 상환 금액,
-Repayment Start Date,상환 시작일,
-Loan Security Details,대출 보안 세부 사항,
-Maximum Loan Value,최대 대출 가치,
-Account Info,계정 정보,
-Loan Account,대출 계좌,
-Interest Income Account,이자 소득 계정,
-Penalty Income Account,페널티 소득 계정,
-Repayment Schedule,상환 일정,
-Total Payable Amount,총 채무 금액,
-Total Principal Paid,총 교장 지불,
-Total Interest Payable,채무 총 관심,
-Total Amount Paid,총 지불 금액,
-Loan Manager,대출 관리자,
-Loan Info,대출 정보,
-Rate of Interest,관심의 속도,
-Proposed Pledges,제안 된 서약,
-Maximum Loan Amount,최대 대출 금액,
-Repayment Info,상환 정보,
-Total Payable Interest,총 채무이자,
-Against Loan ,대출 반대,
-Loan Interest Accrual,대출이자 발생,
-Amounts,금액,
-Pending Principal Amount,보류 원금,
-Payable Principal Amount,지불 가능한 원금,
-Paid Principal Amount,지불 된 원금,
-Paid Interest Amount,지급이자 금액,
-Process Loan Interest Accrual,대부이자 발생 프로세스,
-Repayment Schedule Name,상환 일정 이름,
Regular Payment,정기 지불,
Loan Closure,대출 폐쇄,
-Payment Details,지불 세부 사항,
-Interest Payable,채무,
-Amount Paid,지불 금액,
-Principal Amount Paid,원금 지급,
-Repayment Details,상환 내역,
-Loan Repayment Detail,대출 상환 내역,
-Loan Security Name,대출 보안 이름,
-Unit Of Measure,측정 단위,
-Loan Security Code,대출 보안 코드,
-Loan Security Type,대출 보안 유형,
-Haircut %,이발 %,
-Loan Details,대출 세부 사항,
-Unpledged,약속하지 않은,
-Pledged,서약,
-Partially Pledged,부분적으로 서약,
-Securities,유가 증권,
-Total Security Value,총 보안 가치,
-Loan Security Shortfall,대출 보안 부족,
-Loan ,차관,
-Shortfall Time,부족 시간,
-America/New_York,아메리카 / 뉴욕,
-Shortfall Amount,부족 금액,
-Security Value ,보안 가치,
-Process Loan Security Shortfall,프로세스 대출 보안 부족,
-Loan To Value Ratio,대출 대 가치 비율,
-Unpledge Time,약속 시간,
-Loan Name,대출 이름,
Rate of Interest (%) Yearly,이자의 비율 (%) 연간,
-Penalty Interest Rate (%) Per Day,페널티 이율 (%),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,페널티 이율은 상환이 지연되는 경우 미결제 금액에 매일 부과됩니다.,
-Grace Period in Days,일의 유예 기간,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,대출 상환이 지연된 경우 위약금이 부과되지 않는 기한까지의 일수,
-Pledge,서약,
-Post Haircut Amount,이발 후 금액,
-Process Type,프로세스 유형,
-Update Time,업데이트 시간,
-Proposed Pledge,제안 된 서약,
-Total Payment,총 결제,
-Balance Loan Amount,잔액 대출 금액,
-Is Accrued,발생,
Salary Slip Loan,샐러리 슬립 론,
Loan Repayment Entry,대출 상환 항목,
-Sanctioned Loan Amount,승인 된 대출 금액,
-Sanctioned Amount Limit,승인 된 금액 한도,
-Unpledge,서약,
-Haircut,이발,
MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-,
Generate Schedule,일정을 생성,
Schedules,일정,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,프로젝트는 이러한 사용자에게 웹 사이트에 액세스 할 수 있습니다,
Copied From,에서 복사 됨,
Start and End Dates,시작 날짜를 종료,
-Actual Time (in Hours),실제 시간 (시간),
+Actual Time in Hours (via Timesheet),실제 시간 (시간),
Costing and Billing,원가 계산 및 결제,
-Total Costing Amount (via Timesheets),총 원가 계산 금액 (작업 표를 통해),
-Total Expense Claim (via Expense Claims),총 경비 요청 (비용 청구를 통해),
+Total Costing Amount (via Timesheet),총 원가 계산 금액 (작업 표를 통해),
+Total Expense Claim (via Expense Claim),총 경비 요청 (비용 청구를 통해),
Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해),
Total Sales Amount (via Sales Order),총 판매 금액 (판매 오더를 통한),
-Total Billable Amount (via Timesheets),총 청구 가능 금액 (작업 표를 통해),
-Total Billed Amount (via Sales Invoices),총 청구 금액 (판매 송장을 통해),
-Total Consumed Material Cost (via Stock Entry),총 소비 된 자재 원가 (재고 입력을 통한),
+Total Billable Amount (via Timesheet),총 청구 가능 금액 (작업 표를 통해),
+Total Billed Amount (via Sales Invoice),총 청구 금액 (판매 송장을 통해),
+Total Consumed Material Cost (via Stock Entry),총 소비 된 자재 원가 (재고 입력을 통한),
Gross Margin,매출 총 이익률,
Gross Margin %,매출 총 이익률의 %,
Monitor Progress,진행 상황 모니터링,
@@ -7521,12 +7385,10 @@
Dependencies,종속성,
Dependent Tasks,종속 작업,
Depends on Tasks,작업에 따라 달라집니다,
-Actual Start Date (via Time Sheet),실제 시작 날짜 (시간 시트를 통해),
-Actual Time (in hours),(시간) 실제 시간,
-Actual End Date (via Time Sheet),실제 종료 날짜 (시간 시트를 통해),
-Total Costing Amount (via Time Sheet),(시간 시트를 통해) 총 원가 계산 금액,
+Actual Start Date (via Timesheet),실제 시작 날짜 (시간 시트를 통해),
+Actual Time in Hours (via Timesheet),(시간) 실제 시간,
+Actual End Date (via Timesheet),실제 종료 날짜 (시간 시트를 통해),
Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청,
-Total Billing Amount (via Time Sheet),총 결제 금액 (시간 시트를 통해),
Review Date,검토 날짜,
Closing Date,마감일,
Task Depends On,작업에 따라 다릅니다,
@@ -7887,7 +7749,6 @@
Update Series,업데이트 시리즈,
Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.,
Prefix,접두사,
-Current Value,현재 값,
This is the number of the last created transaction with this prefix,이것은이 접두사를 마지막으로 생성 된 트랜잭션의 수입니다,
Update Series Number,업데이트 시리즈 번호,
Quotation Lost Reason,견적 잃어버린 이유,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천,
Lead Details,리드 세부 사항,
Lead Owner Efficiency,리드 소유자 효율성,
-Loan Repayment and Closure,대출 상환 및 폐쇄,
-Loan Security Status,대출 보안 상태,
Lost Opportunity,잃어버린 기회,
Maintenance Schedules,관리 스케줄,
Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},타겟팅 된 수 : {0},
Payment Account is mandatory,결제 계정은 필수입니다.,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",선택하면 신고 또는 증명 제출없이 소득세를 계산하기 전에 과세 소득에서 전체 금액이 공제됩니다.,
-Disbursement Details,지불 세부 사항,
Material Request Warehouse,자재 요청 창고,
Select warehouse for material requests,자재 요청을위한 창고 선택,
Transfer Materials For Warehouse {0},창고 {0}의 자재 전송,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,급여에서 미 청구 금액 상환,
Deduction from salary,급여에서 공제,
Expired Leaves,만료 된 잎,
-Reference No,참조 번호,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,이발 비율은 대출 담보의 시장 가치와 해당 대출에 대한 담보로 사용될 때 해당 대출 담보에 귀속되는 가치 간의 백분율 차이입니다.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,대출 가치 비율은 담보 담보 가치에 대한 대출 금액의 비율을 나타냅니다. 대출에 대해 지정된 값 이하로 떨어지면 대출 담보 부족이 발생합니다.,
If this is not checked the loan by default will be considered as a Demand Loan,선택하지 않으면 기본적으로 대출이 수요 대출로 간주됩니다.,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,이 계정은 차용인의 대출 상환을 예약하고 차용인에게 대출금을 지급하는 데 사용됩니다.,
This account is capital account which is used to allocate capital for loan disbursal account ,이 계정은 대출 지급 계정에 자본을 할당하는 데 사용되는 자본 계정입니다.,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},{0} 작업이 작업 주문 {1}에 속하지 않습니다.,
Print UOM after Quantity,수량 후 UOM 인쇄,
Set default {0} account for perpetual inventory for non stock items,비 재고 품목의 계속 기록법에 대한 기본 {0} 계정 설정,
-Loan Security {0} added multiple times,대출 담보 {0}이 (가) 여러 번 추가되었습니다.,
-Loan Securities with different LTV ratio cannot be pledged against one loan,LTV 비율이 다른 대출 증권은 하나의 대출에 대해 담보 할 수 없습니다.,
-Qty or Amount is mandatory for loan security!,대출 담보를 위해 수량 또는 금액은 필수입니다!,
-Only submittted unpledge requests can be approved,제출 된 미 서약 요청 만 승인 할 수 있습니다.,
-Interest Amount or Principal Amount is mandatory,이자 금액 또는 원금 금액은 필수입니다.,
-Disbursed Amount cannot be greater than {0},지불 된 금액은 {0}보다 클 수 없습니다.,
-Row {0}: Loan Security {1} added multiple times,{0} 행 : 대출 담보 {1}가 여러 번 추가됨,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,행 # {0} : 하위 항목은 제품 번들이 아니어야합니다. {1} 항목을 제거하고 저장하십시오.,
Credit limit reached for customer {0},고객 {0}의 신용 한도에 도달했습니다.,
Could not auto create Customer due to the following missing mandatory field(s):,다음 누락 된 필수 필드로 인해 고객을 자동 생성 할 수 없습니다.,
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 28927a0..92a7231 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Heke ku pargîdaniya SpA, SApA an SRL ye serlêdan e",
Applicable if the company is a limited liability company,"Heke ku pargîdan pargîdaniyek bi berpirsiyariya tixûbdar be, pêve dibe",
Applicable if the company is an Individual or a Proprietorship,"Heke ku pargîdanek kesek kesek an Xwedîtiyê ye, pêkan e",
-Applicant,Namzêd,
-Applicant Type,Tîpa daxwaznameyê,
Application of Funds (Assets),Sepanê ji Funds (Maldarî),
Application period cannot be across two allocation records,Dema serîlêdanê dikare di raporta her du alavê de ne,
Application period cannot be outside leave allocation period,dema Application nikare bibe îzina li derve dema dabeşkirina,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lîsteya parvekirî yên bi bi hejmarên folio re hene,
Loading Payment System,Pergala Paydayê,
Loan,Sened,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0},
-Loan Application,Serlêdanê deyn,
-Loan Management,Rêveberiya Lînan,
-Loan Repayment,"dayinê, deyn",
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Dîroka Destpêkê û Kevana Dravê Barkirina Dravê Dagirkirinê mecbûr in,
Loans (Liabilities),Deyn (Deynên),
Loans and Advances (Assets),Deynan û pêşketina (Maldarî),
@@ -1611,7 +1605,6 @@
Monday,Duşem,
Monthly,Mehane,
Monthly Distribution,Belavkariya mehane,
-Monthly Repayment Amount cannot be greater than Loan Amount,Şêwaz vegerandinê mehane ne dikarin bibin mezintir Loan Mîqdar,
More,Zêde,
More Information,Information More,
More than one selection for {0} not allowed,Ji hilbijartina zêdetir ji {0} nayê destûr kirin,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pay {0} {1},
Payable,Erzan,
Payable Account,Account cîhde,
-Payable Amount,Mîqdara mestir,
Payment,Diravdanî,
Payment Cancelled. Please check your GoCardless Account for more details,Payment Cancel. Ji kerema xwe ji berfirehtir ji bo Agahdariya GoCardless binihêre,
Payment Confirmation,Daxuyaniya Tezmînatê,
-Payment Date,Date Payment,
Payment Days,Rojan Payment,
Payment Document,Dokumentê Payment,
Payment Due Date,Payment Date ji ber,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Ji kerema xwe ve yekem Meqbûz Purchase binivîse,
Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse,
Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse,
-Please enter Repayment Periods,Ji kerema xwe ve Maweya vegerandinê binivîse,
Please enter Reqd by Date,Ji kerema xwe re Reqd bi dahatinê binivîse,
Please enter Woocommerce Server URL,Ji kerema xwe kerema xwe ya Woocommerce Server URL,
Please enter Write Off Account,Ji kerema xwe re têkevin hewe Off Account,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Ji kerema xwe ve navenda mesrefa bav binivîse,
Please enter quantity for Item {0},Ji kerema xwe ve dorpêçê de ji bo babet binivîse {0},
Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.,
-Please enter repayment Amount,"Ji kerema xwe ve Mîqdar dayinê, binivîse",
Please enter valid Financial Year Start and End Dates,Ji kerema xwe ve derbas dibe Financial Sal destpêkirin û dawîlêanîna binivîse,
Please enter valid email address,"Kerema xwe, navnîşana email derbasdar têkeve ji",
Please enter {0} first,Ji kerema xwe {0} yekem binivîse,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Rules Pricing bi zêdetir li ser bingeha dorpêçê de tê fîltrekirin.,
Primary Address Details,Agahdarî Navnîşan,
Primary Contact Details,Agahdarî Têkiliyên Serûpel,
-Principal Amount,Şêwaz sereke,
Print Format,Print Format,
Print IRS 1099 Forms,Formên IRS 1099 çap bikin,
Print Report Card,Karta Raporta Print,
@@ -2550,7 +2538,6 @@
Sample Collection,Collection Collection,
Sample quantity {0} cannot be more than received quantity {1},Kêmeya nimûne {0} dikare ji hêla mêjûya wergirtiye {1},
Sanctioned,belê,
-Sanctioned Amount,Şêwaz ambargoyê,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Şêwaz belê ne dikarin li Row mezintir Mîqdar Îdîaya {0}.,
Sand,Qûm,
Saturday,Şemî,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ji berê ve heye Parent Procedure {1}.,
API,API,
Annual,Yeksalî,
-Approved,pejirandin,
Change,Gûherrandinî,
Contact Email,Contact Email,
Export Type,Tîpa Exportê,
@@ -3571,7 +3557,6 @@
Account Value,Nirxa Hesabê,
Account is mandatory to get payment entries,Hesab mecbûr e ku meriv şîfreyên dayînê bistîne,
Account is not set for the dashboard chart {0},Hesabê ji bo tabela dashboardê nehatiye destnîşankirin {0,
-Account {0} does not belong to company {1},Account {0} nayê to Company girêdayî ne {1},
Account {0} does not exists in the dashboard chart {1},Hesabê {0} di pîvanê dashboardê de tune {1,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Hesab: <b>{0}</b> sermaye Karê pêşveçûnê ye û nikare ji hêla Journal Entry-ê ve were nûve kirin,
Account: {0} is not permitted under Payment Entry,Hesab: under 0 under ne di bin Tevlêbûna Danezanê de nayê destûr kirin,
@@ -3582,7 +3567,6 @@
Activity,Çalakî,
Add / Manage Email Accounts.,Lê zêde bike / Manage Accounts Email.,
Add Child,lê zêde bike Zarokan,
-Add Loan Security,Ewlehiya deyn zêde bikin,
Add Multiple,lê zêde bike Multiple,
Add Participants,Beşdarvanan,
Add to Featured Item,Vebijarka Taybetmendeyê Zêde Bikin,
@@ -3593,15 +3577,12 @@
Address Line 1,Xeta Navnîşanê 1,
Addresses,Navnîşan,
Admission End Date should be greater than Admission Start Date.,Divê Dîroka Dawîniya Serlêdanê ji Dîroka Destpêkê Admission mezintir be.,
-Against Loan,Li dijî deyn,
-Against Loan:,Li hember deyn:,
All,Gişt,
All bank transactions have been created,Hemî danûstendinên bankê hatine afirandin,
All the depreciations has been booked,Hemî zexîreyan hatîye pirtûk kirin,
Allocation Expired!,Tevnegirtî qedand!,
Allow Resetting Service Level Agreement from Support Settings.,Ji Settings Piştgiriyê Pêdivî ye ku Peymana Nirxandina Asta Karûbarê Reset bidin.,
Amount of {0} is required for Loan closure,Ji bo girtina deyn mîqdara {0 hewce ye,
-Amount paid cannot be zero,Dravê drav nikare zer be,
Applied Coupon Code,Koda kodê ya sepandî,
Apply Coupon Code,Koda kodê bicîh bikin,
Appointment Booking,Kirrûbirra Serdanê,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Asawa ku Navnîşa Driver Bila winda nebe Qeyda Demî tê hesab kirin.,
Cannot Optimize Route as Driver Address is Missing.,Dibe ku Riya ku Addressêwirmendiya Driver winda nabe dikare Rêz bike.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Karê complete 0} wekî peywira wê ya têkildar {1} nikare were domandin / betal kirin.,
-Cannot create loan until application is approved,Heta ku serlêdan pesend nekirin nekarîn,
Cannot find a matching Item. Please select some other value for {0}.,"Can a Hêmanên nedît. Ji kerema xwe re hin nirxên din, ji bo {0} hilbijêre.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nabe ku ji bo Item 0} di rêzikê {1} de ji {2} pirtir were birîn. Ji bo destûrdayîna zêdekirina billing, ji kerema xwe di Settingsên Hesaban de yarmetiyê bidin",
"Capacity Planning Error, planned start time can not be same as end time","Erewtiya plansaziya kapasîteyê, dema destpêkirina plankirî nikare wekî dema paşîn yek be",
@@ -3812,20 +3792,9 @@
Less Than Amount,Mûçeya Kêmtir,
Liabilities,Serserî,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Mîqdara krediyê ji her nirxa kredî ya herî kêm {0} bi gorî secdeyên ewlekariyê yên pêşniyaztir re derbas dibe,
Loan Applications from customers and employees.,Serlêdanên deyn ji kirrûbir û karmendan.,
-Loan Disbursement,Dabeşkirina deyn,
Loan Processes,Pêvajoyên deyn,
-Loan Security,Ewlekariya deyn,
-Loan Security Pledge,Soza Ewlekariya Krediyê,
-Loan Security Pledge Created : {0},Sozê Ewlekariya Krediyê Afirandin: {0,
-Loan Security Price,Bihayê ewlehiya deyn,
-Loan Security Price overlapping with {0},Buhayê ewlehiya kredî bi {0 re dibe hev.,
-Loan Security Unpledge,Yekbûnek Ewlekariya Krediyê,
-Loan Security Value,Nirxa ewlehiya deyn,
Loan Type for interest and penalty rates,Tîpa deyn ji bo rêjeyên rêjeyê û cezayê,
-Loan amount cannot be greater than {0},Dravê kredî nikare ji {0 greater mezintir be,
-Loan is mandatory,Kredî mecbûrî ye,
Loans,Deynî,
Loans provided to customers and employees.,Kredî ji bo mişterî û karmendan peyda kirin.,
Location,Cîh,
@@ -3894,7 +3863,6 @@
Pay,Diravdanî,
Payment Document Type,Tipa Belgeya Dravê,
Payment Name,Navê Payment,
-Penalty Amount,Hêjeya Cezayê,
Pending,Nexelas,
Performance,Birêvebirinî,
Period based On,Period li ser bingeha,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Ji kerema xwe wekî Bikarhênerek Bazarê têkeve da ku ev tişt biguherîne.,
Please login as a Marketplace User to report this item.,Ji kerema xwe wekî Bikarhênerek Bazarê têkeve da ku vê babetê ragihînin.,
Please select <b>Template Type</b> to download template,Ji kerema xwe hilbijêrin <b>şablonê</b> hilbijêrin,
-Please select Applicant Type first,Ji kerema xwe Type Type Applicant yekem hilbijêrin,
Please select Customer first,Ji kerema xwe yekem Xerîdar hilbijêrin,
Please select Item Code first,Ji kerema xwe Koda kodê yekem hilbijêrin,
-Please select Loan Type for company {0},Ji kerema xwe ji bo pargîdaniya Type 0 Hilbijêra krediyê hilbijêrin,
Please select a Delivery Note,Ji kerema xwe Nîşanek Delivery hilbijêre,
Please select a Sales Person for item: {0},Ji kerema xwe Kesek Firotanê ji bo tiştên: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Tikaye din rêbaza dayina hilbijêre. Stripe nade muamele li currency piştgiriya ne '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Ji kerema xwe ji bo pargîdaniya account 0 account hesabek banka bêkêmasî saz bikin.,
Please specify,ji kerema xwe binivîsin,
Please specify a {0},Ji kerema xwe {0 diyar bikin,lead
-Pledge Status,Rewşa sozê,
-Pledge Time,Wexta Sersalê,
Printing,Çapnivîs,
Priority,Pêşeyî,
Priority has been changed to {0}.,Pêşîniya bi {0 ve hatî guhertin.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Pelên XML-ê pêşve kirin,
Profitability,Profitability,
Project,Rêvename,
-Proposed Pledges are mandatory for secured Loans,Sozên pêşniyar ji bo deynên pêbawer mecbûr in,
Provide the academic year and set the starting and ending date.,Sala akademîk peyda bikin û tarîxa destpêk û dawiyê destnîşan dikin.,
Public token is missing for this bank,Nîşana giştî ji bo vê bankeyê winda ye,
Publish,Weşandin,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Pêşwaziya Kirînê Itemê Tişteyek ji bo Tiştê Nimêja Hesabdayînê hatî tune.,
Purchase Return,Return kirîn,
Qty of Finished Goods Item,Qant of Tiştên Hilberandî,
-Qty or Amount is mandatroy for loan security,Qty an Amount ji bo ewlehiya krediyê mandatroy e,
Quality Inspection required for Item {0} to submit,Inspavdêriya Qalîtan ji bo şandina tiştan required 0 required hewce ye,
Quantity to Manufacture,Hêjeya Hilberînê,
Quantity to Manufacture can not be zero for the operation {0},Hejmara Hilberînê ji bo karûbarê nabe 0 can,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Dîroka Baweriyê ji Dîroka Beşdariyê divê ji Mezin an Dîroka Beşdariyê mezintir be,
Rename,Nav biguherîne,
Rename Not Allowed,Navnedayin Nakokirin,
-Repayment Method is mandatory for term loans,Rêbaza vegerandina ji bo deynên termîn mecbûrî ye,
-Repayment Start Date is mandatory for term loans,Dîroka Ragihandina Dravê ji bo deynên termîn mecbûrî ye,
Report Item,Report Babetê,
Report this Item,Vê rapor bike,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qiyama Reserve ji bo Nekokkêşanê: Kêmasiya madeyên xav ji bo çêkirina tiştên pêvekirî.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Row ({0}): {1 already li pêşiya discount 2 already ye.,
Rows Added in {0},Rêzan in 0 Added,
Rows Removed in {0},Rêzan li {0 oved hatin rakirin,
-Sanctioned Amount limit crossed for {0} {1},Sanctioned Sount limit of {0} {1,
-Sanctioned Loan Amount already exists for {0} against company {1},Mîqdara Sînorê Sanctioned ji bo company 0} li dijî pargîdaniya {1 exists heye,
Save,Rizgarkirin,
Save Item,Tiştê hilîne,
Saved Items,Tiştên hatine tomarkirin,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Bikarhêner {0} neçalak e,
Users and Permissions,Bikarhêner û Permissions,
Vacancies cannot be lower than the current openings,Dezgehên vala nikarin ji vebûnên heyî kêmtir bin,
-Valid From Time must be lesser than Valid Upto Time.,Divê Bawer Ji Ser Qedrê idltî ya Valid Pêdivî bimîne.,
Valuation Rate required for Item {0} at row {1},Rêjeya nirxînê ya ku ji bo Pîvanê {0} li row {1 required pêwîst e,
Values Out Of Sync,Nirxên Ji Hevpeymaniyê derketin,
Vehicle Type is required if Mode of Transport is Road,Ger Mode Veguhestina Rê ye Tîpa Vehêabe ye,
@@ -4211,7 +4168,6 @@
Add to Cart,Têxe,
Days Since Last Order,Rojên ji Fermana Dawîn,
In Stock,Ez bêzarim,
-Loan Amount is mandatory,Mîqdara mûçeyê mecbûrî ye,
Mode Of Payment,Mode Kredî,
No students Found,Xwendekar nehat dîtin,
Not in Stock,Ne li Stock,
@@ -4240,7 +4196,6 @@
Group by,Koma By,
In stock,Ez bêzarim,
Item name,Navê Navekî,
-Loan amount is mandatory,Mîqdara mûçeyê mecbûrî ye,
Minimum Qty,Min Qty,
More details,Details More,
Nature of Supplies,Nature of Supplies,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Bi tevahî Qty qedand,
Qty to Manufacture,Qty To Manufacture,
Repay From Salary can be selected only for term loans,Repay Ji Meaşê tenê ji bo deynên demdirêj dikare were hilbijartin,
-No valid Loan Security Price found for {0},Ji bo {0} Bihayê Ewlekariya Deynê ya derbasdar nehat dîtin,
-Loan Account and Payment Account cannot be same,Hesabê kredî û Hesabê drav nikare yek be,
-Loan Security Pledge can only be created for secured loans,Soza Ewlekariya Kredî tenê ji bo krediyên ewledar dikare were afirandin,
Social Media Campaigns,Kampanyayên Medyaya Civakî,
From Date can not be greater than To Date,Ji Dîrok nikare ji Tarîxê mezintir be,
Please set a Customer linked to the Patient,Ji kerema xwe Xerîdarek bi Nexweş ve girêdayî ye,
@@ -6437,7 +6389,6 @@
HR User,Bikarhêner hr,
Appointment Letter,Nameya Ragihandinê,
Job Applicant,Applicant Job,
-Applicant Name,Navê Applicant,
Appointment Date,Dîroka Serdanê,
Appointment Letter Template,Letablonê Destnivîsînê,
Body,Beden,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sync di Pêşveçûnê de,
Hub Seller Name,Navê Nîgarê Hub,
Custom Data,Daneyên Taybetî,
-Member,Endam,
-Partially Disbursed,Qismen dandin de,
-Loan Closure Requested,Daxwaza Girtina Krediyê,
Repay From Salary,H'eyfê ji Salary,
-Loan Details,deyn Details,
-Loan Type,Type deyn,
-Loan Amount,Şêwaz deyn,
-Is Secured Loan,Krediyek Ewlehî ye,
-Rate of Interest (%) / Year,Rêjeya faîzên (%) / Sal,
-Disbursement Date,Date Disbursement,
-Disbursed Amount,Bihayek hat belav kirin,
-Is Term Loan,Termertê deyn e,
-Repayment Method,Method vegerandinê,
-Repay Fixed Amount per Period,Bergîdana yekûnê sabît Period,
-Repay Over Number of Periods,Bergîdana Hejmara Over ji Maweya,
-Repayment Period in Months,"Period dayinê, li Meh",
-Monthly Repayment Amount,Şêwaz vegerandinê mehane,
-Repayment Start Date,Repayment Date Start,
-Loan Security Details,Nîşaneyên ewlehiyê yên deyn,
-Maximum Loan Value,Nirxa deynê pirtirkêmtirîn,
-Account Info,Info account,
-Loan Account,Account,
-Interest Income Account,Account Dahata Interest,
-Penalty Income Account,Hesabê hatiniya darayî,
-Repayment Schedule,Cedwela vegerandinê,
-Total Payable Amount,Temamê meblaxa cîhde,
-Total Principal Paid,Tevahiya Sereke Bêserûber,
-Total Interest Payable,Interest Total cîhde,
-Total Amount Paid,Tiştek Tiştek Paid,
-Loan Manager,Gerînendeyê deyn,
-Loan Info,deyn Info,
-Rate of Interest,Rêjeya faîzên,
-Proposed Pledges,Sozên pêşniyaz,
-Maximum Loan Amount,Maximum Mîqdar Loan,
-Repayment Info,Info vegerandinê,
-Total Payable Interest,Total sûdî,
-Against Loan ,Li dijî Deyn,
-Loan Interest Accrual,Qertê Drav erîf,
-Amounts,Mîqdar,
-Pending Principal Amount,Li benda Dravê Sereke,
-Payable Principal Amount,Dravê Mîrê Sêwasê,
-Paid Principal Amount,Mîqdara Prensîbê Bihayî,
-Paid Interest Amount,Mîqdara Dravê Danê,
-Process Loan Interest Accrual,Nerazîbûna Sererkaniyê Qerase,
-Repayment Schedule Name,Navê Bernameya Vegerînê,
Regular Payment,Dravdana birêkûpêk,
Loan Closure,Girtina deyn,
-Payment Details,Agahdarî,
-Interest Payable,Dravê Bacê,
-Amount Paid,Şêwaz: Destkeftiyên,
-Principal Amount Paid,Mîqdara Parzûnê Pêdivî ye,
-Repayment Details,Agahdariyên Vegerînê,
-Loan Repayment Detail,Detail Vegerîna Deynê,
-Loan Security Name,Navê ewlehiya deyn,
-Unit Of Measure,Yekeya Pîvanê,
-Loan Security Code,Koda ewlehiya deyn,
-Loan Security Type,Tîpa ewlehiya deyn,
-Haircut %,Rêzika%,
-Loan Details,Hûrguliyên krediyê,
-Unpledged,Nexşandî,
-Pledged,Soz dan,
-Partially Pledged,Beşdarî soz dan,
-Securities,Ertên ewlehiyê,
-Total Security Value,Nirxa ewlehiya tevahî,
-Loan Security Shortfall,Kêmasiya ewlehiya deyn,
-Loan ,Sened,
-Shortfall Time,Demjimara kêmbûnê,
-America/New_York,Amerîka / New_York,
-Shortfall Amount,Kêmasiya Kêmasî,
-Security Value ,Nirxa ewlehiyê,
-Process Loan Security Shortfall,Pêvajoya Ewlekariya Krediya Qedrê,
-Loan To Value Ratio,Rêjeya nirxê deyn,
-Unpledge Time,Wextê Unpledge,
-Loan Name,Navê deyn,
Rate of Interest (%) Yearly,Rêjeya faîzên (%) Hit,
-Penalty Interest Rate (%) Per Day,Rêjeya restertê Cezayê (%) Rojê,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Rêjeya Tezmînatê ya Cezayê li ser mîqdara benda li ser mehê rojane di rewşek dereng paşketina deyn deyn dide,
-Grace Period in Days,Di Rojan de Grace Period,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Hejmara rojan ji roja çêbûnê heya ku ceza dê neyê girtin di rewşa derengmayîna vegerandina deyn de,
-Pledge,Berdêl,
-Post Haircut Amount,Mûçeya Pêkanîna Porê Porê,
-Process Type,Type Type,
-Update Time,Wexta nûvekirinê,
-Proposed Pledge,Sozdar pêşniyar,
-Total Payment,Total Payment,
-Balance Loan Amount,Balance Loan Mîqdar,
-Is Accrued,Qebûlkirin e,
Salary Slip Loan,Heqfa Slip Loan,
Loan Repayment Entry,Navnîşa Veberhênana Deynê,
-Sanctioned Loan Amount,Mîqdara deynek sincirî,
-Sanctioned Amount Limit,Sînorê Rêjeya Sanctioned,
-Unpledge,Jêderketin,
-Haircut,Porjêkirî,
MAT-MSH-.YYYY.-,MAT-MSH-YYYY-,
Generate Schedule,Çêneke Cedwela,
Schedules,schedules,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Project li ser malpera ji bo van bikarhênerên were gihiştin,
Copied From,Kopiyek ji From,
Start and End Dates,Destpêk û dawiya Kurdî Nexşe,
-Actual Time (in Hours),Dema Rastîn (Bi Demjimêran),
+Actual Time in Hours (via Timesheet),Dema Rastîn (Bi Demjimêran),
Costing and Billing,Bi qurûşekî û Billing,
-Total Costing Amount (via Timesheets),Giştî Hatina Barkirina (Bi rêya Timesheets),
-Total Expense Claim (via Expense Claims),Total mesrefan (via Îdîayên Expense),
+Total Costing Amount (via Timesheet),Giştî Hatina Barkirina (Bi rêya Timesheets),
+Total Expense Claim (via Expense Claim),Total mesrefan (via Îdîayên Expense),
Total Purchase Cost (via Purchase Invoice),Total Cost Purchase (via Purchase bi fatûreyên),
Total Sales Amount (via Sales Order),Giştî ya Firotinê (ji hêla firotina firotanê),
-Total Billable Amount (via Timesheets),Giştî ya Bilind (Bi rêya Timesheets),
-Total Billed Amount (via Sales Invoices),Amûr Barkirî (Bi rêya Barkirina Bazirganî),
-Total Consumed Material Cost (via Stock Entry),Barkirina Barkirina Tevahiya Giştî (bi rêya Stock Entry),
+Total Billable Amount (via Timesheet),Giştî ya Bilind (Bi rêya Timesheets),
+Total Billed Amount (via Sales Invoice),Amûr Barkirî (Bi rêya Barkirina Bazirganî),
+Total Consumed Material Cost (via Stock Entry),Barkirina Barkirina Tevahiya Giştî (bi rêya Stock Entry),
Gross Margin,Kenarê Gross,
Gross Margin %,Kenarê% Gross,
Monitor Progress,Pêşveçûna Çavdêriyê,
@@ -7521,12 +7385,10 @@
Dependencies,Zehmetiyên,
Dependent Tasks,Karên girêdayî,
Depends on Tasks,Dimîne li ser Peywir,
-Actual Start Date (via Time Sheet),Rastî Date Serî (via Time Sheet),
-Actual Time (in hours),Time rastî (di Hours),
-Actual End Date (via Time Sheet),Rastî End Date (via Time Sheet),
-Total Costing Amount (via Time Sheet),Bi tevahî bi qurûşekî jî Mîqdar (via Time Sheet),
+Actual Start Date (via Timesheet),Rastî Date Serî (via Time Sheet),
+Actual Time in Hours (via Timesheet),Time rastî (di Hours),
+Actual End Date (via Timesheet),Rastî End Date (via Time Sheet),
Total Expense Claim (via Expense Claim),Îdîaya Expense Total (via mesrefan),
-Total Billing Amount (via Time Sheet),Temamê meblaxa Billing (via Time Sheet),
Review Date,Date Review,
Closing Date,Date girtinê,
Task Depends On,Task Dimîne li ser,
@@ -7887,7 +7749,6 @@
Update Series,update Series,
Change the starting / current sequence number of an existing series.,Guhertina Guherandinên / hejmara cihekê niha ya series heyî.,
Prefix,Pêşkîte,
-Current Value,Nirx niha:,
This is the number of the last created transaction with this prefix,"Ev hejmara dawî ya muameleyan tên afirandin, bi vê prefix e",
Update Series Number,Update Hejmara Series,
Quotation Lost Reason,Quotation Lost Sedem,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Baştir DIRTYHERTZ Level,
Lead Details,Details Lead,
Lead Owner Efficiency,Efficiency Xwedîyê Lead,
-Loan Repayment and Closure,Deyn û Ragihandin,
-Loan Security Status,Rewşa ewlehiya deyn,
Lost Opportunity,Derfetek winda kir,
Maintenance Schedules,Schedules Maintenance,
Material Requests for which Supplier Quotations are not created,Daxwazên madî ji bo ku Quotations Supplier bi tên bi,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Jimareyên Armanc: {0},
Payment Account is mandatory,Hesabê dayinê ferz e,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ger were seh kirin, dê tevahî mîqdara ku ji ber baca dahatê nayê hesibandin bêyî daxuyaniyek an radestkirina delîlê ji dahata bacê tê daxistin.",
-Disbursement Details,Agahdariyên Dabeşkirinê,
Material Request Warehouse,Depoya Daxwaza Materyalê,
Select warehouse for material requests,Ji bo daxwazên materyalê embarê hilbijêrin,
Transfer Materials For Warehouse {0},Materyalên Veguhêzbar Ji bo Warehouse {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Mûçeya nevekirî ji meaşê paşde bidin,
Deduction from salary,Daxistina ji meaş,
Expired Leaves,Pelên Dawî,
-Reference No,Çavkanî No.,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Rêjeya porrêjiyê cûdahiya ji sedî ya di navbera nirxê bazara Ewlehiya Deynê û nirxa ku ji Ewlekariya Deynê re tê vegotin e dema ku ji bo wê krediyê wekî pêgir tê bikar anîn.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Rêjeya Loan To Value rêjeya mîqdara deyn bi nirxê ewlehiya ku hatî vexwendin îfade dike. Heke ev ji binî nirxa diyarkirî ya ji bo her deynek dakeve, dê kêmasiyek ewlehiya krediyê were peyda kirin",
If this is not checked the loan by default will be considered as a Demand Loan,Ger ev neyê kontrol kirin dê deyn bi default dê wekî Krediyek Daxwaz were hesibandin,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ev hesab ji bo veqetandina vegerandinên deyn ji deyndêr û her weha dayîna deyn ji deyndêr re tê bikar anîn,
This account is capital account which is used to allocate capital for loan disbursal account ,Ev hesab hesabê sermiyan e ku ji bo veqetandina sermaye ji bo hesabê dayîna kredî tê bikar anîn,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operasyona {0} ne ya emrê xebatê ye {1},
Print UOM after Quantity,Li dû Hêmanê UOM çap bikin,
Set default {0} account for perpetual inventory for non stock items,Ji bo tomarokên ne pargîdanî ji bo envanterê domdar hesabê {0} default bikin,
-Loan Security {0} added multiple times,Ewlekariya Krediyê {0} gelek caran zêde kir,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Ewlekariyên Deynê yên bi rêjeya LTV-ya cûda nikarin li hember yek deynek werin dayin,
-Qty or Amount is mandatory for loan security!,Ji bo ewlehiya kredî Qty an Mêjû mecbûrî ye!,
-Only submittted unpledge requests can be approved,Tenê daxwazên nenaskirî yên şandin têne pejirandin,
-Interest Amount or Principal Amount is mandatory,Mezinahiya Berjewendiyê an Mezinahiya Sereke mecbûrî ye,
-Disbursed Amount cannot be greater than {0},Hejmara Dabeşandî nikare ji {0} mezintir be,
-Row {0}: Loan Security {1} added multiple times,Rêz {0}: Ewlehiya Deyn {1} gelek caran zêde kir,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rêza # {0}: Pêdivî ye ku Tişta Zarok Pêvekek Hilberê nebe. Ji kerema xwe Tişta {1} rakin û Tomar bikin,
Credit limit reached for customer {0},Sînorê krediyê ji bo xerîdar gihîşt {0},
Could not auto create Customer due to the following missing mandatory field(s):,Ji ber ku zeviyê (-yên) mecbûrî yên jêrîn winda nebûn nikaribû bixweber Xerîdar biafirîne:,
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 3904308..676a81e 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","ສະ ໝັກ ໄດ້ຖ້າບໍລິສັດແມ່ນ SpA, SApA ຫຼື SRL",
Applicable if the company is a limited liability company,ໃຊ້ໄດ້ຖ້າບໍລິສັດແມ່ນບໍລິສັດທີ່ຮັບຜິດຊອບ ຈຳ ກັດ,
Applicable if the company is an Individual or a Proprietorship,ສະ ໝັກ ໄດ້ຖ້າບໍລິສັດເປັນບຸກຄົນຫລືຜູ້ຖືສິດຄອບຄອງ,
-Applicant,ຜູ້ສະຫມັກ,
-Applicant Type,ປະເພດຜູ້ສະຫມັກ,
Application of Funds (Assets),ຄໍາຮ້ອງສະຫມັກຂອງກອງທຶນ (ຊັບສິນ),
Application period cannot be across two allocation records,ໄລຍະເວລາໃນການໃຊ້ບໍລິການບໍ່ສາມາດຜ່ານສອງບັນທຶກການຈັດສັນ,
Application period cannot be outside leave allocation period,ໄລຍະເວລາການນໍາໃຊ້ບໍ່ສາມາດເປັນໄລຍະເວການຈັດສັນອອກຈາກພາຍນອກ,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ລາຍຊື່ຜູ້ຖືຫຸ້ນທີ່ມີຈໍານວນຄົນທີ່ມີຢູ່,
Loading Payment System,Loading System Payment,
Loan,ເງິນກູ້ຢືມ,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0},
-Loan Application,Application Loan,
-Loan Management,ການຄຸ້ມຄອງເງິນກູ້,
-Loan Repayment,ການຊໍາລະຫນີ້,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ວັນທີເລີ່ມຕົ້ນການກູ້ຢືມເງິນແລະໄລຍະການກູ້ຢືມແມ່ນມີຄວາມ ຈຳ ເປັນທີ່ຈະປະຫຍັດໃບເກັບເງິນຫຼຸດ,
Loans (Liabilities),ເງິນກູ້ຢືມ (ຫນີ້ສິນ),
Loans and Advances (Assets),ເງິນກູ້ຢືມແລະອື່ນ ໆ (ຊັບສິນ),
@@ -1611,7 +1605,6 @@
Monday,ຈັນ,
Monthly,ປະຈໍາເດືອນ,
Monthly Distribution,ການແຜ່ກະຈາຍປະຈໍາເດືອນ,
-Monthly Repayment Amount cannot be greater than Loan Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນເງິນກູ້,
More,ເພີ່ມເຕີມ,
More Information,ຂໍ້ມູນເພີ່ມເຕີມ,
More than one selection for {0} not allowed,ບໍ່ມີການເລືອກຫຼາຍກວ່າ ໜຶ່ງ ສຳ ລັບ {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},ຈ່າຍ {0} {1},
Payable,ຈ່າຍ,
Payable Account,ບັນຊີທີ່ຕ້ອງຈ່າຍ,
-Payable Amount,ຈຳ ນວນທີ່ຕ້ອງຈ່າຍ,
Payment,ການຊໍາລະເງິນ,
Payment Cancelled. Please check your GoCardless Account for more details,ການຊໍາລະເງິນຖືກຍົກເລີກ. ໂປດກວດເບິ່ງບັນຊີ GoCardless ຂອງທ່ານສໍາລັບລາຍລະອຽດເພີ່ມເຕີມ,
Payment Confirmation,ການຍືນຍັນການຈ່າຍເງິນ,
-Payment Date,ວັນທີ່ສະຫມັກການຊໍາລະເງິນ,
Payment Days,Days ການຊໍາລະເງິນ,
Payment Document,ເອກະສານການຊໍາລະເງິນ,
Payment Due Date,ການຊໍາລະເງິນກໍາຫນົດ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,ກະລຸນາໃສ່ຮັບຊື້ຄັ້ງທໍາອິດ,
Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ,
Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ,
-Please enter Repayment Periods,ກະລຸນາໃສ່ໄລຍະເວລາຊໍາລະຄືນ,
Please enter Reqd by Date,ກະລຸນາໃສ່ Reqd ຕາມວັນທີ,
Please enter Woocommerce Server URL,ກະລຸນາໃສ່ Woocommerce Server URL,
Please enter Write Off Account,ກະລຸນາໃສ່ການຕັດບັນຊີ,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,ກະລຸນາເຂົ້າໄປໃນສູນຄ່າໃຊ້ຈ່າຍຂອງພໍ່ແມ່,
Please enter quantity for Item {0},ກະລຸນາໃສ່ປະລິມານສໍາລັບລາຍການ {0},
Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.,
-Please enter repayment Amount,ກະລຸນາໃສ່ຈໍານວນເງິນຊໍາລະຫນີ້,
Please enter valid Financial Year Start and End Dates,ກະລຸນາໃສ່ປີເລີ່ມຕົ້ນທີ່ຖືກຕ້ອງທາງດ້ານການເງິນແລະວັນສຸດທ້າຍ,
Please enter valid email address,ກະລຸນາໃສ່ທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ,
Please enter {0} first,ກະລຸນາໃສ່ {0} ທໍາອິດ,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກກັ່ນຕອງຕື່ມອີກໂດຍອີງໃສ່ປະລິມານ.,
Primary Address Details,ລາຍະລະອຽດຂັ້ນພື້ນຖານ,
Primary Contact Details,Primary Contact Details,
-Principal Amount,ຈໍານວນຜູ້ອໍານວຍການ,
Print Format,ຮູບແບບການພິມ,
Print IRS 1099 Forms,ພິມແບບຟອມ IRS 1099,
Print Report Card,Print Report Card,
@@ -2550,7 +2538,6 @@
Sample Collection,Sample Collection,
Sample quantity {0} cannot be more than received quantity {1},ປະລິມານຕົວຢ່າງ {0} ບໍ່ສາມາດມີຫຼາຍກ່ວາປະລິມານທີ່ໄດ້ຮັບ {1},
Sanctioned,ທີ່ຖືກເກືອດຫ້າມ,
-Sanctioned Amount,ຈໍານວນເງິນທີ່ຖືກເກືອດຫ້າມ,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ທີ່ຖືກເກືອດຫ້າມຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກວ່າການຮຽກຮ້ອງຈໍານວນເງິນໃນແຖວ {0}.,
Sand,Sand,
Saturday,ວັນເສົາ,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ມີຂັ້ນຕອນການເປັນພໍ່ແມ່ {1} ແລ້ວ.,
API,API,
Annual,ປະຈໍາປີ,
-Approved,ການອະນຸມັດ,
Change,ການປ່ຽນແປງ,
Contact Email,ການຕິດຕໍ່,
Export Type,ປະເພດການສົ່ງອອກ,
@@ -3571,7 +3557,6 @@
Account Value,ມູນຄ່າບັນຊີ,
Account is mandatory to get payment entries,ບັນຊີແມ່ນມີຄວາມ ຈຳ ເປັນທີ່ຈະຕ້ອງໄດ້ຮັບການ ຊຳ ລະເງິນ,
Account is not set for the dashboard chart {0},ບັນຊີບໍ່ໄດ້ຖືກ ກຳ ນົດໄວ້ໃນຕາຕະລາງ dashboard {0},
-Account {0} does not belong to company {1},ບັນຊີ {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1},
Account {0} does not exists in the dashboard chart {1},ບັນຊີ {0} ບໍ່ມີຢູ່ໃນຕາຕະລາງ dashboard {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ບັນຊີ: <b>{0}</b> ແມ່ນທຶນການເຮັດວຽກທີ່ ກຳ ລັງ ດຳ ເນີນຢູ່ແລະບໍ່ສາມາດອັບເດດໄດ້ໂດຍວາລະສານ Entry,
Account: {0} is not permitted under Payment Entry,ບັນຊີ: {0} ບໍ່ໄດ້ຮັບອະນຸຍາດພາຍໃຕ້ການເຂົ້າການຊໍາລະເງິນ,
@@ -3582,7 +3567,6 @@
Activity,ກິດຈະກໍາ,
Add / Manage Email Accounts.,ຕື່ມການ / ການຄຸ້ມຄອງການບັນຊີອີເມວ.,
Add Child,ເພີ່ມເດັກ,
-Add Loan Security,ເພີ່ມຄວາມປອດໄພເງິນກູ້,
Add Multiple,ຕື່ມຫຼາຍ,
Add Participants,ຕື່ມຜູ້ເຂົ້າຮ່ວມ,
Add to Featured Item,ເພີ່ມໃສ່ລາຍການທີ່ແນະ ນຳ,
@@ -3593,15 +3577,12 @@
Address Line 1,ທີ່ຢູ່ Line 1,
Addresses,ທີ່ຢູ່,
Admission End Date should be greater than Admission Start Date.,ວັນສິ້ນສຸດການເຂົ້າໂຮງຮຽນຄວນຈະໃຫຍ່ກ່ວາວັນທີເປີດປະຕູຮັບ.,
-Against Loan,ຕໍ່ການກູ້ຢືມເງິນ,
-Against Loan:,ຕໍ່ການກູ້ຢືມເງິນ:,
All,ທັງ ໝົດ,
All bank transactions have been created,ທຸກໆການເຮັດທຸລະ ກຳ ຂອງທະນາຄານໄດ້ຖືກສ້າງຂື້ນ,
All the depreciations has been booked,ຄ່າເສື່ອມລາຄາທັງ ໝົດ ຖືກຈອງແລ້ວ,
Allocation Expired!,ການຈັດສັນ ໝົດ ອາຍຸ!,
Allow Resetting Service Level Agreement from Support Settings.,ອະນຸຍາດການຕັ້ງຄ່າຂໍ້ຕົກລົງລະດັບການບໍລິການຈາກການຕັ້ງຄ່າສະ ໜັບ ສະ ໜູນ.,
Amount of {0} is required for Loan closure,ຈຳ ນວນເງິນຂອງ {0} ແມ່ນ ຈຳ ເປັນ ສຳ ລັບການປິດການກູ້ຢືມເງິນ,
-Amount paid cannot be zero,ຈຳ ນວນເງິນທີ່ຈ່າຍບໍ່ສາມາດເປັນສູນ,
Applied Coupon Code,ໃຊ້ລະຫັດຄູປອງ,
Apply Coupon Code,ສະ ໝັກ ລະຫັດຄູປອງ,
Appointment Booking,ການນັດ ໝາຍ ການນັດ ໝາຍ,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ບໍ່ສາມາດຄິດໄລ່ເວລາມາຮອດຍ້ອນວ່າທີ່ຢູ່ຂອງຄົນຂັບບໍ່ໄດ້.,
Cannot Optimize Route as Driver Address is Missing.,ບໍ່ສາມາດເພີ່ມປະສິດທິພາບເສັ້ນທາງໄດ້ເນື່ອງຈາກທີ່ຢູ່ຂອງຄົນຂັບບໍ່ໄດ້.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,ບໍ່ສາມາດເຮັດ ສຳ ເລັດວຽກ {0} ຍ້ອນວ່າວຽກທີ່ເພິ່ງພາອາໄສ {1} ບໍ່ໄດ້ຖືກຍົກເລີກ / ຍົກເລີກ.,
-Cannot create loan until application is approved,ບໍ່ສາມາດສ້າງເງິນກູ້ໄດ້ຈົນກວ່າຈະມີການອະນຸມັດ,
Cannot find a matching Item. Please select some other value for {0}.,ບໍ່ສາມາດຊອກຫາສິນຄ້າ. ກະລຸນາເລືອກບາງມູນຄ່າອື່ນໆ {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","ບໍ່ສາມາດ overbill ສຳ ລັບລາຍການ {0} ໃນແຖວ {1} ເກີນ {2}. ເພື່ອອະນຸຍາດການເອີ້ນເກັບເງິນເກີນ, ກະລຸນາ ກຳ ນົດເງິນອຸດ ໜູນ ໃນການຕັ້ງຄ່າບັນຊີ",
"Capacity Planning Error, planned start time can not be same as end time","ຂໍ້ຜິດພາດໃນການວາງແຜນຄວາມອາດສາມາດ, ເວລາເລີ່ມຕົ້ນທີ່ວາງແຜນບໍ່ສາມາດຄືກັບເວລາສິ້ນສຸດ",
@@ -3812,20 +3792,9 @@
Less Than Amount,ຫນ້ອຍກ່ວາຈໍານວນເງິນ,
Liabilities,ຄວາມຮັບຜິດຊອບ,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,ຈຳ ນວນເງິນກູ້ ຈຳ ນວນເກີນ ຈຳ ນວນເງິນກູ້ສູງສຸດຂອງ {0} ຕາມການສະ ເໜີ ຫຼັກຊັບ,
Loan Applications from customers and employees.,ຄຳ ຮ້ອງຂໍເງິນກູ້ຈາກລູກຄ້າແລະລູກຈ້າງ.,
-Loan Disbursement,ການເບີກຈ່າຍເງິນກູ້,
Loan Processes,ຂັ້ນຕອນການກູ້ຢືມເງິນ,
-Loan Security,ເງິນກູ້ຄວາມປອດໄພ,
-Loan Security Pledge,ສັນຍາຄວາມປອດໄພເງິນກູ້,
-Loan Security Pledge Created : {0},ສັນຍາຄວາມປອດໄພດ້ານເງິນກູ້ສ້າງຂື້ນ: {0},
-Loan Security Price,ລາຄາຄວາມປອດໄພຂອງເງິນກູ້,
-Loan Security Price overlapping with {0},ລາຄາຄວາມປອດໄພຂອງເງິນກູ້ຄ້ ຳ ຊ້ອນກັນກັບ {0},
-Loan Security Unpledge,ຄຳ ກູ້ຄວາມປອດໄພຂອງເງິນກູ້,
-Loan Security Value,ມູນຄ່າຄວາມປອດໄພຂອງເງິນກູ້,
Loan Type for interest and penalty rates,ປະເພດເງິນກູ້ ສຳ ລັບດອກເບ້ຍແລະອັດຕາຄ່າປັບ ໃໝ,
-Loan amount cannot be greater than {0},ຈຳ ນວນເງິນກູ້ບໍ່ສາມາດໃຫຍ່ກວ່າ {0},
-Loan is mandatory,ການກູ້ຢືມແມ່ນ ຈຳ ເປັນ,
Loans,ເງິນກູ້,
Loans provided to customers and employees.,ເງິນກູ້ໄດ້ສະ ໜອງ ໃຫ້ແກ່ລູກຄ້າແລະລູກຈ້າງ.,
Location,ສະຖານທີ່,
@@ -3894,7 +3863,6 @@
Pay,ຈ່າຍ,
Payment Document Type,ປະເພດເອກະສານການຈ່າຍເງິນ,
Payment Name,ຊື່ການຈ່າຍເງິນ,
-Penalty Amount,ຈຳ ນວນໂທດ,
Pending,ທີ່ຍັງຄ້າງ,
Performance,ການປະຕິບັດ,
Period based On,ໄລຍະເວລາອີງໃສ່,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,ກະລຸນາເຂົ້າສູ່ລະບົບເປັນຜູ້ໃຊ້ Marketplace ເພື່ອດັດແກ້ສິ່ງນີ້.,
Please login as a Marketplace User to report this item.,ກະລຸນາເຂົ້າສູ່ລະບົບເປັນຜູ້ໃຊ້ Marketplace ເພື່ອລາຍງານລາຍການນີ້.,
Please select <b>Template Type</b> to download template,ກະລຸນາເລືອກ <b>ປະເພດແມ່ແບບ</b> ເພື່ອດາວໂຫລດແມ່ແບບ,
-Please select Applicant Type first,ກະລຸນາເລືອກປະເພດຜູ້ສະ ໝັກ ກ່ອນ,
Please select Customer first,ກະລຸນາເລືອກລູກຄ້າກ່ອນ,
Please select Item Code first,ກະລຸນາເລືອກລະຫັດ Item ກ່ອນ,
-Please select Loan Type for company {0},ກະລຸນາເລືອກປະເພດເງິນກູ້ ສຳ ລັບບໍລິສັດ {0},
Please select a Delivery Note,ກະລຸນາເລືອກ ໝາຍ ເຫດສົ່ງ,
Please select a Sales Person for item: {0},ກະລຸນາເລືອກຄົນຂາຍ ສຳ ລັບສິນຄ້າ: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',ກະລຸນາເລືອກວິທີການຊໍາລະເງິນອື່ນ. ເສັ້ນດ່າງບໍ່ສະຫນັບສະຫນູນທຸລະກໍາໃນສະກຸນເງິນ '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},ກະລຸນາຕັ້ງຄ່າບັນຊີທະນາຄານທີ່ບໍ່ຖືກຕ້ອງ ສຳ ລັບບໍລິສັດ {0},
Please specify,ກະລຸນາລະບຸ,
Please specify a {0},ກະລຸນາລະບຸ {0},lead
-Pledge Status,ສະຖານະສັນຍາ,
-Pledge Time,ເວລາສັນຍາ,
Printing,ການພິມ,
Priority,ບູລິມະສິດ,
Priority has been changed to {0}.,ບຸລິມະສິດໄດ້ຖືກປ່ຽນເປັນ {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,ການປະມວນຜົນໄຟລ໌ XML,
Profitability,ກຳ ໄລ,
Project,ໂຄງການ,
-Proposed Pledges are mandatory for secured Loans,ຂໍ້ສະ ເໜີ ທີ່ເປັນສັນຍາແມ່ນມີຄວາມ ຈຳ ເປັນ ສຳ ລັບເງິນກູ້ທີ່ໄດ້ຮັບປະກັນ,
Provide the academic year and set the starting and ending date.,ໃຫ້ສົກຮຽນແລະ ກຳ ນົດວັນເລີ່ມຕົ້ນແລະວັນສິ້ນສຸດ.,
Public token is missing for this bank,ຫາຍສາບສູນສາທາລະນະຫາຍ ສຳ ລັບທະນາຄານນີ້,
Publish,ເຜີຍແຜ່,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,ໃບຮັບເງິນການຊື້ບໍ່ມີລາຍການທີ່ຕົວຢ່າງ Retain ຖືກເປີດໃຊ້ງານ.,
Purchase Return,Return ຊື້,
Qty of Finished Goods Item,Qty ຂອງສິນຄ້າ ສຳ ເລັດຮູບ,
-Qty or Amount is mandatroy for loan security,Qty ຫຼື Amount ແມ່ນ mandatroy ສຳ ລັບຄວາມປອດໄພໃນການກູ້ຢືມ,
Quality Inspection required for Item {0} to submit,ການກວດກາຄຸນນະພາບ ສຳ ລັບລາຍການ {0} ຕ້ອງສົ່ງ,
Quantity to Manufacture,ຈຳ ນວນການຜະລິດ,
Quantity to Manufacture can not be zero for the operation {0},ຈຳ ນວນການຜະລິດບໍ່ສາມາດເປັນສູນ ສຳ ລັບການ ດຳ ເນີນງານ {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,ວັນທີຜ່ອນຄາຍຕ້ອງມີຂະ ໜາດ ໃຫຍ່ກວ່າຫຼືເທົ່າກັບວັນເຂົ້າຮ່ວມ,
Rename,ປ່ຽນຊື່,
Rename Not Allowed,ປ່ຽນຊື່ບໍ່ອະນຸຍາດ,
-Repayment Method is mandatory for term loans,ວິທີການຈ່າຍຄືນແມ່ນ ຈຳ ເປັນ ສຳ ລັບການກູ້ຢືມໄລຍະ,
-Repayment Start Date is mandatory for term loans,ວັນທີເລີ່ມຕົ້ນການຈ່າຍຄືນແມ່ນ ຈຳ ເປັນ ສຳ ລັບການກູ້ຢືມໄລຍະ,
Report Item,ລາຍງານລາຍການ,
Report this Item,ລາຍງານລາຍການນີ້,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty ທີ່ສະຫງວນໄວ້ ສຳ ລັບສັນຍາຍ່ອຍ: ປະລິມານວັດຖຸດິບເພື່ອຜະລິດສິນຄ້າຍ່ອຍ.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},ແຖວ ({0}): {1} ແມ່ນຫຼຸດລົງແລ້ວໃນ {2},
Rows Added in {0},ເພີ່ມແຖວເຂົ້າໃນ {0},
Rows Removed in {0},ຖອດອອກຈາກແຖວເກັດທີ່ຢູ່ໃນ {0},
-Sanctioned Amount limit crossed for {0} {1},ຂອບເຂດ ຈຳ ກັດ ຈຳ ນວນເງິນທີ່ຖືກຕັດ ສຳ ລັບ {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},ຈຳ ນວນເງິນກູ້ທີ່ຖືກ ຊຳ ລະແລ້ວ ສຳ ລັບ {0} ຕໍ່ບໍລິສັດ {1},
Save,ບັນທຶກ,
Save Item,ບັນທຶກລາຍການ,
Saved Items,ລາຍການທີ່ບັນທຶກໄວ້,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ຜູ້ໃຊ້ {0} ເປັນຄົນພິການ,
Users and Permissions,ຜູ້ຊົມໃຊ້ແລະການອະນຸຍາດ,
Vacancies cannot be lower than the current openings,ບໍລິສັດບໍ່ສາມາດຕໍ່າກ່ວາການເປີດປະຈຸບັນ,
-Valid From Time must be lesser than Valid Upto Time.,ຖືກຕ້ອງຈາກເວລາຕ້ອງນ້ອຍກວ່າເວລາທີ່ໃຊ້ໄດ້ກັບ Upto Time.,
Valuation Rate required for Item {0} at row {1},ອັດຕາການປະເມີນມູນຄ່າທີ່ຕ້ອງການ ສຳ ລັບລາຍການ {0} ຢູ່ແຖວ {1},
Values Out Of Sync,ຄຸນຄ່າຂອງການຊິ້ງຂໍ້ມູນ,
Vehicle Type is required if Mode of Transport is Road,ຕ້ອງມີປະເພດພາຫະນະຖ້າຮູບແບບການຂົນສົ່ງເປັນຖະ ໜົນ,
@@ -4211,7 +4168,6 @@
Add to Cart,ຕື່ມການກັບໂຄງຮ່າງການ,
Days Since Last Order,ມື້ນັບຕັ້ງແຕ່ຄໍາສັ່ງສຸດທ້າຍ,
In Stock,ໃນສາງ,
-Loan Amount is mandatory,ຈຳ ນວນເງິນກູ້ແມ່ນ ຈຳ ເປັນ,
Mode Of Payment,ຮູບແບບການຊໍາລະເງິນ,
No students Found,ບໍ່ພົບນັກຮຽນ,
Not in Stock,ບໍ່ໄດ້ຢູ່ໃນ Stock,
@@ -4240,7 +4196,6 @@
Group by,ກຸ່ມໂດຍ,
In stock,ໃນສາງ,
Item name,ຊື່ສິນຄ້າ,
-Loan amount is mandatory,ຈຳ ນວນເງິນກູ້ແມ່ນ ຈຳ ເປັນ,
Minimum Qty,Minimum Qty,
More details,ລາຍລະອຽດເພີ່ມເຕີມ,
Nature of Supplies,Nature Of Supplies,
@@ -4409,9 +4364,6 @@
Total Completed Qty,ຈຳ ນວນທັງ ໝົດ ສຳ ເລັດ,
Qty to Manufacture,ຈໍານວນການຜະລິດ,
Repay From Salary can be selected only for term loans,ຈ່າຍຄືນຈາກເງິນເດືອນສາມາດເລືອກໄດ້ ສຳ ລັບການກູ້ຢືມໄລຍະ,
-No valid Loan Security Price found for {0},ບໍ່ພົບລາຄາຄວາມປອດໄພເງິນກູ້ທີ່ຖືກຕ້ອງ ສຳ ລັບ {0},
-Loan Account and Payment Account cannot be same,ບັນຊີເງິນກູ້ແລະບັນຊີການຈ່າຍເງິນບໍ່ສາມາດຄືກັນ,
-Loan Security Pledge can only be created for secured loans,ສັນຍາຄວາມປອດໄພຂອງເງິນກູ້ສາມາດສ້າງໄດ້ ສຳ ລັບການກູ້ຢືມທີ່ມີຄວາມປອດໄພເທົ່ານັ້ນ,
Social Media Campaigns,ການໂຄສະນາສື່ສັງຄົມ,
From Date can not be greater than To Date,ຈາກວັນທີບໍ່ສາມາດໃຫຍ່ກວ່າ To Date,
Please set a Customer linked to the Patient,ກະລຸນາ ກຳ ນົດລູກຄ້າທີ່ເຊື່ອມໂຍງກັບຄົນເຈັບ,
@@ -6437,7 +6389,6 @@
HR User,User HR,
Appointment Letter,ຈົດ ໝາຍ ນັດ ໝາຍ,
Job Applicant,ວຽກເຮັດງານທໍາສະຫມັກ,
-Applicant Name,ຊື່ຜູ້ສະຫມັກ,
Appointment Date,ວັນທີນັດ ໝາຍ,
Appointment Letter Template,ແມ່ແບບຈົດ ໝາຍ ນັດພົບ,
Body,ຮ່າງກາຍ,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sync in Progress,
Hub Seller Name,Hub ຊື່ຜູ້ຂາຍ,
Custom Data,Custom Data,
-Member,ສະຫມາຊິກ,
-Partially Disbursed,ຈ່າຍບາງສ່ວນ,
-Loan Closure Requested,ຂໍປິດປະຕູເງິນກູ້,
Repay From Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ,
-Loan Details,ລາຍລະອຽດການກູ້ຢືມເງິນ,
-Loan Type,ປະເພດເງິນກູ້,
-Loan Amount,ຈໍານວນເງິນກູ້ຢືມເງິນ,
-Is Secured Loan,ແມ່ນເງິນກູ້ທີ່ປອດໄພ,
-Rate of Interest (%) / Year,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) / ປີ,
-Disbursement Date,ວັນທີ່ສະຫມັກນໍາເຂົ້າ,
-Disbursed Amount,ຈຳ ນວນເງິນທີ່ຈ່າຍໃຫ້,
-Is Term Loan,ແມ່ນເງີນກູ້ໄລຍະ,
-Repayment Method,ວິທີການຊໍາລະ,
-Repay Fixed Amount per Period,ຈ່າຍຄືນຈໍານວນເງິນທີ່ມີກໍານົດໄລຍະເວລາຕໍ່,
-Repay Over Number of Periods,ຕອບບຸນແທນຄຸນໃນໄລຍະຈໍານວນຂອງໄລຍະເວລາ,
-Repayment Period in Months,ໄລຍະເວລາການຊໍາລະຄືນໃນໄລຍະເດືອນ,
-Monthly Repayment Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນ,
-Repayment Start Date,ວັນທີຊໍາລະເງິນຄືນ,
-Loan Security Details,ລາຍລະອຽດກ່ຽວກັບຄວາມປອດໄພຂອງເງິນກູ້,
-Maximum Loan Value,ມູນຄ່າເງິນກູ້ສູງສຸດ,
-Account Info,ຂໍ້ມູນບັນຊີ,
-Loan Account,ບັນຊີເງິນກູ້,
-Interest Income Account,ບັນຊີດອກເບ້ຍຮັບ,
-Penalty Income Account,ບັນຊີລາຍໄດ້ການລົງໂທດ,
-Repayment Schedule,ຕາຕະລາງການຊໍາລະຫນີ້,
-Total Payable Amount,ຈໍານວນເງິນຫນີ້,
-Total Principal Paid,ການຈ່າຍເງິນຕົ້ນຕໍທັງ ໝົດ,
-Total Interest Payable,ທີ່ຫນ້າສົນໃຈທັງຫມົດ Payable,
-Total Amount Paid,ຈໍານວນເງິນທີ່ຈ່າຍ,
-Loan Manager,ຜູ້ຈັດການເງິນກູ້,
-Loan Info,ຂໍ້ມູນການກູ້ຢືມເງິນ,
-Rate of Interest,ອັດຕາການທີ່ຫນ້າສົນໃຈ,
-Proposed Pledges,ສັນຍາສະ ເໜີ,
-Maximum Loan Amount,ຈໍານວນເງິນກູ້ສູງສຸດ,
-Repayment Info,ຂໍ້ມູນການຊໍາລະຫນີ້,
-Total Payable Interest,ທັງຫມົດດອກເບ້ຍຄ້າງຈ່າຍ,
-Against Loan ,ຕໍ່ການກູ້ຢືມເງິນ,
-Loan Interest Accrual,ອັດຕາດອກເບ້ຍເງິນກູ້,
-Amounts,ຈຳ ນວນເງິນ,
-Pending Principal Amount,ຈຳ ນວນເງີນທີ່ຍັງຄ້າງ,
-Payable Principal Amount,ຈຳ ນວນເງິນ ອຳ ນວຍການທີ່ຕ້ອງຈ່າຍ,
-Paid Principal Amount,ຈຳ ນວນເງິນ ອຳ ນວຍການຈ່າຍ,
-Paid Interest Amount,ຈຳ ນວນດອກເບ້ຍຈ່າຍ,
-Process Loan Interest Accrual,ດອກເບັ້ຍເງິນກູ້ຂະບວນການ,
-Repayment Schedule Name,ຊື່ຕາຕະລາງການຈ່າຍເງິນຄືນ,
Regular Payment,ການຈ່າຍເງິນປົກກະຕິ,
Loan Closure,ການກູ້ຢືມເງິນປິດ,
-Payment Details,ລາຍລະອຽດການຊໍາລະເງິນ,
-Interest Payable,ດອກເບ້ຍທີ່ຈ່າຍໄດ້,
-Amount Paid,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ,
-Principal Amount Paid,ເງິນຕົ້ນຕໍ ຈຳ ນວນເງີນ,
-Repayment Details,ລາຍລະອຽດການຈ່າຍຄືນ,
-Loan Repayment Detail,ລາຍລະອຽດການຈ່າຍຄືນເງິນກູ້,
-Loan Security Name,ຊື່ຄວາມປອດໄພເງິນກູ້,
-Unit Of Measure,ຫົວ ໜ່ວຍ ວັດແທກ,
-Loan Security Code,ລະຫັດຄວາມປອດໄພຂອງເງິນກູ້,
-Loan Security Type,ປະເພດຄວາມປອດໄພເງິນກູ້,
-Haircut %,ຕັດຜົມ%,
-Loan Details,ລາຍລະອຽດເງິນກູ້,
-Unpledged,Unpledged,
-Pledged,ຄຳ ໝັ້ນ ສັນຍາ,
-Partially Pledged,ບາງສ່ວນທີ່ຖືກສັນຍາໄວ້,
-Securities,ຫຼັກຊັບ,
-Total Security Value,ມູນຄ່າຄວາມປອດໄພທັງ ໝົດ,
-Loan Security Shortfall,ການຂາດແຄນຄວາມປອດໄພຂອງເງິນກູ້,
-Loan ,ເງິນກູ້ຢືມ,
-Shortfall Time,ເວລາຂາດເຂີນ,
-America/New_York,ອາເມລິກາ / New_York,
-Shortfall Amount,ຈຳ ນວນຂາດແຄນ,
-Security Value ,ມູນຄ່າຄວາມປອດໄພ,
-Process Loan Security Shortfall,ການກູ້ຢືມເງິນຂະບວນການຂາດເຂີນຄວາມປອດໄພ,
-Loan To Value Ratio,ເງິນກູ້ເພື່ອສົມທຽບມູນຄ່າ,
-Unpledge Time,Unpledge Time,
-Loan Name,ຊື່ການກູ້ຢືມເງິນ,
Rate of Interest (%) Yearly,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) ປະຈໍາປີ,
-Penalty Interest Rate (%) Per Day,ອັດຕາດອກເບ້ຍການລົງໂທດ (%) ຕໍ່ມື້,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,ອັດຕາດອກເບ້ຍການລົງໂທດແມ່ນຄິດໄລ່ຕາມອັດຕາດອກເບ້ຍທີ່ຍັງຄ້າງໃນແຕ່ລະວັນໃນກໍລະນີທີ່ມີການຈ່າຍຄືນທີ່ຊັກຊ້າ,
-Grace Period in Days,ໄລຍະເວລາ Grace ໃນວັນ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,ຈຳ ນວນມື້ນັບແຕ່ມື້ຄົບ ກຳ ນົດຈົນກ່ວາການລົງໂທດຈະບໍ່ຄິດຄ່າ ທຳ ນຽມໃນກໍລະນີທີ່ມີການຊັກຊ້າໃນການຈ່າຍຄືນເງິນກູ້,
-Pledge,ສັນຍາ,
-Post Haircut Amount,ຈຳ ນວນປະລິມານການຕັດຜົມ,
-Process Type,ປະເພດຂະບວນການ,
-Update Time,ເວລາປັບປຸງ,
-Proposed Pledge,ສັນຍາສະ ເໜີ,
-Total Payment,ການຊໍາລະເງິນທັງຫມົດ,
-Balance Loan Amount,ການດຸ່ນດ່ຽງຈໍານວນເງິນກູ້,
-Is Accrued,ຖືກຮັບຮອງ,
Salary Slip Loan,Salary Slip Loan,
Loan Repayment Entry,ການອອກເງິນຄືນການກູ້ຢືມເງິນ,
-Sanctioned Loan Amount,ຈຳ ນວນເງິນກູ້ທີ່ ກຳ ນົດໄວ້,
-Sanctioned Amount Limit,ຂອບເຂດຈໍາກັດຈໍານວນເງິນທີ່ຖືກລົງໂທດ,
-Unpledge,ປະຕິເສດ,
-Haircut,ຕັດຜົມ,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,ສ້າງຕາຕະລາງ,
Schedules,ຕາຕະລາງ,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,ໂຄງການຈະສາມາດເຂົ້າເຖິງກ່ຽວກັບເວັບໄຊທ໌ເພື່ອຜູ້ໃຊ້ເຫລົ່ານີ້,
Copied From,ຄັດລອກຈາກ,
Start and End Dates,ເລີ່ມຕົ້ນແລະສິ້ນສຸດວັນທີ່,
-Actual Time (in Hours),ເວລາຕົວຈິງ (ເປັນຊົ່ວໂມງ),
+Actual Time in Hours (via Timesheet),ເວລາຕົວຈິງ (ເປັນຊົ່ວໂມງ),
Costing and Billing,ການໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນ,
-Total Costing Amount (via Timesheets),ຈໍານວນຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ຜ່ານບັດປະຈໍາຕົວ),
-Total Expense Claim (via Expense Claims),ລວມຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ (ຜ່ານການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ),
+Total Costing Amount (via Timesheet),ຈໍານວນຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ຜ່ານບັດປະຈໍາຕົວ),
+Total Expense Claim (via Expense Claim),ລວມຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ (ຜ່ານການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ),
Total Purchase Cost (via Purchase Invoice),ມູນຄ່າທັງຫມົດຊື້ (ຜ່ານຊື້ Invoice),
Total Sales Amount (via Sales Order),ຈໍານວນການຂາຍທັງຫມົດ (ໂດຍຜ່ານການສັ່ງຂາຍ),
-Total Billable Amount (via Timesheets),ຈໍານວນເງິນທີ່ສາມາດຈ່າຍເງິນໄດ້ (ຜ່ານບັດປະຈໍາຕົວ),
-Total Billed Amount (via Sales Invoices),ຈໍານວນເງິນທີ່ຖືກຊໍາລະທັງຫມົດ (ຜ່ານໃບແຈ້ງຍອດຂາຍ),
-Total Consumed Material Cost (via Stock Entry),ມູນຄ່າວັດຖຸດິບທີ່ໃຊ້ທັງຫມົດ (ໂດຍຜ່ານຫຼັກຊັບ),
+Total Billable Amount (via Timesheet),ຈໍານວນເງິນທີ່ສາມາດຈ່າຍເງິນໄດ້ (ຜ່ານບັດປະຈໍາຕົວ),
+Total Billed Amount (via Sales Invoice),ຈໍານວນເງິນທີ່ຖືກຊໍາລະທັງຫມົດ (ຜ່ານໃບແຈ້ງຍອດຂາຍ),
+Total Consumed Material Cost (via Stock Entry),ມູນຄ່າວັດຖຸດິບທີ່ໃຊ້ທັງຫມົດ (ໂດຍຜ່ານຫຼັກຊັບ),
Gross Margin,ຂອບໃບລວມຍອດ,
Gross Margin %,Gross Margin%,
Monitor Progress,Monitor Progress,
@@ -7521,12 +7385,10 @@
Dependencies,ການເພິ່ງພາອາໄສ,
Dependent Tasks,ໜ້າ ວຽກເພິ່ງພາອາໄສ,
Depends on Tasks,ຂຶ້ນຢູ່ກັບວຽກ,
-Actual Start Date (via Time Sheet),ຕົວຈິງວັນທີ່ເລີ່ມຕົ້ນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ Sheet),
-Actual Time (in hours),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ),
-Actual End Date (via Time Sheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet),
-Total Costing Amount (via Time Sheet),ມູນຄ່າທັງຫມົດຈໍານວນເງິນ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet),
+Actual Start Date (via Timesheet),ຕົວຈິງວັນທີ່ເລີ່ມຕົ້ນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ Sheet),
+Actual Time in Hours (via Timesheet),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ),
+Actual End Date (via Timesheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet),
Total Expense Claim (via Expense Claim),ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ໂດຍຜ່ານຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງ),
-Total Billing Amount (via Time Sheet),ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ Sheet),
Review Date,ການທົບທວນຄືນວັນທີ່,
Closing Date,ວັນປິດ,
Task Depends On,ວຽກງານຂຶ້ນໃນ,
@@ -7887,7 +7749,6 @@
Update Series,ການປັບປຸງ Series,
Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.,
Prefix,ຄໍານໍາຫນ້າ,
-Current Value,ມູນຄ່າປະຈຸບັນ,
This is the number of the last created transaction with this prefix,ນີ້ແມ່ນຈໍານວນຂອງການສ້າງຕັ້ງຂື້ນໃນທີ່ຜ່ານມາມີຄໍານໍາຫນ້ານີ້,
Update Series Number,ຈໍານວນ Series ປັບປຸງ,
Quotation Lost Reason,ວົງຢືມລືມເຫດຜົນ,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise ແນະນໍາຈັດລໍາດັບລະດັບ,
Lead Details,ລາຍລະອຽດນໍາ,
Lead Owner Efficiency,ປະສິດທິພາບເຈົ້າຂອງຜູ້ນໍາພາ,
-Loan Repayment and Closure,ການຈ່າຍຄືນເງິນກູ້ແລະການປິດ,
-Loan Security Status,ສະຖານະພາບຄວາມປອດໄພຂອງເງິນກູ້,
Lost Opportunity,ໂອກາດທີ່ສູນເສຍໄປ,
Maintenance Schedules,ຕາຕະລາງການບໍາລຸງຮັກສາ,
Material Requests for which Supplier Quotations are not created,ການຮ້ອງຂໍອຸປະກອນການສໍາລັບການທີ່ Quotations Supplier ຍັງບໍ່ໄດ້ສ້າງ,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ຈຳ ນວນເປົ້າ ໝາຍ: {0},
Payment Account is mandatory,ບັນຊີ ຊຳ ລະເງິນແມ່ນ ຈຳ ເປັນ,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","ຖ້າຖືກກວດກາ, ຈຳ ນວນເຕັມຈະຖືກຫັກອອກຈາກລາຍໄດ້ທີ່ຕ້ອງເສຍອາກອນກ່ອນທີ່ຈະຄິດໄລ່ອາກອນລາຍໄດ້ໂດຍບໍ່ມີການປະກາດຫລືການຍື່ນພິສູດໃດໆ.",
-Disbursement Details,ລາຍລະອຽດການແຈກຈ່າຍ,
Material Request Warehouse,ສາງຂໍວັດສະດຸ,
Select warehouse for material requests,ເລືອກສາງ ສຳ ລັບການຮ້ອງຂໍດ້ານວັດຖຸ,
Transfer Materials For Warehouse {0},ໂອນວັດສະດຸ ສຳ ລັບສາງ {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,ຈ່າຍຄືນ ຈຳ ນວນທີ່ບໍ່ໄດ້ຮັບຈາກເງິນເດືອນ,
Deduction from salary,ການຫັກລົບຈາກເງິນເດືອນ,
Expired Leaves,ໃບ ໝົດ ອາຍຸ,
-Reference No,ບໍ່ມີ,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ອັດຕາສ່ວນການຕັດຜົມແມ່ນຄວາມແຕກຕ່າງສ່ວນຮ້ອຍລະຫວ່າງມູນຄ່າຕະຫຼາດຂອງຄວາມປອດໄພຂອງເງິນກູ້ແລະມູນຄ່າທີ່ລະບຸໄວ້ໃນຄວາມປອດໄພເງິນກູ້ເມື່ອຖືກ ນຳ ໃຊ້ເປັນຫລັກປະກັນ ສຳ ລັບເງິນກູ້ນັ້ນ.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,ອັດຕາສ່ວນເງິນກູ້ເພື່ອສະແດງອັດຕາສ່ວນຂອງ ຈຳ ນວນເງິນກູ້ໃຫ້ກັບມູນຄ່າຂອງຄວາມປອດໄພທີ່ໄດ້ສັນຍາໄວ້. ການຂາດແຄນດ້ານຄວາມປອດໄພຂອງເງິນກູ້ຈະເກີດຂື້ນຖ້າວ່າມັນຕໍ່າກ່ວາມູນຄ່າທີ່ລະບຸໄວ້ ສຳ ລັບເງິນກູ້ໃດໆ,
If this is not checked the loan by default will be considered as a Demand Loan,ຖ້າສິ່ງນີ້ບໍ່ຖືກກວດກາເງິນກູ້ໂດຍຄ່າເລີ່ມຕົ້ນຈະຖືກພິຈາລະນາເປັນເງິນກູ້ຕາມຄວາມຕ້ອງການ,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,ບັນຊີນີ້ໃຊ້ເພື່ອຈອງການຈ່າຍຄືນເງິນກູ້ຈາກຜູ້ກູ້ຢືມແລະຍັງຈ່າຍເງິນກູ້ໃຫ້ຜູ້ກູ້ຢືມອີກດ້ວຍ,
This account is capital account which is used to allocate capital for loan disbursal account ,ບັນຊີນີ້ແມ່ນບັນຊີທຶນເຊິ່ງຖືກ ນຳ ໃຊ້ເພື່ອຈັດສັນທຶນ ສຳ ລັບບັນຊີການເບີກຈ່າຍເງິນກູ້,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ການ ດຳ ເນີນງານ {0} ບໍ່ຂື້ນກັບ ຄຳ ສັ່ງເຮັດວຽກ {1},
Print UOM after Quantity,ພິມ UOM ຫຼັງຈາກປະລິມານ,
Set default {0} account for perpetual inventory for non stock items,ຕັ້ງຄ່າບັນຊີ {0} ສຳ ລັບສິນຄ້າຄົງຄັງທີ່ບໍ່ມີສິນຄ້າ,
-Loan Security {0} added multiple times,ຄວາມປອດໄພຂອງເງິນກູ້ {0} ເພີ່ມຫຼາຍຄັ້ງ,
-Loan Securities with different LTV ratio cannot be pledged against one loan,ຫຼັກຊັບເງິນກູ້ທີ່ມີອັດຕາສ່ວນ LTV ທີ່ແຕກຕ່າງກັນບໍ່ສາມາດສັນຍາກັບການກູ້ຢືມດຽວ,
-Qty or Amount is mandatory for loan security!,Qty ຫຼື ຈຳ ນວນເງິນແມ່ນ ຈຳ ເປັນ ສຳ ລັບຄວາມປອດໄພໃນການກູ້ຢືມ!,
-Only submittted unpledge requests can be approved,ພຽງແຕ່ການຮ້ອງຂໍທີ່ບໍ່ໄດ້ສັນຍາທີ່ຖືກສົ່ງໄປສາມາດໄດ້ຮັບການອະນຸມັດ,
-Interest Amount or Principal Amount is mandatory,ຈຳ ນວນດອກເບ້ຍຫລື ຈຳ ນວນເງິນຕົ້ນຕໍແມ່ນ ຈຳ ເປັນ,
-Disbursed Amount cannot be greater than {0},ຈຳ ນວນເງິນທີ່ຖືກຈ່າຍບໍ່ສາມາດໃຫຍ່ກວ່າ {0},
-Row {0}: Loan Security {1} added multiple times,ແຖວ {0}: ຄວາມປອດໄພດ້ານເງິນກູ້ {1} ໄດ້ເພີ່ມຫຼາຍຄັ້ງ,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,ແຖວ # {0}: ລາຍການເດັກບໍ່ຄວນເປັນມັດຜະລິດຕະພັນ. ກະລຸນາເອົາລາຍການ {1} ແລະບັນທຶກ,
Credit limit reached for customer {0},ຈຳ ກັດ ຈຳ ນວນສິນເຊື່ອ ສຳ ລັບລູກຄ້າ {0},
Could not auto create Customer due to the following missing mandatory field(s):,ບໍ່ສາມາດສ້າງລູກຄ້າໄດ້ໂດຍອັດຕະໂນມັດເນື່ອງຈາກພາກສະຫນາມທີ່ ຈຳ ເປັນດັ່ງລຸ່ມນີ້:,
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index d05688c..87d2798 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Taikoma, jei įmonė yra SpA, SApA ar SRL",
Applicable if the company is a limited liability company,"Taikoma, jei įmonė yra ribotos atsakomybės įmonė",
Applicable if the company is an Individual or a Proprietorship,"Taikoma, jei įmonė yra individuali įmonė arba įmonė",
-Applicant,Pareiškėjas,
-Applicant Type,Pareiškėjo tipas,
Application of Funds (Assets),Taikymas lėšos (turtas),
Application period cannot be across two allocation records,Paraiškų teikimo laikotarpis negali būti per du paskirstymo įrašus,
Application period cannot be outside leave allocation period,Taikymo laikotarpis negali būti ne atostogos paskirstymo laikotarpis,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Turimų akcininkų sąrašas su folio numeriais,
Loading Payment System,Įkraunama mokėjimo sistema,
Loan,Paskola,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0},
-Loan Application,Paskolos taikymas,
-Loan Management,Paskolų valdymas,
-Loan Repayment,paskolos grąžinimo,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,"Paskyros pradžios data ir paskolos laikotarpis yra privalomi, norint išsaugoti sąskaitos faktūros nuolaidą",
Loans (Liabilities),Paskolos (įsipareigojimai),
Loans and Advances (Assets),Paskolos ir avansai (turtas),
@@ -1611,7 +1605,6 @@
Monday,pirmadienis,
Monthly,kas mėnesį,
Monthly Distribution,Mėnesio pasiskirstymas,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mėnesio grąžinimo suma negali būti didesnė nei paskolos suma,
More,daugiau,
More Information,Daugiau informacijos,
More than one selection for {0} not allowed,Neleidžiama daugiau nei vieno {0} pasirinkimo,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pay {0} {1},
Payable,mokėtinas,
Payable Account,mokėtinos sąskaitos,
-Payable Amount,Mokėtina suma,
Payment,Mokėjimas,
Payment Cancelled. Please check your GoCardless Account for more details,"Mokėjimas atšauktas. Prašome patikrinti savo "GoCardless" sąskaitą, kad gautumėte daugiau informacijos",
Payment Confirmation,Mokėjimo patvirtinimas,
-Payment Date,Mokėjimo diena,
Payment Days,Atsiskaitymo diena,
Payment Document,mokėjimo dokumentą,
Payment Due Date,Sumokėti iki,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Prašome įvesti pirkimo kvito pirmasis,
Please enter Receipt Document,Prašome įvesti Gavimas dokumentą,
Please enter Reference date,Prašome įvesti Atskaitos data,
-Please enter Repayment Periods,Prašome įvesti grąžinimo terminams,
Please enter Reqd by Date,Prašome įvesti reqd pagal datą,
Please enter Woocommerce Server URL,Įveskite Woocommerce serverio URL,
Please enter Write Off Account,Prašome įvesti nurašyti paskyrą,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Prašome įvesti patronuojanti kaštų centrą,
Please enter quantity for Item {0},Prašome įvesti kiekį punkte {0},
Please enter relieving date.,Prašome įvesti malšinančių datą.,
-Please enter repayment Amount,Prašome įvesti grąžinimo suma,
Please enter valid Financial Year Start and End Dates,Prašome įvesti galiojantį finansinių metų pradžios ir pabaigos datos,
Please enter valid email address,"Prašome įvesti galiojantį elektroninio pašto adresą,",
Please enter {0} first,Prašome įvesti {0} pirmas,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Kainodaros taisyklės yra toliau filtruojamas remiantis kiekį.,
Primary Address Details,Pagrindinio adreso duomenys,
Primary Contact Details,Pagrindinė kontaktinė informacija,
-Principal Amount,Pagrindinė suma,
Print Format,Spausdinti Formatas,
Print IRS 1099 Forms,Spausdinti IRS 1099 formas,
Print Report Card,Spausdinti ataskaitos kortelę,
@@ -2550,7 +2538,6 @@
Sample Collection,Pavyzdžių rinkinys,
Sample quantity {0} cannot be more than received quantity {1},Mėginių kiekis {0} negali būti didesnis nei gautas kiekis {1},
Sanctioned,sankcijos,
-Sanctioned Amount,sankcijos suma,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcijos suma negali būti didesnė nei ieškinio suma eilutėje {0}.,
Sand,Smėlis,
Saturday,šeštadienis,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} jau turi tėvų procedūrą {1}.,
API,API,
Annual,metinis,
-Approved,patvirtinta,
Change,pokytis,
Contact Email,kontaktinis elektroninio pašto adresas,
Export Type,Eksporto tipas,
@@ -3571,7 +3557,6 @@
Account Value,Sąskaitos vertė,
Account is mandatory to get payment entries,Sąskaita yra privaloma norint gauti mokėjimų įrašus,
Account is not set for the dashboard chart {0},Prietaisų skydelio diagrama {0} nenustatyta.,
-Account {0} does not belong to company {1},Sąskaita {0} nepriklauso Company {1},
Account {0} does not exists in the dashboard chart {1},Paskyros {0} prietaisų skydelio diagramoje {1} nėra.,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Paskyra: <b>{0}</b> yra kapitalinis darbas, kurio nebaigta, o žurnalo įrašas negali jo atnaujinti",
Account: {0} is not permitted under Payment Entry,Sąskaita: „{0}“ neleidžiama pagal „Mokėjimo įvedimas“,
@@ -3582,7 +3567,6 @@
Activity,veikla,
Add / Manage Email Accounts.,Įdėti / Valdymas elektroninio pašto sąskaitas.,
Add Child,Pridėti vaikas,
-Add Loan Security,Pridėti paskolos saugumą,
Add Multiple,Pridėti kelis,
Add Participants,Pridėti dalyvius,
Add to Featured Item,Pridėti prie panašaus elemento,
@@ -3593,15 +3577,12 @@
Address Line 1,Adreso eilutė 1,
Addresses,adresai,
Admission End Date should be greater than Admission Start Date.,Priėmimo pabaigos data turėtų būti didesnė nei priėmimo pradžios data.,
-Against Loan,Prieš paskolą,
-Against Loan:,Prieš paskolą:,
All,VISOS,
All bank transactions have been created,Visos banko operacijos buvo sukurtos,
All the depreciations has been booked,Visi nusidėvėjimai buvo užregistruoti,
Allocation Expired!,Paskirstymas pasibaigė!,
Allow Resetting Service Level Agreement from Support Settings.,Leisti iš naujo nustatyti paslaugų lygio susitarimą iš palaikymo parametrų.,
Amount of {0} is required for Loan closure,Norint uždaryti paskolą reikalinga {0} suma,
-Amount paid cannot be zero,Sumokėta suma negali būti lygi nuliui,
Applied Coupon Code,Taikomas kupono kodas,
Apply Coupon Code,Taikyti kupono kodą,
Appointment Booking,Paskyrimo rezervavimas,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Neįmanoma apskaičiuoti atvykimo laiko, nes trūksta vairuotojo adreso.",
Cannot Optimize Route as Driver Address is Missing.,"Neįmanoma optimizuoti maršruto, nes trūksta vairuotojo adreso.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Neįmanoma atlikti užduoties {0}, nes nuo jos priklausoma užduotis {1} nėra baigta / atšaukta.",
-Cannot create loan until application is approved,"Neįmanoma sukurti paskolos, kol nebus patvirtinta paraiška",
Cannot find a matching Item. Please select some other value for {0}.,Nerandate atitikimo elementą. Prašome pasirinkti kokią nors kitą vertę {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Negalima permokėti už {0} eilutės {0} eilutę daugiau nei {2}. Jei norite leisti permokėti, nustatykite pašalpą Sąskaitų nustatymuose",
"Capacity Planning Error, planned start time can not be same as end time","Talpos planavimo klaida, planuojamas pradžios laikas negali būti toks pat kaip pabaigos laikas",
@@ -3812,20 +3792,9 @@
Less Than Amount,Mažiau nei suma,
Liabilities,Įsipareigojimai,
Loading...,Kraunasi ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Paskolos suma viršija maksimalią {0} paskolos sumą pagal siūlomus vertybinius popierius,
Loan Applications from customers and employees.,Klientų ir darbuotojų paskolų paraiškos.,
-Loan Disbursement,Paskolos išmokėjimas,
Loan Processes,Paskolų procesai,
-Loan Security,Paskolos saugumas,
-Loan Security Pledge,Paskolos užstatas,
-Loan Security Pledge Created : {0},Sukurtas paskolos užstatas: {0},
-Loan Security Price,Paskolos užstato kaina,
-Loan Security Price overlapping with {0},Paskolos užstato kaina sutampa su {0},
-Loan Security Unpledge,Paskolos užstatas,
-Loan Security Value,Paskolos vertė,
Loan Type for interest and penalty rates,Paskolos rūšis palūkanoms ir baudos dydžiui,
-Loan amount cannot be greater than {0},Paskolos suma negali būti didesnė nei {0},
-Loan is mandatory,Paskola yra privaloma,
Loans,Paskolos,
Loans provided to customers and employees.,Klientams ir darbuotojams suteiktos paskolos.,
Location,vieta,
@@ -3894,7 +3863,6 @@
Pay,mokėti,
Payment Document Type,Mokėjimo dokumento tipas,
Payment Name,Mokėjimo pavadinimas,
-Penalty Amount,Baudos suma,
Pending,kol,
Performance,Spektaklis,
Period based On,Laikotarpis pagrįstas,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Jei norite redaguoti šį elementą, prisijunkite kaip „Marketplace“ vartotojas.",
Please login as a Marketplace User to report this item.,"Jei norite pranešti apie šį elementą, prisijunkite kaip „Marketplace“ vartotojas.",
Please select <b>Template Type</b> to download template,"Pasirinkite <b>šablono tipą, jei</b> norite atsisiųsti šabloną",
-Please select Applicant Type first,Pirmiausia pasirinkite pareiškėjo tipą,
Please select Customer first,Pirmiausia pasirinkite Klientas,
Please select Item Code first,Pirmiausia pasirinkite prekės kodą,
-Please select Loan Type for company {0},Pasirinkite paskolos tipą įmonei {0},
Please select a Delivery Note,Prašome pasirinkti važtaraštį,
Please select a Sales Person for item: {0},Pasirinkite prekės pardavėją: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Prašome pasirinkti kitą mokėjimo būdą. Juostele nepalaiko sandoriams valiuta "{0} ',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Sukurkite numatytąją įmonės {0} banko sąskaitą,
Please specify,Prašome nurodyti,
Please specify a {0},Nurodykite {0},lead
-Pledge Status,Įkeitimo būsena,
-Pledge Time,Įkeitimo laikas,
Printing,spausdinimas,
Priority,Prioritetas,
Priority has been changed to {0}.,Prioritetas buvo pakeistas į {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Apdorojame XML failus,
Profitability,Pelningumas,
Project,projektas,
-Proposed Pledges are mandatory for secured Loans,Siūlomi įkeitimai yra privalomi užtikrinant paskolas,
Provide the academic year and set the starting and ending date.,Nurodykite mokslo metus ir nustatykite pradžios ir pabaigos datą.,
Public token is missing for this bank,Nėra šio banko viešo prieigos rakto,
Publish,Paskelbti,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Pirkimo kvite nėra elementų, kuriems įgalintas „Retain Sample“.",
Purchase Return,pirkimo Grįžti,
Qty of Finished Goods Item,Gatavos prekės kiekis,
-Qty or Amount is mandatroy for loan security,Kiekis ar suma yra būtini paskolos užtikrinimui,
Quality Inspection required for Item {0} to submit,"Norint pateikti {0} elementą, būtina atlikti kokybės patikrinimą",
Quantity to Manufacture,Pagaminamas kiekis,
Quantity to Manufacture can not be zero for the operation {0},Gamybos kiekis operacijai negali būti lygus nuliui {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Atleidimo data turi būti didesnė arba lygi prisijungimo datai,
Rename,pervadinti,
Rename Not Allowed,Pervardyti neleidžiama,
-Repayment Method is mandatory for term loans,Grąžinimo būdas yra privalomas terminuotoms paskoloms,
-Repayment Start Date is mandatory for term loans,Grąžinimo pradžios data yra privaloma terminuotoms paskoloms,
Report Item,Pranešti apie prekę,
Report this Item,Pranešti apie šį elementą,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Subrangos užsakytas kiekis: Žaliavų kiekis subrangovams gaminti.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Eilutė ({0}): {1} jau diskontuojamas {2},
Rows Added in {0},Eilučių pridėta {0},
Rows Removed in {0},Eilučių pašalinta per {0},
-Sanctioned Amount limit crossed for {0} {1},Sankcionuota {0} {1} peržengta sumos riba,
-Sanctioned Loan Amount already exists for {0} against company {1},{0} įmonei {1} jau yra sankcionuotos paskolos suma,
Save,Išsaugoti,
Save Item,Išsaugoti elementą,
Saved Items,Išsaugotos prekės,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Vartotojas {0} yra išjungtas,
Users and Permissions,Vartotojai ir leidimai,
Vacancies cannot be lower than the current openings,Laisvos darbo vietos negali būti mažesnės nei dabartinės angos,
-Valid From Time must be lesser than Valid Upto Time.,Galioja nuo laiko turi būti mažesnė nei galiojanti iki laiko.,
Valuation Rate required for Item {0} at row {1},{0} eilutėje {1} reikalingas vertės koeficientas,
Values Out Of Sync,Vertės nesinchronizuotos,
Vehicle Type is required if Mode of Transport is Road,"Transporto priemonės tipas yra būtinas, jei transporto rūšis yra kelias",
@@ -4211,7 +4168,6 @@
Add to Cart,Į krepšelį,
Days Since Last Order,Dienos nuo paskutinio įsakymo,
In Stock,Prekyboje,
-Loan Amount is mandatory,Paskolos suma yra privaloma,
Mode Of Payment,Mokėjimo būdas,
No students Found,Nerasta studentų,
Not in Stock,Nėra sandėlyje,
@@ -4240,7 +4196,6 @@
Group by,Grupuoti pagal,
In stock,Sandelyje,
Item name,Daikto pavadinimas,
-Loan amount is mandatory,Paskolos suma yra privaloma,
Minimum Qty,Minimalus kiekis,
More details,Daugiau informacijos,
Nature of Supplies,Prekių pobūdis,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Iš viso užpildytas kiekis,
Qty to Manufacture,Kiekis gaminti,
Repay From Salary can be selected only for term loans,Grąžinti iš atlyginimo galima pasirinkti tik terminuotoms paskoloms,
-No valid Loan Security Price found for {0},"Nerasta tinkama paskolos užtikrinimo kaina, skirta {0}",
-Loan Account and Payment Account cannot be same,Paskolos ir mokėjimo sąskaitos negali būti vienodos,
-Loan Security Pledge can only be created for secured loans,Paskolos užtikrinimo įkeitimas gali būti sudaromas tik užtikrinant paskolas,
Social Media Campaigns,Socialinės žiniasklaidos kampanijos,
From Date can not be greater than To Date,Nuo datos negali būti didesnis nei Iki datos,
Please set a Customer linked to the Patient,"Nustatykite klientą, susietą su pacientu",
@@ -6437,7 +6389,6 @@
HR User,HR Vartotojas,
Appointment Letter,Susitikimo laiškas,
Job Applicant,Darbas Pareiškėjas,
-Applicant Name,Vardas pareiškėjas,
Appointment Date,Skyrimo data,
Appointment Letter Template,Paskyrimo laiško šablonas,
Body,kūnas,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinchronizuojamas progresas,
Hub Seller Name,Hub Pardavėjo vardas,
Custom Data,Tinkinti duomenys,
-Member,Narys,
-Partially Disbursed,dalinai Išmokėta,
-Loan Closure Requested,Prašoma paskolos uždarymo,
Repay From Salary,Grąžinti iš Pajamos,
-Loan Details,paskolos detalės,
-Loan Type,paskolos tipas,
-Loan Amount,Paskolos suma,
-Is Secured Loan,Yra užtikrinta paskola,
-Rate of Interest (%) / Year,Palūkanų norma (%) / metus,
-Disbursement Date,išmokėjimas data,
-Disbursed Amount,Išmokėta suma,
-Is Term Loan,Yra terminuota paskola,
-Repayment Method,grąžinimas būdas,
-Repay Fixed Amount per Period,Grąžinti fiksuotas dydis vienam laikotarpis,
-Repay Over Number of Periods,Grąžinti Over periodų skaičius,
-Repayment Period in Months,Grąžinimo laikotarpis mėnesiais,
-Monthly Repayment Amount,Mėnesio grąžinimo suma,
-Repayment Start Date,Grąžinimo pradžios data,
-Loan Security Details,Paskolos saugumo duomenys,
-Maximum Loan Value,Maksimali paskolos vertė,
-Account Info,Sąskaitos info,
-Loan Account,Paskolos sąskaita,
-Interest Income Account,Palūkanų pajamų sąskaita,
-Penalty Income Account,Baudžiamųjų pajamų sąskaita,
-Repayment Schedule,grąžinimo grafikas,
-Total Payable Amount,Iš viso mokėtina suma,
-Total Principal Paid,Iš viso sumokėta pagrindinė suma,
-Total Interest Payable,Iš viso palūkanų Mokėtina,
-Total Amount Paid,Visa sumokėta suma,
-Loan Manager,Paskolų tvarkytojas,
-Loan Info,paskolos informacija,
-Rate of Interest,Palūkanų norma,
-Proposed Pledges,Siūlomi pasižadėjimai,
-Maximum Loan Amount,Maksimali paskolos suma,
-Repayment Info,grąžinimas Informacija,
-Total Payable Interest,Viso mokėtinos palūkanos,
-Against Loan ,Prieš paskolą,
-Loan Interest Accrual,Sukauptos paskolų palūkanos,
-Amounts,Sumos,
-Pending Principal Amount,Laukiama pagrindinė suma,
-Payable Principal Amount,Mokėtina pagrindinė suma,
-Paid Principal Amount,Sumokėta pagrindinė suma,
-Paid Interest Amount,Sumokėtų palūkanų suma,
-Process Loan Interest Accrual,Proceso paskolų palūkanų kaupimas,
-Repayment Schedule Name,Grąžinimo tvarkaraščio pavadinimas,
Regular Payment,Reguliarus mokėjimas,
Loan Closure,Paskolos uždarymas,
-Payment Details,Mokėjimo detalės,
-Interest Payable,Mokėtinos palūkanos,
-Amount Paid,Sumokėta suma,
-Principal Amount Paid,Pagrindinė sumokėta suma,
-Repayment Details,Išsami grąžinimo informacija,
-Loan Repayment Detail,Paskolos grąžinimo detalė,
-Loan Security Name,Paskolos vertybinis popierius,
-Unit Of Measure,Matavimo vienetas,
-Loan Security Code,Paskolos saugumo kodas,
-Loan Security Type,Paskolas užtikrinantis tipas,
-Haircut %,Kirpimas%,
-Loan Details,Informacija apie paskolą,
-Unpledged,Neįpareigotas,
-Pledged,Pasižadėjo,
-Partially Pledged,Iš dalies pažadėta,
-Securities,Vertybiniai popieriai,
-Total Security Value,Bendra saugumo vertė,
-Loan Security Shortfall,Paskolos saugumo trūkumas,
-Loan ,Paskola,
-Shortfall Time,Trūksta laiko,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Trūkumų suma,
-Security Value ,Apsaugos vertė,
-Process Loan Security Shortfall,Proceso paskolų saugumo trūkumas,
-Loan To Value Ratio,Paskolos ir vertės santykis,
-Unpledge Time,Neįsipareigojimo laikas,
-Loan Name,paskolos Vardas,
Rate of Interest (%) Yearly,Palūkanų norma (%) Metinės,
-Penalty Interest Rate (%) Per Day,Baudų palūkanų norma (%) per dieną,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,"Baudos palūkanų norma už kiekvieną delspinigių sumą imama kiekvieną dieną, jei grąžinimas vėluoja",
-Grace Period in Days,Lengvatinis laikotarpis dienomis,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Dienų nuo termino, iki kurio bauda nebus imama, jei vėluojama grąžinti paskolą, skaičius",
-Pledge,Pasižadėjimas,
-Post Haircut Amount,Skelbkite kirpimo sumą,
-Process Type,Proceso tipas,
-Update Time,Atnaujinimo laikas,
-Proposed Pledge,Siūlomas pasižadėjimas,
-Total Payment,bendras Apmokėjimas,
-Balance Loan Amount,Balansas Paskolos suma,
-Is Accrued,Yra sukaupta,
Salary Slip Loan,Atlyginimo paskolos paskola,
Loan Repayment Entry,Paskolos grąžinimo įrašas,
-Sanctioned Loan Amount,Sankcijos sankcijos suma,
-Sanctioned Amount Limit,Sankcionuotas sumos limitas,
-Unpledge,Neapsikentimas,
-Haircut,Kirpimas,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Sukurti Tvarkaraštis,
Schedules,tvarkaraščiai,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projektas bus prieinama tinklalapyje šių vartotojų,
Copied From,Nukopijuota iš,
Start and End Dates,Pradžios ir pabaigos datos,
-Actual Time (in Hours),Faktinis laikas (valandomis),
+Actual Time in Hours (via Timesheet),Faktinis laikas (valandomis),
Costing and Billing,Sąnaudų ir atsiskaitymas,
-Total Costing Amount (via Timesheets),Bendra sąnaudų suma (per laiko lapus),
-Total Expense Claim (via Expense Claims),Bendras išlaidų pretenzija (per išlaidų paraiškos),
+Total Costing Amount (via Timesheet),Bendra sąnaudų suma (per laiko lapus),
+Total Expense Claim (via Expense Claim),Bendras išlaidų pretenzija (per išlaidų paraiškos),
Total Purchase Cost (via Purchase Invoice),Viso įsigijimo savikainą (per pirkimo sąskaitoje faktūroje),
Total Sales Amount (via Sales Order),Bendra pardavimo suma (per pardavimo užsakymą),
-Total Billable Amount (via Timesheets),Visa apmokestinamoji suma (per laiko lapus),
-Total Billed Amount (via Sales Invoices),Visa išleista suma (per pardavimo sąskaitas faktūras),
-Total Consumed Material Cost (via Stock Entry),Iš viso sunaudotų medžiagų kaina (per sandėlius),
+Total Billable Amount (via Timesheet),Visa apmokestinamoji suma (per laiko lapus),
+Total Billed Amount (via Sales Invoice),Visa išleista suma (per pardavimo sąskaitas faktūras),
+Total Consumed Material Cost (via Stock Entry),Iš viso sunaudotų medžiagų kaina (per sandėlius),
Gross Margin,bendroji marža,
Gross Margin %,"Bendroji marža,%",
Monitor Progress,Stebėti progresą,
@@ -7521,12 +7385,10 @@
Dependencies,Priklausomybės,
Dependent Tasks,Priklausomos užduotys,
Depends on Tasks,Priklauso nuo Užduotys,
-Actual Start Date (via Time Sheet),Tikrasis pradžios data (per Time lapas),
-Actual Time (in hours),Tikrasis laikas (valandomis),
-Actual End Date (via Time Sheet),Tikrasis Pabaigos data (per Time lapas),
-Total Costing Amount (via Time Sheet),Iš viso Sąnaudų suma (per Time lapas),
+Actual Start Date (via Timesheet),Tikrasis pradžios data (per Time lapas),
+Actual Time in Hours (via Timesheet),Tikrasis laikas (valandomis),
+Actual End Date (via Timesheet),Tikrasis Pabaigos data (per Time lapas),
Total Expense Claim (via Expense Claim),Bendras išlaidų pretenzija (per expense punktą),
-Total Billing Amount (via Time Sheet),Iš viso Atsiskaitymo suma (per Time lapas),
Review Date,peržiūros data,
Closing Date,Pabaigos data,
Task Depends On,Užduotis Priklauso nuo,
@@ -7887,7 +7749,6 @@
Update Series,Atnaujinti serija,
Change the starting / current sequence number of an existing series.,Pakeisti pradinį / trumpalaikiai eilės numerį esamo serijos.,
Prefix,priešdėlis,
-Current Value,Dabartinė vertė,
This is the number of the last created transaction with this prefix,Tai yra paskutinio sukurto skaičius operacijoje su šio prefikso,
Update Series Number,Atnaujinti serijos numeris,
Quotation Lost Reason,Citata Pamiršote Priežastis,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Rekomenduojama Pertvarkyti lygis,
Lead Details,Švino detalės,
Lead Owner Efficiency,Švinas Savininko efektyvumas,
-Loan Repayment and Closure,Paskolų grąžinimas ir uždarymas,
-Loan Security Status,Paskolos saugumo statusas,
Lost Opportunity,Prarasta galimybė,
Maintenance Schedules,priežiūros Tvarkaraščiai,
Material Requests for which Supplier Quotations are not created,Medžiaga Prašymai dėl kurių Tiekėjas Citatos nėra sukurtos,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Taikomi tikslai: {0},
Payment Account is mandatory,Mokėjimo sąskaita yra privaloma,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Jei bus pažymėta, prieš apskaičiuojant pajamų mokestį, be deklaracijos ar įrodymo, visa suma bus išskaičiuota iš apmokestinamųjų pajamų.",
-Disbursement Details,Išsami išmokėjimo informacija,
Material Request Warehouse,Medžiagų užklausų sandėlis,
Select warehouse for material requests,Pasirinkite sandėlį medžiagų užklausoms,
Transfer Materials For Warehouse {0},Sandėlio medžiagos perdavimas {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Iš atlyginimo grąžinkite neprašytą sumą,
Deduction from salary,Išskaičiavimas iš atlyginimo,
Expired Leaves,Pasibaigę lapai,
-Reference No,nuoroda ne,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Kirpimo procentas yra procentinis skirtumas tarp paskolos vertybinių popierių rinkos vertės ir vertės, priskiriamos tam paskolos vertybiniam popieriui, kai jis naudojamas kaip tos paskolos užtikrinimo priemonė.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Paskolos ir vertės santykis išreiškia paskolos sumos ir įkeisto užstato vertės santykį. Paskolos trūkumas susidarys, jei jis bus mažesnis už nurodytą bet kurios paskolos vertę",
If this is not checked the loan by default will be considered as a Demand Loan,"Jei tai nėra pažymėta, paskola pagal numatytuosius nustatymus bus laikoma paklausos paskola",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ši sąskaita naudojama paskolos grąžinimo iš skolininko rezervavimui ir paskolos paskolos gavėjui išmokėjimui,
This account is capital account which is used to allocate capital for loan disbursal account ,"Ši sąskaita yra kapitalo sąskaita, naudojama paskirstyti kapitalą paskolos išmokėjimo sąskaitai",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operacija {0} nepriklauso darbo užsakymui {1},
Print UOM after Quantity,Spausdinkite UOM po kiekio,
Set default {0} account for perpetual inventory for non stock items,"Nustatykite numatytąją {0} sąskaitą, skirtą nuolatinėms atsargoms ne akcijoms",
-Loan Security {0} added multiple times,Paskolos apsauga {0} pridėta kelis kartus,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Skolos vertybiniai popieriai su skirtingu LTV santykiu negali būti įkeisti vienai paskolai,
-Qty or Amount is mandatory for loan security!,Kiekis arba suma yra būtini paskolos užtikrinimui!,
-Only submittted unpledge requests can be approved,Galima patvirtinti tik pateiktus nepadengimo įkeitimo prašymus,
-Interest Amount or Principal Amount is mandatory,Palūkanų suma arba pagrindinė suma yra privaloma,
-Disbursed Amount cannot be greater than {0},Išmokėta suma negali būti didesnė nei {0},
-Row {0}: Loan Security {1} added multiple times,{0} eilutė: paskolos apsauga {1} pridėta kelis kartus,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,{0} eilutė: antrinis elementas neturėtų būti produktų rinkinys. Pašalinkite elementą {1} ir išsaugokite,
Credit limit reached for customer {0},Pasiektas kliento kredito limitas {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nepavyko automatiškai sukurti kliento dėl šio trūkstamo (-ų) privalomo (-ų) lauko (-ų):,
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index d5cf852..c6204c1 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Piemēro, ja uzņēmums ir SpA, SApA vai SRL",
Applicable if the company is a limited liability company,"Piemēro, ja uzņēmums ir sabiedrība ar ierobežotu atbildību",
Applicable if the company is an Individual or a Proprietorship,"Piemērojams, ja uzņēmums ir fiziska persona vai īpašnieks",
-Applicant,Pieteikuma iesniedzējs,
-Applicant Type,Pieteikuma iesniedzēja tips,
Application of Funds (Assets),Līdzekļu (aktīvu),
Application period cannot be across two allocation records,Pieteikšanās periods nevar būt divos sadalījuma ierakstos,
Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Pieejamo akcionāru saraksts ar folio numuriem,
Loading Payment System,Maksājumu sistēmas ielāde,
Loan,Aizdevums,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0},
-Loan Application,Kredīta pieteikums,
-Loan Management,Aizdevumu vadība,
-Loan Repayment,Kredīta atmaksa,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,"Aizdevuma sākuma datums un aizdevuma periods ir obligāti, lai saglabātu rēķina diskontu",
Loans (Liabilities),Kredītiem (pasīvi),
Loans and Advances (Assets),Aizdevumi un avansi (aktīvi),
@@ -1611,7 +1605,6 @@
Monday,Pirmdiena,
Monthly,Ikmēneša,
Monthly Distribution,Mēneša Distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Ikmēneša atmaksa summa nedrīkst būt lielāka par aizdevuma summu,
More,Vairāk,
More Information,Vairāk informācijas,
More than one selection for {0} not allowed,Nav atļauts atlasīt vairāk nekā vienu {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Maksājiet {0} {1},
Payable,Maksājams,
Payable Account,Maksājama konts,
-Payable Amount,Maksājamā summa,
Payment,Maksājums,
Payment Cancelled. Please check your GoCardless Account for more details,"Maksājums atcelts. Lai saņemtu sīkāku informāciju, lūdzu, pārbaudiet GoCardless kontu",
Payment Confirmation,Maksājuma apstiprinājums,
-Payment Date,Maksājuma datums,
Payment Days,Maksājumu dienas,
Payment Document,maksājuma dokumentu,
Payment Due Date,Maksājuma Due Date,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Ievadiet pirkuma čeka pirmais,
Please enter Receipt Document,Ievadiet saņemšana dokuments,
Please enter Reference date,Ievadiet Atsauces datums,
-Please enter Repayment Periods,Ievadiet atmaksas termiņi,
Please enter Reqd by Date,"Lūdzu, ievadiet Reqd pēc datuma",
Please enter Woocommerce Server URL,"Lūdzu, ievadiet Woocommerce servera URL",
Please enter Write Off Account,Ievadiet norakstīt kontu,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Ievadiet mātes izmaksu centru,
Please enter quantity for Item {0},Ievadiet daudzumu postenī {0},
Please enter relieving date.,Ievadiet atbrīvojot datumu.,
-Please enter repayment Amount,Ievadiet atmaksas summa,
Please enter valid Financial Year Start and End Dates,Ievadiet derīgu finanšu gada sākuma un beigu datumi,
Please enter valid email address,Ievadiet derīgu e-pasta adresi,
Please enter {0} first,Ievadiet {0} pirmais,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu.",
Primary Address Details,Primārās adreses dati,
Primary Contact Details,Primārā kontaktinformācija,
-Principal Amount,pamatsumma,
Print Format,Print Format,
Print IRS 1099 Forms,Drukāt IRS 1099 veidlapas,
Print Report Card,Drukāt ziņojumu karti,
@@ -2550,7 +2538,6 @@
Sample Collection,Paraugu kolekcija,
Sample quantity {0} cannot be more than received quantity {1},Paraugu skaits {0} nevar būt lielāks par saņemto daudzumu {1},
Sanctioned,sodīts,
-Sanctioned Amount,Sodīts Summa,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.,
Sand,Smiltis,
Saturday,Sestdiena,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} jau ir vecāku procedūra {1}.,
API,API,
Annual,Gada,
-Approved,Apstiprināts,
Change,Maiņa,
Contact Email,Kontaktpersonas e-pasta,
Export Type,Eksporta veids,
@@ -3571,7 +3557,6 @@
Account Value,Konta vērtība,
Account is mandatory to get payment entries,"Konts ir obligāts, lai iegūtu maksājuma ierakstus",
Account is not set for the dashboard chart {0},Informācijas paneļa diagrammai konts nav iestatīts {0},
-Account {0} does not belong to company {1},Konts {0} nepieder Sabiedrībai {1},
Account {0} does not exists in the dashboard chart {1},Konts {0} nepastāv informācijas paneļa diagrammā {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Konts: <b>{0}</b> ir kapitāls, kas turpina darbu, un žurnāla ieraksts to nevar atjaunināt",
Account: {0} is not permitted under Payment Entry,Konts: maksājuma ievadīšanas laikā {0} nav atļauts,
@@ -3582,7 +3567,6 @@
Activity,Aktivitāte,
Add / Manage Email Accounts.,Add / Pārvaldīt e-pasta kontu.,
Add Child,Pievienot Child,
-Add Loan Security,Pievienojiet aizdevuma drošību,
Add Multiple,Vairāku pievienošana,
Add Participants,Pievienot dalībniekus,
Add to Featured Item,Pievienot piedāvātajam vienumam,
@@ -3593,15 +3577,12 @@
Address Line 1,Adrese Line 1,
Addresses,Adreses,
Admission End Date should be greater than Admission Start Date.,Uzņemšanas beigu datumam jābūt lielākam par uzņemšanas sākuma datumu.,
-Against Loan,Pret aizdevumu,
-Against Loan:,Pret aizdevumu:,
All,Visi,
All bank transactions have been created,Visi bankas darījumi ir izveidoti,
All the depreciations has been booked,Visas amortizācijas ir rezervētas,
Allocation Expired!,Piešķīruma termiņš ir beidzies!,
Allow Resetting Service Level Agreement from Support Settings.,Atļaut pakalpojuma līmeņa līguma atiestatīšanu no atbalsta iestatījumiem.,
Amount of {0} is required for Loan closure,Aizdevuma slēgšanai nepieciešama {0} summa,
-Amount paid cannot be zero,Izmaksātā summa nevar būt nulle,
Applied Coupon Code,Piemērotais kupona kods,
Apply Coupon Code,Piesakies kupona kods,
Appointment Booking,Iecelšanas rezervācija,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Nevar aprēķināt ierašanās laiku, jo trūkst draivera adreses.",
Cannot Optimize Route as Driver Address is Missing.,"Nevar optimizēt maršrutu, jo trūkst vadītāja adreses.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Nevar pabeigt uzdevumu {0}, jo no tā atkarīgais uzdevums {1} nav pabeigts / atcelts.",
-Cannot create loan until application is approved,"Nevar izveidot aizdevumu, kamēr pieteikums nav apstiprināts",
Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas objektu. Lūdzu, izvēlieties kādu citu vērtību {0}.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{0} rindā {1} nevar pārsniegt rēķinu par {0} vairāk nekā {2}. Lai atļautu rēķinu pārsniegšanu, lūdzu, kontu iestatījumos iestatiet pabalstu",
"Capacity Planning Error, planned start time can not be same as end time","Jaudas plānošanas kļūda, plānotais sākuma laiks nevar būt tāds pats kā beigu laiks",
@@ -3812,20 +3792,9 @@
Less Than Amount,Mazāks par summu,
Liabilities,Saistības,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Aizdevuma summa pārsniedz maksimālo aizdevuma summu {0} par katru piedāvāto vērtspapīru,
Loan Applications from customers and employees.,Klientu un darbinieku aizdevumu pieteikumi.,
-Loan Disbursement,Kredīta izmaksa,
Loan Processes,Aizdevumu procesi,
-Loan Security,Aizdevuma nodrošinājums,
-Loan Security Pledge,Aizdevuma nodrošinājuma ķīla,
-Loan Security Pledge Created : {0},Izveidota aizdevuma drošības ķīla: {0},
-Loan Security Price,Aizdevuma nodrošinājuma cena,
-Loan Security Price overlapping with {0},"Aizdevuma nodrošinājuma cena, kas pārklājas ar {0}",
-Loan Security Unpledge,Aizdevuma drošības ķīla,
-Loan Security Value,Aizdevuma drošības vērtība,
Loan Type for interest and penalty rates,Aizdevuma veids procentiem un soda procentiem,
-Loan amount cannot be greater than {0},Aizdevuma summa nevar būt lielāka par {0},
-Loan is mandatory,Aizdevums ir obligāts,
Loans,Aizdevumi,
Loans provided to customers and employees.,Kredīti klientiem un darbiniekiem.,
Location,Vieta,
@@ -3894,7 +3863,6 @@
Pay,Maksāt,
Payment Document Type,Maksājuma dokumenta tips,
Payment Name,Maksājuma nosaukums,
-Penalty Amount,Soda summa,
Pending,Līdz,
Performance,Performance,
Period based On,"Periods, pamatojoties uz",
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Lūdzu, piesakieties kā Marketplace lietotājs, lai rediģētu šo vienumu.",
Please login as a Marketplace User to report this item.,"Lūdzu, piesakieties kā Marketplace lietotājs, lai ziņotu par šo vienumu.",
Please select <b>Template Type</b> to download template,"Lūdzu, atlasiet <b>Veidnes veidu,</b> lai lejupielādētu veidni",
-Please select Applicant Type first,"Lūdzu, vispirms atlasiet pretendenta veidu",
Please select Customer first,"Lūdzu, vispirms izvēlieties klientu",
Please select Item Code first,"Lūdzu, vispirms atlasiet preces kodu",
-Please select Loan Type for company {0},"Lūdzu, atlasiet aizdevuma veidu uzņēmumam {0}",
Please select a Delivery Note,"Lūdzu, atlasiet piegādes pavadzīmi",
Please select a Sales Person for item: {0},"Lūdzu, priekšmetam atlasiet pārdevēju: {0}",
Please select another payment method. Stripe does not support transactions in currency '{0}',"Lūdzu, izvēlieties citu maksājuma veidu. Stripe neatbalsta darījumus valūtā '{0}'",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},"Lūdzu, iestatiet uzņēmuma {0} noklusējuma bankas kontu.",
Please specify,"Lūdzu, norādiet",
Please specify a {0},"Lūdzu, norādiet {0}",lead
-Pledge Status,Ķīlas statuss,
-Pledge Time,Ķīlas laiks,
Printing,Iespiešana,
Priority,Prioritāte,
Priority has been changed to {0}.,Prioritāte ir mainīta uz {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML failu apstrāde,
Profitability,Rentabilitāte,
Project,Projekts,
-Proposed Pledges are mandatory for secured Loans,Piedāvātās ķīlas ir obligātas nodrošinātajiem aizdevumiem,
Provide the academic year and set the starting and ending date.,Norādiet akadēmisko gadu un iestatiet sākuma un beigu datumu.,
Public token is missing for this bank,Šai bankai trūkst publiska marķiera,
Publish,Publicēt,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Pirkuma kvītī nav nevienas preces, kurai ir iespējota funkcija Saglabāt paraugu.",
Purchase Return,Pirkuma Return,
Qty of Finished Goods Item,Gatavo preču daudzums,
-Qty or Amount is mandatroy for loan security,Daudzums vai daudzums ir mandāts aizdevuma nodrošināšanai,
Quality Inspection required for Item {0} to submit,"Lai iesniegtu vienumu {0}, nepieciešama kvalitātes pārbaude",
Quantity to Manufacture,Ražošanas daudzums,
Quantity to Manufacture can not be zero for the operation {0},Ražošanas daudzums operācijā nevar būt nulle 0,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Atvieglojuma datumam jābūt lielākam vai vienādam ar iestāšanās datumu,
Rename,Pārdēvēt,
Rename Not Allowed,Pārdēvēt nav atļauts,
-Repayment Method is mandatory for term loans,Atmaksas metode ir obligāta termiņa aizdevumiem,
-Repayment Start Date is mandatory for term loans,Atmaksas sākuma datums ir obligāts termiņaizdevumiem,
Report Item,Pārskata vienums,
Report this Item,Ziņot par šo vienumu,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,"Rezervētais daudzums apakšlīgumā: Izejvielu daudzums, lai izgatavotu priekšmetus, par kuriem slēdz apakšlīgumu.",
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rinda ({0}): {1} jau tiek diskontēts {2},
Rows Added in {0},Rindas pievienotas mapē {0},
Rows Removed in {0},Rindas noņemtas {0},
-Sanctioned Amount limit crossed for {0} {1},{0} {1} ir pārsniegts sankcijas robežlielums,
-Sanctioned Loan Amount already exists for {0} against company {1},Sankcionētā aizdevuma summa {0} jau pastāv pret uzņēmumu {1},
Save,Saglabāt,
Save Item,Saglabāt vienumu,
Saved Items,Saglabātās preces,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Lietotāja {0} ir invalīds,
Users and Permissions,Lietotāji un atļaujas,
Vacancies cannot be lower than the current openings,Vakances nevar būt zemākas par pašreizējām atverēm,
-Valid From Time must be lesser than Valid Upto Time.,Derīgam no laika jābūt mazākam par derīgo darbības laiku.,
Valuation Rate required for Item {0} at row {1},{0} vienumam {1} nepieciešama vērtēšanas pakāpe,
Values Out Of Sync,Vērtības ārpus sinhronizācijas,
Vehicle Type is required if Mode of Transport is Road,"Transportlīdzekļa tips ir nepieciešams, ja transporta veids ir autotransports",
@@ -4211,7 +4168,6 @@
Add to Cart,Pievienot grozam,
Days Since Last Order,Dienas kopš pēdējā pasūtījuma,
In Stock,Noliktavā,
-Loan Amount is mandatory,Aizdevuma summa ir obligāta,
Mode Of Payment,Maksājuma veidu,
No students Found,Nav atrasts neviens students,
Not in Stock,Nav noliktavā,
@@ -4240,7 +4196,6 @@
Group by,Group By,
In stock,Noliktavā,
Item name,Vienības nosaukums,
-Loan amount is mandatory,Aizdevuma summa ir obligāta,
Minimum Qty,Minimālais daudzums,
More details,Sīkāka informācija,
Nature of Supplies,Piegādes veids,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Kopā pabeigtie gab,
Qty to Manufacture,Daudz ražot,
Repay From Salary can be selected only for term loans,Atmaksu no algas var izvēlēties tikai termiņa aizdevumiem,
-No valid Loan Security Price found for {0},Vietnei {0} nav atrasta derīga aizdevuma nodrošinājuma cena,
-Loan Account and Payment Account cannot be same,Kredīta konts un maksājumu konts nevar būt vienādi,
-Loan Security Pledge can only be created for secured loans,Kredīta nodrošinājumu var izveidot tikai nodrošinātiem aizdevumiem,
Social Media Campaigns,Sociālo mediju kampaņas,
From Date can not be greater than To Date,Sākot no datuma nevar būt lielāks par datumu,
Please set a Customer linked to the Patient,"Lūdzu, iestatiet klientu, kas saistīts ar pacientu",
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Iecelšanas vēstule,
Job Applicant,Darba iesniedzējs,
-Applicant Name,Pieteikuma iesniedzēja nosaukums,
Appointment Date,Iecelšanas datums,
Appointment Letter Template,Iecelšanas vēstules veidne,
Body,Korpuss,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinhronizācija notiek,
Hub Seller Name,Hub Pārdevēja vārds,
Custom Data,Pielāgoti dati,
-Member,Biedrs,
-Partially Disbursed,Daļēji Izmaksātā,
-Loan Closure Requested,Pieprasīta aizdevuma slēgšana,
Repay From Salary,Atmaksāt no algas,
-Loan Details,aizdevums Details,
-Loan Type,aizdevuma veids,
-Loan Amount,Kredīta summa,
-Is Secured Loan,Ir nodrošināts aizdevums,
-Rate of Interest (%) / Year,Procentu likme (%) / gads,
-Disbursement Date,izmaksu datums,
-Disbursed Amount,Izmaksātā summa,
-Is Term Loan,Ir termiņa aizdevums,
-Repayment Method,atmaksas metode,
-Repay Fixed Amount per Period,Atmaksāt summu par vienu periodu,
-Repay Over Number of Periods,Atmaksāt Over periodu skaits,
-Repayment Period in Months,Atmaksas periods mēnešos,
-Monthly Repayment Amount,Ikmēneša maksājums Summa,
-Repayment Start Date,Atmaksas sākuma datums,
-Loan Security Details,Aizdevuma drošības informācija,
-Maximum Loan Value,Maksimālā aizdevuma vērtība,
-Account Info,konta informācija,
-Loan Account,Kredīta konts,
-Interest Income Account,Procentu ienākuma konts,
-Penalty Income Account,Soda ienākumu konts,
-Repayment Schedule,atmaksas grafiks,
-Total Payable Amount,Kopējā maksājamā summa,
-Total Principal Paid,Kopā samaksātā pamatsumma,
-Total Interest Payable,Kopā maksājamie procenti,
-Total Amount Paid,Kopējā samaksātā summa,
-Loan Manager,Aizdevumu pārvaldnieks,
-Loan Info,Loan informācija,
-Rate of Interest,Procentu likme,
-Proposed Pledges,Ierosinātās ķīlas,
-Maximum Loan Amount,Maksimālais Kredīta summa,
-Repayment Info,atmaksas info,
-Total Payable Interest,Kopā Kreditoru Procentu,
-Against Loan ,Pret aizdevumu,
-Loan Interest Accrual,Kredīta procentu uzkrājums,
-Amounts,Summas,
-Pending Principal Amount,Nepabeigtā pamatsumma,
-Payable Principal Amount,Maksājamā pamatsumma,
-Paid Principal Amount,Apmaksātā pamatsumma,
-Paid Interest Amount,Samaksāto procentu summa,
-Process Loan Interest Accrual,Procesa aizdevuma procentu uzkrājums,
-Repayment Schedule Name,Atmaksas grafika nosaukums,
Regular Payment,Regulārs maksājums,
Loan Closure,Aizdevuma slēgšana,
-Payment Details,Maksājumu informācija,
-Interest Payable,Maksājamie procenti,
-Amount Paid,Samaksātā summa,
-Principal Amount Paid,Samaksātā pamatsumma,
-Repayment Details,Informācija par atmaksu,
-Loan Repayment Detail,Informācija par aizdevuma atmaksu,
-Loan Security Name,Aizdevuma vērtspapīra nosaukums,
-Unit Of Measure,Mērvienība,
-Loan Security Code,Aizdevuma drošības kods,
-Loan Security Type,Aizdevuma drošības veids,
-Haircut %,Matu griezums,
-Loan Details,Informācija par aizdevumu,
-Unpledged,Neapsolīts,
-Pledged,Ieķīlāts,
-Partially Pledged,Daļēji ieķīlāts,
-Securities,Vērtspapīri,
-Total Security Value,Kopējā drošības vērtība,
-Loan Security Shortfall,Aizdevuma nodrošinājuma deficīts,
-Loan ,Aizdevums,
-Shortfall Time,Trūkuma laiks,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Iztrūkuma summa,
-Security Value ,Drošības vērtība,
-Process Loan Security Shortfall,Procesa aizdevuma drošības deficīts,
-Loan To Value Ratio,Aizdevuma un vērtības attiecība,
-Unpledge Time,Nepārdošanas laiks,
-Loan Name,aizdevums Name,
Rate of Interest (%) Yearly,Procentu likme (%) Gada,
-Penalty Interest Rate (%) Per Day,Soda procentu likme (%) dienā,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,"Soda procentu likme tiek iekasēta par katru dienu līdz atliktajai procentu summai, ja kavēta atmaksa",
-Grace Period in Days,Labvēlības periods dienās,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Dienu skaits no noteiktā datuma, līdz kuram soda nauda netiks iekasēta, ja aizkavēsies aizdevuma atmaksa",
-Pledge,Ķīla,
-Post Haircut Amount,Post matu griezuma summa,
-Process Type,Procesa tips,
-Update Time,Atjaunināšanas laiks,
-Proposed Pledge,Ierosinātā ķīla,
-Total Payment,kopējais maksājums,
-Balance Loan Amount,Balance Kredīta summa,
-Is Accrued,Ir uzkrāts,
Salary Slip Loan,Algas slīdēšanas kredīts,
Loan Repayment Entry,Kredīta atmaksas ieraksts,
-Sanctioned Loan Amount,Sankcionētā aizdevuma summa,
-Sanctioned Amount Limit,Sankcionētās summas ierobežojums,
-Unpledge,Neapsolīšana,
-Haircut,Matu griezums,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Izveidot Kalendārs,
Schedules,Saraksti,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekts būs pieejams tīmekļa vietnē ar šo lietotāju,
Copied From,kopēts no,
Start and End Dates,Sākuma un beigu datumi,
-Actual Time (in Hours),Faktiskais laiks (stundās),
+Actual Time in Hours (via Timesheet),Faktiskais laiks (stundās),
Costing and Billing,Izmaksu un Norēķinu,
-Total Costing Amount (via Timesheets),Kopējā izmaksu summa (izmantojot laika kontrolsaraksts),
-Total Expense Claim (via Expense Claims),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas),
+Total Costing Amount (via Timesheet),Kopējā izmaksu summa (izmantojot laika kontrolsaraksts),
+Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas),
Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina),
Total Sales Amount (via Sales Order),Kopējā pārdošanas summa (ar pārdošanas pasūtījumu),
-Total Billable Amount (via Timesheets),Kopējā apmaksājamā summa (izmantojot laika kontrolsaraksts),
-Total Billed Amount (via Sales Invoices),Kopējā iekasētā summa (izmantojot pārdošanas rēķinus),
-Total Consumed Material Cost (via Stock Entry),Kopējā patērētā materiāla cena (izmantojot krājuma ierakstu),
+Total Billable Amount (via Timesheet),Kopējā apmaksājamā summa (izmantojot laika kontrolsaraksts),
+Total Billed Amount (via Sales Invoice),Kopējā iekasētā summa (izmantojot pārdošanas rēķinus),
+Total Consumed Material Cost (via Stock Entry),Kopējā patērētā materiāla cena (izmantojot krājuma ierakstu),
Gross Margin,Bruto peļņa,
Gross Margin %,Bruto rezerve%,
Monitor Progress,Pārraudzīt Progress,
@@ -7521,12 +7385,10 @@
Dependencies,Atkarības,
Dependent Tasks,Atkarīgie uzdevumi,
Depends on Tasks,Atkarīgs no uzdevumiem,
-Actual Start Date (via Time Sheet),Faktiskā Sākuma datums (via laiks lapas),
-Actual Time (in hours),Faktiskais laiks (stundās),
-Actual End Date (via Time Sheet),Faktiskā Beigu datums (via laiks lapas),
-Total Costing Amount (via Time Sheet),Kopā Izmaksu summa (via laiks lapas),
+Actual Start Date (via Timesheet),Faktiskā Sākuma datums (via laiks lapas),
+Actual Time in Hours (via Timesheet),Faktiskais laiks (stundās),
+Actual End Date (via Timesheet),Faktiskā Beigu datums (via laiks lapas),
Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via Izdevumu Claim),
-Total Billing Amount (via Time Sheet),Kopā Norēķinu Summa (via laiks lapas),
Review Date,Pārskatīšana Datums,
Closing Date,Slēgšanas datums,
Task Depends On,Uzdevums Atkarīgs On,
@@ -7887,7 +7749,6 @@
Update Series,Update 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.,
Prefix,Priedēklis,
-Current Value,Pašreizējā vērtība,
This is the number of the last created transaction with this prefix,Tas ir skaitlis no pēdējiem izveidots darījuma ar šo prefiksu,
Update Series Number,Update Series skaits,
Quotation Lost Reason,Piedāvājuma Zaudējuma Iemesls,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level,
Lead Details,Potenciālā klienta detaļas,
Lead Owner Efficiency,Lead Īpašnieks Efektivitāte,
-Loan Repayment and Closure,Kredīta atmaksa un slēgšana,
-Loan Security Status,Aizdevuma drošības statuss,
Lost Opportunity,Zaudēta iespēja,
Maintenance Schedules,Apkopes grafiki,
Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Mērķtiecīgi skaitļi: {0},
Payment Account is mandatory,Maksājumu konts ir obligāts,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Pārbaudot, pirms ienākuma nodokļa aprēķināšanas bez deklarācijas vai pierādījumu iesniegšanas tiks atskaitīta pilna summa no apliekamā ienākuma.",
-Disbursement Details,Informācija par izmaksu,
Material Request Warehouse,Materiālu pieprasījumu noliktava,
Select warehouse for material requests,Atlasiet noliktavu materiālu pieprasījumiem,
Transfer Materials For Warehouse {0},Materiālu pārsūtīšana noliktavai {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Atmaksājiet nepieprasīto summu no algas,
Deduction from salary,Atskaitīšana no algas,
Expired Leaves,"Lapas, kurām beidzies derīguma termiņš",
-Reference No,Atsauces Nr,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Matu griezuma procents ir procentuālā starpība starp Aizdevuma vērtspapīra tirgus vērtību un šim Aizdevuma vērtspapīram piešķirto vērtību, ja to izmanto kā nodrošinājumu šim aizdevumam.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Aizdevuma un vērtības attiecība izsaka aizdevuma summas attiecību pret ieķīlātā nodrošinājuma vērtību. Aizdevuma nodrošinājuma deficīts tiks aktivizēts, ja tas nokritīsies zem jebkura aizdevuma norādītās vērtības",
If this is not checked the loan by default will be considered as a Demand Loan,"Ja tas nav pārbaudīts, aizdevums pēc noklusējuma tiks uzskatīts par Pieprasījuma aizdevumu",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Šis konts tiek izmantots, lai rezervētu aizdevuma atmaksu no aizņēmēja un arī aizdevuma izmaksu aizņēmējam",
This account is capital account which is used to allocate capital for loan disbursal account ,"Šis konts ir kapitāla konts, ko izmanto, lai piešķirtu kapitālu aizdevuma izmaksas kontam",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Darbība {0} nepieder pie darba pasūtījuma {1},
Print UOM after Quantity,Drukāt UOM pēc daudzuma,
Set default {0} account for perpetual inventory for non stock items,"Iestatiet noklusējuma {0} kontu pastāvīgajam krājumam precēm, kas nav krājumi",
-Loan Security {0} added multiple times,Kredīta nodrošinājums {0} tika pievienots vairākas reizes,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Aizdevuma vērtspapīrus ar atšķirīgu LTV koeficientu nevar ieķīlāt pret vienu aizdevumu,
-Qty or Amount is mandatory for loan security!,Daudzums vai summa ir obligāta aizdevuma nodrošināšanai!,
-Only submittted unpledge requests can be approved,Apstiprināt var tikai iesniegtos neķīlas pieprasījumus,
-Interest Amount or Principal Amount is mandatory,Procentu summa vai pamatsumma ir obligāta,
-Disbursed Amount cannot be greater than {0},Izmaksātā summa nedrīkst būt lielāka par {0},
-Row {0}: Loan Security {1} added multiple times,{0}. Rinda: Kredīta nodrošinājums {1} tika pievienots vairākas reizes,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,"{0}. Rinda: pakārtotajam vienumam nevajadzētu būt produktu komplektam. Lūdzu, noņemiet vienumu {1} un saglabājiet",
Credit limit reached for customer {0},Kredīta limits sasniegts klientam {0},
Could not auto create Customer due to the following missing mandatory field(s):,"Nevarēja automātiski izveidot klientu, jo trūkst šāda (-u) obligātā (-o) lauka (-u):",
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index e01cb70..a225f81 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Применливо е ако компанијата е SpA, SApA или SRL",
Applicable if the company is a limited liability company,Се применува доколку компанијата е компанија со ограничена одговорност,
Applicable if the company is an Individual or a Proprietorship,Се применува доколку компанијата е индивидуа или сопственост,
-Applicant,Апликант,
-Applicant Type,Тип на апликант,
Application of Funds (Assets),Примена на средства (средства),
Application period cannot be across two allocation records,Периодот на примена не може да биде во две записи за распределба,
Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Листа на достапни акционери со фолио броеви,
Loading Payment System,Вчитување на платниот систем,
Loan,Заем,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0},
-Loan Application,Апликација за заем,
-Loan Management,Кредит за управување,
-Loan Repayment,отплата на кредитот,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Датум на започнување со заемот и период на заемот се задолжителни за да ја зачувате попуст на фактурата,
Loans (Liabilities),Кредити (Пасива),
Loans and Advances (Assets),Кредити и побарувања (средства),
@@ -1611,7 +1605,6 @@
Monday,Понеделник,
Monthly,Месечен,
Monthly Distribution,Месечен Дистрибуција,
-Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може да биде поголем од кредит Износ,
More,Повеќе,
More Information,Повеќе информации,
More than one selection for {0} not allowed,Не е дозволено повеќе од еден избор за {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Плаќаат {0} {1},
Payable,Треба да се плати,
Payable Account,Треба да се плати сметката,
-Payable Amount,Платен износ,
Payment,Плаќање,
Payment Cancelled. Please check your GoCardless Account for more details,Откажаното плаќање. Ве молиме проверете ја вашата GoCardless сметка за повеќе детали,
Payment Confirmation,Потврда за исплата,
-Payment Date,Датум за плаќање,
Payment Days,Плаќање дена,
Payment Document,плаќање документ,
Payment Due Date,Плаќање најдоцна до Датум,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Ве молиме внесете Набавка Потврда прв,
Please enter Receipt Document,Ве молиме внесете Потврда документ,
Please enter Reference date,Ве молиме внесете Референтен датум,
-Please enter Repayment Periods,Ве молиме внесете отплата периоди,
Please enter Reqd by Date,Ве молиме внесете Reqd по датум,
Please enter Woocommerce Server URL,Внесете URL на Woocommerce Server,
Please enter Write Off Account,Ве молиме внесете го отпише профил,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Ве молиме внесете цена центар родител,
Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0},
Please enter relieving date.,Ве молиме внесете ослободување датум.,
-Please enter repayment Amount,Ве молиме внесете отплата износ,
Please enter valid Financial Year Start and End Dates,Ве молиме внесете валидна Финансиска година на отпочнување и завршување,
Please enter valid email address,Ве молиме внесете валидна е-мејл адреса,
Please enter {0} first,Ве молиме внесете {0} прв,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот.,
Primary Address Details,Детали за примарна адреса,
Primary Contact Details,Основни детали за контакт,
-Principal Amount,главнината,
Print Format,Печати формат,
Print IRS 1099 Forms,Печатете обрасци IRS 1099,
Print Report Card,Печатење на извештај картичка,
@@ -2550,7 +2538,6 @@
Sample Collection,Збирка примероци,
Sample quantity {0} cannot be more than received quantity {1},Количината на примерокот {0} не може да биде повеќе од добиената количина {1},
Sanctioned,Санкционирани,
-Sanctioned Amount,Износ санкционира,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.,
Sand,Песок,
Saturday,Сабота,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} веќе има Матична постапка {1}.,
API,API,
Annual,Годишен,
-Approved,Одобрени,
Change,Промени,
Contact Email,Контакт E-mail,
Export Type,Тип на извоз,
@@ -3571,7 +3557,6 @@
Account Value,Вредност на сметката,
Account is mandatory to get payment entries,Сметката е задолжителна за да добиете записи за плаќање,
Account is not set for the dashboard chart {0},Сметката не е поставена за табелата во таблата {0,
-Account {0} does not belong to company {1},На сметка {0} не му припаѓа на компанијата {1},
Account {0} does not exists in the dashboard chart {1},Сметката {0} не постои во табелата со табла {1,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Сметка: <b>{0}</b> е капитал Работа во тек и не може да се ажурира од страна на списание Влез,
Account: {0} is not permitted under Payment Entry,Сметка: {0} не е дозволено под уписот за плаќање,
@@ -3582,7 +3567,6 @@
Activity,Активност,
Add / Manage Email Accounts.,Додадете / Управување со е-мејл профили.,
Add Child,Додади детето,
-Add Loan Security,Додадете безбедност за заем,
Add Multiple,Додади Повеќе,
Add Participants,Додајте учесници,
Add to Featured Item,Додај во Избрана ставка,
@@ -3593,15 +3577,12 @@
Address Line 1,Адреса Линија 1,
Addresses,Адреси,
Admission End Date should be greater than Admission Start Date.,Датумот на завршување на приемот треба да биде поголем од датумот на започнување со приемот.,
-Against Loan,Против заем,
-Against Loan:,Против заем:,
All,Сите,
All bank transactions have been created,Создадени се сите банкарски трансакции,
All the depreciations has been booked,Сите амортизации се резервирани,
Allocation Expired!,Распределбата истече!,
Allow Resetting Service Level Agreement from Support Settings.,Дозволи ресетирање на договорот за ниво на услугата од поставките за поддршка.,
Amount of {0} is required for Loan closure,За затворање на заемот е потребна сума од {0,
-Amount paid cannot be zero,Платената сума не може да биде нула,
Applied Coupon Code,Применет купонски код,
Apply Coupon Code,Аплицирајте код за купон,
Appointment Booking,Резервација за назначување,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Не може да се пресмета времето на пристигнување како што недостасува адресата на возачот.,
Cannot Optimize Route as Driver Address is Missing.,"Не можам да го оптимизирам патот, бидејќи адресата на возачот недостасува.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Не можам да ја завршам задачата {0} како нејзина зависна задача {1} не се комплетирани / откажани.,
-Cannot create loan until application is approved,Не можам да создадам заем сè додека не се одобри апликацијата,
Cannot find a matching Item. Please select some other value for {0}.,Не може да се најде ставка. Ве молиме одберете некои други вредност за {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Не може да се преполнува за ставка {0} по ред {1} повеќе од {2. За да дозволите прекумерно наплата, ве молам поставете додаток во Поставки за сметки",
"Capacity Planning Error, planned start time can not be same as end time","Грешка при планирање на капацитетот, планираното време на започнување не може да биде исто како и времето на завршување",
@@ -3812,20 +3792,9 @@
Less Than Amount,Помалку од износот,
Liabilities,Обврски,
Loading...,Се вчитува ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Износот на заемот го надминува максималниот износ на заем од {0} според предложените хартии од вредност,
Loan Applications from customers and employees.,Апликации за заем од клиенти и вработени.,
-Loan Disbursement,Исплата на заем,
Loan Processes,Процеси на заем,
-Loan Security,Обезбедување на заем,
-Loan Security Pledge,Залог за безбедност на заем,
-Loan Security Pledge Created : {0},Создаден залог за заем за заем: {0},
-Loan Security Price,Цена на заемот за заем,
-Loan Security Price overlapping with {0},Преклопување на цената на заемот со преклопување со {0,
-Loan Security Unpledge,Заложба за безбедност на заемот,
-Loan Security Value,Безбедна вредност на заемот,
Loan Type for interest and penalty rates,Тип на заем за каматни стапки и казни,
-Loan amount cannot be greater than {0},Износот на заемот не може да биде поголем од {0,
-Loan is mandatory,Заемот е задолжителен,
Loans,Заеми,
Loans provided to customers and employees.,Кредити обезбедени на клиенти и вработени.,
Location,Локација,
@@ -3894,7 +3863,6 @@
Pay,Плаќаат,
Payment Document Type,Тип на документ за плаќање,
Payment Name,Име на плаќање,
-Penalty Amount,Износ на казна,
Pending,Во очекување,
Performance,Изведба,
Period based On,Период врз основа на,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Ве молиме најавете се како Корисник на Marketplace за да ја уредувате оваа ставка.,
Please login as a Marketplace User to report this item.,Ве молиме најавете се како Корисник на пазарот за да ја пријавите оваа ставка.,
Please select <b>Template Type</b> to download template,Изберете <b>Шаблон</b> за шаблон за преземање на образецот,
-Please select Applicant Type first,"Ве молиме, прво изберете го Тип на апликант",
Please select Customer first,"Ве молиме, прво изберете клиент",
Please select Item Code first,"Ве молиме, прво изберете го кодот на артикалот",
-Please select Loan Type for company {0},Изберете Тип на заем за компанија {0,
Please select a Delivery Note,Изберете белешка за испорака,
Please select a Sales Person for item: {0},Изберете лице за продажба за производот: {0,
Please select another payment method. Stripe does not support transactions in currency '{0}',Ве молам изберете друг начин на плаќање. Лента не поддржува трансакции во валута '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Поставете основна банкарска сметка за компанијата {0,
Please specify,Ве молиме наведете,
Please specify a {0},Ве молиме наведете {0,lead
-Pledge Status,Статус на залог,
-Pledge Time,Време на залог,
Printing,Печатење,
Priority,Приоритет,
Priority has been changed to {0}.,Приоритет е променет на {0.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Обработка на датотеки со XML,
Profitability,Профитабилноста,
Project,Проект,
-Proposed Pledges are mandatory for secured Loans,Предложените залози се задолжителни за обезбедени заеми,
Provide the academic year and set the starting and ending date.,Обезбедете ја академската година и поставете го датумот на започнување и завршување.,
Public token is missing for this bank,Јавниот знак недостасува за оваа банка,
Publish,Објавете,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Потврда за набавка нема никаква ставка за која е овозможен задржување на примерокот.,
Purchase Return,Купување Враќање,
Qty of Finished Goods Item,Количина на готови производи,
-Qty or Amount is mandatroy for loan security,Количина или износот е мандатроја за обезбедување на заем,
Quality Inspection required for Item {0} to submit,Потребна е инспекција за квалитет за точката {0} за поднесување,
Quantity to Manufacture,Количина на производство,
Quantity to Manufacture can not be zero for the operation {0},Количината на производство не може да биде нула за работењето {0,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Датумот на ослободување мора да биде поголем или еднаков на датумот на придружување,
Rename,Преименувај,
Rename Not Allowed,Преименување не е дозволено,
-Repayment Method is mandatory for term loans,Метод на отплата е задолжителен за заеми со рок,
-Repayment Start Date is mandatory for term loans,Датумот на започнување на отплата е задолжителен за заеми со термин,
Report Item,Известување ставка,
Report this Item,Пријави ја оваа ставка,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Резервирана количина за подизведувач: Количина на суровини за да се направат подизведувачи.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Ред (0}}): {1} веќе е намалена за {2,
Rows Added in {0},Редови додадени во {0},
Rows Removed in {0},Редови се отстранети за {0,
-Sanctioned Amount limit crossed for {0} {1},Преминета граница на изречена санкција за {0} {1,
-Sanctioned Loan Amount already exists for {0} against company {1},Износот на санкцијата за заем веќе постои за {0} против компанија {1,
Save,Зачувај,
Save Item,Зачувајте ставка,
Saved Items,Зачувани артикли,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Корисник {0} е исклучен,
Users and Permissions,Корисници и дозволи,
Vacancies cannot be lower than the current openings,Конкурсите не можат да бидат пониски од тековните отвори,
-Valid From Time must be lesser than Valid Upto Time.,Валидно од времето мора да биде помало од валидно време на вклучување.,
Valuation Rate required for Item {0} at row {1},Потребна е стапка на вреднување за точка {0} по ред {1},
Values Out Of Sync,Вредности надвор од синхронизација,
Vehicle Type is required if Mode of Transport is Road,Тип на возило е потребен ако режимот на транспорт е пат,
@@ -4211,7 +4168,6 @@
Add to Cart,Додади во кошничка,
Days Since Last Order,Денови од последната нарачка,
In Stock,Залиха,
-Loan Amount is mandatory,Износот на заемот е задолжителен,
Mode Of Payment,Начин на плаќање,
No students Found,Не се пронајдени студенти,
Not in Stock,Не во парк,
@@ -4240,7 +4196,6 @@
Group by,Со група,
In stock,На залиха,
Item name,Точка Име,
-Loan amount is mandatory,Износот на заемот е задолжителен,
Minimum Qty,Минимална количина,
More details,Повеќе детали,
Nature of Supplies,Природата на материјали,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Вкупно завршена количина,
Qty to Manufacture,Количина на производство,
Repay From Salary can be selected only for term loans,Отплата од плата може да се избере само за орочени заеми,
-No valid Loan Security Price found for {0},Не е пронајдена важечка цена за безбедност на заемот за {0},
-Loan Account and Payment Account cannot be same,Сметката за заем и сметката за плаќање не можат да бидат исти,
-Loan Security Pledge can only be created for secured loans,Залог за обезбедување заем може да се креира само за обезбедени заеми,
Social Media Campaigns,Кампањи за социјални медиуми,
From Date can not be greater than To Date,Од Датум не може да биде поголема од До денес,
Please set a Customer linked to the Patient,Ве молиме поставете клиент поврзан со пациентот,
@@ -6437,7 +6389,6 @@
HR User,HR пристап,
Appointment Letter,Писмо за именувања,
Job Applicant,Работа на апликантот,
-Applicant Name,Подносител на барањето Име,
Appointment Date,Датум на назначување,
Appointment Letter Template,Шаблон за писмо за назначување,
Body,Тело,
@@ -7059,99 +7010,12 @@
Sync in Progress,Синхронизацијата е во тек,
Hub Seller Name,Име на продавачот на хаб,
Custom Data,Прилагодени податоци,
-Member,Член,
-Partially Disbursed,делумно исплатени,
-Loan Closure Requested,Побарано затворање на заем,
Repay From Salary,Отплати од плата,
-Loan Details,Детали за заем,
-Loan Type,Тип на кредит,
-Loan Amount,Износ на кредитот,
-Is Secured Loan,Е заштитен заем,
-Rate of Interest (%) / Year,Каматна стапка (%) / година,
-Disbursement Date,Датум на повлекување средства,
-Disbursed Amount,Испрати сума,
-Is Term Loan,Дали е термин заем,
-Repayment Method,Начин на отплата,
-Repay Fixed Amount per Period,Отплати фиксен износ за период,
-Repay Over Number of Periods,Отплати текот број на периоди,
-Repayment Period in Months,Отплата Период во месеци,
-Monthly Repayment Amount,Месечна отплата износ,
-Repayment Start Date,Датум на почеток на отплата,
-Loan Security Details,Детали за безбедност на заемот,
-Maximum Loan Value,Максимална вредност на заемот,
-Account Info,информации за сметката,
-Loan Account,Сметка за заем,
-Interest Income Account,Сметка приход од камата,
-Penalty Income Account,Сметка за казни,
-Repayment Schedule,Распоред на отплата,
-Total Payable Amount,Вкупно се плаќаат Износ,
-Total Principal Paid,Вкупно платена главница,
-Total Interest Payable,Вкупно камати,
-Total Amount Paid,Вкупен износ платен,
-Loan Manager,Менаџер за заем,
-Loan Info,Информации за заем,
-Rate of Interest,Каматна стапка,
-Proposed Pledges,Предложени ветувања,
-Maximum Loan Amount,Максимален заем Износ,
-Repayment Info,Информации за отплата,
-Total Payable Interest,Вкупно се плаќаат камати,
-Against Loan ,Против заем,
-Loan Interest Accrual,Каматна стапка на акредитиви,
-Amounts,Износи,
-Pending Principal Amount,Во очекување на главната сума,
-Payable Principal Amount,Износ на главнината што се плаќа,
-Paid Principal Amount,Платена главна сума,
-Paid Interest Amount,Износ на платена камата,
-Process Loan Interest Accrual,Инвестициска камата за заем за процеси,
-Repayment Schedule Name,Име на распоред на отплата,
Regular Payment,Редовно плаќање,
Loan Closure,Затворање на заем,
-Payment Details,Детали за плаќањата,
-Interest Payable,Камата што се плаќа,
-Amount Paid,Уплатениот износ,
-Principal Amount Paid,Главен износ платен,
-Repayment Details,Детали за отплата,
-Loan Repayment Detail,Детал за отплата на заемот,
-Loan Security Name,Име за безбедност на заем,
-Unit Of Measure,Единица мерка,
-Loan Security Code,Кодекс за безбедност на заем,
-Loan Security Type,Тип на сигурност за заем,
-Haircut %,Фризура%,
-Loan Details,Детали за заем,
-Unpledged,Несакана,
-Pledged,Вети,
-Partially Pledged,Делумно заложен,
-Securities,Хартии од вредност,
-Total Security Value,Вкупен безбедносна вредност,
-Loan Security Shortfall,Недостаток на безбедност на заемот,
-Loan ,Заем,
-Shortfall Time,Време на недостаток,
-America/New_York,Америка / Newу_Јорк,
-Shortfall Amount,Количина на недостаток,
-Security Value ,Безбедносна вредност,
-Process Loan Security Shortfall,Недостаток на безбедност за заем во процеси,
-Loan To Value Ratio,Сооднос на заем до вредност,
-Unpledge Time,Време на одметнување,
-Loan Name,заем Име,
Rate of Interest (%) Yearly,Каматна стапка (%) Годишен,
-Penalty Interest Rate (%) Per Day,Казна каматна стапка (%) на ден,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Казнената каматна стапка се наплатува на висината на каматата на дневна основа во случај на задоцнета отплата,
-Grace Period in Days,Грејс Период во денови,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Број на денови од датумот на доспевање до која казна нема да се наплатува во случај на доцнење во отплатата на заемот,
-Pledge,Залог,
-Post Haircut Amount,Износ износ на фризура,
-Process Type,Тип на процес,
-Update Time,Време на ажурирање,
-Proposed Pledge,Предлог залог,
-Total Payment,Вкупно исплата,
-Balance Loan Amount,Биланс на кредит Износ,
-Is Accrued,Се стекнува,
Salary Slip Loan,Плата за лизгање на пензија,
Loan Repayment Entry,Влез за отплата на заем,
-Sanctioned Loan Amount,Изречена сума на заем,
-Sanctioned Amount Limit,Граничен износ на санкција,
-Unpledge,Вметнување,
-Haircut,Фризура,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Генерирање Распоред,
Schedules,Распоред,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Проектот ќе биде достапен на веб страната за овие корисници,
Copied From,копирани од,
Start and End Dates,Отпочнување и завршување,
-Actual Time (in Hours),Вистинско време (за неколку часа),
+Actual Time in Hours (via Timesheet),Вистинско време (за неколку часа),
Costing and Billing,Трошоци и регистрации,
-Total Costing Amount (via Timesheets),Вкупен износ на трошоци (преку тајмс),
-Total Expense Claim (via Expense Claims),Вкупно Побарување за Расход (преку Побарувања за Расходи),
+Total Costing Amount (via Timesheet),Вкупен износ на трошоци (преку тајмс),
+Total Expense Claim (via Expense Claim),Вкупно Побарување за Расход (преку Побарувања за Расходи),
Total Purchase Cost (via Purchase Invoice),Вкупен трошок за Набавка (преку Влезна фактура),
Total Sales Amount (via Sales Order),Вкупен износ на продажба (преку нарачка за продажба),
-Total Billable Amount (via Timesheets),Вкупно наплатен износ (преку тајмс),
-Total Billed Amount (via Sales Invoices),Вкупен износ на фактури (преку фактури за продажба),
-Total Consumed Material Cost (via Stock Entry),Вкупен трошок за потрошен материјал (преку внес на акции),
+Total Billable Amount (via Timesheet),Вкупно наплатен износ (преку тајмс),
+Total Billed Amount (via Sales Invoice),Вкупен износ на фактури (преку фактури за продажба),
+Total Consumed Material Cost (via Stock Entry),Вкупен трошок за потрошен материјал (преку внес на акции),
Gross Margin,Бруто маржа,
Gross Margin %,Бруто маржа%,
Monitor Progress,Следи напредок,
@@ -7521,12 +7385,10 @@
Dependencies,Зависи,
Dependent Tasks,Зависни задачи,
Depends on Tasks,Зависи Задачи,
-Actual Start Date (via Time Sheet),Старт на проектот Датум (преку време лист),
-Actual Time (in hours),Крај на времето (во часови),
-Actual End Date (via Time Sheet),Крај Крај Датум (преку време лист),
-Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист),
+Actual Start Date (via Timesheet),Старт на проектот Датум (преку време лист),
+Actual Time in Hours (via Timesheet),Крај на времето (во часови),
+Actual End Date (via Timesheet),Крај Крај Датум (преку време лист),
Total Expense Claim (via Expense Claim),Вкупно Побарување за Расход (преку Побарување за Расход),
-Total Billing Amount (via Time Sheet),Вкупен износ за наплата (преку време лист),
Review Date,Преглед Датум,
Closing Date,Краен датум,
Task Depends On,Задача зависи од,
@@ -7887,7 +7749,6 @@
Update Series,Ажурирање Серија,
Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.,
Prefix,Префикс,
-Current Value,Сегашна вредност,
This is the number of the last created transaction with this prefix,Ова е бројот на последниот создадена трансакција со овој префикс,
Update Series Number,Ажурирање Серија број,
Quotation Lost Reason,Причина за Нереализирана Понуда,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво,
Lead Details,Детали за Потенцијален клиент,
Lead Owner Efficiency,Водач сопственик ефикасност,
-Loan Repayment and Closure,Отплата и затворање на заем,
-Loan Security Status,Статус на заем за заем,
Lost Opportunity,Изгубена можност,
Maintenance Schedules,Распоред за одржување,
Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Броеви насочени: {0},
Payment Account is mandatory,Сметката за плаќање е задолжителна,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ако се провери, целиот износ ќе се одземе од оданочивиот доход пред да се пресмета данокот на доход без каква било изјава или доказ.",
-Disbursement Details,Детали за исплата,
Material Request Warehouse,Магацин за барање материјали,
Select warehouse for material requests,Изберете магацин за материјални барања,
Transfer Materials For Warehouse {0},Трансфер материјали за магацин {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Отплати небаран износ од плата,
Deduction from salary,Намалување од плата,
Expired Leaves,Истечени лисја,
-Reference No,Референца бр,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Процент на фризура е процентната разлика помеѓу пазарната вредност на гаранцијата за заем и вредноста припишана на таа гаранција на заемот кога се користи како обезбедување за тој заем.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Соодносот на заемот и вредноста го изразува односот на износот на заемот и вредноста на заложената хартија од вредност. Недостаток на сигурност на заем ќе се активира доколку падне под одредената вредност за кој било заем,
If this is not checked the loan by default will be considered as a Demand Loan,"Доколку ова не е проверено, заемот по дифолт ќе се смета како заем за побарувачка",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Оваа сметка се користи за резервирање на отплати на заеми од заемопримачот и исто така за исплата на заеми на заемопримачот,
This account is capital account which is used to allocate capital for loan disbursal account ,Оваа сметка е капитална сметка што се користи за алокација на капитал за сметка за исплата на заем,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Операцијата {0} не припаѓа на налогот за работа {1},
Print UOM after Quantity,Печатете UOM по количина,
Set default {0} account for perpetual inventory for non stock items,Поставете стандардна сметка на {0} за вечен инвентар за берзански ставки,
-Loan Security {0} added multiple times,Безбедноста на заемот {0} се додава повеќе пати,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Хартии од вредност на заемот со различен однос на LTV не можат да се заложат за еден заем,
-Qty or Amount is mandatory for loan security!,Количина или износ е задолжителна за обезбедување заем!,
-Only submittted unpledge requests can be approved,Може да се одобрат само поднесени барања за залог,
-Interest Amount or Principal Amount is mandatory,Износ на камата или износ на главница е задолжителен,
-Disbursed Amount cannot be greater than {0},Исплатената сума не може да биде поголема од {0},
-Row {0}: Loan Security {1} added multiple times,Ред {0}: Безбедност на заем {1} додадена повеќе пати,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Ред # {0}: Детска ставка не треба да биде пакет производи. Ве молиме отстранете ја ставката {1} и зачувајте,
Credit limit reached for customer {0},Постигнат кредитен лимит за клиентот {0},
Could not auto create Customer due to the following missing mandatory field(s):,Не може автоматски да се создаде клиент поради следново недостасува задолжително поле (и):,
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index c5a98b6..bd6f65f 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","കമ്പനി സ്പാ, സാപ്പ അല്ലെങ്കിൽ എസ്ആർഎൽ ആണെങ്കിൽ ബാധകമാണ്",
Applicable if the company is a limited liability company,കമ്പനി ഒരു പരിമിത ബാധ്യതാ കമ്പനിയാണെങ്കിൽ ബാധകമാണ്,
Applicable if the company is an Individual or a Proprietorship,കമ്പനി ഒരു വ്യക്തിയോ പ്രൊപ്രൈറ്റർഷിപ്പോ ആണെങ്കിൽ ബാധകമാണ്,
-Applicant,അപേക്ഷക,
-Applicant Type,അപേക്ഷകന്റെ തരം,
Application of Funds (Assets),ഫണ്ട് അപേക്ഷാ (ആസ്തികൾ),
Application period cannot be across two allocation records,അപേക്ഷാ കാലയളവ് രണ്ട് വകഭേദാ രേഖകളിലായിരിക്കരുത്,
Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ഫോളിയോ നമ്പറുകളുള്ള ഷെയർഹോൾഡർമാരുടെ പട്ടിക,
Loading Payment System,പേയ്മെന്റ് സിസ്റ്റം ലോഡുചെയ്യുന്നു,
Loan,വായ്പ,
-Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല,
-Loan Application,വായ്പ അപേക്ഷ,
-Loan Management,ലോൺ മാനേജ്മെന്റ്,
-Loan Repayment,വായ്പാ തിരിച്ചടവ്,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ഇൻവോയ്സ് ഡിസ്കൗണ്ടിംഗ് സംരക്ഷിക്കുന്നതിന് വായ്പ ആരംഭ തീയതിയും വായ്പ കാലയളവും നിർബന്ധമാണ്,
Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും),
Loans and Advances (Assets),വായ്പകളും അഡ്വാൻസുകളും (ആസ്തികൾ),
@@ -1611,7 +1605,6 @@
Monday,തിങ്കളാഴ്ച,
Monthly,പ്രതിമാസം,
Monthly Distribution,പ്രതിമാസ വിതരണം,
-Monthly Repayment Amount cannot be greater than Loan Amount,പ്രതിമാസ തിരിച്ചടവ് തുക വായ്പാ തുക ശ്രേഷ്ഠ പാടില്ല,
More,കൂടുതൽ,
More Information,കൂടുതൽ വിവരങ്ങൾ,
More than one selection for {0} not allowed,{0} എന്നതിന് ഒന്നിൽ കൂടുതൽ തിരഞ്ഞെടുപ്പുകൾ അനുവദനീയമല്ല,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} പണമടയ്ക്കുക,
Payable,അടയ്ക്കേണ്ട,
Payable Account,അടയ്ക്കേണ്ട അക്കൗണ്ട്,
-Payable Amount,നൽകേണ്ട തുക,
Payment,പേയ്മെന്റ്,
Payment Cancelled. Please check your GoCardless Account for more details,പെയ്മെന്റ് റദ്ദാക്കി. കൂടുതൽ വിശദാംശങ്ങൾക്ക് നിങ്ങളുടെ GoCardless അക്കൗണ്ട് പരിശോധിക്കുക,
Payment Confirmation,പണമടച്ചതിന്റെ സ്ഥിരീകരണം,
-Payment Date,പേയ്മെന്റ് തീയതി,
Payment Days,പേയ്മെന്റ് ദിനങ്ങൾ,
Payment Document,പേയ്മെന്റ് പ്രമാണം,
Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,പർച്ചേസ് റെസീപ്റ്റ് ആദ്യം നൽകുക,
Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക,
Please enter Reference date,റഫറൻസ് തീയതി നൽകുക,
-Please enter Repayment Periods,ദയവായി തിരിച്ചടവ് ഭരണവും നൽകുക,
Please enter Reqd by Date,ദയവായി തീയതി അനുസരിച്ച് Reqd നൽകുക,
Please enter Woocommerce Server URL,ദയവായി Woocommerce സെർവർ URL നൽകുക,
Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,പാരന്റ് കോസ്റ്റ് സെന്റർ നൽകുക,
Please enter quantity for Item {0},ഇനം {0} വേണ്ടി അളവ് നൽകുക,
Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.,
-Please enter repayment Amount,ദയവായി തിരിച്ചടവ് തുക നൽകുക,
Please enter valid Financial Year Start and End Dates,"സാധുവായ സാമ്പത്തിക വർഷം ആരംഭ, അവസാന തീയതി നൽകുക",
Please enter valid email address,ദയവായി സാധുവായ ഇമെയിൽ വിലാസം നൽകുക,
Please enter {0} first,ആദ്യം {0} നൽകുക,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,പ്രൈസിങ് നിയമങ്ങൾ കൂടുതൽ അളവ് അടിസ്ഥാനമാക്കി ഫിൽറ്റർ.,
Primary Address Details,പ്രാഥമിക വിലാസ വിശദാംശങ്ങൾ,
Primary Contact Details,പ്രാഥമിക കോൺടാക്റ്റ് വിശദാംശങ്ങൾ,
-Principal Amount,പ്രിൻസിപ്പൽ തുക,
Print Format,പ്രിന്റ് ഫോർമാറ്റ്,
Print IRS 1099 Forms,IRS 1099 ഫോമുകൾ അച്ചടിക്കുക,
Print Report Card,റിപ്പോർട്ട് റിപ്പോർട്ട് പ്രിന്റ് ചെയ്യുക,
@@ -2550,7 +2538,6 @@
Sample Collection,സാമ്പിൾ ശേഖരണം,
Sample quantity {0} cannot be more than received quantity {1},സാമ്പിൾ അളവ് {0} ലഭിച്ച തുകയേക്കാൾ കൂടുതൽ ആകരുത് {1},
Sanctioned,അനുവദിച്ചു,
-Sanctioned Amount,അനുവദിക്കപ്പെട്ട തുക,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,അനുവദിക്കപ്പെട്ട തുക വരി {0} ൽ ക്ലെയിം തുക വലുതായിരിക്കണം കഴിയില്ല.,
Sand,മണല്,
Saturday,ശനിയാഴ്ച,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ന് ഇതിനകം ഒരു രക്ഷാകർതൃ നടപടിക്രമം ഉണ്ട് {1}.,
API,API,
Annual,വാർഷിക,
-Approved,അംഗീകരിച്ചു,
Change,മാറ്റുക,
Contact Email,കോൺടാക്റ്റ് ഇമെയിൽ,
Export Type,എക്സ്പോർട്ട് തരം,
@@ -3571,7 +3557,6 @@
Account Value,അക്കൗണ്ട് മൂല്യം,
Account is mandatory to get payment entries,പേയ്മെന്റ് എൻട്രികൾ ലഭിക്കുന്നതിന് അക്കൗണ്ട് നിർബന്ധമാണ്,
Account is not set for the dashboard chart {0},ഡാഷ്ബോർഡ് ചാർട്ടിനായി അക്കൗണ്ട് സജ്ജമാക്കിയിട്ടില്ല {0},
-Account {0} does not belong to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} സ്വന്തമല്ല,
Account {0} does not exists in the dashboard chart {1},{0} അക്കൗണ്ട് ഡാഷ്ബോർഡ് ചാർട്ടിൽ നിലവിലില്ല {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"അക്കൗണ്ട്: capital <b>0</b> capital മൂലധന പ്രവർത്തനമാണ് പുരോഗതിയിലുള്ളത്, ജേണൽ എൻട്രി അപ്ഡേറ്റ് ചെയ്യാൻ കഴിയില്ല",
Account: {0} is not permitted under Payment Entry,അക്കൗണ്ട്: പേയ്മെന്റ് എൻട്രിക്ക് കീഴിൽ {0} അനുവദനീയമല്ല,
@@ -3582,7 +3567,6 @@
Activity,പ്രവർത്തനം,
Add / Manage Email Accounts.,ചേർക്കുക / ഇമെയിൽ അക്കൗണ്ടുകൾ നിയന്ത്രിക്കുക.,
Add Child,ശിശു ചേർക്കുക,
-Add Loan Security,വായ്പ സുരക്ഷ ചേർക്കുക,
Add Multiple,ഒന്നിലധികം ചേർക്കുക,
Add Participants,പങ്കെടുക്കുന്നവരെ ചേർക്കുക,
Add to Featured Item,തിരഞ്ഞെടുത്ത ഇനത്തിലേക്ക് ചേർക്കുക,
@@ -3593,15 +3577,12 @@
Address Line 1,വിലാസ ലൈൻ 1,
Addresses,വിലാസങ്ങൾ,
Admission End Date should be greater than Admission Start Date.,പ്രവേശന അവസാന തീയതി പ്രവേശന ആരംഭ തീയതിയെക്കാൾ കൂടുതലായിരിക്കണം.,
-Against Loan,വായ്പയ്ക്കെതിരെ,
-Against Loan:,വായ്പയ്ക്കെതിരെ:,
All,എല്ലാം,
All bank transactions have been created,എല്ലാ ബാങ്ക് ഇടപാടുകളും സൃഷ്ടിച്ചു,
All the depreciations has been booked,എല്ലാ മൂല്യത്തകർച്ചകളും ബുക്ക് ചെയ്തു,
Allocation Expired!,വിഹിതം കാലഹരണപ്പെട്ടു!,
Allow Resetting Service Level Agreement from Support Settings.,പിന്തുണാ ക്രമീകരണങ്ങളിൽ നിന്ന് സേവന ലെവൽ കരാർ പുന et സജ്ജമാക്കാൻ അനുവദിക്കുക.,
Amount of {0} is required for Loan closure,വായ്പ അടയ്ക്കുന്നതിന് {0 തുക ആവശ്യമാണ്,
-Amount paid cannot be zero,അടച്ച തുക പൂജ്യമാകരുത്,
Applied Coupon Code,പ്രയോഗിച്ച കൂപ്പൺ കോഡ്,
Apply Coupon Code,കൂപ്പൺ കോഡ് പ്രയോഗിക്കുക,
Appointment Booking,അപ്പോയിന്റ്മെന്റ് ബുക്കിംഗ്,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ഡ്രൈവർ വിലാസം നഷ്ടമായതിനാൽ വരവ് സമയം കണക്കാക്കാൻ കഴിയില്ല.,
Cannot Optimize Route as Driver Address is Missing.,ഡ്രൈവർ വിലാസം നഷ്ടമായതിനാൽ റൂട്ട് ഒപ്റ്റിമൈസ് ചെയ്യാൻ കഴിയില്ല.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Task 0 task എന്ന ടാസ്ക് പൂർത്തിയാക്കാൻ കഴിയില്ല, കാരണം അതിന്റെ ആശ്രിത ടാസ്ക് {1 c പൂർത്തിയാകുന്നില്ല / റദ്ദാക്കില്ല.",
-Cannot create loan until application is approved,അപേക്ഷ അംഗീകരിക്കുന്നതുവരെ വായ്പ സൃഷ്ടിക്കാൻ കഴിയില്ല,
Cannot find a matching Item. Please select some other value for {0}.,ഒരു പൊരുത്തമുള്ള ഇനം കണ്ടെത്താൻ കഴിയുന്നില്ല. {0} വേണ്ടി മറ്റ് ചില മൂല്യം തിരഞ്ഞെടുക്കുക.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{1 row വരിയിലെ {0} ഇനത്തിന് over 2 over എന്നതിനേക്കാൾ കൂടുതൽ ബിൽ ചെയ്യാൻ കഴിയില്ല. ഓവർ ബില്ലിംഗ് അനുവദിക്കുന്നതിന്, അക്കൗണ്ട് ക്രമീകരണങ്ങളിൽ അലവൻസ് സജ്ജമാക്കുക",
"Capacity Planning Error, planned start time can not be same as end time","ശേഷി ആസൂത്രണ പിശക്, ആസൂത്രിതമായ ആരംഭ സമയം അവസാന സമയത്തിന് തുല്യമാകരുത്",
@@ -3812,20 +3792,9 @@
Less Than Amount,തുകയേക്കാൾ കുറവ്,
Liabilities,ബാധ്യതകൾ,
Loading...,ലോഡുചെയ്യുന്നു ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,നിർദ്ദിഷ്ട സെക്യൂരിറ്റികൾ അനുസരിച്ച് വായ്പ തുക പരമാവധി വായ്പ തുക {0 കവിയുന്നു,
Loan Applications from customers and employees.,ഉപഭോക്താക്കളിൽ നിന്നും ജീവനക്കാരിൽ നിന്നുമുള്ള വായ്പാ അപേക്ഷകൾ.,
-Loan Disbursement,വായ്പ വിതരണം,
Loan Processes,വായ്പാ പ്രക്രിയകൾ,
-Loan Security,വായ്പ സുരക്ഷ,
-Loan Security Pledge,വായ്പ സുരക്ഷാ പ്രതിജ്ഞ,
-Loan Security Pledge Created : {0},വായ്പാ സുരക്ഷാ പ്രതിജ്ഞ സൃഷ്ടിച്ചു: {0},
-Loan Security Price,വായ്പ സുരക്ഷാ വില,
-Loan Security Price overlapping with {0},സുരക്ഷാ സുരക്ഷ വില {0 with ഓവർലാപ്പുചെയ്യുന്നു,
-Loan Security Unpledge,ലോൺ സെക്യൂരിറ്റി അൺപ്ലഡ്ജ്,
-Loan Security Value,വായ്പാ സുരക്ഷാ മൂല്യം,
Loan Type for interest and penalty rates,"പലിശ, പിഴ നിരക്കുകൾക്കുള്ള വായ്പ തരം",
-Loan amount cannot be greater than {0},വായ്പ തുക {0 than ൽ കൂടുതലാകരുത്,
-Loan is mandatory,വായ്പ നിർബന്ധമാണ്,
Loans,വായ്പകൾ,
Loans provided to customers and employees.,ഉപഭോക്താക്കൾക്കും ജീവനക്കാർക്കും വായ്പ നൽകിയിട്ടുണ്ട്.,
Location,സ്ഥാനം,
@@ -3894,7 +3863,6 @@
Pay,ശമ്പള,
Payment Document Type,പേയ്മെന്റ് പ്രമാണ തരം,
Payment Name,പേയ്മെന്റിന്റെ പേര്,
-Penalty Amount,പിഴ തുക,
Pending,തീർച്ചപ്പെടുത്തിയിട്ടില്ല,
Performance,പ്രകടനം,
Period based On,അടിസ്ഥാനമാക്കിയുള്ള കാലയളവ്,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,ഈ ഇനം എഡിറ്റുചെയ്യുന്നതിന് ദയവായി ഒരു മാർക്കറ്റ്പ്ലെയ്സ് ഉപയോക്താവായി പ്രവേശിക്കുക.,
Please login as a Marketplace User to report this item.,ഈ ഇനം റിപ്പോർട്ടുചെയ്യാൻ ഒരു മാർക്കറ്റ്പ്ലെയ്സ് ഉപയോക്താവായി പ്രവേശിക്കുക.,
Please select <b>Template Type</b> to download template,<b>ടെംപ്ലേറ്റ് ഡ</b> download ൺലോഡ് ചെയ്യാൻ ടെംപ്ലേറ്റ് <b>തരം</b> തിരഞ്ഞെടുക്കുക,
-Please select Applicant Type first,ആദ്യം അപേക്ഷകന്റെ തരം തിരഞ്ഞെടുക്കുക,
Please select Customer first,ആദ്യം ഉപഭോക്താവിനെ തിരഞ്ഞെടുക്കുക,
Please select Item Code first,ആദ്യം ഇനം കോഡ് തിരഞ്ഞെടുക്കുക,
-Please select Loan Type for company {0},Company 0 company കമ്പനിയ്ക്കായി ലോൺ തരം തിരഞ്ഞെടുക്കുക,
Please select a Delivery Note,ഒരു ഡെലിവറി കുറിപ്പ് തിരഞ്ഞെടുക്കുക,
Please select a Sales Person for item: {0},ഇനത്തിനായി ഒരു വിൽപ്പനക്കാരനെ തിരഞ്ഞെടുക്കുക: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',മറ്റൊരു പെയ്മെന്റ് രീതി തിരഞ്ഞെടുക്കുക. വര കറൻസി ഇടപാടുകളും പിന്തുണയ്ക്കുന്നില്ല '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Company 0 company കമ്പനിക്കായി ഒരു സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട് സജ്ജമാക്കുക,
Please specify,ദയവായി വ്യക്തമാക്കുക,
Please specify a {0},ഒരു {0 വ്യക്തമാക്കുക,lead
-Pledge Status,പ്രതിജ്ഞാ നില,
-Pledge Time,പ്രതിജ്ഞാ സമയം,
Printing,അച്ചടി,
Priority,മുൻഗണന,
Priority has been changed to {0}.,മുൻഗണന {0 to ആയി മാറ്റി.,
@@ -3944,7 +3908,6 @@
Processing XML Files,എക്സ്എംഎൽ ഫയലുകൾ പ്രോസസ്സ് ചെയ്യുന്നു,
Profitability,ലാഭക്ഷമത,
Project,പ്രോജക്ട്,
-Proposed Pledges are mandatory for secured Loans,സുരക്ഷിതമായ വായ്പകൾക്ക് നിർദ്ദിഷ്ട പ്രതിജ്ഞകൾ നിർബന്ധമാണ്,
Provide the academic year and set the starting and ending date.,"അധ്യയന വർഷം നൽകി ആരംഭ, അവസാന തീയതി സജ്ജമാക്കുക.",
Public token is missing for this bank,ഈ ബാങ്കിനായി പൊതു ടോക്കൺ കാണുന്നില്ല,
Publish,പ്രസിദ്ധീകരിക്കുക,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,വാങ്ങൽ രസീതിൽ നിലനിർത്തൽ സാമ്പിൾ പ്രവർത്തനക്ഷമമാക്കിയ ഒരു ഇനവുമില്ല.,
Purchase Return,വാങ്ങൽ റിട്ടേൺ,
Qty of Finished Goods Item,പൂർത്തിയായ ചരക്ക് ഇനത്തിന്റെ ക്യൂട്ടി,
-Qty or Amount is mandatroy for loan security,വായ്പ സുരക്ഷയ്ക്കായി ക്യൂട്ടി അല്ലെങ്കിൽ തുക മാൻഡ്രോയ് ആണ്,
Quality Inspection required for Item {0} to submit,സമർപ്പിക്കാൻ ഇനം {0 for ന് ഗുണനിലവാര പരിശോധന ആവശ്യമാണ്,
Quantity to Manufacture,ഉൽപ്പാദിപ്പിക്കുന്നതിനുള്ള അളവ്,
Quantity to Manufacture can not be zero for the operation {0},To 0 the പ്രവർത്തനത്തിന് ഉൽപ്പാദനത്തിന്റെ അളവ് പൂജ്യമാകരുത്,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,റിലീവിംഗ് തീയതി ചേരുന്ന തീയതിയെക്കാൾ വലുതോ തുല്യമോ ആയിരിക്കണം,
Rename,പേരു്മാറ്റുക,
Rename Not Allowed,പേരുമാറ്റുന്നത് അനുവദനീയമല്ല,
-Repayment Method is mandatory for term loans,ടേം ലോണുകൾക്ക് തിരിച്ചടവ് രീതി നിർബന്ധമാണ്,
-Repayment Start Date is mandatory for term loans,ടേം ലോണുകൾക്ക് തിരിച്ചടവ് ആരംഭ തീയതി നിർബന്ധമാണ്,
Report Item,ഇനം റിപ്പോർട്ടുചെയ്യുക,
Report this Item,ഈ ഇനം റിപ്പോർട്ട് ചെയ്യുക,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,സബ് കോൺട്രാക്റ്റിനായി റിസർവ്വ് ചെയ്ത ക്യൂട്ടി: സബ് കോൺട്രാക്റ്റ് ചെയ്ത ഇനങ്ങൾ നിർമ്മിക്കുന്നതിനുള്ള അസംസ്കൃത വസ്തുക്കളുടെ അളവ്.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},വരി ({0}): {1 already ഇതിനകം {2 in ൽ കിഴിവാണ്,
Rows Added in {0},വരികൾ {0 in ൽ ചേർത്തു,
Rows Removed in {0},വരികൾ {0 in ൽ നീക്കംചെയ്തു,
-Sanctioned Amount limit crossed for {0} {1},അനുവദിച്ച തുക പരിധി {0} {1 for ന് മറികടന്നു,
-Sanctioned Loan Amount already exists for {0} against company {1},{1 company കമ്പനിക്കെതിരെ {0 for ന് അനുവദിച്ച വായ്പ തുക ഇതിനകം നിലവിലുണ്ട്,
Save,സംരക്ഷിക്കുക,
Save Item,ഇനം സംരക്ഷിക്കുക,
Saved Items,ഇനങ്ങൾ സംരക്ഷിച്ചു,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ഉപയോക്താവ് {0} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ,
Users and Permissions,ഉപയോക്താക്കൾ അനുമതികളും,
Vacancies cannot be lower than the current openings,ഒഴിവുകൾ നിലവിലെ ഓപ്പണിംഗിനേക്കാൾ കുറവായിരിക്കരുത്,
-Valid From Time must be lesser than Valid Upto Time.,സമയം മുതൽ സാധുതയുള്ളത് സമയത്തേക്കാൾ സാധുതയുള്ളതായിരിക്കണം.,
Valuation Rate required for Item {0} at row {1},{1 row വരിയിലെ {0 item ഇനത്തിന് മൂല്യനിർണ്ണയ നിരക്ക് ആവശ്യമാണ്,
Values Out Of Sync,മൂല്യങ്ങൾ സമന്വയത്തിന് പുറത്താണ്,
Vehicle Type is required if Mode of Transport is Road,ഗതാഗത രീതി റോഡാണെങ്കിൽ വാഹന തരം ആവശ്യമാണ്,
@@ -4211,7 +4168,6 @@
Add to Cart,കാർട്ടിലേക്ക് ചേർക്കുക,
Days Since Last Order,അവസാന ഓർഡറിന് ശേഷമുള്ള ദിവസങ്ങൾ,
In Stock,സ്റ്റോക്കുണ്ട്,
-Loan Amount is mandatory,വായ്പ തുക നിർബന്ധമാണ്,
Mode Of Payment,അടക്കേണ്ട മോഡ്,
No students Found,വിദ്യാർത്ഥികളെയൊന്നും കണ്ടെത്തിയില്ല,
Not in Stock,അല്ല സ്റ്റോക്കുണ്ട്,
@@ -4240,7 +4196,6 @@
Group by,ഗ്രൂപ്പ്,
In stock,സ്റ്റോക്കുണ്ട്,
Item name,ഇനം പേര്,
-Loan amount is mandatory,വായ്പ തുക നിർബന്ധമാണ്,
Minimum Qty,മിനിമം ക്യൂട്ടി,
More details,കൂടുതൽ വിശദാംശങ്ങൾ,
Nature of Supplies,വസ്തുക്കളുടെ സ്വഭാവം,
@@ -4409,9 +4364,6 @@
Total Completed Qty,ആകെ പൂർത്തിയാക്കിയ ക്യൂട്ടി,
Qty to Manufacture,നിർമ്മിക്കാനുള്ള Qty,
Repay From Salary can be selected only for term loans,ടേം ലോണുകൾക്ക് മാത്രമേ ശമ്പളത്തിൽ നിന്ന് തിരിച്ചടവ് തിരഞ്ഞെടുക്കാനാകൂ,
-No valid Loan Security Price found for {0},Loan 0 for എന്നതിനായി സാധുവായ ലോൺ സുരക്ഷാ വിലയൊന്നും കണ്ടെത്തിയില്ല,
-Loan Account and Payment Account cannot be same,വായ്പ അക്കൗണ്ടും പേയ്മെന്റ് അക്കൗണ്ടും സമാനമാകരുത്,
-Loan Security Pledge can only be created for secured loans,സുരക്ഷിത വായ്പകൾക്കായി മാത്രമേ വായ്പ സുരക്ഷാ പ്രതിജ്ഞ സൃഷ്ടിക്കാൻ കഴിയൂ,
Social Media Campaigns,സോഷ്യൽ മീഡിയ കാമ്പെയ്നുകൾ,
From Date can not be greater than To Date,തീയതി മുതൽ തീയതി വരെ വലുതായിരിക്കരുത്,
Please set a Customer linked to the Patient,രോഗിയുമായി ലിങ്കുചെയ്തിരിക്കുന്ന ഒരു ഉപഭോക്താവിനെ സജ്ജമാക്കുക,
@@ -6437,7 +6389,6 @@
HR User,എച്ച് ഉപയോക്താവ്,
Appointment Letter,നിയമന പത്രിക,
Job Applicant,ഇയ്യോബ് അപേക്ഷകന്,
-Applicant Name,അപേക്ഷകന് പേര്,
Appointment Date,നിയമന തീയതി,
Appointment Letter Template,അപ്പോയിന്റ്മെന്റ് ലെറ്റർ ടെംപ്ലേറ്റ്,
Body,ശരീരം,
@@ -7059,99 +7010,12 @@
Sync in Progress,സമന്വയം പുരോഗമിക്കുന്നു,
Hub Seller Name,ഹബ് വിൽപ്പറിന്റെ പേര്,
Custom Data,ഇഷ്ടാനുസൃത ഡാറ്റ,
-Member,അംഗം,
-Partially Disbursed,ഭാഗികമായി വിതരണം,
-Loan Closure Requested,വായ്പ അടയ്ക്കൽ അഭ്യർത്ഥിച്ചു,
Repay From Salary,ശമ്പളത്തിൽ നിന്ന് പകരം,
-Loan Details,വായ്പ വിശദാംശങ്ങൾ,
-Loan Type,ലോൺ ഇനം,
-Loan Amount,വായ്പാ തുക,
-Is Secured Loan,സുരക്ഷിത വായ്പയാണ്,
-Rate of Interest (%) / Year,പലിശ നിരക്ക് (%) / വർഷം,
-Disbursement Date,ചിലവ് തീയതി,
-Disbursed Amount,വിതരണം ചെയ്ത തുക,
-Is Term Loan,ടേം ലോൺ ആണ്,
-Repayment Method,തിരിച്ചടവ് രീതി,
-Repay Fixed Amount per Period,കാലയളവ് അനുസരിച്ച് നിശ്ചിത പകരം,
-Repay Over Number of Periods,കാലയളവിന്റെ എണ്ണം ഓവർ പകരം,
-Repayment Period in Months,മാസങ്ങളിലെ തിരിച്ചടവ് കാലാവധി,
-Monthly Repayment Amount,പ്രതിമാസ തിരിച്ചടവ് തുക,
-Repayment Start Date,തിരിച്ചടവ് ആരംഭിക്കുന്ന തീയതി,
-Loan Security Details,വായ്പാ സുരക്ഷാ വിശദാംശങ്ങൾ,
-Maximum Loan Value,പരമാവധി വായ്പ മൂല്യം,
-Account Info,അക്കൗണ്ട് വിവരങ്ങളും,
-Loan Account,ലോൺ അക്കൗണ്ട്,
-Interest Income Account,പലിശ വരുമാനം അക്കൗണ്ട്,
-Penalty Income Account,പിഴ വരുമാന അക്കൗണ്ട്,
-Repayment Schedule,തിരിച്ചടവ് ഷെഡ്യൂൾ,
-Total Payable Amount,ആകെ അടയ്ക്കേണ്ട തുക,
-Total Principal Paid,ആകെ പ്രിൻസിപ്പൽ പണമടച്ചു,
-Total Interest Payable,ആകെ തുകയും,
-Total Amount Paid,പണമടച്ച തുക,
-Loan Manager,ലോൺ മാനേജർ,
-Loan Info,ലോൺ വിവരങ്ങളും,
-Rate of Interest,പലിശ നിരക്ക്,
-Proposed Pledges,നിർദ്ദേശിച്ച പ്രതിജ്ഞകൾ,
-Maximum Loan Amount,പരമാവധി വായ്പാ തുക,
-Repayment Info,തിരിച്ചടവ് വിവരങ്ങളും,
-Total Payable Interest,ആകെ പലിശ,
-Against Loan ,വായ്പയ്ക്കെതിരെ,
-Loan Interest Accrual,വായ്പ പലിശ വർദ്ധനവ്,
-Amounts,തുകകൾ,
-Pending Principal Amount,പ്രധാന തുക ശേഷിക്കുന്നു,
-Payable Principal Amount,അടയ്ക്കേണ്ട പ്രധാന തുക,
-Paid Principal Amount,പണമടച്ച പ്രിൻസിപ്പൽ തുക,
-Paid Interest Amount,പണമടച്ച പലിശ തുക,
-Process Loan Interest Accrual,പ്രോസസ് ലോൺ പലിശ ശേഖരണം,
-Repayment Schedule Name,തിരിച്ചടവ് ഷെഡ്യൂളിന്റെ പേര്,
Regular Payment,പതിവ് പേയ്മെന്റ്,
Loan Closure,വായ്പ അടയ്ക്കൽ,
-Payment Details,പേയ്മെന്റ് വിശദാംശങ്ങൾ,
-Interest Payable,നൽകേണ്ട പലിശ,
-Amount Paid,തുക,
-Principal Amount Paid,പണമടച്ച പ്രിൻസിപ്പൽ തുക,
-Repayment Details,തിരിച്ചടവ് വിശദാംശങ്ങൾ,
-Loan Repayment Detail,വായ്പ തിരിച്ചടവ് വിശദാംശം,
-Loan Security Name,വായ്പ സുരക്ഷാ പേര്,
-Unit Of Measure,അളവുകോൽ,
-Loan Security Code,വായ്പ സുരക്ഷാ കോഡ്,
-Loan Security Type,വായ്പ സുരക്ഷാ തരം,
-Haircut %,മുടിവെട്ട് %,
-Loan Details,വായ്പ വിശദാംശങ്ങൾ,
-Unpledged,പൂർത്തിയാകാത്തത്,
-Pledged,പണയം വച്ചു,
-Partially Pledged,ഭാഗികമായി പ്രതിജ്ഞ ചെയ്തു,
-Securities,സെക്യൂരിറ്റികള്,
-Total Security Value,മൊത്തം സുരക്ഷാ മൂല്യം,
-Loan Security Shortfall,വായ്പാ സുരക്ഷാ കുറവ്,
-Loan ,വായ്പ,
-Shortfall Time,കുറവ് സമയം,
-America/New_York,അമേരിക്ക / ന്യൂ_യോർക്ക്,
-Shortfall Amount,കുറവ് തുക,
-Security Value ,സുരക്ഷാ മൂല്യം,
-Process Loan Security Shortfall,പ്രോസസ്സ് ലോൺ സുരക്ഷാ കുറവ്,
-Loan To Value Ratio,മൂല്യ അനുപാതത്തിലേക്ക് വായ്പ,
-Unpledge Time,അൺപ്ലെഡ്ജ് സമയം,
-Loan Name,ലോൺ പേര്,
Rate of Interest (%) Yearly,പലിശ നിരക്ക് (%) വാർഷികം,
-Penalty Interest Rate (%) Per Day,പ്രതിദിനം പലിശ നിരക്ക് (%),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,തിരിച്ചടവ് വൈകിയാൽ ദിവസേന തീർപ്പുകൽപ്പിക്കാത്ത പലിശ തുകയ്ക്ക് പിഴ പലിശ നിരക്ക് ഈടാക്കുന്നു,
-Grace Period in Days,ദിവസങ്ങളിലെ ഗ്രേസ് പിരീഡ്,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,വായ്പ തിരിച്ചടവ് വൈകിയാൽ പിഴ ഈടാക്കാത്ത തീയതി മുതൽ നിശ്ചിത തീയതി വരെ,
-Pledge,പ്രതിജ്ഞ,
-Post Haircut Amount,പോസ്റ്റ് ഹെയർകട്ട് തുക,
-Process Type,പ്രോസസ്സ് തരം,
-Update Time,അപ്ഡേറ്റ് സമയം,
-Proposed Pledge,നിർദ്ദേശിച്ച പ്രതിജ്ഞ,
-Total Payment,ആകെ പേയ്മെന്റ്,
-Balance Loan Amount,ബാലൻസ് വായ്പാ തുക,
-Is Accrued,വർദ്ധിച്ചിരിക്കുന്നു,
Salary Slip Loan,ശമ്പളം സ്ലിപ്പ് വായ്പ,
Loan Repayment Entry,വായ്പ തിരിച്ചടവ് എൻട്രി,
-Sanctioned Loan Amount,അനുവദിച്ച വായ്പ തുക,
-Sanctioned Amount Limit,അനുവദിച്ച തുക പരിധി,
-Unpledge,അൺപ്ലെഡ്ജ്,
-Haircut,മുടിവെട്ട്,
MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-,
Generate Schedule,ഷെഡ്യൂൾ ജനറേറ്റുചെയ്യൂ,
Schedules,സമയക്രമങ്ങൾ,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,പ്രോജക്ട് ഈ ഉപയോക്താക്കൾക്ക് വെബ്സൈറ്റിൽ ആക്സസ്സുചെയ്യാനാവൂ,
Copied From,നിന്നും പകർത്തി,
Start and End Dates,"ആരംഭ, അവസാന തീയതി",
-Actual Time (in Hours),യഥാർത്ഥ സമയം (മണിക്കൂറിൽ),
+Actual Time in Hours (via Timesheet),യഥാർത്ഥ സമയം (മണിക്കൂറിൽ),
Costing and Billing,ആറെണ്ണവും ബില്ലിംഗ്,
-Total Costing Amount (via Timesheets),ആകെ ചെലവ് തുക (ടൈംഷെറ്റുകൾ വഴി),
-Total Expense Claim (via Expense Claims),(ചിലവേറിയ ക്ലെയിമുകൾ വഴി) ആകെ ചിലവേറിയ ക്ലെയിം,
+Total Costing Amount (via Timesheet),ആകെ ചെലവ് തുക (ടൈംഷെറ്റുകൾ വഴി),
+Total Expense Claim (via Expense Claim),(ചിലവേറിയ ക്ലെയിമുകൾ വഴി) ആകെ ചിലവേറിയ ക്ലെയിം,
Total Purchase Cost (via Purchase Invoice),(വാങ്ങൽ ഇൻവോയിസ് വഴി) ആകെ വാങ്ങൽ ചെലവ്,
Total Sales Amount (via Sales Order),ആകെ വില്പന തുക (സെയിൽസ് ഓർഡർ വഴി),
-Total Billable Amount (via Timesheets),ആകെ ബില്ലബിൾ തുക (ടൈംഷെറ്റുകൾ വഴി),
-Total Billed Amount (via Sales Invoices),മൊത്തം ബില്ലും തുക (വിൽപ്പന ഇൻവോയ്സുകളിലൂടെ),
-Total Consumed Material Cost (via Stock Entry),ആകെ ഉപഭോഗം ചെയ്യുന്ന മെറ്റീരിയൽ ചെലവ് (സ്റ്റോക്ക് എൻട്രി വഴി),
+Total Billable Amount (via Timesheet),ആകെ ബില്ലബിൾ തുക (ടൈംഷെറ്റുകൾ വഴി),
+Total Billed Amount (via Sales Invoice),മൊത്തം ബില്ലും തുക (വിൽപ്പന ഇൻവോയ്സുകളിലൂടെ),
+Total Consumed Material Cost (via Stock Entry),ആകെ ഉപഭോഗം ചെയ്യുന്ന മെറ്റീരിയൽ ചെലവ് (സ്റ്റോക്ക് എൻട്രി വഴി),
Gross Margin,മൊത്തം മാർജിൻ,
Gross Margin %,മൊത്തം മാർജിൻ%,
Monitor Progress,മോണിറ്റർ പുരോഗതി,
@@ -7521,12 +7385,10 @@
Dependencies,ആശ്രിതത്വം,
Dependent Tasks,ആശ്രിത ചുമതലകൾ,
Depends on Tasks,ചുമതലകൾ ആശ്രയിച്ചിരിക്കുന്നു,
-Actual Start Date (via Time Sheet),യഥാർത്ഥ ആരംഭ തീയതി (ടൈം ഷീറ്റ് വഴി),
-Actual Time (in hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം,
-Actual End Date (via Time Sheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി),
-Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി),
+Actual Start Date (via Timesheet),യഥാർത്ഥ ആരംഭ തീയതി (ടൈം ഷീറ്റ് വഴി),
+Actual Time in Hours (via Timesheet),(അവേഴ്സ്) യഥാർത്ഥ സമയം,
+Actual End Date (via Timesheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി),
Total Expense Claim (via Expense Claim),(ചിലവിടൽ ക്ലെയിം വഴി) ആകെ ചിലവേറിയ ക്ലെയിം,
-Total Billing Amount (via Time Sheet),ആകെ ബില്ലിംഗ് തുക (ടൈം ഷീറ്റ് വഴി),
Review Date,അവലോകന തീയതി,
Closing Date,അവസാന തീയതി,
Task Depends On,ടാസ്ക് ആശ്രയിച്ചിരിക്കുന്നു,
@@ -7887,7 +7749,6 @@
Update Series,അപ്ഡേറ്റ് സീരീസ്,
Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.,
Prefix,പ്രിഫിക്സ്,
-Current Value,ഇപ്പോഴത്തെ മൂല്യം,
This is the number of the last created transaction with this prefix,ഇത് ഈ കൂടിയ അവസാന സൃഷ്ടിച്ച ഇടപാട് എണ്ണം ആണ്,
Update Series Number,അപ്ഡേറ്റ് സീരീസ് നമ്പർ,
Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത,
Lead Details,ലീഡ് വിവരങ്ങൾ,
Lead Owner Efficiency,ലീഡ് ഉടമ എഫിഷ്യൻസി,
-Loan Repayment and Closure,വായ്പ തിരിച്ചടവും അടയ്ക്കലും,
-Loan Security Status,വായ്പാ സുരക്ഷാ നില,
Lost Opportunity,അവസരം നഷ്ടപ്പെട്ടു,
Maintenance Schedules,മെയിൻറനൻസ് സമയക്രമങ്ങൾ,
Material Requests for which Supplier Quotations are not created,വിതരണക്കാരൻ ഉദ്ധരണികളും സൃഷ്ടിച്ചിട്ടില്ല ചെയ്തിട്ടുളള മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ടാർഗെറ്റുചെയ്ത എണ്ണങ്ങൾ: {0},
Payment Account is mandatory,പേയ്മെന്റ് അക്കൗണ്ട് നിർബന്ധമാണ്,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","പരിശോധിച്ചാൽ, പ്രഖ്യാപനമോ തെളിവ് സമർപ്പിക്കലോ ഇല്ലാതെ ആദായനികുതി കണക്കാക്കുന്നതിന് മുമ്പ് മുഴുവൻ തുകയും നികുതി നൽകേണ്ട വരുമാനത്തിൽ നിന്ന് കുറയ്ക്കും.",
-Disbursement Details,വിതരണ വിശദാംശങ്ങൾ,
Material Request Warehouse,മെറ്റീരിയൽ അഭ്യർത്ഥന വെയർഹ house സ്,
Select warehouse for material requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾക്കായി വെയർഹ house സ് തിരഞ്ഞെടുക്കുക,
Transfer Materials For Warehouse {0},വെയർഹൗസിനായി മെറ്റീരിയലുകൾ കൈമാറുക {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,ക്ലെയിം ചെയ്യാത്ത തുക ശമ്പളത്തിൽ നിന്ന് തിരിച്ചടയ്ക്കുക,
Deduction from salary,ശമ്പളത്തിൽ നിന്ന് കിഴിവ്,
Expired Leaves,കാലഹരണപ്പെട്ട ഇലകൾ,
-Reference No,റഫറൻസ് നമ്പർ,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ലോൺ സെക്യൂരിറ്റിയുടെ മാര്ക്കറ്റ് മൂല്യവും ആ വായ്പയ്ക്ക് ഈടായി ഉപയോഗിക്കുമ്പോൾ ആ ലോൺ സെക്യൂരിറ്റിയുടെ മൂല്യവും തമ്മിലുള്ള ശതമാനം വ്യത്യാസമാണ് ഹെയർകട്ട് ശതമാനം.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,ലോൺ ടു വാല്യൂ റേഷ്യോ വായ്പ പണത്തിന്റെ അനുപാതം പണയം വച്ച സുരക്ഷയുടെ മൂല്യവുമായി പ്രകടിപ്പിക്കുന്നു. ഏതെങ്കിലും വായ്പയുടെ നിർദ്ദിഷ്ട മൂല്യത്തേക്കാൾ കുറവാണെങ്കിൽ ഒരു വായ്പാ സുരക്ഷാ കുറവുണ്ടാകും,
If this is not checked the loan by default will be considered as a Demand Loan,ഇത് പരിശോധിച്ചില്ലെങ്കിൽ സ്ഥിരസ്ഥിതിയായി വായ്പ ഒരു ഡിമാൻഡ് വായ്പയായി കണക്കാക്കും,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,വായ്പക്കാരനിൽ നിന്ന് വായ്പ തിരിച്ചടവ് ബുക്ക് ചെയ്യുന്നതിനും വായ്പക്കാരന് വായ്പ വിതരണം ചെയ്യുന്നതിനും ഈ അക്കൗണ്ട് ഉപയോഗിക്കുന്നു,
This account is capital account which is used to allocate capital for loan disbursal account ,വായ്പാ വിതരണ അക്കൗണ്ടിനായി മൂലധനം അനുവദിക്കുന്നതിന് ഉപയോഗിക്കുന്ന മൂലധന അക്കൗണ്ടാണ് ഈ അക്കൗണ്ട്,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},{0 the പ്രവർത്തനം വർക്ക് ഓർഡറിൽ ഉൾപ്പെടുന്നില്ല {1},
Print UOM after Quantity,അളവിന് ശേഷം UOM പ്രിന്റുചെയ്യുക,
Set default {0} account for perpetual inventory for non stock items,സ്റ്റോക്ക് ഇതര ഇനങ്ങൾക്കായി സ്ഥിരമായ ഇൻവെന്ററിക്ക് സ്ഥിരസ്ഥിതി {0} അക്കൗണ്ട് സജ്ജമാക്കുക,
-Loan Security {0} added multiple times,ലോൺ സുരക്ഷ {0 multiple ഒന്നിലധികം തവണ ചേർത്തു,
-Loan Securities with different LTV ratio cannot be pledged against one loan,വ്യത്യസ്ത എൽടിവി അനുപാതമുള്ള ലോൺ സെക്യൂരിറ്റികൾ ഒരു വായ്പയ്ക്കെതിരെ പണയം വയ്ക്കാൻ കഴിയില്ല,
-Qty or Amount is mandatory for loan security!,വായ്പ സുരക്ഷയ്ക്കായി ക്യൂട്ടി അല്ലെങ്കിൽ തുക നിർബന്ധമാണ്!,
-Only submittted unpledge requests can be approved,സമർപ്പിച്ച അൺപ്ലഡ്ജ് അഭ്യർത്ഥനകൾക്ക് മാത്രമേ അംഗീകാരം ലഭിക്കൂ,
-Interest Amount or Principal Amount is mandatory,പലിശ തുക അല്ലെങ്കിൽ പ്രിൻസിപ്പൽ തുക നിർബന്ധമാണ്,
-Disbursed Amount cannot be greater than {0},വിതരണം ചെയ്ത തുക {0 than ൽ കൂടുതലാകരുത്,
-Row {0}: Loan Security {1} added multiple times,വരി {0}: വായ്പ സുരക്ഷ {1 multiple ഒന്നിലധികം തവണ ചേർത്തു,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,വരി # {0}: കുട്ടികളുടെ ഇനം ഒരു ഉൽപ്പന്ന ബണ്ടിൽ ആകരുത്. ഇനം {1 remove നീക്കംചെയ്ത് സംരക്ഷിക്കുക,
Credit limit reached for customer {0},ഉപഭോക്താവിന് ക്രെഡിറ്റ് പരിധി എത്തിച്ചു {0},
Could not auto create Customer due to the following missing mandatory field(s):,ഇനിപ്പറയുന്ന നിർബന്ധിത ഫീൽഡ് (കൾ) കാണാത്തതിനാൽ ഉപഭോക്താവിനെ യാന്ത്രികമായി സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല:,
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 21aaa3f..578cca7 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","जर कंपनी एसपीए, सपा किंवा एसआरएल असेल तर लागू",
Applicable if the company is a limited liability company,जर कंपनी मर्यादित दायित्व कंपनी असेल तर लागू,
Applicable if the company is an Individual or a Proprietorship,जर कंपनी वैयक्तिक किंवा मालकीची असेल तर ती लागू होईल,
-Applicant,अर्जदार,
-Applicant Type,अर्जदार प्रकार,
Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज,
Application period cannot be across two allocation records,अर्ज कालावधी दोन वाटपांच्या रेकॉर्डमध्ये असू शकत नाही,
Application period cannot be outside leave allocation period,अर्ज काळ रजा वाटप कालावधी बाहेर असू शकत नाही,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,फोलीओ नंबरसह उपलब्ध भागधारकांची यादी,
Loading Payment System,देयक भरणा पद्धत,
Loan,कर्ज,
-Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0},
-Loan Application,कर्ज अर्ज,
-Loan Management,कर्ज व्यवस्थापन,
-Loan Repayment,कर्जाची परतफेड,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,बीजक सवलत बचत करण्यासाठी कर्ज प्रारंभ तारीख आणि कर्जाचा कालावधी अनिवार्य आहे,
Loans (Liabilities),कर्ज (दायित्व),
Loans and Advances (Assets),कर्ज आणि मालमत्ता (assets),
@@ -1611,7 +1605,6 @@
Monday,सोमवार,
Monthly,मासिक,
Monthly Distribution,मासिक वितरण,
-Monthly Repayment Amount cannot be greater than Loan Amount,मासिक परतफेड रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही,
More,आणखी,
More Information,अधिक माहिती,
More than one selection for {0} not allowed,{0} साठी एकापेक्षा अधिक निवड करण्याची परवानगी नाही,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} ला पैसे द्या,
Payable,देय,
Payable Account,देय खाते,
-Payable Amount,देय रक्कम,
Payment,भरणा,
Payment Cancelled. Please check your GoCardless Account for more details,देयक रद्द झाले कृपया अधिक तपशीलांसाठी आपले GoCardless खाते तपासा,
Payment Confirmation,प्रदान खात्री,
-Payment Date,पगाराची तारीख,
Payment Days,भरणा दिवस,
Payment Document,भरणा दस्तऐवज,
Payment Due Date,पैसे भरण्याची शेवटची तारिख,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,पहिले खरेदी पावती प्रविष्ट करा,
Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा,
Please enter Reference date,संदर्भ तारीख प्रविष्ट करा,
-Please enter Repayment Periods,परतफेड कालावधी प्रविष्ट करा,
Please enter Reqd by Date,कृपया दिनांकानुसार Reqd प्रविष्ट करा,
Please enter Woocommerce Server URL,कृपया Woocommerce सर्व्हर URL प्रविष्ट करा,
Please enter Write Off Account,Write Off खाते प्रविष्ट करा,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,पालक खर्च केंद्र प्रविष्ट करा,
Please enter quantity for Item {0},आयटम {0} साठी संख्या प्रविष्ट करा,
Please enter relieving date.,relieving तारीख प्रविष्ट करा.,
-Please enter repayment Amount,परतफेड रक्कम प्रविष्ट करा,
Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि समाप्त तारखा प्रविष्ट करा,
Please enter valid email address,वैध ईमेल पत्ता प्रविष्ट करा,
Please enter {0} first,प्रथम {0} प्रविष्ट करा,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,किंमत नियमांना पुढील प्रमाणावर आधारित फिल्टर आहेत.,
Primary Address Details,प्राथमिक पत्ता तपशील,
Primary Contact Details,प्राथमिक संपर्क तपशील,
-Principal Amount,मुख्य रक्कम,
Print Format,मुद्रण स्वरूप,
Print IRS 1099 Forms,आयआरएस 1099 फॉर्म मुद्रित करा,
Print Report Card,अहवाल कार्ड प्रिंट करा,
@@ -2550,7 +2538,6 @@
Sample Collection,नमुना संकलन,
Sample quantity {0} cannot be more than received quantity {1},नमुना प्रमाण {0} प्राप्त केलेल्या प्रमाणाहून अधिक असू शकत नाही {1},
Sanctioned,मंजूर,
-Sanctioned Amount,मंजूर रक्कम,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो {0} मधे मागणी रक्कमेपेक्षा जास्त असू शकत नाही.,
Sand,वाळू,
Saturday,शनिवारी,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} कडे आधीपासूनच पालक प्रक्रिया आहे {1}.,
API,API,
Annual,वार्षिक,
-Approved,मंजूर,
Change,बदला,
Contact Email,संपर्क ईमेल,
Export Type,निर्यात प्रकार,
@@ -3571,7 +3557,6 @@
Account Value,खाते मूल्य,
Account is mandatory to get payment entries,देय नोंदी मिळविण्यासाठी खाते अनिवार्य आहे,
Account is not set for the dashboard chart {0},डॅशबोर्ड चार्ट Account 0 Account साठी खाते सेट केलेले नाही,
-Account {0} does not belong to company {1},खाते {0} कंपनी संबंधित नाही {1},
Account {0} does not exists in the dashboard chart {1},डॅशबोर्ड चार्ट {1} मध्ये खाते {0 exists विद्यमान नाही,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,खाते: <b>{0</b> capital भांडवल आहे प्रगतीपथावर आणि जर्नल एन्ट्रीद्वारे अद्यतनित केले जाऊ शकत नाही,
Account: {0} is not permitted under Payment Entry,खाते: पेमेंट एंट्री अंतर्गत {0} ला परवानगी नाही,
@@ -3582,7 +3567,6 @@
Activity,क्रियाकलाप,
Add / Manage Email Accounts.,ईमेल खाती व्यवस्थापित करा / जोडा.,
Add Child,child जोडा,
-Add Loan Security,कर्ज सुरक्षा जोडा,
Add Multiple,अनेक जोडा,
Add Participants,सहभागी जोडा,
Add to Featured Item,वैशिष्ट्यीकृत आयटमवर जोडा,
@@ -3593,15 +3577,12 @@
Address Line 1,पत्ता ओळ 1,
Addresses,पत्ते,
Admission End Date should be greater than Admission Start Date.,प्रवेश समाप्ती तारीख प्रवेश प्रारंभ तारखेपेक्षा मोठी असावी.,
-Against Loan,कर्जाच्या विरूद्ध,
-Against Loan:,कर्जाविरूद्ध:,
All,सर्व,
All bank transactions have been created,सर्व बँक व्यवहार तयार केले गेले आहेत,
All the depreciations has been booked,सर्व अवमूल्यन बुक केले गेले आहेत,
Allocation Expired!,वाटप कालबाह्य!,
Allow Resetting Service Level Agreement from Support Settings.,समर्थन सेटिंग्जमधून सेवा स्तर करार रीसेट करण्याची अनुमती द्या.,
Amount of {0} is required for Loan closure,कर्ज बंद करण्यासाठी {0} ची रक्कम आवश्यक आहे,
-Amount paid cannot be zero,देय रक्कम शून्य असू शकत नाही,
Applied Coupon Code,लागू केलेला कूपन कोड,
Apply Coupon Code,कूपन कोड लागू करा,
Appointment Booking,नियुक्ती बुकिंग,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ड्रायव्हरचा पत्ता गहाळ झाल्यामुळे आगमन वेळेची गणना करणे शक्य नाही.,
Cannot Optimize Route as Driver Address is Missing.,ड्रायव्हरचा पत्ता गहाळ झाल्यामुळे मार्ग ऑप्टिमाइझ करणे शक्य नाही.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,कार्य {0 complete पूर्ण करू शकत नाही कारण त्याचे अवलंबन कार्य {1} कॉम्पलेटेड / रद्द केलेले नाही.,
-Cannot create loan until application is approved,अर्ज मंजूर होईपर्यंत कर्ज तयार करू शकत नाही,
Cannot find a matching Item. Please select some other value for {0}.,मानक क्षेत्रात हटवू शकत नाही. आपण {0} साठी काही इतर मूल्य निवडा.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",आयटम row 0 row च्या पंक्ती row 1} मध्ये {2} पेक्षा जास्त ओव्हरबिल करू शकत नाही. ओव्हर बिलिंगला अनुमती देण्यासाठी कृपया खाती सेटिंग्जमध्ये भत्ता सेट करा,
"Capacity Planning Error, planned start time can not be same as end time","क्षमता नियोजन त्रुटी, नियोजित प्रारंभ वेळ शेवटच्या वेळेसारखा असू शकत नाही",
@@ -3812,20 +3792,9 @@
Less Than Amount,पेक्षा कमी रक्कम,
Liabilities,उत्तरदायित्व,
Loading...,लोड करीत आहे ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,प्रस्तावित सिक्युरिटीजनुसार कर्जाची रक्कम कमाल कर्जाची रक्कम {0 ce पेक्षा जास्त आहे,
Loan Applications from customers and employees.,ग्राहक व कर्मचार्यांकडून कर्ज अर्ज.,
-Loan Disbursement,कर्ज वितरण,
Loan Processes,कर्ज प्रक्रिया,
-Loan Security,कर्ज सुरक्षा,
-Loan Security Pledge,कर्ज सुरक्षा तारण,
-Loan Security Pledge Created : {0},कर्ज सुरक्षिततेची प्रतिज्ञा तयार केली: {0},
-Loan Security Price,कर्ज सुरक्षा किंमत,
-Loan Security Price overlapping with {0},कर्ज सुरक्षा किंमत {0 with सह आच्छादित,
-Loan Security Unpledge,कर्ज सुरक्षा Unp प्ले,
-Loan Security Value,कर्जाची सुरक्षा मूल्य,
Loan Type for interest and penalty rates,व्याज आणि दंड दरासाठी कर्जाचा प्रकार,
-Loan amount cannot be greater than {0},कर्जाची रक्कम {0} पेक्षा जास्त असू शकत नाही,
-Loan is mandatory,कर्ज अनिवार्य आहे,
Loans,कर्ज,
Loans provided to customers and employees.,ग्राहक आणि कर्मचार्यांना दिलेली कर्जे.,
Location,स्थान,
@@ -3894,7 +3863,6 @@
Pay,द्या,
Payment Document Type,पेमेंट दस्तऐवज प्रकार,
Payment Name,देय नाव,
-Penalty Amount,दंड रक्कम,
Pending,प्रलंबित,
Performance,कामगिरी,
Period based On,कालावधी चालू,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,हा आयटम संपादित करण्यासाठी कृपया मार्केटप्लेस वापरकर्ता म्हणून लॉगिन करा.,
Please login as a Marketplace User to report this item.,या आयटमचा अहवाल देण्यासाठी कृपया मार्केटप्लेस वापरकर्ता म्हणून लॉगिन करा.,
Please select <b>Template Type</b> to download template,कृपया <b>टेम्पलेट</b> डाउनलोड करण्यासाठी टेम्पलेट <b>प्रकार</b> निवडा,
-Please select Applicant Type first,कृपया प्रथम अर्जदार प्रकार निवडा,
Please select Customer first,कृपया प्रथम ग्राहक निवडा,
Please select Item Code first,कृपया प्रथम आयटम कोड निवडा,
-Please select Loan Type for company {0},कृपया कंपनीसाठी कर्जाचे प्रकार निवडा Type 0,
Please select a Delivery Note,कृपया डिलिव्हरी नोट निवडा,
Please select a Sales Person for item: {0},कृपया आयटमसाठी एक विक्री व्यक्ती निवडा: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',कृपया दुसरी देयक पद्धत निवडा. पट्टी चलन व्यवहार समर्थन देत नाही '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},कृपया कंपनी for 0} साठी डीफॉल्ट बँक खाते सेट अप करा.,
Please specify,कृपया निर्दिष्ट करा,
Please specify a {0},कृपया एक {0 specify निर्दिष्ट करा,lead
-Pledge Status,तारण स्थिती,
-Pledge Time,तारण वेळ,
Printing,मुद्रण,
Priority,प्राधान्य,
Priority has been changed to {0}.,अग्रक्रम {0} मध्ये बदलले गेले आहे.,
@@ -3944,7 +3908,6 @@
Processing XML Files,एक्सएमएल फायलींवर प्रक्रिया करीत आहे,
Profitability,नफा,
Project,प्रकल्प,
-Proposed Pledges are mandatory for secured Loans,सुरक्षित कर्जासाठी प्रस्तावित प्रतिज्ञा अनिवार्य आहेत,
Provide the academic year and set the starting and ending date.,शैक्षणिक वर्ष प्रदान करा आणि प्रारंभ आणि समाप्ती तारीख सेट करा.,
Public token is missing for this bank,या बँकेसाठी सार्वजनिक टोकन गहाळ आहे,
Publish,प्रकाशित करा,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,खरेदी पावतीमध्ये कोणताही आयटम नाही ज्यासाठी रीटेन नमूना सक्षम केला आहे.,
Purchase Return,खरेदी परत,
Qty of Finished Goods Item,तयार वस्तूंची संख्या,
-Qty or Amount is mandatroy for loan security,कर्जाच्या रकमेसाठी क्वाटी किंवा रकम ही मॅनडॅट्रॉय आहे,
Quality Inspection required for Item {0} to submit,आयटम for 0 submit सबमिट करण्यासाठी गुणवत्ता तपासणी आवश्यक आहे,
Quantity to Manufacture,उत्पादन करण्यासाठी प्रमाण,
Quantity to Manufacture can not be zero for the operation {0},ऑपरेशन {0} साठी उत्पादनाची प्रमाण शून्य असू शकत नाही,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,सामील होण्याची तारीख सामील होण्याच्या तारखेच्या किंवा त्याहून अधिक असणे आवश्यक आहे,
Rename,पुनर्नामित करा,
Rename Not Allowed,पुनर्नामित अनुमत नाही,
-Repayment Method is mandatory for term loans,मुदतीच्या कर्जासाठी परतफेड करण्याची पद्धत अनिवार्य आहे,
-Repayment Start Date is mandatory for term loans,मुदतीच्या कर्जासाठी परतफेड सुरू करण्याची तारीख अनिवार्य आहे,
Report Item,आयटम नोंदवा,
Report this Item,या आयटमचा अहवाल द्या,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,सब कॉन्ट्रॅक्टसाठी राखीव क्वाटीटी: सब कॉन्ट्रॅक्ट केलेल्या वस्तू बनविण्यासाठी कच्च्या मालाचे प्रमाण.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},पंक्ती ({0}): {1 आधीपासूनच {2 in मध्ये सवलत आहे,
Rows Added in {0},Ows 0} मध्ये पंक्ती जोडल्या,
Rows Removed in {0},पंक्ती {0 in मध्ये काढल्या,
-Sanctioned Amount limit crossed for {0} {1},मंजूर रकमेची मर्यादा} 0} {1 for साठी ओलांडली,
-Sanctioned Loan Amount already exists for {0} against company {1},कंपनी} 1} विरूद्ध Lo 0 for साठी मंजूर कर्ज रक्कम आधीपासून विद्यमान आहे,
Save,जतन करा,
Save Item,आयटम जतन करा,
Saved Items,जतन केलेले आयटम,
@@ -4135,7 +4093,6 @@
User {0} is disabled,सदस्य {0} अक्षम आहे,
Users and Permissions,वापरकर्ते आणि परवानग्या,
Vacancies cannot be lower than the current openings,रिक्त जागा सध्याच्या उद्घाटनापेक्षा कमी असू शकत नाहीत,
-Valid From Time must be lesser than Valid Upto Time.,वैध वेळेपासून वैध वेळेपेक्षा कमी असणे आवश्यक आहे.,
Valuation Rate required for Item {0} at row {1},पंक्ती {1} वर आयटम {0} साठी मूल्य दर आवश्यक,
Values Out Of Sync,समक्रमित मूल्ये,
Vehicle Type is required if Mode of Transport is Road,जर मोड ऑफ ट्रान्सपोर्ट रोड असेल तर वाहन प्रकार आवश्यक आहे,
@@ -4211,7 +4168,6 @@
Add to Cart,सूचीत टाका,
Days Since Last Order,शेवटची ऑर्डर असल्याने दिवस,
In Stock,स्टॉक,
-Loan Amount is mandatory,कर्जाची रक्कम अनिवार्य आहे,
Mode Of Payment,मोड ऑफ पेमेंट्स,
No students Found,कोणतेही विद्यार्थी आढळले नाहीत,
Not in Stock,स्टॉक मध्ये नाही,
@@ -4240,7 +4196,6 @@
Group by,गट,
In stock,स्टॉक मध्ये,
Item name,आयटम नाव,
-Loan amount is mandatory,कर्जाची रक्कम अनिवार्य आहे,
Minimum Qty,किमान प्रमाण,
More details,अधिक माहितीसाठी,
Nature of Supplies,पुरवठा स्वरूप,
@@ -4409,9 +4364,6 @@
Total Completed Qty,एकूण पूर्ण प्रमाण,
Qty to Manufacture,निर्मिती करण्यासाठी Qty,
Repay From Salary can be selected only for term loans,पगाराची परतफेड केवळ मुदतीच्या कर्जासाठी निवडली जाऊ शकते,
-No valid Loan Security Price found for {0},Security 0 for साठी कोणतीही वैध कर्जाची सुरक्षा किंमत आढळली नाही,
-Loan Account and Payment Account cannot be same,कर्ज खाते आणि देयक खाते एकसारखे असू शकत नाही,
-Loan Security Pledge can only be created for secured loans,कर्जाची सुरक्षा प्रतिज्ञा केवळ सुरक्षित कर्जासाठी केली जाऊ शकते,
Social Media Campaigns,सोशल मीडिया मोहिमा,
From Date can not be greater than To Date,तारखेपासून तारखेपेक्षा मोठी असू शकत नाही,
Please set a Customer linked to the Patient,कृपया रुग्णांशी जोडलेला एखादा ग्राहक सेट करा,
@@ -6437,7 +6389,6 @@
HR User,एचआर सदस्य,
Appointment Letter,नियुक्ती पत्र,
Job Applicant,ईयोब अर्जदाराचे,
-Applicant Name,अर्जदाराचे नाव,
Appointment Date,नियुक्तीची तारीख,
Appointment Letter Template,नियुक्ती पत्र टेम्पलेट,
Body,शरीर,
@@ -7059,99 +7010,12 @@
Sync in Progress,प्रगतीपथावर संकालन,
Hub Seller Name,हब विक्रेता नाव,
Custom Data,सानुकूल डेटा,
-Member,सदस्य,
-Partially Disbursed,अंशत: वाटप,
-Loan Closure Requested,कर्ज बंद करण्याची विनंती केली,
Repay From Salary,पगार पासून परत फेड करा,
-Loan Details,कर्ज तपशील,
-Loan Type,कर्ज प्रकार,
-Loan Amount,कर्ज रक्कम,
-Is Secured Loan,सुरक्षित कर्ज आहे,
-Rate of Interest (%) / Year,व्याज (%) / वर्ष दर,
-Disbursement Date,खर्च तारीख,
-Disbursed Amount,वितरित रक्कम,
-Is Term Loan,टर्म लोन आहे,
-Repayment Method,परतफेड पद्धत,
-Repay Fixed Amount per Period,प्रति कालावधी मुदत रक्कम परतफेड,
-Repay Over Number of Periods,"कालावधी, म्हणजे क्रमांक परत फेड करा",
-Repayment Period in Months,महिने कर्जफेड कालावधी,
-Monthly Repayment Amount,मासिक परतफेड रक्कम,
-Repayment Start Date,परतफेड प्रारंभ तारीख,
-Loan Security Details,कर्जाची सुरक्षा तपशील,
-Maximum Loan Value,कमाल कर्ज मूल्य,
-Account Info,खात्याची माहिती,
-Loan Account,कर्ज खाते,
-Interest Income Account,व्याज उत्पन्न खाते,
-Penalty Income Account,दंड उत्पन्न खाते,
-Repayment Schedule,परतफेड वेळापत्रकाच्या,
-Total Payable Amount,एकूण देय रक्कम,
-Total Principal Paid,एकूण प्राचार्य दिले,
-Total Interest Payable,देय एकूण व्याज,
-Total Amount Paid,देय एकूण रक्कम,
-Loan Manager,कर्ज व्यवस्थापक,
-Loan Info,कर्ज माहिती,
-Rate of Interest,व्याज दर,
-Proposed Pledges,प्रस्तावित प्रतिज्ञा,
-Maximum Loan Amount,कमाल कर्ज रक्कम,
-Repayment Info,परतफेड माहिती,
-Total Payable Interest,एकूण व्याज देय,
-Against Loan ,कर्जाच्या विरूद्ध,
-Loan Interest Accrual,कर्ज व्याज जमा,
-Amounts,रक्कम,
-Pending Principal Amount,प्रलंबित रक्कम,
-Payable Principal Amount,देय प्रधान रक्कम,
-Paid Principal Amount,देय प्रधान रक्कम,
-Paid Interest Amount,देय व्याज रक्कम,
-Process Loan Interest Accrual,प्रक्रिया कर्ज व्याज जमा,
-Repayment Schedule Name,परतफेड वेळापत्रक,
Regular Payment,नियमित देय,
Loan Closure,कर्ज बंद,
-Payment Details,भरणा माहिती,
-Interest Payable,व्याज देय,
-Amount Paid,अदा केलेली रक्कम,
-Principal Amount Paid,मुख्य रक्कम दिली,
-Repayment Details,परतफेड तपशील,
-Loan Repayment Detail,कर्जाची परतफेड तपशील,
-Loan Security Name,कर्जाचे सुरक्षा नाव,
-Unit Of Measure,मोजण्याचे एकक,
-Loan Security Code,कर्ज सुरक्षा कोड,
-Loan Security Type,कर्ज सुरक्षा प्रकार,
-Haircut %,केशरचना%,
-Loan Details,कर्जाचा तपशील,
-Unpledged,अप्रमाणित,
-Pledged,तारण ठेवले,
-Partially Pledged,अर्धवट तारण ठेवले,
-Securities,सिक्युरिटीज,
-Total Security Value,एकूण सुरक्षा मूल्य,
-Loan Security Shortfall,कर्ज सुरक्षा कमतरता,
-Loan ,कर्ज,
-Shortfall Time,कमी वेळ,
-America/New_York,अमेरिका / न्यूयॉर्क,
-Shortfall Amount,उणीव रक्कम,
-Security Value ,सुरक्षा मूल्य,
-Process Loan Security Shortfall,प्रक्रिया कर्ज सुरक्षा कमतरता,
-Loan To Value Ratio,कर्जाचे मूल्य प्रमाण,
-Unpledge Time,अप्रत्याशित वेळ,
-Loan Name,कर्ज नाव,
Rate of Interest (%) Yearly,व्याज दर (%) वार्षिक,
-Penalty Interest Rate (%) Per Day,दंड व्याज दर (%) दर दिवशी,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,विलंब परतफेड झाल्यास दररोज प्रलंबित व्याज रकमेवर दंड व्याज दर आकारला जातो,
-Grace Period in Days,दिवसांमध्ये ग्रेस पीरियड,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,कर्जाची परतफेड करण्यास विलंब झाल्यास देय तारखेपासून किती दिवस दंड आकारला जाणार नाही?,
-Pledge,प्रतिज्ञा,
-Post Haircut Amount,केशरचनानंतरची रक्कम,
-Process Type,प्रक्रिया प्रकार,
-Update Time,अद्यतनित वेळ,
-Proposed Pledge,प्रस्तावित प्रतिज्ञा,
-Total Payment,एकूण भरणा,
-Balance Loan Amount,शिल्लक कर्ज रक्कम,
-Is Accrued,जमा आहे,
Salary Slip Loan,वेतन स्लिप कर्ज,
Loan Repayment Entry,कर्जाची परतफेड एन्ट्री,
-Sanctioned Loan Amount,मंजूर कर्जाची रक्कम,
-Sanctioned Amount Limit,मंजूर रक्कम मर्यादा,
-Unpledge,न कबूल करा,
-Haircut,केशरचना,
MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-,
Generate Schedule,वेळापत्रक तयार करा,
Schedules,वेळापत्रक,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,"प्रकल्प या वापरकर्त्यांना वेबसाइटवर उपलब्ध राहील,",
Copied From,कॉपी,
Start and End Dates,सुरू आणि तारखा समाप्त,
-Actual Time (in Hours),वास्तविक वेळ (तासांमध्ये),
+Actual Time in Hours (via Timesheet),वास्तविक वेळ (तासांमध्ये),
Costing and Billing,भांडवलाच्या आणि बिलिंग,
-Total Costing Amount (via Timesheets),एकूण किंमत (वेळपत्रके मार्गे),
-Total Expense Claim (via Expense Claims),एकूण खर्च हक्क (खर्चाचे दावे द्वारे),
+Total Costing Amount (via Timesheet),एकूण किंमत (वेळपत्रके मार्गे),
+Total Expense Claim (via Expense Claim),एकूण खर्च हक्क (खर्चाचे दावे द्वारे),
Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी चलन द्वारे),
Total Sales Amount (via Sales Order),एकूण विक्री रक्कम (विक्री आदेशानुसार),
-Total Billable Amount (via Timesheets),एकूण बिल करण्यायोग्य रक्कम (टाईम्सशीट्सद्वारे),
-Total Billed Amount (via Sales Invoices),एकूण बिल रक्कम (विक्री चलन द्वारे),
-Total Consumed Material Cost (via Stock Entry),टोटल कन्स्ट्रक्टेड मटेरियल कॉस्ट (स्टॉक एंट्री द्वारे),
+Total Billable Amount (via Timesheet),एकूण बिल करण्यायोग्य रक्कम (टाईम्सशीट्सद्वारे),
+Total Billed Amount (via Sales Invoice),एकूण बिल रक्कम (विक्री चलन द्वारे),
+Total Consumed Material Cost (via Stock Entry),टोटल कन्स्ट्रक्टेड मटेरियल कॉस्ट (स्टॉक एंट्री द्वारे),
Gross Margin,एकूण मार्जिन,
Gross Margin %,एकूण मार्जिन%,
Monitor Progress,मॉनिटर प्रगती,
@@ -7521,12 +7385,10 @@
Dependencies,अवलंबित्व,
Dependent Tasks,अवलंबित कार्ये,
Depends on Tasks,कार्ये अवलंबून,
-Actual Start Date (via Time Sheet),प्रत्यक्ष प्रारंभ तारीख (वेळ पत्रक द्वारे),
-Actual Time (in hours),(तास) वास्तविक वेळ,
-Actual End Date (via Time Sheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे),
-Total Costing Amount (via Time Sheet),एकूण कोस्टींग रक्कम (वेळ पत्रक द्वारे),
+Actual Start Date (via Timesheet),प्रत्यक्ष प्रारंभ तारीख (वेळ पत्रक द्वारे),
+Actual Time in Hours (via Timesheet),(तास) वास्तविक वेळ,
+Actual End Date (via Timesheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे),
Total Expense Claim (via Expense Claim),(खर्च दावा द्वारे) एकूण खर्च दावा,
-Total Billing Amount (via Time Sheet),एकूण बिलिंग रक्कम (वेळ पत्रक द्वारे),
Review Date,पुनरावलोकन तारीख,
Closing Date,अखेरची दिनांक,
Task Depends On,कार्य अवलंबून असते,
@@ -7887,7 +7749,6 @@
Update Series,अद्यतन मालिका,
Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.,
Prefix,पूर्वपद,
-Current Value,वर्तमान मूल्य,
This is the number of the last created transaction with this prefix,हा क्रमांक या प्रत्ययसह गेल्या निर्माण केलेला व्यवहार आहे,
Update Series Number,अद्यतन मालिका क्रमांक,
Quotation Lost Reason,कोटेशन हरवले कारण,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस,
Lead Details,लीड तपशील,
Lead Owner Efficiency,लीड मालक कार्यक्षमता,
-Loan Repayment and Closure,कर्जाची परतफेड आणि बंद,
-Loan Security Status,कर्ज सुरक्षा स्थिती,
Lost Opportunity,संधी गमावली,
Maintenance Schedules,देखभाल वेळापत्रक,
Material Requests for which Supplier Quotations are not created,साहित्य विनंत्या ज्यांच्यासाठी पुरवठादार अवतरणे तयार नाहीत,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},लक्ष्यित संख्या: {0},
Payment Account is mandatory,पेमेंट खाते अनिवार्य आहे,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","तपासल्यास, कोणतीही घोषणा किंवा पुरावा सबमिशन न करता आयकर मोजण्यापूर्वी संपूर्ण रक्कम करपात्र उत्पन्नामधून वजा केली जाईल.",
-Disbursement Details,वितरणाचा तपशील,
Material Request Warehouse,साहित्य विनंती वखार,
Select warehouse for material requests,भौतिक विनंत्यांसाठी गोदाम निवडा,
Transfer Materials For Warehouse {0},वेअरहाउस {0 For साठी सामग्री हस्तांतरित करा,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,वेतनातून दावा न केलेली रक्कम परत द्या,
Deduction from salary,वेतनातून वजावट,
Expired Leaves,कालबाह्य झालेले पाने,
-Reference No,संदर्भ क्रमांक,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,केशभूषा टक्केवारी म्हणजे कर्जाची जमानत म्हणून वापरली जाणारी कर्जाची सुरक्षा किंमत आणि त्या कर्जाच्या सुरक्षिततेस दिलेल्या मूल्यांमधील टक्केवारीतील फरक.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,लोन टू व्हॅल्यू रेश्यो तारण ठेवलेल्या सिक्युरिटीजच्या कर्जाच्या रकमेचे प्रमाण व्यक्त करते. जर हे कोणत्याही कर्जाच्या निर्दिष्ट मूल्यापेक्षा कमी झाले तर कर्जाची सुरक्षा कमतरता निर्माण होईल,
If this is not checked the loan by default will be considered as a Demand Loan,हे तपासले नाही तर डीफॉल्टनुसार कर्ज डिमांड लोन मानले जाईल,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,हे खाते कर्जदाराकडून कर्ज परतफेड बुक करण्यासाठी आणि कर्जदाराला कर्ज वितरणासाठी वापरले जाते.,
This account is capital account which is used to allocate capital for loan disbursal account ,हे खाते भांडवल खाते आहे जे कर्ज वितरण खात्यासाठी भांडवल वाटप करण्यासाठी वापरले जाते,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ऑपरेशन {0 the वर्क ऑर्डरशी संबंधित नाही {1},
Print UOM after Quantity,प्रमाणानंतर यूओएम मुद्रित करा,
Set default {0} account for perpetual inventory for non stock items,स्टॉक नसलेल्या वस्तूंसाठी कायम सूचीसाठी डीफॉल्ट {0} खाते सेट करा,
-Loan Security {0} added multiple times,कर्ज सुरक्षा {0} अनेक वेळा जोडली,
-Loan Securities with different LTV ratio cannot be pledged against one loan,एका एलटीव्ही रेशोसह वेगवेगळ्या कर्ज सिक्युरिटीज एका कर्जावर तारण ठेवू शकत नाही,
-Qty or Amount is mandatory for loan security!,कर्जाच्या सुरक्षिततेसाठी रक्कम किंवा रक्कम अनिवार्य आहे!,
-Only submittted unpledge requests can be approved,केवळ सबमिट केलेल्या अनप्लेज विनंत्यांना मंजूर केले जाऊ शकते,
-Interest Amount or Principal Amount is mandatory,व्याज रक्कम किंवा मूळ रक्कम अनिवार्य आहे,
-Disbursed Amount cannot be greater than {0},वितरित केलेली रक्कम {0 than पेक्षा जास्त असू शकत नाही,
-Row {0}: Loan Security {1} added multiple times,पंक्ती {0}: कर्ज सुरक्षा {1 multiple अनेक वेळा जोडली,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,पंक्ती # {0}: चाईल्ड आयटम उत्पादन बंडल असू नये. कृपया आयटम {1 remove काढा आणि जतन करा,
Credit limit reached for customer {0},ग्राहकांसाठी क्रेडिट मर्यादा reached 0 reached पर्यंत पोहोचली,
Could not auto create Customer due to the following missing mandatory field(s):,खालील हरवलेल्या अनिवार्य फील्डमुळे ग्राहक स्वयंचलितरित्या तयार करु शकले नाही:,
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 5a3d986..e815a1d 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Berkenaan jika syarikat itu adalah SpA, SApA atau SRL",
Applicable if the company is a limited liability company,Berkenaan jika syarikat itu adalah syarikat liabiliti terhad,
Applicable if the company is an Individual or a Proprietorship,Berkenaan jika syarikat itu adalah Individu atau Tuan Rumah,
-Applicant,Pemohon,
-Applicant Type,Jenis Pemohon,
Application of Funds (Assets),Permohonan Dana (Aset),
Application period cannot be across two allocation records,Tempoh permohonan tidak boleh merangkumi dua rekod peruntukan,
Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Senarai Pemegang Saham yang tersedia dengan nombor folio,
Loading Payment System,Memuatkan Sistem Pembayaran,
Loan,Pinjaman,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman Maksimum {0},
-Loan Application,Permohonan Pinjaman,
-Loan Management,Pengurusan Pinjaman,
-Loan Repayment,bayaran balik pinjaman,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Tarikh Mula Pinjaman dan Tempoh Pinjaman adalah wajib untuk menyimpan Invois Discounting,
Loans (Liabilities),Pinjaman (Liabiliti),
Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset),
@@ -1611,7 +1605,6 @@
Monday,Isnin,
Monthly,Bulanan,
Monthly Distribution,Pengagihan Bulanan,
-Monthly Repayment Amount cannot be greater than Loan Amount,Jumlah Pembayaran balik bulanan tidak boleh lebih besar daripada Jumlah Pinjaman,
More,Lebih banyak,
More Information,Maklumat lanjut,
More than one selection for {0} not allowed,Lebih daripada satu pilihan untuk {0} tidak dibenarkan,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Bayar {0} {1},
Payable,Kena dibayar,
Payable Account,Akaun Belum Bayar,
-Payable Amount,Jumlah yang Dibayar,
Payment,Pembayaran,
Payment Cancelled. Please check your GoCardless Account for more details,Pembayaran Dibatalkan. Sila semak Akaun GoCardless anda untuk maklumat lanjut,
Payment Confirmation,Pengesahan pembayaran,
-Payment Date,Tarikh pembayaran,
Payment Days,Hari Pembayaran,
Payment Document,Dokumen Pembayaran,
Payment Due Date,Tarikh Pembayaran,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Sila masukkan Resit Pembelian pertama,
Please enter Receipt Document,Sila masukkan Dokumen Resit,
Please enter Reference date,Sila masukkan tarikh rujukan,
-Please enter Repayment Periods,Sila masukkan Tempoh Bayaran Balik,
Please enter Reqd by Date,Sila masukkan Reqd mengikut Tarikh,
Please enter Woocommerce Server URL,Sila masukkan URL Pelayan Woocommerce,
Please enter Write Off Account,Sila masukkan Tulis Off Akaun,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Sila masukkan induk pusat kos,
Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0},
Please enter relieving date.,Sila masukkan tarikh melegakan.,
-Please enter repayment Amount,Sila masukkan jumlah pembayaran balik,
Please enter valid Financial Year Start and End Dates,Sila masukkan tahun kewangan yang sah Mula dan Tarikh Akhir,
Please enter valid email address,Sila masukkan alamat emel yang sah,
Please enter {0} first,Sila masukkan {0} pertama,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.,
Primary Address Details,Butiran Alamat Utama,
Primary Contact Details,Butiran Hubungan Utama,
-Principal Amount,Jumlah Prinsipal,
Print Format,Format cetak,
Print IRS 1099 Forms,Cetak Borang IRS 1099,
Print Report Card,Cetak Kad Laporan,
@@ -2550,7 +2538,6 @@
Sample Collection,Pengumpulan Sampel,
Sample quantity {0} cannot be more than received quantity {1},Kuantiti sampel {0} tidak boleh melebihi kuantiti yang diterima {1},
Sanctioned,Diiktiraf,
-Sanctioned Amount,Jumlah dibenarkan,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.,
Sand,Pasir,
Saturday,Sabtu,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} sudah mempunyai Tatacara Ibu Bapa {1}.,
API,API,
Annual,Tahunan,
-Approved,Diluluskan,
Change,Perubahan,
Contact Email,Hubungi E-mel,
Export Type,Jenis Eksport,
@@ -3571,7 +3557,6 @@
Account Value,Nilai Akaun,
Account is mandatory to get payment entries,Akaun adalah wajib untuk mendapatkan penyertaan pembayaran,
Account is not set for the dashboard chart {0},Akaun tidak ditetapkan untuk carta papan pemuka {0},
-Account {0} does not belong to company {1},Akaun {0} bukan milik Syarikat {1},
Account {0} does not exists in the dashboard chart {1},Akaun {0} tidak wujud dalam carta papan pemuka {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Akaun: <b>{0}</b> adalah modal Kerja dalam proses dan tidak dapat dikemas kini oleh Kemasukan Jurnal,
Account: {0} is not permitted under Payment Entry,Akaun: {0} tidak dibenarkan di bawah Penyertaan Bayaran,
@@ -3582,7 +3567,6 @@
Activity,Aktiviti,
Add / Manage Email Accounts.,Tambah / Urus Akaun E-mel.,
Add Child,Tambah Anak,
-Add Loan Security,Tambah Keselamatan Pinjaman,
Add Multiple,menambah Pelbagai,
Add Participants,Tambah Peserta,
Add to Featured Item,Tambah ke Item Pilihan,
@@ -3593,15 +3577,12 @@
Address Line 1,Alamat Baris 1,
Addresses,Alamat,
Admission End Date should be greater than Admission Start Date.,Tarikh Akhir Kemasukan hendaklah lebih besar daripada Tarikh Permulaan Kemasukan.,
-Against Loan,Terhadap Pinjaman,
-Against Loan:,Terhadap Pinjaman:,
All,Semua,
All bank transactions have been created,Semua transaksi bank telah dibuat,
All the depreciations has been booked,Semua susut nilai telah ditempah,
Allocation Expired!,Peruntukan Tamat Tempoh!,
Allow Resetting Service Level Agreement from Support Settings.,Benarkan Perjanjian Tahap Perkhidmatan Reset dari Tetapan Sokongan.,
Amount of {0} is required for Loan closure,Jumlah {0} diperlukan untuk penutupan Pinjaman,
-Amount paid cannot be zero,Jumlah yang dibayar tidak boleh menjadi sifar,
Applied Coupon Code,Kod Kupon Gunaan,
Apply Coupon Code,Guna Kod Kupon,
Appointment Booking,Tempahan Pelantikan,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Tidak Dapat Kira Masa Kedatangan Sebagai Alamat Pemandu Hilang.,
Cannot Optimize Route as Driver Address is Missing.,Tidak Dapat Mengoptimumkan Laluan sebagai Alamat Pemandu Hilang.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Tidak dapat menyelesaikan tugas {0} sebagai tugasnya bergantung {1} tidak selesai / dibatalkan.,
-Cannot create loan until application is approved,Tidak boleh membuat pinjaman sehingga permohonan diluluskan,
Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat mencari Item yang sepadan. Sila pilih beberapa nilai lain untuk {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Tidak boleh mengatasi Perkara {0} dalam baris {1} lebih daripada {2}. Untuk membenarkan lebihan pengebilan, sila tentukan peruntukan dalam Tetapan Akaun",
"Capacity Planning Error, planned start time can not be same as end time","Kesalahan Perancangan Kapasiti, masa permulaan yang dirancang tidak boleh sama dengan masa tamat",
@@ -3812,20 +3792,9 @@
Less Than Amount,Kurang Daripada Jumlah,
Liabilities,Liabiliti,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Jumlah Pinjaman melebihi jumlah maksimum pinjaman {0} seperti yang dicadangkan sekuriti,
Loan Applications from customers and employees.,Permohonan Pinjaman dari pelanggan dan pekerja.,
-Loan Disbursement,Pengeluaran Pinjaman,
Loan Processes,Proses Pinjaman,
-Loan Security,Keselamatan Pinjaman,
-Loan Security Pledge,Ikrar Jaminan Pinjaman,
-Loan Security Pledge Created : {0},Ikrar Jaminan Pinjaman Dibuat: {0},
-Loan Security Price,Harga Sekuriti Pinjaman,
-Loan Security Price overlapping with {0},Harga Sekuriti Pinjaman bertindih dengan {0},
-Loan Security Unpledge,Keselamatan Pinjaman Tidak Menutup,
-Loan Security Value,Nilai Jaminan Pinjaman,
Loan Type for interest and penalty rates,Jenis Pinjaman untuk kadar faedah dan penalti,
-Loan amount cannot be greater than {0},Jumlah pinjaman tidak boleh melebihi {0},
-Loan is mandatory,Pinjaman wajib,
Loans,Pinjaman,
Loans provided to customers and employees.,Pinjaman yang diberikan kepada pelanggan dan pekerja.,
Location,Lokasi,
@@ -3894,7 +3863,6 @@
Pay,Bayar,
Payment Document Type,Jenis Dokumen Pembayaran,
Payment Name,Nama Pembayaran,
-Penalty Amount,Jumlah Penalti,
Pending,Sementara menunggu,
Performance,Prestasi,
Period based On,Tempoh berasaskan,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Sila log masuk sebagai Pengguna Marketplace untuk mengedit item ini.,
Please login as a Marketplace User to report this item.,Sila log masuk sebagai Pengguna Pasaran untuk melaporkan perkara ini.,
Please select <b>Template Type</b> to download template,Sila pilih <b>Templat Jenis</b> untuk memuat turun templat,
-Please select Applicant Type first,Sila pilih Jenis Pemohon terlebih dahulu,
Please select Customer first,Sila pilih Pelanggan terlebih dahulu,
Please select Item Code first,Sila pilih Kod Item terlebih dahulu,
-Please select Loan Type for company {0},Sila pilih Jenis Pinjaman untuk syarikat {0},
Please select a Delivery Note,Sila pilih Nota Penghantaran,
Please select a Sales Person for item: {0},Sila pilih Orang Jualan untuk item: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Sila pilih kaedah pembayaran yang lain. Jalur tidak menyokong urus niaga dalam mata wang '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Sila tetapkan akaun bank lalai untuk syarikat {0},
Please specify,Sila nyatakan,
Please specify a {0},Sila nyatakan {0},lead
-Pledge Status,Status Ikrar,
-Pledge Time,Masa Ikrar,
Printing,Percetakan,
Priority,Keutamaan,
Priority has been changed to {0}.,Keutamaan telah diubah menjadi {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Memproses Fail XML,
Profitability,Keuntungan,
Project,Projek,
-Proposed Pledges are mandatory for secured Loans,Cadangan Ikrar adalah wajib bagi Pinjaman bercagar,
Provide the academic year and set the starting and ending date.,Menyediakan tahun akademik dan menetapkan tarikh permulaan dan akhir.,
Public token is missing for this bank,Token umum hilang untuk bank ini,
Publish,Menerbitkan,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Resit Pembelian tidak mempunyai sebarang item yang mengekalkan sampel adalah didayakan.,
Purchase Return,Pembelian Pulangan,
Qty of Finished Goods Item,Qty Item Barang yang Selesai,
-Qty or Amount is mandatroy for loan security,Qty atau Jumlah adalah mandatroy untuk keselamatan pinjaman,
Quality Inspection required for Item {0} to submit,Pemeriksaan Kualiti diperlukan untuk Item {0} untuk dihantar,
Quantity to Manufacture,Kuantiti Pengilangan,
Quantity to Manufacture can not be zero for the operation {0},Kuantiti Pengilangan tidak boleh menjadi sifar untuk operasi {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Tarikh Pelunasan mestilah lebih besar daripada atau sama dengan Tarikh Bergabung,
Rename,Nama semula,
Rename Not Allowed,Namakan semula Tidak Dibenarkan,
-Repayment Method is mandatory for term loans,Kaedah pembayaran balik adalah wajib untuk pinjaman berjangka,
-Repayment Start Date is mandatory for term loans,Tarikh Mula Bayaran Balik adalah wajib untuk pinjaman berjangka,
Report Item,Laporkan Perkara,
Report this Item,Laporkan item ini,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Dicadangkan Qty untuk Subkontrak: Kuantiti bahan mentah untuk membuat item subkontrak.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Baris ({0}): {1} telah didiskaunkan dalam {2},
Rows Added in {0},Baris Ditambah dalam {0},
Rows Removed in {0},Baris Dihapuskan dalam {0},
-Sanctioned Amount limit crossed for {0} {1},Had Jumlah Sanctioned diseberang untuk {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Amaun Pinjaman yang Dimansuhkan telah wujud untuk {0} terhadap syarikat {1},
Save,Simpan,
Save Item,Simpan Item,
Saved Items,Item yang disimpan,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Pengguna {0} adalah orang kurang upaya,
Users and Permissions,Pengguna dan Kebenaran,
Vacancies cannot be lower than the current openings,Kekosongan tidak boleh lebih rendah daripada bukaan semasa,
-Valid From Time must be lesser than Valid Upto Time.,Sah dari Masa mesti kurang daripada Sah Sehingga Masa.,
Valuation Rate required for Item {0} at row {1},Kadar Penilaian diperlukan untuk Item {0} pada baris {1},
Values Out Of Sync,Nilai Out Of Sync,
Vehicle Type is required if Mode of Transport is Road,Jenis Kenderaan diperlukan jika Mod Pengangkutan adalah Jalan,
@@ -4211,7 +4168,6 @@
Add to Cart,Dalam Troli,
Days Since Last Order,Hari Sejak Perintah Terakhir,
In Stock,In Stock,
-Loan Amount is mandatory,Amaun Pinjaman adalah wajib,
Mode Of Payment,Cara Pembayaran,
No students Found,Tiada pelajar yang dijumpai,
Not in Stock,Tidak dalam Saham,
@@ -4240,7 +4196,6 @@
Group by,Group By,
In stock,Dalam stok,
Item name,Nama Item,
-Loan amount is mandatory,Amaun Pinjaman adalah wajib,
Minimum Qty,Qty Minimum,
More details,Maklumat lanjut,
Nature of Supplies,Alam Bekalan,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Jumlah Selesai Qty,
Qty to Manufacture,Qty Untuk Pembuatan,
Repay From Salary can be selected only for term loans,Bayaran Balik Dari Gaji boleh dipilih hanya untuk pinjaman berjangka,
-No valid Loan Security Price found for {0},Tidak dijumpai Harga Keselamatan Pinjaman yang sah untuk {0},
-Loan Account and Payment Account cannot be same,Akaun Pinjaman dan Akaun Pembayaran tidak boleh sama,
-Loan Security Pledge can only be created for secured loans,Pinjaman Keselamatan Pinjaman hanya boleh dibuat untuk pinjaman bercagar,
Social Media Campaigns,Kempen Media Sosial,
From Date can not be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Tarikh,
Please set a Customer linked to the Patient,Sila tetapkan Pelanggan yang dihubungkan dengan Pesakit,
@@ -6437,7 +6389,6 @@
HR User,HR pengguna,
Appointment Letter,Surat temujanji,
Job Applicant,Kerja Pemohon,
-Applicant Name,Nama pemohon,
Appointment Date,Tarikh Pelantikan,
Appointment Letter Template,Templat Surat Pelantikan,
Body,Badan,
@@ -7059,99 +7010,12 @@
Sync in Progress,Segerakkan dalam Kemajuan,
Hub Seller Name,Nama Penjual Hab,
Custom Data,Data Tersuai,
-Member,Ahli,
-Partially Disbursed,sebahagiannya Dikeluarkan,
-Loan Closure Requested,Penutupan Pinjaman yang Diminta,
Repay From Salary,Membayar balik dari Gaji,
-Loan Details,Butiran pinjaman,
-Loan Type,Jenis pinjaman,
-Loan Amount,Jumlah pinjaman,
-Is Secured Loan,Adakah Pinjaman Terjamin,
-Rate of Interest (%) / Year,Kadar faedah (%) / Tahun,
-Disbursement Date,Tarikh pembayaran,
-Disbursed Amount,Jumlah yang Dibelanjakan,
-Is Term Loan,Adakah Pinjaman Berjangka,
-Repayment Method,Kaedah Bayaran Balik,
-Repay Fixed Amount per Period,Membayar balik Jumlah tetap setiap Tempoh,
-Repay Over Number of Periods,Membayar balik Over Bilangan Tempoh,
-Repayment Period in Months,Tempoh pembayaran balik dalam Bulan,
-Monthly Repayment Amount,Jumlah Bayaran Balik Bulanan,
-Repayment Start Date,Tarikh Mula Pembayaran Balik,
-Loan Security Details,Butiran Keselamatan Pinjaman,
-Maximum Loan Value,Nilai Pinjaman Maksimum,
-Account Info,Maklumat akaun,
-Loan Account,Akaun Pinjaman,
-Interest Income Account,Akaun Pendapatan Faedah,
-Penalty Income Account,Akaun Pendapatan Penalti,
-Repayment Schedule,Jadual Pembayaran Balik,
-Total Payable Amount,Jumlah Dibayar,
-Total Principal Paid,Jumlah Prinsipal Dibayar,
-Total Interest Payable,Jumlah Faedah yang Perlu Dibayar,
-Total Amount Paid,Jumlah Amaun Dibayar,
-Loan Manager,Pengurus Pinjaman,
-Loan Info,Maklumat pinjaman,
-Rate of Interest,Kadar faedah,
-Proposed Pledges,Cadangan Ikrar,
-Maximum Loan Amount,Jumlah Pinjaman maksimum,
-Repayment Info,Maklumat pembayaran balik,
-Total Payable Interest,Jumlah Faedah yang Perlu Dibayar,
-Against Loan ,Melawan Pinjaman,
-Loan Interest Accrual,Akruan Faedah Pinjaman,
-Amounts,Jumlah,
-Pending Principal Amount,Jumlah Prinsipal yang belum selesai,
-Payable Principal Amount,Jumlah Prinsipal yang Dibayar,
-Paid Principal Amount,Amaun Prinsipal yang Dibayar,
-Paid Interest Amount,Jumlah Faedah Dibayar,
-Process Loan Interest Accrual,Memproses Accrual Interest Loan,
-Repayment Schedule Name,Nama Jadual Pembayaran Balik,
Regular Payment,Pembayaran tetap,
Loan Closure,Penutupan Pinjaman,
-Payment Details,Butiran Pembayaran,
-Interest Payable,Faedah yang Dibayar,
-Amount Paid,Amaun Dibayar,
-Principal Amount Paid,Jumlah Prinsipal Dibayar,
-Repayment Details,Butiran Bayaran Balik,
-Loan Repayment Detail,Perincian Bayaran Balik Pinjaman,
-Loan Security Name,Nama Sekuriti Pinjaman,
-Unit Of Measure,Unit ukuran,
-Loan Security Code,Kod Keselamatan Pinjaman,
-Loan Security Type,Jenis Keselamatan Pinjaman,
-Haircut %,Potongan rambut%,
-Loan Details,Butiran Pinjaman,
-Unpledged,Tidak terpadam,
-Pledged,Dicagar,
-Partially Pledged,Sebahagian yang dijanjikan,
-Securities,Sekuriti,
-Total Security Value,Jumlah Nilai Keselamatan,
-Loan Security Shortfall,Kekurangan Keselamatan Pinjaman,
-Loan ,Pinjaman,
-Shortfall Time,Masa Berkurangan,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Jumlah Kekurangan,
-Security Value ,Nilai Keselamatan,
-Process Loan Security Shortfall,Proses Kekurangan Keselamatan Pinjaman Proses,
-Loan To Value Ratio,Nisbah Pinjaman kepada Nilai,
-Unpledge Time,Masa Unpledge,
-Loan Name,Nama Loan,
Rate of Interest (%) Yearly,Kadar faedah (%) tahunan,
-Penalty Interest Rate (%) Per Day,Kadar Faedah Penalti (%) Sehari,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Kadar Faedah Penalti dikenakan ke atas jumlah faedah yang tertunggak setiap hari sekiranya pembayaran balik ditangguhkan,
-Grace Period in Days,Tempoh Grace dalam Hari,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Jumlah hari dari tarikh akhir sehingga penalti tidak akan dikenakan sekiranya berlaku kelewatan pembayaran pinjaman,
-Pledge,Ikrar,
-Post Haircut Amount,Jumlah Potongan Rambut,
-Process Type,Jenis Proses,
-Update Time,Kemas kini Masa,
-Proposed Pledge,Cadangan Ikrar,
-Total Payment,Jumlah Bayaran,
-Balance Loan Amount,Jumlah Baki Pinjaman,
-Is Accrued,Telah terakru,
Salary Slip Loan,Pinjaman Slip Gaji,
Loan Repayment Entry,Kemasukan Bayaran Balik Pinjaman,
-Sanctioned Loan Amount,Amaun Pinjaman Yang Dituntut,
-Sanctioned Amount Limit,Had jumlah yang disyorkan,
-Unpledge,Tidak melengkapkan,
-Haircut,Potongan rambut,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Menjana Jadual,
Schedules,Jadual,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projek akan boleh diakses di laman web untuk pengguna ini,
Copied From,disalin Dari,
Start and End Dates,Tarikh mula dan tamat,
-Actual Time (in Hours),Masa Sebenar (dalam Jam),
+Actual Time in Hours (via Timesheet),Masa Sebenar (dalam Jam),
Costing and Billing,Kos dan Billing,
-Total Costing Amount (via Timesheets),Jumlah Kos Jumlah (melalui Timesheet),
-Total Expense Claim (via Expense Claims),Jumlah Tuntutan Perbelanjaan (melalui Tuntutan Perbelanjaan),
+Total Costing Amount (via Timesheet),Jumlah Kos Jumlah (melalui Timesheet),
+Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Tuntutan Perbelanjaan),
Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian),
Total Sales Amount (via Sales Order),Jumlah Jumlah Jualan (melalui Perintah Jualan),
-Total Billable Amount (via Timesheets),Jumlah Jumlah Yang Boleh Dibayar (melalui Timesheet),
-Total Billed Amount (via Sales Invoices),Jumlah Amaun Dibilkan (melalui Invois Jualan),
-Total Consumed Material Cost (via Stock Entry),Jumlah Kos Bahan Terutu (melalui Entry Saham),
+Total Billable Amount (via Timesheet),Jumlah Jumlah Yang Boleh Dibayar (melalui Timesheet),
+Total Billed Amount (via Sales Invoice),Jumlah Amaun Dibilkan (melalui Invois Jualan),
+Total Consumed Material Cost (via Stock Entry),Jumlah Kos Bahan Terutu (melalui Entry Saham),
Gross Margin,Margin kasar,
Gross Margin %,Margin kasar%,
Monitor Progress,Memantau Kemajuan,
@@ -7521,12 +7385,10 @@
Dependencies,Kebergantungan,
Dependent Tasks,Tugasan yang bergantung,
Depends on Tasks,Bergantung kepada Tugas,
-Actual Start Date (via Time Sheet),Tarikh Mula Sebenar (melalui Lembaran Time),
-Actual Time (in hours),Masa sebenar (dalam jam),
-Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time),
-Total Costing Amount (via Time Sheet),Jumlah Kos Jumlah (melalui Lembaran Time),
+Actual Start Date (via Timesheet),Tarikh Mula Sebenar (melalui Lembaran Time),
+Actual Time in Hours (via Timesheet),Masa sebenar (dalam jam),
+Actual End Date (via Timesheet),Sebenar Tarikh Akhir (melalui Lembaran Time),
Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan),
-Total Billing Amount (via Time Sheet),Jumlah Bil (melalui Lembaran Time),
Review Date,Tarikh Semakan,
Closing Date,Tarikh Tutup,
Task Depends On,Petugas Bergantung Pada,
@@ -7887,7 +7749,6 @@
Update Series,Update Siri,
Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.,
Prefix,Awalan,
-Current Value,Nilai semasa,
This is the number of the last created transaction with this prefix,Ini ialah bilangan transaksi terakhir yang dibuat dengan awalan ini,
Update Series Number,Update Siri Nombor,
Quotation Lost Reason,Sebut Harga Hilang Akal,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise lawatan Reorder Level,
Lead Details,Butiran Lead,
Lead Owner Efficiency,Lead Owner Kecekapan,
-Loan Repayment and Closure,Bayaran Balik dan Penutupan Pinjaman,
-Loan Security Status,Status Keselamatan Pinjaman,
Lost Opportunity,Kesempatan Hilang,
Maintenance Schedules,Jadual Penyelenggaraan,
Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Kiraan yang Disasarkan: {0},
Payment Account is mandatory,Akaun Pembayaran adalah wajib,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Sekiranya diperiksa, jumlah penuh akan dikurangkan dari pendapatan bercukai sebelum mengira cukai pendapatan tanpa pengakuan atau penyerahan bukti.",
-Disbursement Details,Butiran Pembayaran,
Material Request Warehouse,Gudang Permintaan Bahan,
Select warehouse for material requests,Pilih gudang untuk permintaan bahan,
Transfer Materials For Warehouse {0},Pindahkan Bahan Untuk Gudang {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Bayar balik jumlah yang tidak dituntut dari gaji,
Deduction from salary,Potongan gaji,
Expired Leaves,Daun Tamat Tempoh,
-Reference No,No rujukan,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Peratusan potongan rambut adalah peratusan perbezaan antara nilai pasaran dari Pinjaman Keselamatan dan nilai yang diberikan kepada Pinjaman Keselamatan tersebut ketika digunakan sebagai jaminan untuk pinjaman tersebut.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Loan To Value Ratio menyatakan nisbah jumlah pinjaman dengan nilai cagaran yang dijanjikan. Kekurangan jaminan pinjaman akan dicetuskan jika ini jatuh di bawah nilai yang ditentukan untuk sebarang pinjaman,
If this is not checked the loan by default will be considered as a Demand Loan,"Sekiranya ini tidak diperiksa, pinjaman secara lalai akan dianggap sebagai Permintaan Pinjaman",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Akaun ini digunakan untuk membuat pembayaran pinjaman dari peminjam dan juga mengeluarkan pinjaman kepada peminjam,
This account is capital account which is used to allocate capital for loan disbursal account ,Akaun ini adalah akaun modal yang digunakan untuk memperuntukkan modal untuk akaun pengeluaran pinjaman,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operasi {0} bukan milik perintah kerja {1},
Print UOM after Quantity,Cetak UOM selepas Kuantiti,
Set default {0} account for perpetual inventory for non stock items,Tetapkan akaun {0} lalai untuk inventori berterusan untuk item bukan stok,
-Loan Security {0} added multiple times,Pinjaman Keselamatan {0} ditambahkan berkali-kali,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Sekuriti Pinjaman dengan nisbah LTV yang berbeza tidak boleh dijaminkan dengan satu pinjaman,
-Qty or Amount is mandatory for loan security!,Kuantiti atau Jumlah adalah wajib untuk keselamatan pinjaman!,
-Only submittted unpledge requests can be approved,Hanya permintaan unpledge yang dihantar dapat disetujui,
-Interest Amount or Principal Amount is mandatory,Jumlah Faedah atau Amaun adalah wajib,
-Disbursed Amount cannot be greater than {0},Jumlah yang dikeluarkan tidak boleh lebih besar daripada {0},
-Row {0}: Loan Security {1} added multiple times,Baris {0}: Keselamatan Pinjaman {1} ditambahkan berkali-kali,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Baris # {0}: Item Anak tidak boleh menjadi Kumpulan Produk. Sila keluarkan Item {1} dan Simpan,
Credit limit reached for customer {0},Had kredit dicapai untuk pelanggan {0},
Could not auto create Customer due to the following missing mandatory field(s):,Tidak dapat membuat Pelanggan secara automatik kerana bidang wajib berikut tidak ada:,
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 7638e76..3fe94f5 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","သက်ဆိုင်ကုမ္ပဏီ SpA, ဒေသတွင်းလူမှုအဖွဲ့အစည်းသို့မဟုတ် SRL လျှင်",
Applicable if the company is a limited liability company,ကုမ္ပဏီ၏ကန့်သတ်တာဝန်ယူမှုကုမ္ပဏီလျှင်သက်ဆိုင်သော,
Applicable if the company is an Individual or a Proprietorship,သက်ဆိုင်ကုမ္ပဏီတစ်ခုတစ်ဦးချင်းသို့မဟုတ်တစ် Proprietorship လျှင်,
-Applicant,လြှောကျသူ,
-Applicant Type,လျှောက်ထားသူအမျိုးအစား,
Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ),
Application period cannot be across two allocation records,လျှောက်လွှာကာလနှစ်ခုခွဲဝေမှတ်တမ်းများကိုဖြတ်ပြီးမဖွစျနိုငျ,
Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ဖိုလီယိုနံပါတ်များနှင့်အတူရရှိနိုင်ပါသည်ရှယ်ယာရှင်များမှာများစာရင်း,
Loading Payment System,Loading ငွေပေးချေစနစ်,
Loan,ခြေးငှေ,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်,
-Loan Application,ချေးငွေလျှောက်လွှာ,
-Loan Management,ချေးငွေစီမံခန့်ခွဲမှု,
-Loan Repayment,ချေးငွေပြန်ဆပ်,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ချေးငွေကို Start နေ့စွဲနှင့်ချေးငွေကာလအတွက်ငွေတောင်းခံလွှာလျှော့ကယ်ဖို့မဖြစ်မနေများမှာ,
Loans (Liabilities),ချေးငွေများ (စိစစ်),
Loans and Advances (Assets),ချေးငွေနှင့်ကြိုတင်ငွေ (ပိုင်ဆိုင်မှုများ),
@@ -1611,7 +1605,6 @@
Monday,တနင်္လာနေ့,
Monthly,လစဉ်,
Monthly Distribution,လစဉ်ဖြန့်ဖြူး,
-Monthly Repayment Amount cannot be greater than Loan Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏချေးငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ,
More,နောက်ထပ်,
More Information,More Information ကို,
More than one selection for {0} not allowed,{0} ခွင့်မပြုဘို့တစ်ဦးထက်ပိုရွေးချယ်ရေး,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pay ကို {0} {1},
Payable,ပေးအပ်သော,
Payable Account,ပေးဆောင်ရမည့်အကောင့်,
-Payable Amount,ပေးဆောင်ရမည့်ငွေပမာဏ,
Payment,ငွေပေးချေမှုရမည့်,
Payment Cancelled. Please check your GoCardless Account for more details,ငွေပေးချေမှုရမည့်ပယ်ဖျက်ထားသည်မှာ။ အသေးစိတ်အဘို့သင့် GoCardless အကောင့်စစ်ဆေးပါ,
Payment Confirmation,ငွေပေးချေမှုရမည့်အတည်ပြုချက်,
-Payment Date,ငွေပေးချေသည့်နေ့ရက်,
Payment Days,ငွေပေးချေမှုရမည့်ကာလသ,
Payment Document,ငွေပေးချေမှုရမည့်စာရွက်စာတမ်း,
Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,ဝယ်ယူခြင်းပြေစာပထမဦးဆုံးရိုက်ထည့်ပေးပါ,
Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ,
Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ,
-Please enter Repayment Periods,ပြန်ဆပ်ကာလကိုရိုက်ထည့်ပေးပါ,
Please enter Reqd by Date,နေ့စွဲခြင်းဖြင့် Reqd ရိုက်ထည့်ပေးပါ,
Please enter Woocommerce Server URL,Woocommerce ဆာဗာ URL ရိုက်ထည့်ပေးပါ,
Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ,
Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ,
Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။,
-Please enter repayment Amount,ပြန်ဆပ်ငွေပမာဏရိုက်ထည့်ပေးပါ,
Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.,
Please enter valid email address,မှန်ကန်သော email address ကိုရိုက်ထည့်ပေးပါ,
Please enter {0} first,ပထမဦးဆုံး {0} မဝင်ရ ကျေးဇူးပြု.,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။,
Primary Address Details,မူလတန်းလိပ်စာအသေးစိတ်,
Primary Contact Details,မူလတန်းဆက်သွယ်ပါအသေးစိတ်,
-Principal Amount,ကျောင်းအုပ်ကြီးငွေပမာဏ,
Print Format,ပုံနှိပ်စီစဉ်ဖွဲ့စည်းမှုပုံစံ,
Print IRS 1099 Forms,IRS ကို 1099 Form များ Print,
Print Report Card,ပုံနှိပ်ပါအစီရင်ခံစာကဒ်,
@@ -2550,7 +2538,6 @@
Sample Collection,နမူနာစုစည်းမှု,
Sample quantity {0} cannot be more than received quantity {1},နမူနာအရေအတွက် {0} လက်ခံရရှိအရေအတွက် {1} ထက်ပိုမဖွစျနိုငျ,
Sanctioned,ဒဏ်ခတ်အရေးယူ,
-Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။,
Sand,သဲ,
Saturday,စနေနေ့,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ပြီးသားမိဘလုပ်ထုံးလုပ်နည်း {1} ရှိပါတယ်။,
API,API ကို,
Annual,နှစ်ပတ်လည်,
-Approved,Approved,
Change,ပွောငျးလဲခွငျး,
Contact Email,ဆက်သွယ်ရန်အီးမေးလ်,
Export Type,ပို့ကုန်အမျိုးအစား,
@@ -3571,7 +3557,6 @@
Account Value,အကောင့်တန်ဖိုး,
Account is mandatory to get payment entries,ငွေပေးချေမှု entries တွေကိုရရန်အကောင့်မဖြစ်မနေဖြစ်ပါတယ်,
Account is not set for the dashboard chart {0},ဒိုင်ခွက်ဇယားအတွက်အကောင့်ကိုသတ်မှတ်မထားပါ {0},
-Account {0} does not belong to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး,
Account {0} does not exists in the dashboard chart {1},အကောင့် {0} သည်ဒိုင်ခွက်ဇယားတွင်မရှိပါ။ {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,အကောင့်: <b>{0}</b> တိုးတက်မှုအတွက်မြို့တော်သူ Work သည်နှင့်ဂျာနယ် Entry အားဖြင့် update လုပ်မရနိုငျ,
Account: {0} is not permitted under Payment Entry,အကောင့်: {0} ငွေပေးချေမှုရမည့် Entry အောက်မှာအခွင့်မရှိကြ,
@@ -3582,7 +3567,6 @@
Activity,လုပ်ဆောင်ချက်,
Add / Manage Email Accounts.,Add / အီးမေးလ် Manage Accounts ကို။,
Add Child,ကလေး Add,
-Add Loan Security,ချေးငွေလုံခြုံရေးထည့်ပါ,
Add Multiple,အကွိမျမြားစှာ Add,
Add Participants,သင်တန်းသားများ Add,
Add to Featured Item,အသားပေးပစ္စည်းပေါင်းထည့်ရန်,
@@ -3593,15 +3577,12 @@
Address Line 1,လိပ်စာစာကြောင်း 1,
Addresses,လိပ်စာများ,
Admission End Date should be greater than Admission Start Date.,၀ င်ခွင့်အဆုံးနေ့သည် ၀ င်ခွင့်စတင်သည့်နေ့ထက်ကြီးရမည်။,
-Against Loan,ချေးငွေဆန့်ကျင်,
-Against Loan:,ချေးငွေ,
All,အားလုံး,
All bank transactions have been created,အားလုံးဘဏ်ငွေကြေးလွှဲပြောင်းမှုမှာဖန်တီးခဲ့ကြ,
All the depreciations has been booked,လူအားလုံးတို့သည်တန်ဖိုးကြိုတင်ဘွတ်ကင်ထားပြီး,
Allocation Expired!,ခွဲဝေ Expired!,
Allow Resetting Service Level Agreement from Support Settings.,ပံ့ပိုးမှုက Settings ထဲကနေပြန်စခြင်းသည်ဝန်ဆောင်မှုအဆင့်သဘောတူညီချက် Allow ။,
Amount of {0} is required for Loan closure,ချေးငွေကိုပိတ်ပစ်ရန် {0} ပမာဏလိုအပ်သည်,
-Amount paid cannot be zero,ပေးဆောင်သည့်ပမာဏသည်သုညမဖြစ်နိုင်ပါ,
Applied Coupon Code,လျှောက်ထားကူပွန် Code ကို,
Apply Coupon Code,ကူပွန် Code ကို Apply,
Appointment Booking,ရက်ချိန်းယူခြင်းကြိုတင်စာရင်းသွင်းခြင်း,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ယာဉ်မောင်းလိပ်စာပျောက်ဆုံးနေတာဖြစ်ပါတယ်အဖြစ်ဆိုက်ရောက်အချိန် calculate ကိုမပေးနိုငျပါ။,
Cannot Optimize Route as Driver Address is Missing.,ယာဉ်မောင်းလိပ်စာပျောက်ဆုံးနေကြောင့်လမ်းကြောင်းအကောင်းဆုံးလုပ်ဆောင်ပါလို့မရပါဘူး။,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,{0} ကိုမှီခိုနေရတဲ့အလုပ် {1} အနေဖြင့်ပြီးပြည့်စုံသောအလုပ်ကိုမပြီးနိူင်ပါ။,
-Cannot create loan until application is approved,လျှောက်လွှာကိုအတည်ပြုသည်အထိချေးငွေကို ဖန်တီး၍ မရပါ,
Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",{2} ထက်ပိုသောအတန်း {1} တွင် Item {0} အတွက် overbill မလုပ်နိုင်ပါ။ အလွန်အကျွံငွေပေးချေခြင်းကိုခွင့်ပြုရန် ကျေးဇူးပြု၍ Accounts Settings တွင်ခွင့်ပြုပါ,
"Capacity Planning Error, planned start time can not be same as end time",စွမ်းဆောင်ရည်မြှင့်တင်ရေးအမှား၊ စတင်ရန်စီစဉ်ထားချိန်သည်အဆုံးသတ်ကာလနှင့်မတူနိုင်ပါ,
@@ -3812,20 +3792,9 @@
Less Than Amount,ငွေပမာဏသန်းလျော့နည်း,
Liabilities,liabilities,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,ချေးငွေပမာဏသည်အဆိုပြုထားသောအာမခံများအရအများဆုံးချေးငွေပမာဏ {0} ထက်ပိုသည်,
Loan Applications from customers and employees.,ဖောက်သည်များနှင့် ၀ န်ထမ်းများထံမှချေးငွေလျှောက်လွှာများ။,
-Loan Disbursement,ချေးငွေထုတ်ပေးမှု,
Loan Processes,ချေးငွေလုပ်ငန်းစဉ်,
-Loan Security,ချေးငွေလုံခြုံရေး,
-Loan Security Pledge,ချေးငွေလုံခြုံရေးအပေါင်,
-Loan Security Pledge Created : {0},ချေးငွေလုံခြုံရေးအပေါင်ခံ: {0},
-Loan Security Price,ချေးငွေလုံခြုံရေးစျေးနှုန်း,
-Loan Security Price overlapping with {0},{0} နဲ့ချေးငွေလုံခြုံရေးစျေးနှင့်ထပ်နေသည်,
-Loan Security Unpledge,ချေးငွေလုံခြုံရေး Unpledge,
-Loan Security Value,ချေးငွေလုံခြုံရေးတန်ဖိုး,
Loan Type for interest and penalty rates,အတိုးနှုန်းနှင့်ပြစ်ဒဏ်များအတွက်ချေးငွေအမျိုးအစား,
-Loan amount cannot be greater than {0},ချေးငွေပမာဏ {0} ထက်မကြီးနိုင်ပါ,
-Loan is mandatory,ချေးငွေမဖြစ်မနေဖြစ်ပါတယ်,
Loans,ချေးငွေများ,
Loans provided to customers and employees.,ဖောက်သည်များနှင့် ၀ န်ထမ်းများအားချေးငွေများ,
Location,တည်ရှိမှု,
@@ -3894,7 +3863,6 @@
Pay,အခပေး,
Payment Document Type,ငွေပေးချေမှုရမည့်စာရွက်စာတမ်းအမျိုးအစား,
Payment Name,ငွေပေးချေမှုရမည့်အမည်,
-Penalty Amount,ပြစ်ဒဏ်ပမာဏ,
Pending,လာမည့်,
Performance,performance,
Period based On,ကာလတွင်အခြေစိုက်,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,ကျေးဇူးပြု၍ ဤအရာကိုတည်းဖြတ်ရန် Marketplace အသုံးပြုသူအဖြစ်ဝင်ရောက်ပါ။,
Please login as a Marketplace User to report this item.,ဤအကြောင်းအရာအားသတင်းပို့ဖို့ Marketplace အသုံးပြုသူအဖြစ် login ပေးပါ။,
Please select <b>Template Type</b> to download template,ကျေးဇူးပြုပြီး <b>template type</b> ကို download လုပ်ရန် <b>Template Type</b> ကိုရွေးချယ်ပါ,
-Please select Applicant Type first,ကျေးဇူးပြု၍ လျှောက်လွှာပုံစံကိုအရင်ရွေးပါ,
Please select Customer first,ပထမဦးဆုံးဖောက်သည်ကို select ပေးပါ,
Please select Item Code first,ကျေးဇူးပြု၍ item Code ကိုအရင်ရွေးပါ,
-Please select Loan Type for company {0},ကျေးဇူးပြု၍ ကုမ္ပဏီအတွက်ချေးငွေအမျိုးအစားကိုရွေးပါ {0},
Please select a Delivery Note,တစ်ဦး Delivery မှတ်ချက်ကို select ပေးပါ,
Please select a Sales Person for item: {0},ကျေးဇူးပြု၍ ပစ္စည်းအတွက်အရောင်းကိုယ်စားလှယ်ကိုရွေးချယ်ပါ။ {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',အခြားပေးချေမှုနည်းလမ်းကိုရွေးချယ်ပါ။ အစင်းငွေကြေးအရောင်းအထောကျပံ့ပေးမထားဘူး '' {0} ',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},ကုမ္ပဏီ {0} ဘို့ကျေးဇူးပြုပြီး setup ကိုတစ်ဦးက default ဘဏ်အကောင့်,
Please specify,သတ်မှတ် ကျေးဇူးပြု.,
Please specify a {0},ကျေးဇူးပြုပြီး {0} ကိုသတ်မှတ်ပေးပါ။,lead
-Pledge Status,ပေါင်အခြေအနေ,
-Pledge Time,အချိန်ပေးပါ,
Printing,ပုံနှိပ်ခြင်း,
Priority,ဦးစားပေး,
Priority has been changed to {0}.,ဦးစားပေး {0} သို့ပြောင်းလဲခဲ့သည်။,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML ဖိုင်များ processing,
Profitability,အမြတ်အစွန်း,
Project,စီမံကိန်း,
-Proposed Pledges are mandatory for secured Loans,အဆိုပြုထား Pledges လုံခြုံချေးငွေများအတွက်မဖြစ်မနေဖြစ်ကြသည်,
Provide the academic year and set the starting and ending date.,ယင်းပညာသင်နှစ်တွင်ပေးနှင့်စတင်နှင့်အဆုံးသတ်ရက်စွဲထားကြ၏။,
Public token is missing for this bank,ပြည်သူ့လက္ခဏာသက်သေဤဘဏ်အဘို့အပျောက်နေ,
Publish,ပုံနှိပ်ထုတ်ဝေ,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,အရစ်ကျငွေလက်ခံပြေစာနမူနာ enabled ဖြစ်ပါတယ်သိမ်းဆည်းထားရသောအဘို့မဆိုပစ္စည်းမရှိပါ။,
Purchase Return,အရစ်ကျသို့ပြန်သွားသည်,
Qty of Finished Goods Item,ပြီးဆုံးကုန်စည်ပစ္စည်းများ၏အရည်အတွက်,
-Qty or Amount is mandatroy for loan security,အရေအတွက်သို့မဟုတ်ပမာဏသည်ချေးငွေလုံခြုံရေးအတွက် mandatroy ဖြစ်သည်,
Quality Inspection required for Item {0} to submit,Item {0} တင်ပြရန်လိုအပ်အရည်အသွေးစစ်ဆေးရေး,
Quantity to Manufacture,ထုတ်လုပ်ရန်ပမာဏ,
Quantity to Manufacture can not be zero for the operation {0},ထုတ်လုပ်မှုပမာဏသည်စစ်ဆင်ရေးအတွက်သုညမဖြစ်နိုင်ပါ။ {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,ကယ်ဆယ်ရေးနေ့သည် ၀ င်ရောက်သည့်နေ့ထက်ကြီးသည်သို့မဟုတ်တူညီရမည်,
Rename,Rename,
Rename Not Allowed,အမည်ပြောင်းခွင့်မပြု,
-Repayment Method is mandatory for term loans,ချေးငွေသက်တမ်းကိုပြန်ဆပ်ရန်နည်းလမ်းသည်မဖြစ်မနေလိုအပ်သည်,
-Repayment Start Date is mandatory for term loans,ငွေပြန်အမ်းခြင်းရက်သည်ချေးငွေများအတွက်မဖြစ်မနေလိုအပ်သည်,
Report Item,အစီရင်ခံစာ Item,
Report this Item,ဤအကြောင်းအရာအားသတင်းပို့,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,ကန်ထရိုက်စာချုပ်ချုပ်ဆိုရန်အတွက်ကြိုတင်မှာယူထားသောပမာဏ - ကန်ထရိုက်စာချုပ်ချုပ်ဆိုထားသောပစ္စည်းများထုတ်လုပ်ရန်ကုန်ကြမ်းအရေအတွက်။,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},row ({0}): {1} ပြီးသား {2} အတွက်လျှော့နေသည်,
Rows Added in {0},{0} အတွက် Added အတန်း,
Rows Removed in {0},{0} အတွက်ဖယ်ရှားပြီးအတန်း,
-Sanctioned Amount limit crossed for {0} {1},{0} {1} အတွက်ဖြတ်ကျော်ထားသောကန့်သတ်ပမာဏကိုကန့်သတ်,
-Sanctioned Loan Amount already exists for {0} against company {1},ခွင့်ပြုထားသောချေးငွေပမာဏသည်ကုမ္ပဏီ {1} နှင့် {0} အတွက်ရှိပြီးဖြစ်သည်။,
Save,Save ကို,
Save Item,Item Save,
Saved Items,ကယ်တင်ခြင်းသို့ရောက်သောပစ္စည်းများ,
@@ -4135,7 +4093,6 @@
User {0} is disabled,အသုံးပြုသူ {0} ပိတ်ထားတယ်,
Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်,
Vacancies cannot be lower than the current openings,နေရာလွတ်ဟာလက်ရှိအဖွင့်ထက်နိမ့်မဖွစျနိုငျ,
-Valid From Time must be lesser than Valid Upto Time.,Time From Valid သည် Upto Time ထက်နည်းရမည်။,
Valuation Rate required for Item {0} at row {1},အတန်း {1} မှာအရာဝတ္ထု {0} များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း,
Values Out Of Sync,ထပ်တူပြုခြင်းထဲကတန်ဖိုးများ,
Vehicle Type is required if Mode of Transport is Road,ပို့ဆောင်ရေး Mode ကိုလမ်းမပါလျှင်ယာဉ်အမျိုးအစားလိုအပ်ပါသည်,
@@ -4211,7 +4168,6 @@
Add to Cart,စျေးဝယ်ခြင်းထဲသို့ထည့်သည်,
Days Since Last Order,နောက်ဆုံးအမိန့်အပြီးရက်များ,
In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ,
-Loan Amount is mandatory,ချေးငွေပမာဏမဖြစ်မနေဖြစ်ပါတယ်,
Mode Of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို,
No students Found,ကျောင်းသားများရှာမတွေ့ပါ,
Not in Stock,မစတော့အိတ်အတွက်,
@@ -4240,7 +4196,6 @@
Group by,Group မှဖြင့်,
In stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ,
Item name,item အမည်,
-Loan amount is mandatory,ချေးငွေပမာဏမဖြစ်မနေဖြစ်ပါတယ်,
Minimum Qty,နိမ့်ဆုံးအရည်အတွက်,
More details,ပိုများသောအသေးစိတ်,
Nature of Supplies,ထောက်ပံ့ကုန်၏သဘောသဘာဝ,
@@ -4409,9 +4364,6 @@
Total Completed Qty,စုစုပေါင်း Completed အရည်အတွက်,
Qty to Manufacture,ထုတ်လုပ်ခြင်းရန် Qty,
Repay From Salary can be selected only for term loans,လစာမှငွေပြန်အမ်းငွေကိုကာလရှည်ချေးငွေအတွက်သာရွေးချယ်နိုင်သည်,
-No valid Loan Security Price found for {0},{0} အတွက်ခိုင်လုံသောချေးငွေလုံခြုံရေးစျေးနှုန်းမတွေ့ပါ။,
-Loan Account and Payment Account cannot be same,ချေးငွေအကောင့်နှင့်ငွေပေးချေမှုအကောင့်အတူတူမဖြစ်နိုင်ပါ,
-Loan Security Pledge can only be created for secured loans,ချေးငွေလုံခြုံရေးအပေါင်ကိုလုံခြုံသောချေးငွေများအတွက်သာဖန်တီးနိုင်သည်,
Social Media Campaigns,လူမှုမီဒီယာစည်းရုံးလှုံ့ဆော်ရေး,
From Date can not be greater than To Date,နေ့မှစ၍ ရက်စွဲသည်ယနေ့ထက် ပို၍ မကြီးနိုင်ပါ,
Please set a Customer linked to the Patient,ကျေးဇူးပြုပြီးလူနာနှင့်ဆက်သွယ်ထားသောဖောက်သည်တစ် ဦး ကိုသတ်မှတ်ပေးပါ,
@@ -6437,7 +6389,6 @@
HR User,HR အသုံးပြုသူတို့၏,
Appointment Letter,ရက်ချိန်းပေးစာ,
Job Applicant,ယောဘသည်လျှောက်ထားသူ,
-Applicant Name,လျှောက်ထားသူအမည်,
Appointment Date,ရက်ချိန်းရက်,
Appointment Letter Template,ရက်ချိန်းပေးစာပုံစံ,
Body,ကိုယ်ခန္ဓာ,
@@ -7059,99 +7010,12 @@
Sync in Progress,တိုးတက်မှုအတွက် Sync ကို,
Hub Seller Name,hub ရောင်းသူအမည်,
Custom Data,စိတ်တိုင်းကျမှာ Data,
-Member,အဖှဲ့ဝငျ,
-Partially Disbursed,တစ်စိတ်တစ်ပိုင်းထုတ်ချေး,
-Loan Closure Requested,ချေးငွေပိတ်သိမ်းတောင်းဆိုခဲ့သည်,
Repay From Salary,လစာထဲကနေပြန်ဆပ်,
-Loan Details,ချေးငွေအသေးစိတ်,
-Loan Type,ချေးငွေအမျိုးအစား,
-Loan Amount,ချေးငွေပမာဏ,
-Is Secured Loan,လုံခြုံသောချေးငွေ,
-Rate of Interest (%) / Year,အကျိုးစီးပွား၏နှုန်းမှာ (%) / တစ်နှစ်တာ,
-Disbursement Date,ငွေပေးချေနေ့စွဲ,
-Disbursed Amount,ထုတ်ပေးငွေပမာဏ,
-Is Term Loan,Term ချေးငွေ,
-Repayment Method,ပြန်ဆပ် Method ကို,
-Repay Fixed Amount per Period,ကာလနှုန်း Fixed ငွေပမာဏပြန်ဆပ်,
-Repay Over Number of Periods,ကာလနံပါတ်ကျော်ပြန်ဆပ်,
-Repayment Period in Months,လထဲမှာပြန်ဆပ်ကာလ,
-Monthly Repayment Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏ,
-Repayment Start Date,ပြန်ဆပ်ဖို့ Start နေ့စွဲ,
-Loan Security Details,ချေးငွေလုံခြုံရေးအသေးစိတ်,
-Maximum Loan Value,အများဆုံးချေးငွေတန်ဖိုး,
-Account Info,အကောင့်အင်ဖို,
-Loan Account,ချေးငွေအကောင့်,
-Interest Income Account,အကျိုးစီးပွားဝင်ငွေခွန်အကောင့်,
-Penalty Income Account,ပြစ်ဒဏ်ဝင်ငွေစာရင်း,
-Repayment Schedule,ပြန်ဆပ်ဇယား,
-Total Payable Amount,စုစုပေါင်းပေးရန်ငွေပမာဏ,
-Total Principal Paid,စုစုပေါင်းကျောင်းအုပ်ကြီး Paid,
-Total Interest Payable,စုစုပေါင်းအကျိုးစီးပွားပေးရန်,
-Total Amount Paid,စုစုပေါင်းငွေပမာဏ Paid,
-Loan Manager,ချေးငွေမန်နေဂျာ,
-Loan Info,ချေးငွေအင်ဖို,
-Rate of Interest,အကျိုးစီးပွား၏နှုန်းမှာ,
-Proposed Pledges,အဆိုပြုထား Pledges,
-Maximum Loan Amount,အများဆုံးချေးငွေပမာဏ,
-Repayment Info,ပြန်ဆပ်အင်ဖို,
-Total Payable Interest,စုစုပေါင်းပေးရန်စိတ်ဝင်စားမှု,
-Against Loan ,ချေးငွေဆန့်ကျင်,
-Loan Interest Accrual,ချေးငွေအတိုးနှုန်းတိုးပွားလာ,
-Amounts,ပမာဏ,
-Pending Principal Amount,ဆိုင်းငံ့ကျောင်းအုပ်ကြီးငွေပမာဏ,
-Payable Principal Amount,ပေးဆောင်ရမည့်ကျောင်းအုပ်ကြီးပမာဏ,
-Paid Principal Amount,ပေးဆောင်ကျောင်းအုပ်ကြီးငွေပမာဏ,
-Paid Interest Amount,Paid interest ပမာဏ,
-Process Loan Interest Accrual,လုပ်ငန်းစဉ်ချေးငွေအကျိုးစီးပွားတိုးပွားလာ,
-Repayment Schedule Name,ပြန်ပေးငွေဇယားအမည်,
Regular Payment,ပုံမှန်ငွေပေးချေမှု,
Loan Closure,ချေးငွေပိတ်သိမ်း,
-Payment Details,ငွေပေးချေမှုရမည့်အသေးစိတ်အကြောင်းအရာ,
-Interest Payable,ပေးဆောင်ရမည့်အတိုး,
-Amount Paid,Paid ငွေပမာဏ,
-Principal Amount Paid,ပေးဆောင်သည့်ငွေပမာဏ,
-Repayment Details,ပြန်ပေးငွေအသေးစိတ်,
-Loan Repayment Detail,ချေးငွေပြန်ဆပ်မှုအသေးစိတ်,
-Loan Security Name,ချေးငွေလုံခြုံရေးအမည်,
-Unit Of Measure,အတိုင်းအတာယူနစ်,
-Loan Security Code,ချေးငွေလုံခြုံရေး Code ကို,
-Loan Security Type,ချေးငွေလုံခြုံရေးအမျိုးအစား,
-Haircut %,ဆံပင်ပုံပုံ%,
-Loan Details,ချေးငွေအသေးစိတ်,
-Unpledged,မင်္ဂလာပါ,
-Pledged,ကျေးဇူးတင်ပါတယ်,
-Partially Pledged,တစ်စိတ်တစ်ပိုင်း Pledged,
-Securities,လုံခြုံရေး,
-Total Security Value,စုစုပေါင်းလုံခြုံရေးတန်ဖိုး,
-Loan Security Shortfall,ချေးငွေလုံခြုံရေးလိုအပ်ချက်,
-Loan ,ခြေးငှေ,
-Shortfall Time,အချိန်တို,
-America/New_York,အမေရိက / နယူးယောက်,
-Shortfall Amount,လိုအပ်ချက်ပမာဏ,
-Security Value ,လုံခြုံရေးတန်ဖိုး,
-Process Loan Security Shortfall,ချေးငွေလုံခြုံရေးလိုအပ်ချက်,
-Loan To Value Ratio,အချိုးအစားတန်ဖိုးကိုချေးငွေ,
-Unpledge Time,Unpledge အချိန်,
-Loan Name,ချေးငွေအမည်,
Rate of Interest (%) Yearly,အကျိုးစီးပွား၏နှုန်းမှာ (%) နှစ်အလိုက်,
-Penalty Interest Rate (%) Per Day,တစ်နေ့လျှင်ပြစ်ဒဏ်အတိုးနှုန်း (%),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,နှောင့်နှေးသောအကြွေးပြန်ဆပ်သည့်အချိန်တွင်ပင်စင်အတိုးနှုန်းကိုဆိုင်းငံ့အတိုးနှုန်းအပေါ်နေ့စဉ်ပေးဆောင်ရသည်,
-Grace Period in Days,နေ့ရက်ကာလ၌ကျေးဇူးတော်ရှိစေသတည်းကာလ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,ချေးငွေပြန်ဆပ်ရန်နှောင့်နှေးလျှင်အရေးယူမည့်နေ့အထိရက်အရေအတွက်,
-Pledge,ပေါင်,
-Post Haircut Amount,ဆံပင်ညှပ်ပမာဏ,
-Process Type,လုပ်ငန်းစဉ်အမျိုးအစား,
-Update Time,အချိန်အသစ်ပြောင်းပါ,
-Proposed Pledge,အဆိုပြုထားအပေါင်,
-Total Payment,စုစုပေါင်းငွေပေးချေမှုရမည့်,
-Balance Loan Amount,balance ချေးငွေပမာဏ,
-Is Accrued,ရှိပါသည်,
Salary Slip Loan,လစာစလစ်ဖြတ်ပိုင်းပုံစံချေးငွေ,
Loan Repayment Entry,ချေးငွေပြန်ပေးရေး Entry,
-Sanctioned Loan Amount,ခွင့်ပြုထားသောချေးငွေပမာဏ,
-Sanctioned Amount Limit,ငွေပမာဏကန့်သတ်,
-Unpledge,မင်္ဂလာပါ,
-Haircut,ဆံပင်ညှပ်,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,ဇယား Generate,
Schedules,အချိန်ဇယားများ,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,စီမံကိန်းကဤသည်အသုံးပြုသူများမှ website တွင်ဝင်ရောက်ဖြစ်လိမ့်မည်,
Copied From,မှစ. ကူးယူ,
Start and End Dates,Start နဲ့ရပ်တန့်နေ့စွဲများ,
-Actual Time (in Hours),အမှန်တကယ်အချိန် (နာရီများအတွင်း),
+Actual Time in Hours (via Timesheet),အမှန်တကယ်အချိန် (နာရီများအတွင်း),
Costing and Billing,ကုန်ကျနှင့်ငွေတောင်းခံလွှာ,
-Total Costing Amount (via Timesheets),(Timesheets မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ,
-Total Expense Claim (via Expense Claims),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ,
+Total Costing Amount (via Timesheet),(Timesheets မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ,
+Total Expense Claim (via Expense Claim),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ,
Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်,
Total Sales Amount (via Sales Order),(အရောင်းအမိန့်မှတဆင့်) စုစုပေါင်းအရောင်းပမာဏ,
-Total Billable Amount (via Timesheets),(Timesheets မှတဆင့်) စုစုပေါင်းဘီလ်ဆောင်ငွေပမာဏ,
-Total Billed Amount (via Sales Invoices),(အရောင်းငွေတောင်းခံလွှာကနေတဆင့်) စုစုပေါင်းကောက်ခံခဲ့ငွေပမာဏ,
-Total Consumed Material Cost (via Stock Entry),(စတော့အိတ် Entry 'မှတဆင့်) စုစုပေါင်းစားသုံးပစ္စည်းကုန်ကျစရိတ်,
+Total Billable Amount (via Timesheet),(Timesheets မှတဆင့်) စုစုပေါင်းဘီလ်ဆောင်ငွေပမာဏ,
+Total Billed Amount (via Sales Invoice),(အရောင်းငွေတောင်းခံလွှာကနေတဆင့်) စုစုပေါင်းကောက်ခံခဲ့ငွေပမာဏ,
+Total Consumed Material Cost (via Stock Entry),(စတော့အိတ် Entry 'မှတဆင့်) စုစုပေါင်းစားသုံးပစ္စည်းကုန်ကျစရိတ်,
Gross Margin,gross Margin,
Gross Margin %,gross Margin%,
Monitor Progress,တိုးတက်မှုစောင့်ကြည့်,
@@ -7521,12 +7385,10 @@
Dependencies,မှီခို,
Dependent Tasks,မှီခိုလုပ်ငန်းများ,
Depends on Tasks,လုပ်ငန်းများအပေါ်မူတည်,
-Actual Start Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ် Start ကိုနေ့စွဲ,
-Actual Time (in hours),(နာရီအတွက်) အမှန်တကယ်အချိန်,
-Actual End Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ,
-Total Costing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ,
+Actual Start Date (via Timesheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ် Start ကိုနေ့စွဲ,
+Actual Time in Hours (via Timesheet),(နာရီအတွက်) အမှန်တကယ်အချိန်,
+Actual End Date (via Timesheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ,
Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ,
-Total Billing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းငွေတောင်းခံလွှာပမာဏ,
Review Date,ပြန်လည်ဆန်းစစ်ခြင်းနေ့စွဲ,
Closing Date,နိဂုံးချုပ်နေ့စွဲ,
Task Depends On,Task အပေါ်မူတည်,
@@ -7887,7 +7749,6 @@
Update Series,Update ကိုစီးရီး,
Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။,
Prefix,ရှေ့ဆကျတှဲ,
-Current Value,လက်ရှိ Value တစ်ခု,
This is the number of the last created transaction with this prefix,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်,
Update Series Number,Update ကိုစီးရီးနံပါတ်,
Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား,
Lead Details,ခဲအသေးစိတ်ကို,
Lead Owner Efficiency,ခဲပိုင်ရှင်စွမ်းရည်,
-Loan Repayment and Closure,ချေးငွေပြန်ဆပ်ခြင်းနှင့်ပိတ်သိမ်းခြင်း,
-Loan Security Status,ချေးငွေလုံခြုံရေးအခြေအနေ,
Lost Opportunity,အခွင့်အလမ်းဆုံးရှုံးခဲ့ရ,
Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား,
Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},လျာထားသောအရေအတွက် - {0},
Payment Account is mandatory,ငွေပေးချေမှုအကောင့်မဖြစ်မနေဖြစ်ပါတယ်,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",စစ်ဆေးမှုရှိပါကကြေငြာချက်သို့မဟုတ်သက်သေအထောက်အထားမပါဘဲ ၀ င်ငွေခွန်ကိုမတွက်ချက်မီအခွန် ၀ င်ငွေမှနုတ်ယူလိမ့်မည်။,
-Disbursement Details,ငွေပေးချေမှုအသေးစိတ်,
Material Request Warehouse,ပစ္စည်းတောင်းခံဂိုဒေါင်,
Select warehouse for material requests,ပစ္စည်းတောင်းဆိုမှုများအတွက်ဂိုဒေါင်ကိုရွေးပါ,
Transfer Materials For Warehouse {0},ဂိုဒေါင်အတွက်လွှဲပြောင်းပစ္စည်းများ {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,မတောင်းဆိုသောငွေကိုလစာမှပြန်ပေးပါ,
Deduction from salary,လစာမှနှုတ်ယူခြင်း,
Expired Leaves,သက်တမ်းကုန်ဆုံးသောအရွက်,
-Reference No,ကိုးကားစရာနံပါတ်,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ဆံပင်ညှပ်နှုန်းသည်ချေးငွေအာမခံ၏စျေးကွက်တန်ဖိုးနှင့်ချေးငွေအတွက်အပေါင်ပစ္စည်းအဖြစ်အသုံးပြုသောချေးငွေလုံခြုံရေးမှဖော်ပြသောတန်ဖိုးအကြားရာခိုင်နှုန်းကွာခြားချက်ဖြစ်သည်။,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,ချေးငွေနှင့်တန်ဖိုးအချိုးသည်ချေးငွေပမာဏနှင့်ကတိထားရာလုံခြုံရေးတန်ဖိုးနှင့်ဖော်ပြသည်။ အကယ်၍ ၎င်းသည်မည်သည့်ချေးငွေအတွက်မဆိုသတ်မှတ်ထားသောတန်ဖိုးအောက်ရောက်လျှင်ချေးငွေလုံခြုံရေးပြတ်လပ်မှုဖြစ်ပေါ်လာလိမ့်မည်,
If this is not checked the loan by default will be considered as a Demand Loan,အကယ်၍ ၎င်းကိုမစစ်ဆေးပါကပုံမှန်အားဖြင့်ချေးငွေကို Demand Loan အဖြစ်သတ်မှတ်မည်,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,ဒီအကောင့်ကိုငွေချေးသူထံမှချေးငွေပြန်ဆပ်မှုကိုကြိုတင်မှာကြားပြီးငွေချေးသူမှချေးငွေများထုတ်ပေးသည်,
This account is capital account which is used to allocate capital for loan disbursal account ,ဤအကောင့်သည်ငွေရင်းငွေစာရင်းဖြစ်သည်,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},စစ်ဆင်ရေး {0} သည်အလုပ်အော်ဒါ {1} နှင့်မသက်ဆိုင်ပါ။,
Print UOM after Quantity,အရေအတွက်အပြီး UOM ကို print ထုတ်ပါ,
Set default {0} account for perpetual inventory for non stock items,သိုမဟုတ်သောပစ္စည်းများအတွက်အမြဲတမ်းစာရင်းအတွက်ပုံမှန် {0} အကောင့်ကိုသတ်မှတ်ပါ,
-Loan Security {0} added multiple times,ချေးငွေလုံခြုံရေး {0} အကြိမ်ပေါင်းများစွာဆက်ပြောသည်,
-Loan Securities with different LTV ratio cannot be pledged against one loan,ကွဲပြားသော LTV အချိုးရှိချေးငွေအာမခံကိုချေးငွေတစ်ခုအားအပေါင်မပေးနိုင်ပါ,
-Qty or Amount is mandatory for loan security!,ငွေပမာဏသည်ချေးငွေအတွက်မဖြစ်မနေလိုအပ်သည်။,
-Only submittted unpledge requests can be approved,တင်ပြပြီး unpledge တောင်းဆိုမှုများကိုသာအတည်ပြုနိုင်သည်,
-Interest Amount or Principal Amount is mandatory,အတိုးနှုန်းသို့မဟုတ်ကျောင်းအုပ်ကြီးပမာဏသည်မဖြစ်မနေလိုအပ်သည်,
-Disbursed Amount cannot be greater than {0},ထုတ်ပေးသောငွေပမာဏသည် {0} ထက်မကြီးနိုင်ပါ,
-Row {0}: Loan Security {1} added multiple times,အတန်း {0}: ချေးငွေလုံခြုံရေး {1} အကြိမ်ပေါင်းများစွာဆက်ပြောသည်,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Row # {0} - ကလေးပစ္စည်းသည်ကုန်ပစ္စည်းအစုအဝေးမဖြစ်သင့်ပါ။ ကျေးဇူးပြု၍ ပစ္စည်း {1} ကိုဖယ်ရှား။ သိမ်းဆည်းပါ,
Credit limit reached for customer {0},ဖောက်သည်အတွက်အကြွေးကန့်သတ် {0},
Could not auto create Customer due to the following missing mandatory field(s):,အောက်ပါလိုအပ်သောဖြည့်စွက်ထားသောအကွက်များကြောင့်ဖောက်သည်ကိုအလိုအလျောက် ဖန်တီး၍ မရပါ။,
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index b559c69..bbea299 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Van toepassing als het bedrijf SpA, SApA of SRL is",
Applicable if the company is a limited liability company,Van toepassing als het bedrijf een naamloze vennootschap is,
Applicable if the company is an Individual or a Proprietorship,Van toepassing als het bedrijf een individu of een eigenaar is,
-Applicant,aanvrager,
-Applicant Type,aanvrager Type,
Application of Funds (Assets),Toepassing van kapitaal (Activa),
Application period cannot be across two allocation records,De toepassingsperiode kan niet over twee toewijzingsrecords lopen,
Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet,
@@ -875,7 +873,7 @@
Donor Type information.,Donor Type informatie.,
Donor information.,Donorinformatie.,
Download JSON,JSON downloaden,
-Draft,Droogte,
+Draft,Concept,
Drop Ship,Drop Ship,
Drug,drug,
Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lijst met beschikbare aandeelhouders met folionummers,
Loading Payment System,Loading Payment System,
Loan,Lening,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0},
-Loan Application,Aanvraag voor een lening,
-Loan Management,Leningbeheer,
-Loan Repayment,Lening terugbetaling,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,De startdatum en de uitleentermijn van de lening zijn verplicht om de korting op de factuur op te slaan,
Loans (Liabilities),Leningen (Passiva),
Loans and Advances (Assets),Leningen en voorschotten (activa),
@@ -1611,7 +1605,6 @@
Monday,Maandag,
Monthly,Maandelijks,
Monthly Distribution,Maandelijkse verdeling,
-Monthly Repayment Amount cannot be greater than Loan Amount,Maandelijks te betalen bedrag kan niet groter zijn dan Leningen zijn,
More,Meer,
More Information,Meer informatie,
More than one selection for {0} not allowed,Meer dan één selectie voor {0} niet toegestaan,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Betaal {0} {1},
Payable,betaalbaar,
Payable Account,Verschuldigd Account,
-Payable Amount,Te betalen bedrag,
Payment,Betaling,
Payment Cancelled. Please check your GoCardless Account for more details,Betaling geannuleerd. Controleer uw GoCardless-account voor meer informatie,
Payment Confirmation,Betalingsbevestiging,
-Payment Date,Betaaldatum,
Payment Days,Betaling dagen,
Payment Document,betaling Document,
Payment Due Date,Betaling Vervaldatum,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Vul Kwitantie eerste,
Please enter Receipt Document,Vul Ontvangst Document,
Please enter Reference date,Vul Peildatum in,
-Please enter Repayment Periods,Vul de aflossingsperiode,
Please enter Reqd by Date,Voer Reqd in op datum,
Please enter Woocommerce Server URL,Voer de URL van de Woocommerce-server in,
Please enter Write Off Account,Voer Afschrijvingenrekening in,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Vul bovenliggende kostenplaats in,
Please enter quantity for Item {0},Vul het aantal in voor artikel {0},
Please enter relieving date.,Vul het verlichten datum .,
-Please enter repayment Amount,Vul hier terug te betalen bedrag,
Please enter valid Financial Year Start and End Dates,Voer geldige boekjaar begin- en einddatum,
Please enter valid email address,Vul alstublieft een geldig e-mailadres in,
Please enter {0} first,Voer {0} eerste,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal.,
Primary Address Details,Primaire adresgegevens,
Primary Contact Details,Primaire contactgegevens,
-Principal Amount,hoofdsom,
Print Format,Print Formaat,
Print IRS 1099 Forms,Formulieren IRS 1099 afdrukken,
Print Report Card,Rapportkaart afdrukken,
@@ -2550,7 +2538,6 @@
Sample Collection,Sample Collection,
Sample quantity {0} cannot be more than received quantity {1},Voorbeeldhoeveelheid {0} kan niet meer dan ontvangen aantal {1} zijn,
Sanctioned,Sanctioned,
-Sanctioned Amount,Gesanctioneerde Bedrag,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.,
Sand,Zand,
Saturday,Zaterdag,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} heeft al een ouderprocedure {1}.,
API,API,
Annual,jaar-,
-Approved,Aangenomen,
Change,Verandering,
Contact Email,Contact E-mail,
Export Type,Exporttype,
@@ -3571,7 +3557,6 @@
Account Value,Accountwaarde,
Account is mandatory to get payment entries,Account is verplicht om betalingsinvoer te krijgen,
Account is not set for the dashboard chart {0},Account is niet ingesteld voor de dashboardgrafiek {0},
-Account {0} does not belong to company {1},Rekening {0} behoort niet tot Bedrijf {1},
Account {0} does not exists in the dashboard chart {1},Account {0} bestaat niet in de dashboardgrafiek {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Account: <b>{0}</b> is hoofdletter onderhanden werk en kan niet worden bijgewerkt via journaalboeking,
Account: {0} is not permitted under Payment Entry,Account: {0} is niet toegestaan onder Betaling invoeren,
@@ -3582,7 +3567,6 @@
Activity,Activiteit,
Add / Manage Email Accounts.,Toevoegen / Beheer op E-mailaccounts.,
Add Child,Onderliggende toevoegen,
-Add Loan Security,Leningbeveiliging toevoegen,
Add Multiple,Meerdere toevoegen,
Add Participants,Voeg deelnemers toe,
Add to Featured Item,Toevoegen aan aanbevolen item,
@@ -3593,15 +3577,12 @@
Address Line 1,Adres Lijn 1,
Addresses,Adressen,
Admission End Date should be greater than Admission Start Date.,Einddatum van toelating moet groter zijn dan Startdatum van toelating.,
-Against Loan,Tegen lening,
-Against Loan:,Tegen lening:,
All,Allemaal,
All bank transactions have been created,Alle banktransacties zijn gecreëerd,
All the depreciations has been booked,Alle afschrijvingen zijn geboekt,
Allocation Expired!,Toekenning verlopen!,
Allow Resetting Service Level Agreement from Support Settings.,Sta Resetten Service Level Agreement toe vanuit ondersteuningsinstellingen.,
Amount of {0} is required for Loan closure,Een bedrag van {0} is vereist voor het afsluiten van de lening,
-Amount paid cannot be zero,Betaald bedrag kan niet nul zijn,
Applied Coupon Code,Toegepaste couponcode,
Apply Coupon Code,Couponcode toepassen,
Appointment Booking,Afspraak boeken,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Kan aankomsttijd niet berekenen omdat het adres van de bestuurder ontbreekt.,
Cannot Optimize Route as Driver Address is Missing.,Kan route niet optimaliseren omdat het adres van de bestuurder ontbreekt.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Kan taak {0} niet voltooien omdat de afhankelijke taak {1} niet is voltooid / geannuleerd.,
-Cannot create loan until application is approved,Kan geen lening maken tot aanvraag is goedgekeurd,
Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Kan voor item {0} in rij {1} meer dan {2} niet teveel factureren. Als u overfactureren wilt toestaan, stelt u een toeslag in Accounts-instellingen in",
"Capacity Planning Error, planned start time can not be same as end time","Capaciteitsplanningsfout, geplande starttijd kan niet hetzelfde zijn als eindtijd",
@@ -3812,20 +3792,9 @@
Less Than Amount,Minder dan bedrag,
Liabilities,Passiva,
Loading...,Laden ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Het geleende bedrag overschrijdt het maximale geleende bedrag van {0} per voorgestelde effecten,
Loan Applications from customers and employees.,Leningaanvragen van klanten en werknemers.,
-Loan Disbursement,Uitbetaling van de lening,
Loan Processes,Lening processen,
-Loan Security,Lening beveiliging,
-Loan Security Pledge,Lening zekerheid pandrecht,
-Loan Security Pledge Created : {0},Lening Security Pledge gecreëerd: {0},
-Loan Security Price,Lening beveiligingsprijs,
-Loan Security Price overlapping with {0},Lening Beveiliging Prijs overlapt met {0},
-Loan Security Unpledge,Lening beveiliging Unpledge,
-Loan Security Value,Lening beveiligingswaarde,
Loan Type for interest and penalty rates,Type lening voor rente en boetes,
-Loan amount cannot be greater than {0},Leenbedrag kan niet groter zijn dan {0},
-Loan is mandatory,Lening is verplicht,
Loans,Leningen,
Loans provided to customers and employees.,Leningen verstrekt aan klanten en werknemers.,
Location,Locatie,
@@ -3894,7 +3863,6 @@
Pay,Betalen,
Payment Document Type,Type betaaldocument,
Payment Name,Betalingsnaam,
-Penalty Amount,Bedrag van de boete,
Pending,In afwachting van,
Performance,Prestatie,
Period based On,Periode gebaseerd op,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Meld u aan als Marketplace-gebruiker om dit item te bewerken.,
Please login as a Marketplace User to report this item.,Meld u aan als Marketplace-gebruiker om dit item te melden.,
Please select <b>Template Type</b> to download template,Selecteer het <b>sjabloontype</b> om de sjabloon te downloaden,
-Please select Applicant Type first,Selecteer eerst het Type aanvrager,
Please select Customer first,Selecteer eerst Klant,
Please select Item Code first,Selecteer eerst de artikelcode,
-Please select Loan Type for company {0},Selecteer het type lening voor bedrijf {0},
Please select a Delivery Note,Selecteer een afleveringsbewijs,
Please select a Sales Person for item: {0},Selecteer een verkoper voor artikel: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Selecteer een andere betaalmethode. Stripe ondersteunt geen transacties in valuta '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Stel een standaard bankrekening in voor bedrijf {0},
Please specify,Specificeer,
Please specify a {0},Geef een {0} op,lead
-Pledge Status,Pandstatus,
-Pledge Time,Belofte tijd,
Printing,Afdrukken,
Priority,Prioriteit,
Priority has been changed to {0}.,Prioriteit is gewijzigd in {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML-bestanden verwerken,
Profitability,Winstgevendheid,
Project,Project,
-Proposed Pledges are mandatory for secured Loans,Voorgestelde toezeggingen zijn verplicht voor beveiligde leningen,
Provide the academic year and set the starting and ending date.,Geef het academische jaar op en stel de begin- en einddatum in.,
Public token is missing for this bank,Openbaar token ontbreekt voor deze bank,
Publish,Publiceren,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Aankoopbewijs heeft geen artikel waarvoor Voorbeeld behouden is ingeschakeld.,
Purchase Return,Inkoop Retour,
Qty of Finished Goods Item,Aantal gereed product,
-Qty or Amount is mandatroy for loan security,Aantal of Bedrag is verplicht voor leningzekerheid,
Quality Inspection required for Item {0} to submit,Kwaliteitsinspectie vereist om item {0} te verzenden,
Quantity to Manufacture,Te produceren hoeveelheid,
Quantity to Manufacture can not be zero for the operation {0},Te produceren hoeveelheid kan niet nul zijn voor de bewerking {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Ontlastingsdatum moet groter zijn dan of gelijk zijn aan de datum van toetreding,
Rename,Hernoemen,
Rename Not Allowed,Naam wijzigen niet toegestaan,
-Repayment Method is mandatory for term loans,Terugbetalingsmethode is verplicht voor termijnleningen,
-Repayment Start Date is mandatory for term loans,De startdatum van de terugbetaling is verplicht voor termijnleningen,
Report Item,Meld item,
Report this Item,Meld dit item,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Gereserveerde hoeveelheid voor uitbesteding: hoeveelheid grondstoffen om uitbestede artikelen te maken.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rij ({0}): {1} is al verdisconteerd in {2},
Rows Added in {0},Rijen toegevoegd in {0},
Rows Removed in {0},Rijen verwijderd in {0},
-Sanctioned Amount limit crossed for {0} {1},Sanctielimiet overschreden voor {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Er bestaat al een gesanctioneerd leningbedrag voor {0} tegen bedrijf {1},
Save,bewaren,
Save Item,Item opslaan,
Saved Items,Opgeslagen items,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Gebruiker {0} is uitgeschakeld,
Users and Permissions,Gebruikers en machtigingen,
Vacancies cannot be lower than the current openings,Vacatures kunnen niet lager zijn dan de huidige openingen,
-Valid From Time must be lesser than Valid Upto Time.,Geldig vanaf tijd moet kleiner zijn dan Geldig tot tijd.,
Valuation Rate required for Item {0} at row {1},Waarderingspercentage vereist voor artikel {0} op rij {1},
Values Out Of Sync,Niet synchroon,
Vehicle Type is required if Mode of Transport is Road,Voertuigtype is vereist als de wijze van vervoer weg is,
@@ -4211,7 +4168,6 @@
Add to Cart,In winkelwagen,
Days Since Last Order,Dagen sinds laatste bestelling,
In Stock,Op voorraad,
-Loan Amount is mandatory,Leenbedrag is verplicht,
Mode Of Payment,Wijze van betaling,
No students Found,Geen studenten gevonden,
Not in Stock,Niet op voorraad,
@@ -4240,7 +4196,6 @@
Group by,Groeperen volgens,
In stock,Op voorraad,
Item name,Artikelnaam,
-Loan amount is mandatory,Leenbedrag is verplicht,
Minimum Qty,Minimum aantal,
More details,Meer details,
Nature of Supplies,Aard van leveringen,
@@ -4279,7 +4234,7 @@
Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it.,Rij # {0}: artikel {1} is geen geserialiseerd / batch artikel. Het kan geen serienummer / batchnummer hebben.,
Please set {0},Stel {0} in,
Please set {0},Stel {0} in,supplier
-Draft,Droogte,"docstatus,=,0"
+Draft,Concept,"docstatus,=,0"
Cancelled,Geannuleerd,"docstatus,=,2"
Please setup Instructor Naming System in Education > Education Settings,Stel het instructeursysteem in onder onderwijs> onderwijsinstellingen,
Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series in op {0} via Instellingen> Instellingen> Naming Series,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Totaal voltooid aantal,
Qty to Manufacture,Aantal te produceren,
Repay From Salary can be selected only for term loans,Terugbetaling van salaris kan alleen worden geselecteerd voor termijnleningen,
-No valid Loan Security Price found for {0},Geen geldige leningprijs gevonden voor {0},
-Loan Account and Payment Account cannot be same,Leningrekening en Betaalrekening kunnen niet hetzelfde zijn,
-Loan Security Pledge can only be created for secured loans,Een pandrecht op leningen kan alleen worden gecreëerd voor gedekte leningen,
Social Media Campaigns,Campagnes op sociale media,
From Date can not be greater than To Date,Vanaf datum kan niet groter zijn dan Tot datum,
Please set a Customer linked to the Patient,Stel een klant in die is gekoppeld aan de patiënt,
@@ -6437,7 +6389,6 @@
HR User,HR Gebruiker,
Appointment Letter,Afspraakbrief,
Job Applicant,Sollicitant,
-Applicant Name,Aanvrager Naam,
Appointment Date,Benoemingsdatum,
Appointment Letter Template,Afspraak briefsjabloon,
Body,Lichaam,
@@ -7059,99 +7010,12 @@
Sync in Progress,Synchronisatie in uitvoering,
Hub Seller Name,Hub verkopernaam,
Custom Data,Aangepaste gegevens,
-Member,Lid,
-Partially Disbursed,gedeeltelijk uitbetaald,
-Loan Closure Requested,Sluiting van lening gevraagd,
Repay From Salary,Terugbetalen van Loon,
-Loan Details,Loan Details,
-Loan Type,Loan Type,
-Loan Amount,Leenbedrag,
-Is Secured Loan,Is een beveiligde lening,
-Rate of Interest (%) / Year,Rate of Interest (%) / Jaar,
-Disbursement Date,uitbetaling Date,
-Disbursed Amount,Uitbetaald bedrag,
-Is Term Loan,Is termijnlening,
-Repayment Method,terugbetaling Method,
-Repay Fixed Amount per Period,Terugbetalen vast bedrag per periode,
-Repay Over Number of Periods,Terug te betalen gedurende een aantal perioden,
-Repayment Period in Months,Terugbetaling Periode in maanden,
-Monthly Repayment Amount,Maandelijks te betalen bedrag,
-Repayment Start Date,Startdatum aflossing,
-Loan Security Details,Lening Beveiligingsdetails,
-Maximum Loan Value,Maximale leenwaarde,
-Account Info,Account informatie,
-Loan Account,Lening account,
-Interest Income Account,Rentebaten Account,
-Penalty Income Account,Penalty Inkomen Account,
-Repayment Schedule,Terugbetalingsschema,
-Total Payable Amount,Totaal te betalen bedrag,
-Total Principal Paid,Totaal hoofdsom betaald,
-Total Interest Payable,Totaal te betalen rente,
-Total Amount Paid,Totaal betaald bedrag,
-Loan Manager,Lening Manager,
-Loan Info,Loan Info,
-Rate of Interest,Rentevoet,
-Proposed Pledges,Voorgestelde toezeggingen,
-Maximum Loan Amount,Maximum Leningen,
-Repayment Info,terugbetaling Info,
-Total Payable Interest,Totaal verschuldigde rente,
-Against Loan ,Tegen lening,
-Loan Interest Accrual,Opbouw rente,
-Amounts,bedragen,
-Pending Principal Amount,In afwachting van hoofdbedrag,
-Payable Principal Amount,Te betalen hoofdbedrag,
-Paid Principal Amount,Betaalde hoofdsom,
-Paid Interest Amount,Betaald rentebedrag,
-Process Loan Interest Accrual,Lening opbouw rente verwerken,
-Repayment Schedule Name,Naam aflossingsschema,
Regular Payment,Reguliere betaling,
Loan Closure,Lening sluiting,
-Payment Details,Betalingsdetails,
-Interest Payable,Verschuldigde rente,
-Amount Paid,Betaald bedrag,
-Principal Amount Paid,Hoofdsom betaald,
-Repayment Details,Betalingsgegevens,
-Loan Repayment Detail,Detail van terugbetaling van lening,
-Loan Security Name,Naam leningbeveiliging,
-Unit Of Measure,Maateenheid,
-Loan Security Code,Lening beveiligingscode,
-Loan Security Type,Type leningbeveiliging,
-Haircut %,Kapsel%,
-Loan Details,Lening details,
-Unpledged,Unpledged,
-Pledged,verpande,
-Partially Pledged,Gedeeltelijk toegezegd,
-Securities,Effecten,
-Total Security Value,Totale beveiligingswaarde,
-Loan Security Shortfall,Lening Zekerheidstekort,
-Loan ,Lening,
-Shortfall Time,Tekorttijd,
-America/New_York,America / New_York,
-Shortfall Amount,Tekortbedrag,
-Security Value ,Beveiligingswaarde,
-Process Loan Security Shortfall,Proceslening Beveiligingstekort,
-Loan To Value Ratio,Lening tot waardeverhouding,
-Unpledge Time,Unpledge Time,
-Loan Name,lening Naam,
Rate of Interest (%) Yearly,Rate of Interest (%) Jaarlijkse,
-Penalty Interest Rate (%) Per Day,Boeterente (%) per dag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,In geval van vertraagde terugbetaling wordt dagelijks een boeterente geheven over het lopende rentebedrag,
-Grace Period in Days,Grace periode in dagen,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Aantal dagen vanaf de vervaldatum tot welke boete niet in rekening wordt gebracht in geval van vertraging bij de terugbetaling van de lening,
-Pledge,Belofte,
-Post Haircut Amount,Kapselbedrag posten,
-Process Type,Proces type,
-Update Time,Update tijd,
-Proposed Pledge,Voorgestelde belofte,
-Total Payment,Totale betaling,
-Balance Loan Amount,Balans Leningsbedrag,
-Is Accrued,Wordt opgebouwd,
Salary Slip Loan,Salaris Sliplening,
Loan Repayment Entry,Lening terugbetaling terugbetaling,
-Sanctioned Loan Amount,Sanctiebedrag,
-Sanctioned Amount Limit,Sanctiebedraglimiet,
-Unpledge,Unpledge,
-Haircut,haircut,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Genereer Plan,
Schedules,Schema,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Project zal toegankelijk op de website van deze gebruikers,
Copied From,Gekopieerd van,
Start and End Dates,Begin- en einddatum,
-Actual Time (in Hours),Werkelijke tijd (in uren),
+Actual Time in Hours (via Timesheet),Werkelijke tijd (in uren),
Costing and Billing,Kostenberekening en facturering,
-Total Costing Amount (via Timesheets),Totale kostenbedrag (via urenstaten),
-Total Expense Claim (via Expense Claims),Total Expense Claim (via declaraties),
+Total Costing Amount (via Timesheet),Totale kostenbedrag (via urenstaten),
+Total Expense Claim (via Expense Claim),Total Expense Claim (via declaraties),
Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice),
Total Sales Amount (via Sales Order),Totaal verkoopbedrag (via klantorder),
-Total Billable Amount (via Timesheets),Totaal factureerbare hoeveelheid (via urenstaten),
-Total Billed Amount (via Sales Invoices),Totaal gefactureerd bedrag (via verkoopfacturen),
-Total Consumed Material Cost (via Stock Entry),Totale verbruikte materiaalkosten (via voorraadinvoer),
+Total Billable Amount (via Timesheet),Totaal factureerbare hoeveelheid (via urenstaten),
+Total Billed Amount (via Sales Invoice),Totaal gefactureerd bedrag (via verkoopfacturen),
+Total Consumed Material Cost (via Stock Entry),Totale verbruikte materiaalkosten (via voorraadinvoer),
Gross Margin,Bruto Marge,
Gross Margin %,Bruto marge %,
Monitor Progress,Voortgang in de gaten houden,
@@ -7521,12 +7385,10 @@
Dependencies,afhankelijkheden,
Dependent Tasks,Afhankelijke taken,
Depends on Tasks,Hangt af van Taken,
-Actual Start Date (via Time Sheet),Werkelijke Startdatum (via Urenregistratie),
-Actual Time (in hours),Werkelijke tijd (in uren),
-Actual End Date (via Time Sheet),Werkelijke Einddatum (via Urenregistratie),
-Total Costing Amount (via Time Sheet),Totaal bedrag Costing (via Urenregistratie),
+Actual Start Date (via Timesheet),Werkelijke Startdatum (via Urenregistratie),
+Actual Time in Hours (via Timesheet),Werkelijke tijd (in uren),
+Actual End Date (via Timesheet),Werkelijke Einddatum (via Urenregistratie),
Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim),
-Total Billing Amount (via Time Sheet),Totaal Billing Bedrag (via Urenregistratie),
Review Date,Herzieningsdatum,
Closing Date,Afsluitingsdatum,
Task Depends On,Taak Hangt On,
@@ -7887,7 +7749,6 @@
Update Series,Reeksen bijwerken,
Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.,
Prefix,Voorvoegsel,
-Current Value,Huidige waarde,
This is the number of the last created transaction with this prefix,Dit is het nummer van de laatst gemaakte transactie met dit voorvoegsel,
Update Series Number,Serienummer bijwerken,
Quotation Lost Reason,Reden verlies van Offerte,
@@ -8191,7 +8052,7 @@
Prevdoc DocType,Prevdoc DocType,
Parent Detail docname,Bovenliggende Detail docname,
"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden.",
-Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp),
+Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen concept),
MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-,
From Package No.,Van Pakket No,
Identification of the package for the delivery (for print),Identificatie van het pakket voor de levering (voor afdrukken),
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau,
Lead Details,Lead Details,
Lead Owner Efficiency,Leideneigenaar Efficiency,
-Loan Repayment and Closure,Terugbetaling en sluiting van leningen,
-Loan Security Status,Lening Beveiligingsstatus,
Lost Opportunity,Kans verloren,
Maintenance Schedules,Onderhoudsschema's,
Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Getarget aantal: {0},
Payment Account is mandatory,Betaalrekening is verplicht,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Indien aangevinkt, wordt het volledige bedrag afgetrokken van het belastbaar inkomen vóór de berekening van de inkomstenbelasting zonder dat enige aangifte of bewijs wordt ingediend.",
-Disbursement Details,Uitbetalingsgegevens,
Material Request Warehouse,Materiaalaanvraag Magazijn,
Select warehouse for material requests,Selecteer magazijn voor materiaalaanvragen,
Transfer Materials For Warehouse {0},Materiaal overbrengen voor magazijn {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Betaal niet-opgeëiste bedrag terug van salaris,
Deduction from salary,Inhouding op salaris,
Expired Leaves,Verlopen bladeren,
-Reference No,referentienummer,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Het haircutpercentage is het procentuele verschil tussen de marktwaarde van de lening en de waarde die aan die lening wordt toegeschreven wanneer deze wordt gebruikt als onderpand voor die lening.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Loan to Value Ratio geeft de verhouding weer tussen het geleende bedrag en de waarde van de in pand gegeven zekerheid. Als dit onder de voor een lening bepaalde waarde komt, ontstaat er een tekort aan lening",
If this is not checked the loan by default will be considered as a Demand Loan,"Als dit niet is aangevinkt, wordt de lening standaard beschouwd als een opeisbare lening",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Deze rekening wordt gebruikt voor het boeken van aflossingen van leningen van de lener en ook voor het uitbetalen van leningen aan de lener,
This account is capital account which is used to allocate capital for loan disbursal account ,Deze rekening is een kapitaalrekening die wordt gebruikt om kapitaal toe te wijzen voor het uitbetalen van leningen,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Bewerking {0} hoort niet bij de werkorder {1},
Print UOM after Quantity,Druk maateenheid af na aantal,
Set default {0} account for perpetual inventory for non stock items,Stel een standaard {0} -account in voor eeuwigdurende voorraad voor niet-voorraadartikelen,
-Loan Security {0} added multiple times,Leningzekerheid {0} meerdere keren toegevoegd,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Lening Effecten met verschillende LTV-ratio's kunnen niet worden verpand tegen één lening,
-Qty or Amount is mandatory for loan security!,Aantal of Bedrag is verplicht voor leenzekerheid!,
-Only submittted unpledge requests can be approved,Alleen ingediende verzoeken tot ongedaan maken van pand kunnen worden goedgekeurd,
-Interest Amount or Principal Amount is mandatory,Rentebedrag of hoofdsom is verplicht,
-Disbursed Amount cannot be greater than {0},Uitbetaald bedrag mag niet hoger zijn dan {0},
-Row {0}: Loan Security {1} added multiple times,Rij {0}: leningzekerheid {1} meerdere keren toegevoegd,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rij # {0}: onderliggend item mag geen productbundel zijn. Verwijder item {1} en sla het op,
Credit limit reached for customer {0},Kredietlimiet bereikt voor klant {0},
Could not auto create Customer due to the following missing mandatory field(s):,Klant kan niet automatisch worden aangemaakt vanwege de volgende ontbrekende verplichte velden:,
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 20b8916..dbb32f3 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Gjelder hvis selskapet er SpA, SApA eller SRL",
Applicable if the company is a limited liability company,Gjelder hvis selskapet er et aksjeselskap,
Applicable if the company is an Individual or a Proprietorship,Gjelder hvis selskapet er et individ eller et eierskap,
-Applicant,Søker,
-Applicant Type,Søker Type,
Application of Funds (Assets),Anvendelse av midler (aktiva),
Application period cannot be across two allocation records,Søknadsperioden kan ikke være over to allokeringsregister,
Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Liste over tilgjengelige Aksjonærer med folio nummer,
Loading Payment System,Laster inn betalingssystem,
Loan,Låne,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0},
-Loan Application,Lånesøknad,
-Loan Management,Lånestyring,
-Loan Repayment,lån tilbakebetaling,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Lånets startdato og låneperiode er obligatorisk for å lagre fakturabatten,
Loans (Liabilities),Lån (gjeld),
Loans and Advances (Assets),Utlån (Eiendeler),
@@ -1611,7 +1605,6 @@
Monday,Mandag,
Monthly,Månedlig,
Monthly Distribution,Månedlig Distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig nedbetaling beløpet kan ikke være større enn Lånebeløp,
More,Mer,
More Information,Mer informasjon,
More than one selection for {0} not allowed,Mer enn ett valg for {0} er ikke tillatt,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Betal {0} {1},
Payable,Betales,
Payable Account,Betales konto,
-Payable Amount,Betalbart beløp,
Payment,Betaling,
Payment Cancelled. Please check your GoCardless Account for more details,Betaling avbrutt. Vennligst sjekk din GoCardless-konto for mer informasjon,
Payment Confirmation,Betalingsbekreftelse,
-Payment Date,Betalingsdato,
Payment Days,Betalings Days,
Payment Document,betaling Document,
Payment Due Date,Betalingsfrist,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Skriv inn Kjøpskvittering først,
Please enter Receipt Document,Fyll inn Kvittering Document,
Please enter Reference date,Skriv inn Reference dato,
-Please enter Repayment Periods,Fyll inn nedbetalingstid,
Please enter Reqd by Date,Vennligst skriv inn Reqd etter dato,
Please enter Woocommerce Server URL,Vennligst skriv inn Woocommerce Server URL,
Please enter Write Off Account,Skriv inn avskrive konto,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Skriv inn forelder kostnadssted,
Please enter quantity for Item {0},Skriv inn antall for Element {0},
Please enter relieving date.,Skriv inn lindrende dato.,
-Please enter repayment Amount,Fyll inn gjenværende beløpet,
Please enter valid Financial Year Start and End Dates,Fyll inn gyldig Regnskapsår start- og sluttdato,
Please enter valid email address,Vennligst skriv inn gyldig e-postadresse,
Please enter {0} first,Fyll inn {0} først,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet.,
Primary Address Details,Primæradresse detaljer,
Primary Contact Details,Primær kontaktdetaljer,
-Principal Amount,hovedstol,
Print Format,Print Format,
Print IRS 1099 Forms,Skriv ut IRS 1099 skjemaer,
Print Report Card,Skriv ut rapportkort,
@@ -2550,7 +2538,6 @@
Sample Collection,Eksempel Innsamling,
Sample quantity {0} cannot be more than received quantity {1},Prøvekvantitet {0} kan ikke være mer enn mottatt mengde {1},
Sanctioned,sanksjonert,
-Sanctioned Amount,Sanksjonert beløp,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.,
Sand,Sand,
Saturday,Lørdag,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} har allerede en foreldreprosedyre {1}.,
API,API,
Annual,Årlig,
-Approved,Godkjent,
Change,Endre,
Contact Email,Kontakt Epost,
Export Type,Eksporttype,
@@ -3571,7 +3557,6 @@
Account Value,Kontoverdi,
Account is mandatory to get payment entries,Konto er obligatorisk for å få betalingsoppføringer,
Account is not set for the dashboard chart {0},Kontoen er ikke angitt for dashborddiagrammet {0},
-Account {0} does not belong to company {1},Konto {0} tilhører ikke selskapet {1},
Account {0} does not exists in the dashboard chart {1},Konto {0} eksisterer ikke i oversiktsdiagrammet {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> er kapital Arbeid pågår og kan ikke oppdateres av journalpost,
Account: {0} is not permitted under Payment Entry,Konto: {0} er ikke tillatt under betalingsoppføringen,
@@ -3582,7 +3567,6 @@
Activity,Aktivitet,
Add / Manage Email Accounts.,Legg til / Administrer e-postkontoer.,
Add Child,Legg Child,
-Add Loan Security,Legg til lånesikkerhet,
Add Multiple,Legg til flere,
Add Participants,Legg til deltakere,
Add to Featured Item,Legg til valgt produkt,
@@ -3593,15 +3577,12 @@
Address Line 1,Adresselinje 1,
Addresses,Adresser,
Admission End Date should be greater than Admission Start Date.,Sluttdatoen for opptaket skal være større enn startdato for opptaket.,
-Against Loan,Mot lån,
-Against Loan:,Mot lån:,
All,Alle,
All bank transactions have been created,Alle banktransaksjoner er opprettet,
All the depreciations has been booked,Alle avskrivningene er booket,
Allocation Expired!,Tildeling utløpt!,
Allow Resetting Service Level Agreement from Support Settings.,Tillat tilbakestilling av servicenivåavtale fra støtteinnstillinger.,
Amount of {0} is required for Loan closure,Mengden {0} er nødvendig for lånets nedleggelse,
-Amount paid cannot be zero,Betalt beløp kan ikke være null,
Applied Coupon Code,Anvendt kupongkode,
Apply Coupon Code,Bruk kupongkode,
Appointment Booking,Avtalebestilling,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Kan ikke beregne ankomsttid da driveradressen mangler.,
Cannot Optimize Route as Driver Address is Missing.,Kan ikke optimalisere ruten ettersom driveradressen mangler.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Kan ikke fullføre oppgaven {0} da den avhengige oppgaven {1} ikke er komplettert / kansellert.,
-Cannot create loan until application is approved,Kan ikke opprette lån før søknaden er godkjent,
Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Kan ikke overbillige for varen {0} i rad {1} mer enn {2}. For å tillate overfakturering, må du angi godtgjørelse i Kontoinnstillinger",
"Capacity Planning Error, planned start time can not be same as end time","Kapasitetsplanleggingsfeil, planlagt starttid kan ikke være det samme som sluttid",
@@ -3812,20 +3792,9 @@
Less Than Amount,Mindre enn beløpet,
Liabilities,gjeld,
Loading...,Laster inn ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Lånebeløpet overstiger det maksimale lånebeløpet på {0} som per foreslåtte verdipapirer,
Loan Applications from customers and employees.,Låneapplikasjoner fra kunder og ansatte.,
-Loan Disbursement,Lånutbetaling,
Loan Processes,Låneprosesser,
-Loan Security,Lånesikkerhet,
-Loan Security Pledge,Lånesikkerhetspant,
-Loan Security Pledge Created : {0},Lånesikkerhetspant opprettet: {0},
-Loan Security Price,Lånesikkerhetspris,
-Loan Security Price overlapping with {0},Lånesikkerhetspris som overlapper med {0},
-Loan Security Unpledge,Lånesikkerhet unpedge,
-Loan Security Value,Lånesikkerhetsverdi,
Loan Type for interest and penalty rates,Lånetype for renter og bøter,
-Loan amount cannot be greater than {0},Lånebeløpet kan ikke være større enn {0},
-Loan is mandatory,Lån er obligatorisk,
Loans,lån,
Loans provided to customers and employees.,Lån gitt til kunder og ansatte.,
Location,Beliggenhet,
@@ -3894,7 +3863,6 @@
Pay,Betale,
Payment Document Type,Betalingsdokumenttype,
Payment Name,Betalingsnavn,
-Penalty Amount,Straffebeløp,
Pending,Avventer,
Performance,Opptreden,
Period based On,Periode basert på,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Vennligst logg inn som markedsplassbruker for å redigere dette elementet.,
Please login as a Marketplace User to report this item.,Vennligst logg inn som Marketplace-bruker for å rapportere denne varen.,
Please select <b>Template Type</b> to download template,Velg <b>Template Type for</b> å laste ned mal,
-Please select Applicant Type first,Velg Søkertype først,
Please select Customer first,Velg kunde først,
Please select Item Code first,Velg varekode først,
-Please select Loan Type for company {0},Velg lånetype for selskapet {0},
Please select a Delivery Note,Velg en leveringsmerknad,
Please select a Sales Person for item: {0},Velg en selger for varen: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Vennligst velg en annen betalingsmetode. Stripe støtter ikke transaksjoner i valuta '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Sett opp en standard bankkonto for selskapet {0},
Please specify,Vennligst spesifiser,
Please specify a {0},Angi {0},lead
-Pledge Status,Pantestatus,
-Pledge Time,Pantetid,
Printing,Utskrift,
Priority,Prioritet,
Priority has been changed to {0}.,Prioritet er endret til {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Behandler XML-filer,
Profitability,lønnsomhet,
Project,Prosjekt,
-Proposed Pledges are mandatory for secured Loans,Foreslåtte pantsettelser er obligatoriske for sikrede lån,
Provide the academic year and set the starting and ending date.,Gi studieåret og angi start- og sluttdato.,
Public token is missing for this bank,Offentlig token mangler for denne banken,
Publish,publisere,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Innkjøpskvittering har ingen varer som beholder prøve er aktivert for.,
Purchase Return,Kjøp Return,
Qty of Finished Goods Item,Antall ferdige varer,
-Qty or Amount is mandatroy for loan security,Antall eller beløp er mandatroy for lån sikkerhet,
Quality Inspection required for Item {0} to submit,Kvalitetskontroll kreves for at varen {0} skal sendes inn,
Quantity to Manufacture,Mengde å produsere,
Quantity to Manufacture can not be zero for the operation {0},Mengde å produsere kan ikke være null for operasjonen {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Relieving Date må være større enn eller lik dato for tiltredelse,
Rename,Gi nytt navn,
Rename Not Allowed,Gi nytt navn ikke tillatt,
-Repayment Method is mandatory for term loans,Tilbakebetalingsmetode er obligatorisk for lån,
-Repayment Start Date is mandatory for term loans,Startdato for tilbakebetaling er obligatorisk for terminlån,
Report Item,Rapporter varen,
Report this Item,Rapporter dette elementet,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Reservert antall for underleveranser: Råvaremengde for å lage underleveranser.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rad ({0}): {1} er allerede nedsatt innen {2},
Rows Added in {0},Rader lagt til i {0},
Rows Removed in {0},Rader fjernet om {0},
-Sanctioned Amount limit crossed for {0} {1},Sanksjonert beløpsgrense krysset for {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Sanksjonert lånebeløp eksisterer allerede for {0} mot selskap {1},
Save,Lagre,
Save Item,Lagre varen,
Saved Items,Lagrede elementer,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Bruker {0} er deaktivert,
Users and Permissions,Brukere og tillatelser,
Vacancies cannot be lower than the current openings,Ledige stillinger kan ikke være lavere enn dagens åpninger,
-Valid From Time must be lesser than Valid Upto Time.,Gyldig fra tid må være mindre enn gyldig inntil tid.,
Valuation Rate required for Item {0} at row {1},Verdsettelsesgrad påkrevd for vare {0} på rad {1},
Values Out Of Sync,Verdier utenfor synkronisering,
Vehicle Type is required if Mode of Transport is Road,Kjøretøytype er påkrevd hvis modus for transport er vei,
@@ -4211,7 +4168,6 @@
Add to Cart,Legg til i handlevogn,
Days Since Last Order,Dager siden sist bestilling,
In Stock,På lager,
-Loan Amount is mandatory,Lånebeløp er obligatorisk,
Mode Of Payment,Modus for betaling,
No students Found,Ingen studenter funnet,
Not in Stock,Ikke på lager,
@@ -4240,7 +4196,6 @@
Group by,Grupper etter,
In stock,På lager,
Item name,Navn,
-Loan amount is mandatory,Lånebeløp er obligatorisk,
Minimum Qty,Minimum antall,
More details,Mer informasjon,
Nature of Supplies,Naturens forsyninger,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Totalt fullført antall,
Qty to Manufacture,Antall å produsere,
Repay From Salary can be selected only for term loans,Tilbakebetaling fra lønn kan bare velges for løpetidslån,
-No valid Loan Security Price found for {0},Fant ingen gyldig sikkerhetspris for lån for {0},
-Loan Account and Payment Account cannot be same,Lånekontoen og betalingskontoen kan ikke være den samme,
-Loan Security Pledge can only be created for secured loans,Lånesikkerhetspant kan bare opprettes for sikrede lån,
Social Media Campaigns,Sosiale mediekampanjer,
From Date can not be greater than To Date,Fra dato kan ikke være større enn til dato,
Please set a Customer linked to the Patient,Angi en kunde som er koblet til pasienten,
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Avtalebrev,
Job Applicant,Jobbsøker,
-Applicant Name,Søkerens navn,
Appointment Date,Avtaledato,
Appointment Letter Template,Avtalebrevmal,
Body,Kropp,
@@ -7059,99 +7010,12 @@
Sync in Progress,Synkronisering i fremgang,
Hub Seller Name,Hub Selger Navn,
Custom Data,Tilpassede data,
-Member,Medlem,
-Partially Disbursed,delvis Utbetalt,
-Loan Closure Requested,Låneavslutning bedt om,
Repay From Salary,Smelle fra Lønn,
-Loan Details,lån Detaljer,
-Loan Type,låne~~POS=TRUNC,
-Loan Amount,Lånebeløp,
-Is Secured Loan,Er sikret lån,
-Rate of Interest (%) / Year,Rente (%) / År,
-Disbursement Date,Innbetalingsdato,
-Disbursed Amount,Utbetalt beløp,
-Is Term Loan,Er terminlån,
-Repayment Method,tilbakebetaling Method,
-Repay Fixed Amount per Period,Smelle fast beløp per periode,
-Repay Over Number of Periods,Betale tilbake over antall perioder,
-Repayment Period in Months,Nedbetalingstid i måneder,
-Monthly Repayment Amount,Månedlig nedbetaling beløpet,
-Repayment Start Date,Tilbakebetaling Startdato,
-Loan Security Details,Lånesikkerhetsdetaljer,
-Maximum Loan Value,Maksimal utlånsverdi,
-Account Info,Kontoinformasjon,
-Loan Account,Lånekonto,
-Interest Income Account,Renteinntekter konto,
-Penalty Income Account,Straffinntektsregnskap,
-Repayment Schedule,tilbakebetaling Schedule,
-Total Payable Amount,Totalt betales beløpet,
-Total Principal Paid,Totalt hovedstol betalt,
-Total Interest Payable,Total rentekostnader,
-Total Amount Paid,Totalt beløp betalt,
-Loan Manager,Låneansvarlig,
-Loan Info,lån info,
-Rate of Interest,Rente,
-Proposed Pledges,Forslag til pantsettelser,
-Maximum Loan Amount,Maksimal Lånebeløp,
-Repayment Info,tilbakebetaling info,
-Total Payable Interest,Total skyldige renter,
-Against Loan ,Mot lån,
-Loan Interest Accrual,Lånerenteopptjening,
-Amounts,beløp,
-Pending Principal Amount,Venter på hovedbeløp,
-Payable Principal Amount,Betalbart hovedbeløp,
-Paid Principal Amount,Betalt hovedbeløp,
-Paid Interest Amount,Betalt rentebeløp,
-Process Loan Interest Accrual,Prosess Lån Renteopptjening,
-Repayment Schedule Name,Navn på tilbakebetalingsplan,
Regular Payment,Vanlig betaling,
Loan Closure,Lånet stenging,
-Payment Details,Betalingsinformasjon,
-Interest Payable,Betalbar rente,
-Amount Paid,Beløpet Betalt,
-Principal Amount Paid,Hovedbeløp betalt,
-Repayment Details,Detaljer om tilbakebetaling,
-Loan Repayment Detail,Detalj om tilbakebetaling av lån,
-Loan Security Name,Lånesikkerhetsnavn,
-Unit Of Measure,Måleenhet,
-Loan Security Code,Lånesikkerhetskode,
-Loan Security Type,Lånesikkerhetstype,
-Haircut %,Hårklipp%,
-Loan Details,Lånedetaljer,
-Unpledged,Unpledged,
-Pledged,lovet,
-Partially Pledged,Delvis pantsatt,
-Securities,verdipapirer,
-Total Security Value,Total sikkerhetsverdi,
-Loan Security Shortfall,Lånesikkerhetsmangel,
-Loan ,Låne,
-Shortfall Time,Mangel på tid,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Mangelbeløp,
-Security Value ,Sikkerhetsverdi,
-Process Loan Security Shortfall,Prosess Lånsikkerhetsmangel,
-Loan To Value Ratio,Utlån til verdi,
-Unpledge Time,Unpedge Time,
-Loan Name,lån Name,
Rate of Interest (%) Yearly,Rente (%) Årlig,
-Penalty Interest Rate (%) Per Day,Straffrente (%) per dag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Straffrente pålegges daglig det pågående rentebeløpet i tilfelle forsinket tilbakebetaling,
-Grace Period in Days,Nådeperiode i dager,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Antall dager fra forfallsdato og til hvilket gebyr ikke vil bli belastet i tilfelle forsinkelse i tilbakebetaling av lån,
-Pledge,Løfte,
-Post Haircut Amount,Legg inn hårklippsbeløp,
-Process Type,Prosess Type,
-Update Time,Oppdateringstid,
-Proposed Pledge,Foreslått pant,
-Total Payment,totalt betaling,
-Balance Loan Amount,Balanse Lånebeløp,
-Is Accrued,Er påløpt,
Salary Slip Loan,Lønnsslipplån,
Loan Repayment Entry,Innbetaling av lånebetaling,
-Sanctioned Loan Amount,Sanksjonert lånebeløp,
-Sanctioned Amount Limit,Sanksjonert beløpsgrense,
-Unpledge,Unpledge,
-Haircut,Hårklipp,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generere Schedule,
Schedules,Rutetider,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Prosjektet vil være tilgjengelig på nettstedet til disse brukerne,
Copied From,Kopiert fra,
Start and End Dates,Start- og sluttdato,
-Actual Time (in Hours),Faktisk tid (i timer),
+Actual Time in Hours (via Timesheet),Faktisk tid (i timer),
Costing and Billing,Kalkulasjon og fakturering,
-Total Costing Amount (via Timesheets),Totalt kostende beløp (via tidsskrifter),
-Total Expense Claim (via Expense Claims),Total Expense krav (via Utgifts Krav),
+Total Costing Amount (via Timesheet),Totalt kostende beløp (via tidsskrifter),
+Total Expense Claim (via Expense Claim),Total Expense krav (via Utgifts Krav),
Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen),
Total Sales Amount (via Sales Order),Total salgsbeløp (via salgsordre),
-Total Billable Amount (via Timesheets),Totalt fakturerbart beløp (via tidsskrifter),
-Total Billed Amount (via Sales Invoices),Sum fakturert beløp (via salgsfakturaer),
-Total Consumed Material Cost (via Stock Entry),Total forbruket materialkostnad (via lagerinngang),
+Total Billable Amount (via Timesheet),Totalt fakturerbart beløp (via tidsskrifter),
+Total Billed Amount (via Sales Invoice),Sum fakturert beløp (via salgsfakturaer),
+Total Consumed Material Cost (via Stock Entry),Total forbruket materialkostnad (via lagerinngang),
Gross Margin,Bruttomargin,
Gross Margin %,Bruttomargin%,
Monitor Progress,Monitor Progress,
@@ -7521,12 +7385,10 @@
Dependencies,avhengig,
Dependent Tasks,Avhengige oppgaver,
Depends on Tasks,Avhenger Oppgaver,
-Actual Start Date (via Time Sheet),Faktisk startdato (via Timeregistrering),
-Actual Time (in hours),Virkelig tid (i timer),
-Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering),
-Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering),
+Actual Start Date (via Timesheet),Faktisk startdato (via Timeregistrering),
+Actual Time in Hours (via Timesheet),Virkelig tid (i timer),
+Actual End Date (via Timesheet),Faktisk Sluttdato (via Timeregistrering),
Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav),
-Total Billing Amount (via Time Sheet),Total Billing Beløp (via Timeregistrering),
Review Date,Omtale Dato,
Closing Date,Avslutningsdato,
Task Depends On,Task Avhenger,
@@ -7887,7 +7749,6 @@
Update Series,Update-serien,
Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.,
Prefix,Prefix,
-Current Value,Nåværende Verdi,
This is the number of the last created transaction with this prefix,Dette er nummeret på den siste laget transaksjonen med dette prefikset,
Update Series Number,Update-serien Nummer,
Quotation Lost Reason,Sitat av Lost Reason,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå,
Lead Details,Lead Detaljer,
Lead Owner Efficiency,Leder Eier Effektivitet,
-Loan Repayment and Closure,Lånebetaling og lukking,
-Loan Security Status,Lånesikkerhetsstatus,
Lost Opportunity,Mistet mulighet,
Maintenance Schedules,Vedlikeholdsplaner,
Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Målrettet antall: {0},
Payment Account is mandatory,Betalingskonto er obligatorisk,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Hvis det er merket av, vil hele beløpet bli trukket fra skattepliktig inntekt før beregning av inntektsskatt uten erklæring eller bevis.",
-Disbursement Details,Utbetalingsdetaljer,
Material Request Warehouse,Materialforespørsel Lager,
Select warehouse for material requests,Velg lager for materialforespørsler,
Transfer Materials For Warehouse {0},Overfør materiale til lager {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Tilbakebetalt uavhentet beløp fra lønn,
Deduction from salary,Trekk fra lønn,
Expired Leaves,Utløpte blader,
-Reference No,referanse Nei,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Hårklippsprosent er den prosentvise forskjellen mellom markedsverdien av lånesikkerheten og verdien som tilskrives lånets sikkerhet når den brukes som sikkerhet for lånet.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Loan To Value Ratio uttrykker forholdet mellom lånebeløpet og verdien av pantet. Et lånesikkerhetsmangel vil utløses hvis dette faller under den angitte verdien for et lån,
If this is not checked the loan by default will be considered as a Demand Loan,"Hvis dette ikke er sjekket, vil lånet som standard bli betraktet som et etterspørsel",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Denne kontoen brukes til å bestille tilbakebetaling av lån fra låntaker og også utbetale lån til låner,
This account is capital account which is used to allocate capital for loan disbursal account ,Denne kontoen er en kapitalkonto som brukes til å fordele kapital til utbetaling av lån,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operasjon {0} tilhører ikke arbeidsordren {1},
Print UOM after Quantity,Skriv ut UOM etter antall,
Set default {0} account for perpetual inventory for non stock items,Angi standard {0} -konto for evigvarende beholdning for varer som ikke er på lager,
-Loan Security {0} added multiple times,Lånesikkerhet {0} er lagt til flere ganger,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Lånepapirer med forskjellig LTV-forhold kan ikke pantsettes mot ett lån,
-Qty or Amount is mandatory for loan security!,Antall eller beløp er obligatorisk for lånesikkerhet!,
-Only submittted unpledge requests can be approved,Bare innsendte uforpliktede forespørsler kan godkjennes,
-Interest Amount or Principal Amount is mandatory,Rentebeløp eller hovedbeløp er obligatorisk,
-Disbursed Amount cannot be greater than {0},Utbetalt beløp kan ikke være større enn {0},
-Row {0}: Loan Security {1} added multiple times,Rad {0}: Lånesikkerhet {1} lagt til flere ganger,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rad nr. {0}: Underordnet vare skal ikke være en produktpakke. Fjern element {1} og lagre,
Credit limit reached for customer {0},Kredittgrensen er nådd for kunden {0},
Could not auto create Customer due to the following missing mandatory field(s):,Kunne ikke opprette kunde automatisk på grunn av følgende manglende obligatoriske felt:,
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 4a93d49..a3fa0ec 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -165,7 +165,7 @@
Against Voucher Type,Rodzaj dowodu,
Age,Wiek,
Age (Days),Wiek (dni),
-Ageing Based On,,
+Ageing Based On,Starzenie na podstawie,
Ageing Range 1,Starzenie Zakres 1,
Ageing Range 2,Starzenie Zakres 2,
Ageing Range 3,Starzenie Zakres 3,
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Stosuje się, jeśli spółką jest SpA, SApA lub SRL",
Applicable if the company is a limited liability company,"Stosuje się, jeśli firma jest spółką z ograniczoną odpowiedzialnością",
Applicable if the company is an Individual or a Proprietorship,"Stosuje się, jeśli firma jest jednostką lub właścicielem",
-Applicant,Petent,
-Applicant Type,Typ Wnioskodawcy,
Application of Funds (Assets),Aktywa,
Application period cannot be across two allocation records,Okres aplikacji nie może mieć dwóch rekordów przydziału,
Application period cannot be outside leave allocation period,Wskazana data nieobecności nie może wykraczać poza zaalokowany okres dla nieobecności,
@@ -315,7 +313,6 @@
Auto Material Requests Generated,Wnioski Auto Materiał Generated,
Auto Repeat,Auto Repeat,
Auto repeat document updated,Automatycznie powtórzony dokument został zaktualizowany,
-Automotive,,
Available,Dostępny,
Available Leaves,Dostępne Nieobecności,
Available Qty,Dostępne szt,
@@ -428,7 +425,7 @@
"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}",
By {0},Do {0},
Bypass credit check at Sales Order ,Pomiń kontrolę kredytową w zleceniu sprzedaży,
-C-Form records,,
+C-Form records,C-forma rekordy,
C-form is not applicable for Invoice: {0},C-forma nie ma zastosowania do faktury: {0},
CEO,CEO,
CESS Amount,Kwota CESS,
@@ -514,7 +511,7 @@
Changing Customer Group for the selected Customer is not allowed.,Zmiana grupy klientów dla wybranego klienta jest niedozwolona.,
Chapter,Rozdział,
Chapter information.,Informacje o rozdziale.,
-Charge of type 'Actual' in row {0} cannot be included in Item Rate,,
+Charge of type 'Actual' in row {0} cannot be included in Item Rate,Opłata typu 'Aktualny' w wierszu {0} nie może być uwzględniona w cenie pozycji,
Chargeble,Chargeble,
Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji,
"Charges will be distributed proportionately based on item qty or amount, as per your selection","Koszty zostaną rozdzielone proporcjonalnie na podstawie Ilość pozycji lub kwoty, jak na swój wybór",
@@ -537,7 +534,7 @@
Clear filters,Wyczyść filtry,
Clear values,Wyczyść wartości,
Clearance Date,Data Czystki,
-Clearance Date not mentioned,,
+Clearance Date not mentioned,Rozliczenie Data nie została podana,
Clearance Date updated,Rozliczenie Data aktualizacji,
Client,Klient,
Client ID,Identyfikator klienta,
@@ -574,7 +571,7 @@
Company is manadatory for company account,Firma jest manadatory dla konta firmowego,
Company name not same,Nazwa firmy nie jest taka sama,
Company {0} does not exist,Firma {0} nie istnieje,
-Compensatory Off,,
+Compensatory Off,Urlop wyrównawczy,
Compensatory leave request days not in valid holidays,Dni urlopu wyrównawczego nie zawierają się w zakresie prawidłowych dniach świątecznych,
Complaint,Skarga,
Completion Date,Data ukończenia,
@@ -616,7 +613,7 @@
Cost Center,Centrum kosztów,
Cost Center Number,Numer centrum kosztów,
Cost Center and Budgeting,Centrum kosztów i budżetowanie,
-Cost Center is required in row {0} in Taxes table for type {1},,
+Cost Center is required in row {0} in Taxes table for type {1},Centrum kosztów jest wymagane w wierszu {0} w tabeli podatków dla typu {1},
Cost Center with existing transactions can not be converted to group,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w grupę,
Cost Center with existing transactions can not be converted to ledger,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w rejestr,
Cost Centers,Centra Kosztów,
@@ -686,9 +683,9 @@
Create Users,Tworzenie użytkowników,
Create Variant,Utwórz wariant,
Create Variants,Tworzenie Warianty,
-"Create and manage daily, weekly and monthly email digests.",,
+"Create and manage daily, weekly and monthly email digests.","Tworzenie i zarządzanie dziennymi, tygodniowymi i miesięcznymi zestawieniami e-mail.",
+Create rules to restrict transactions based on values.,Tworzenie reguł ograniczających transakcje na podstawie wartości,
Create customer quotes,Tworzenie cytaty z klientami,
-Create rules to restrict transactions based on values.,,
Created {0} scorecards for {1} between: ,Utworzono {0} karty wyników dla {1} między:,
Creating Company and Importing Chart of Accounts,Tworzenie firmy i importowanie planu kont,
Creating Fees,Tworzenie opłat,
@@ -696,11 +693,11 @@
Creating Salary Slips...,Tworzenie zarobków ...,
Creating student groups,Tworzenie grup studentów,
Creating {0} Invoice,Tworzenie faktury {0},
-Credit,,
+Credit,Kredyt,
Credit ({0}),Kredyt ({0}),
Credit Account,Konto kredytowe,
Credit Balance,Saldo kredytowe,
-Credit Card,,
+Credit Card,Karta kredytowa,
Credit Days cannot be a negative number,Dni kredytu nie mogą być liczbą ujemną,
Credit Limit,Limit kredytowy,
Credit Note,Nota uznaniowa (kredytowa),
@@ -722,7 +719,7 @@
Currency should be same as Price List Currency: {0},"Waluta powinna być taka sama, jak waluta cennika: {0}",
Current,Bieżący,
Current Assets,Aktywa finansowe,
-Current BOM and New BOM can not be same,,
+Current BOM and New BOM can not be same,Aktualna BOM i Nowa BOM nie może być taki sam,
Current Job Openings,Aktualne ofert pracy,
Current Liabilities,Bieżące Zobowiązania,
Current Qty,Obecna ilość,
@@ -730,7 +727,7 @@
Custom HTML,Niestandardowy HTML,
Custom?,Niestandardowy?,
Customer,Klient,
-Customer Addresses And Contacts,,
+Customer Addresses And Contacts,Klienci Adresy i kontakty,
Customer Contact,Kontakt z klientem,
Customer Database.,Baza danych klientów.,
Customer Group,Grupa klientów,
@@ -742,7 +739,7 @@
Customer and Supplier,Klient i dostawca,
Customer is required,Klient jest wymagany,
Customer isn't enrolled in any Loyalty Program,Klient nie jest zarejestrowany w żadnym Programie Lojalnościowym,
-Customer required for 'Customerwise Discount',,
+Customer required for 'Customerwise Discount',Klient wymagany dla 'Klientwise Discount',
Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1},
Customer {0} is created.,Utworzono klienta {0}.,
Customers in Queue,Klienci w kolejce,
@@ -814,7 +811,7 @@
Delivery Trip,Podróż dostawy,
Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0},
Department,Departament,
-Department Stores,,
+Department Stores,Sklepy detaliczne,
Depreciation,Amortyzacja,
Depreciation Amount,Kwota amortyzacji,
Depreciation Amount during the period,Kwota amortyzacji w okresie,
@@ -838,7 +835,7 @@
"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia",
Difference Amount,Kwota różnicy,
Difference Amount must be zero,Różnica Kwota musi wynosić zero,
-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.,,
+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.,"Różne UOM dla pozycji prowadzi do nieprawidłowych (Całkowity) Waga netto wartość. Upewnij się, że Waga netto każdej pozycji jest w tej samej UOM.",
Direct Expenses,Wydatki bezpośrednie,
Direct Income,Przychody bezpośrednie,
Disable,Wyłącz,
@@ -1023,7 +1020,7 @@
Female,Kobieta,
Fetch Data,Pobierz dane,
Fetch Subscription Updates,Pobierz aktualizacje subskrypcji,
-Fetch exploded BOM (including sub-assemblies),,
+Fetch exploded BOM (including sub-assemblies),Pobierz rozbitą BOM (w tym podzespoły),
Fetching records......,Pobieranie rekordów ......,
Field Name,Nazwa pola,
Fieldname,Nazwa pola,
@@ -1259,7 +1256,6 @@
In Value,w polu Wartość,
"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","W przypadku programu wielowarstwowego Klienci zostaną automatycznie przypisani do danego poziomu, zgodnie z wydatkami",
Inactive,Nieaktywny,
-Incentives,,
Include Default Book Entries,Dołącz domyślne wpisy książki,
Include Exploded Items,Dołącz rozstrzelone przedmioty,
Include POS Transactions,Uwzględnij transakcje POS,
@@ -1269,7 +1265,6 @@
Income Account,Konto przychodów,
Income Tax,Podatek dochodowy,
Incoming,Przychodzące,
-Incoming Rate,,
Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nieprawidłowa liczba zapisów w Księdze głównej. Być może wybrano niewłaściwe konto w transakcji.,
Increment cannot be 0,Przyrost nie może być 0,
Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0,
@@ -1357,7 +1352,6 @@
"Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, UOM, Qty and Dates.","Cena produktu pojawia się wiele razy w oparciu o Cennik, Dostawcę / Klienta, Walutę, Pozycję, UOM, Ilość i Daty.",
Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1},
Item Row {0}: {1} {2} does not exist in above '{1}' table,Wiersz pozycji {0}: {1} {2} nie istnieje w powyższej tabeli "{1}",
-Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,,
Item Template,Szablon przedmiotu,
Item Variant Settings,Ustawienia wariantu pozycji,
Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami,
@@ -1376,13 +1370,11 @@
"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian",
Item {0} is cancelled,Element {0} jest anulowany,
Item {0} is disabled,Element {0} jest wyłączony,
-Item {0} is not a serialized Item,,
Item {0} is not a stock Item,Element {0} nie jest w magazynie,
Item {0} is not active or end of life has been reached,"Element {0} nie jest aktywny, lub osiągnął datę przydatności",
Item {0} is not setup for Serial Nos. Check Item master,Element {0} nie jest ustawiony na nr seryjny. Sprawdź mastera tego elementu,
Item {0} is not setup for Serial Nos. Column must be blank,Element {0} nie jest ustawiony na nr seryjny. Kolumny powinny być puste,
Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu,
-Item {0} must be a Sub-contracted Item,,
Item {0} must be a non-stock item,Element {0} musi być elementem non-stock,
Item {0} must be a stock Item,Item {0} musi być dostępna w magazynie,
Item {0} not found,Element {0} nie został znaleziony,
@@ -1471,10 +1463,6 @@
List of available Shareholders with folio numbers,Lista dostępnych Akcjonariuszy z numerami folio,
Loading Payment System,Ładowanie systemu płatności,
Loan,Pożyczka,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0},
-Loan Application,Podanie o pożyczkę,
-Loan Management,Zarządzanie kredytem,
-Loan Repayment,Spłata pożyczki,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,"Data rozpoczęcia pożyczki i okres pożyczki są obowiązkowe, aby zapisać dyskontowanie faktury",
Loans (Liabilities),Kredyty (zobowiązania),
Loans and Advances (Assets),Pożyczki i zaliczki (aktywa),
@@ -1611,7 +1599,6 @@
Monday,Poniedziałek,
Monthly,Miesięcznie,
Monthly Distribution,Miesięczny Dystrybucja,
-Monthly Repayment Amount cannot be greater than Loan Amount,Miesięczna kwota spłaty nie może być większa niż Kwota kredytu,
More,Więcej,
More Information,Więcej informacji,
More than one selection for {0} not allowed,Więcej niż jeden wybór dla {0} jest niedozwolony,
@@ -1824,7 +1811,6 @@
Order/Quot %,Zamówienie / kwota%,
Ordered,Zamówione,
Ordered Qty,Ilość Zamówiona,
-"Ordered Qty: Quantity ordered for purchase, but not received.",,
Orders,Zamówienia,
Orders released for production.,Zamówienia puszczone do produkcji.,
Organization,Organizacja,
@@ -1884,11 +1870,9 @@
Pay {0} {1},Zapłać {0} {1},
Payable,Płatność,
Payable Account,Konto płatności,
-Payable Amount,Kwota do zapłaty,
Payment,Płatność,
Payment Cancelled. Please check your GoCardless Account for more details,"Płatność anulowana. Sprawdź swoje konto bez karty, aby uzyskać więcej informacji",
Payment Confirmation,Potwierdzenie płatności,
-Payment Date,Data płatności,
Payment Days,Dni płatności,
Payment Document,Płatność Dokument,
Payment Due Date,Termin płatności,
@@ -1981,8 +1965,6 @@
Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz,
Please enter Purchase Receipt first,Proszę wpierw wprowadzić dokument zakupu,
Please enter Receipt Document,Proszę podać Otrzymanie dokumentu,
-Please enter Reference date,,
-Please enter Repayment Periods,Proszę wprowadzić okresy spłaty,
Please enter Reqd by Date,Wprowadź datę realizacji,
Please enter Woocommerce Server URL,Wprowadź adres URL serwera Woocommerce,
Please enter Write Off Account,Proszę zdefiniować konto odpisów,
@@ -1993,8 +1975,6 @@
Please enter message before sending,Proszę wpisać wiadomość przed wysłaniem,
Please enter parent cost center,Proszę podać nadrzędne centrum kosztów,
Please enter quantity for Item {0},Wprowadź ilość dla przedmiotu {0},
-Please enter relieving date.,,
-Please enter repayment Amount,Wpisz Kwota spłaty,
Please enter valid Financial Year Start and End Dates,Proszę wpisać poprawny rok obrotowy od daty rozpoczęcia i zakończenia,
Please enter valid email address,Proszę wprowadzić poprawny adres email,
Please enter {0} first,Podaj {0} pierwszy,
@@ -2006,7 +1986,6 @@
Please mention Basic and HRA component in Company,Proszę wspomnieć o komponencie Basic i HRA w firmie,
Please mention Round Off Account in Company,Proszę określić konto do zaokrągleń kwot w firmie,
Please mention Round Off Cost Center in Company,Powołaj zaokrąglić centrum kosztów w Spółce,
-Please mention no of visits required,,
Please mention the Lead Name in Lead {0},Zapoznaj się z nazwą wiodącego wiodącego {0},
Please pull items from Delivery Note,Wyciągnij elementy z dowodu dostawy,
Please register the SIREN number in the company information file,Zarejestruj numer SIREN w pliku z informacjami o firmie,
@@ -2109,7 +2088,6 @@
Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Podziel się swoją opinią na szkolenie, klikając link "Szkolenia zwrotne", a następnie "Nowy"",
Please specify Company,Sprecyzuj Firmę,
Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej,
-Please specify a valid 'From Case No.',,
Please specify a valid Row ID for row {0} in table {1},Proszę podać poprawny identyfikator wiersz dla rzędu {0} w tabeli {1},
Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów,
Please specify currency in Company,Proszę określić walutę w Spółce,
@@ -2160,7 +2138,6 @@
Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości.,
Primary Address Details,Podstawowe dane adresowe,
Primary Contact Details,Podstawowe dane kontaktowe,
-Principal Amount,Główna kwota,
Print Format,Format Druku,
Print IRS 1099 Forms,Drukuj formularze IRS 1099,
Print Report Card,Wydrukuj kartę raportu,
@@ -2206,7 +2183,6 @@
Project Value,Wartość projektu,
Project activity / task.,Czynność / zadanie projektu,
Project master.,Dyrektor projektu,
-Project-wise data is not available for Quotation,,
Projected,Prognozowany,
Projected Qty,Przewidywana ilość,
Projected Quantity Formula,Formuła przewidywanej ilości,
@@ -2369,8 +2345,6 @@
Request for Raw Materials,Zapytanie o surowce,
Request for purchase.,Prośba o zakup,
Request for quotation.,Zapytanie ofertowe.,
-Requested Qty,,
-"Requested Qty: Quantity requested for purchase, but not ordered.",,
Requesting Site,Strona żądająca,
Requesting payment against {0} {1} for amount {2},Żądanie zapłatę przed {0} {1} w ilości {2},
Requestor,Żądający,
@@ -2386,7 +2360,6 @@
Reserved Qty,Zarezerwowana ilość,
Reserved Qty for Production,Reserved Ilość Produkcji,
Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Zarezerwowane Ilość na produkcję: Ilość surowców do produkcji artykułów.,
-"Reserved Qty: Quantity ordered for sale, but not delivered.",,
Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,Magazyn Reserved jest obowiązkowy dla Produktu {0} w dostarczonych Surowcach,
Reserved for manufacturing,Zarezerwowana dla produkcji,
Reserved for sale,Zarezerwowane na sprzedaż,
@@ -2499,9 +2472,7 @@
Rows with duplicate due dates in other rows were found: {0},Znaleziono wiersze z powtarzającymi się datami w innych wierszach: {0},
Rules for adding shipping costs.,Zasady naliczania kosztów transportu.,
Rules for applying pricing and discount.,Zasady określania cen i zniżek,
-S.O. No.,,
SGST Amount,Kwota SGST,
-SO Qty,,
Safety Stock,Bezpieczeństwo Zdjęcie,
Salary,Wynagrodzenia,
Salary Slip ID,Wynagrodzenie Slip ID,
@@ -2550,7 +2521,6 @@
Sample Collection,Kolekcja próbek,
Sample quantity {0} cannot be more than received quantity {1},Ilość próbki {0} nie może być większa niż ilość odebranej {1},
Sanctioned,usankcjonowane,
-Sanctioned Amount,Zatwierdzona Kwota,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.,
Sand,Piasek,
Saturday,Sobota,
@@ -2647,7 +2617,6 @@
Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1},
Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1},
Serial No {0} not found,Nr seryjny {0} nie znaleziono,
-Serial No {0} not in stock,,
Serial No {0} quantity {1} cannot be a fraction,Nr seryjny {0} dla ilości {1} nie może być ułamkiem,
Serial Nos Required for Serialized Item {0},Nr-y seryjne Wymagane do szeregowania pozycji {0},
Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1},
@@ -2809,7 +2778,6 @@
Stock UOM,Jednostka,
Stock Value,Wartość zapasów,
Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {3},
-Stock cannot be updated against Delivery Note {0},,
Stock cannot be updated against Purchase Receipt {0},Zdjęcie nie może zostać zaktualizowany przed ZAKUPU {0},
Stock cannot exist for Item {0} since has variants,"Zdjęcie nie może istnieć dla pozycji {0}, ponieważ ma warianty",
Stock transactions before {0} are frozen,Operacje magazynowe przed {0} są zamrożone,
@@ -2880,7 +2848,6 @@
Supplier Part No,Dostawca Część nr,
Supplier Quotation,Oferta dostawcy,
Supplier Scorecard,Karta wyników dostawcy,
-Supplier Warehouse mandatory for sub-contracted Purchase Receipt,,
Supplier database.,Baza dostawców,
Supplier {0} not found in {1},Dostawca {0} nie został znaleziony w {1},
Supplier(s),Dostawca(y),
@@ -2889,7 +2856,6 @@
Suppliies made to Composition Taxable Persons,Dodatki do osób podlegających opodatkowaniu,
Supply Type,Rodzaj dostawy,
Support,Wsparcie,
-Support Analytics,,
Support Settings,Ustawienia wsparcia,
Support Tickets,Bilety na wsparcie,
Support queries from customers.,Zapytania klientów o wsparcie techniczne,
@@ -2902,7 +2868,6 @@
Tap items to add them here,"Dotknij elementów, aby je dodać tutaj",
Target,Cel,
Target ({}),Cel ({}),
-Target On,,
Target Warehouse,Magazyn docelowy,
Target warehouse is mandatory for row {0},Magazyn docelowy jest obowiązkowy dla wiersza {0},
Task,Zadanie,
@@ -2979,7 +2944,6 @@
There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1},
"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Może być tylko jedna Zasada dostawy z wartością 0 lub pustą wartością w polu ""Wartość""",
There is no leave period in between {0} and {1},Nie ma okresu próbnego między {0} a {1},
-There is not enough leave balance for Leave Type {0},,
There is nothing to edit.,Nie ma nic do edycji,
There isn't any item variant for the selected item,Nie ma żadnego wariantu przedmiotu dla wybranego przedmiotu,
"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Wygląda na to, że problem dotyczy konfiguracji serwera GoCardless. Nie martw się, w przypadku niepowodzenia kwota zostanie zwrócona na Twoje konto.",
@@ -3053,7 +3017,6 @@
To date can not greater than employee's relieving date,Do tej pory nie może przekroczyć daty zwolnienia pracownika,
"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze",
"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Aby uzyskać najlepsze z ERPNext, zalecamy, aby poświęcić trochę czasu i oglądać te filmy pomoc.",
-"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",,
To make Customer based incentive schemes.,Aby tworzyć systemy motywacyjne oparte na Kliencie.,
"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów",
"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone.",
@@ -3279,7 +3242,6 @@
Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty,
Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu,
Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Ostrzeżenie: Zamówienie sprzedaży {0} już istnieje wobec Klienta Zamówienia {1},
-Warning: System will not check overbilling since amount for Item {0} in {1} is zero,,
Warranty,Gwarancja,
Warranty Claim,Roszczenie gwarancyjne,
Warranty Claim against Serial No.,Roszczenie gwarancyjne z numerem seryjnym,
@@ -3405,7 +3367,6 @@
{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1},
{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}.",
{0} is not a stock Item,{0} nie jest przechowywany na magazynie,
-{0} is not a valid Batch Number for Item {1},,
{0} is not added in the table,{0} nie zostało dodane do tabeli,
{0} is not in Optional Holiday List,{0} nie znajduje się na Opcjonalnej Liście Świątecznej,
{0} is not in a valid Payroll Period,{0} nie jest w ważnym Okresie Rozliczeniowym,
@@ -3541,7 +3502,6 @@
{0} already has a Parent Procedure {1}.,{0} ma już procedurę nadrzędną {1}.,
API,API,
Annual,Roczny,
-Approved,Zatwierdzono,
Change,Reszta,
Contact Email,E-mail kontaktu,
Export Type,Typ eksportu,
@@ -3571,7 +3531,6 @@
Account Value,Wartość konta,
Account is mandatory to get payment entries,"Konto jest obowiązkowe, aby uzyskać wpisy płatności",
Account is not set for the dashboard chart {0},Konto nie jest ustawione dla wykresu deski rozdzielczej {0},
-Account {0} does not belong to company {1},Konto {0} nie jest przypisane do Firmy {1},
Account {0} does not exists in the dashboard chart {1},Konto {0} nie istnieje na schemacie deski rozdzielczej {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> to kapitał Trwają prace i nie można go zaktualizować za pomocą zapisu księgowego,
Account: {0} is not permitted under Payment Entry,Konto: {0} jest niedozwolone w ramach wprowadzania płatności,
@@ -3582,7 +3541,6 @@
Activity,Aktywność,
Add / Manage Email Accounts.,Dodaj / Zarządzaj kontami poczty e-mail.,
Add Child,Dodaj pod-element,
-Add Loan Security,Dodaj zabezpieczenia pożyczki,
Add Multiple,Dodaj wiele,
Add Participants,Dodaj uczestników,
Add to Featured Item,Dodaj do polecanego elementu,
@@ -3593,15 +3551,12 @@
Address Line 1,Pierwszy wiersz adresu,
Addresses,Adresy,
Admission End Date should be greater than Admission Start Date.,Data zakończenia przyjęcia powinna być większa niż data rozpoczęcia przyjęcia.,
-Against Loan,Przeciw pożyczce,
-Against Loan:,Przeciw pożyczce:,
All,Wszystko,
All bank transactions have been created,Wszystkie transakcje bankowe zostały utworzone,
All the depreciations has been booked,Wszystkie amortyzacje zostały zarezerwowane,
Allocation Expired!,Przydział wygasł!,
Allow Resetting Service Level Agreement from Support Settings.,Zezwalaj na resetowanie umowy o poziomie usług z ustawień wsparcia.,
Amount of {0} is required for Loan closure,Kwota {0} jest wymagana do zamknięcia pożyczki,
-Amount paid cannot be zero,Kwota wypłacona nie może wynosić zero,
Applied Coupon Code,Zastosowany kod kuponu,
Apply Coupon Code,Wprowadź Kod Kuponu,
Appointment Booking,Rezerwacja terminu,
@@ -3649,7 +3604,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Nie można obliczyć czasu przybycia, ponieważ brakuje adresu sterownika.",
Cannot Optimize Route as Driver Address is Missing.,"Nie można zoptymalizować trasy, ponieważ brakuje adresu sterownika.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Nie można ukończyć zadania {0}, ponieważ jego zależne zadanie {1} nie zostało zakończone / anulowane.",
-Cannot create loan until application is approved,"Nie można utworzyć pożyczki, dopóki wniosek nie zostanie zatwierdzony",
Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nie można przepłacić za element {0} w wierszu {1} więcej niż {2}. Aby zezwolić na nadmierne fakturowanie, ustaw limit w Ustawieniach kont",
"Capacity Planning Error, planned start time can not be same as end time","Błąd planowania wydajności, planowany czas rozpoczęcia nie może być taki sam jak czas zakończenia",
@@ -3812,20 +3766,9 @@
Less Than Amount,Mniej niż kwota,
Liabilities,Zadłużenie,
Loading...,Wczytuję...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Kwota pożyczki przekracza maksymalną kwotę pożyczki w wysokości {0} zgodnie z proponowanymi papierami wartościowymi,
Loan Applications from customers and employees.,Wnioski o pożyczkę od klientów i pracowników.,
-Loan Disbursement,Wypłata pożyczki,
Loan Processes,Procesy pożyczkowe,
-Loan Security,Zabezpieczenie pożyczki,
-Loan Security Pledge,Zobowiązanie do zabezpieczenia pożyczki,
-Loan Security Pledge Created : {0},Utworzono zastaw na zabezpieczeniu pożyczki: {0},
-Loan Security Price,Cena zabezpieczenia pożyczki,
-Loan Security Price overlapping with {0},Cena zabezpieczenia kredytu pokrywająca się z {0},
-Loan Security Unpledge,Zabezpieczenie pożyczki Unpledge,
-Loan Security Value,Wartość zabezpieczenia pożyczki,
Loan Type for interest and penalty rates,Rodzaj pożyczki na odsetki i kary pieniężne,
-Loan amount cannot be greater than {0},Kwota pożyczki nie może być większa niż {0},
-Loan is mandatory,Pożyczka jest obowiązkowa,
Loans,Pożyczki,
Loans provided to customers and employees.,Pożyczki udzielone klientom i pracownikom.,
Location,Lokacja,
@@ -3894,7 +3837,6 @@
Pay,Zapłacone,
Payment Document Type,Typ dokumentu płatności,
Payment Name,Nazwa płatności,
-Penalty Amount,Kwota kary,
Pending,W toku,
Performance,Występ,
Period based On,Okres oparty na,
@@ -3916,10 +3858,8 @@
Please login as a Marketplace User to edit this item.,"Zaloguj się jako użytkownik Marketplace, aby edytować ten element.",
Please login as a Marketplace User to report this item.,"Zaloguj się jako użytkownik Marketplace, aby zgłosić ten element.",
Please select <b>Template Type</b> to download template,"Wybierz <b>Typ szablonu,</b> aby pobrać szablon",
-Please select Applicant Type first,Najpierw wybierz typ wnioskodawcy,
Please select Customer first,Najpierw wybierz klienta,
Please select Item Code first,Najpierw wybierz Kod produktu,
-Please select Loan Type for company {0},Wybierz typ pożyczki dla firmy {0},
Please select a Delivery Note,Wybierz dowód dostawy,
Please select a Sales Person for item: {0},Wybierz sprzedawcę dla produktu: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Wybierz inną metodę płatności. Stripe nie obsługuje transakcji w walucie '{0}',
@@ -3935,8 +3875,6 @@
Please setup a default bank account for company {0},Ustaw domyślne konto bankowe dla firmy {0},
Please specify,Sprecyzuj,
Please specify a {0},Proszę podać {0},lead
-Pledge Status,Status zobowiązania,
-Pledge Time,Czas przyrzeczenia,
Printing,Druk,
Priority,Priorytet,
Priority has been changed to {0}.,Priorytet został zmieniony na {0}.,
@@ -3944,7 +3882,6 @@
Processing XML Files,Przetwarzanie plików XML,
Profitability,Rentowność,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Proponowane zastawy są obowiązkowe dla zabezpieczonych pożyczek,
Provide the academic year and set the starting and ending date.,Podaj rok akademicki i ustaw datę początkową i końcową.,
Public token is missing for this bank,Brakuje publicznego tokena dla tego banku,
Publish,Publikować,
@@ -3960,7 +3897,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"W potwierdzeniu zakupu nie ma żadnego elementu, dla którego włączona jest opcja Zachowaj próbkę.",
Purchase Return,Zwrot zakupu,
Qty of Finished Goods Item,Ilość produktu gotowego,
-Qty or Amount is mandatroy for loan security,Ilość lub Kwota jest mandatroy dla zabezpieczenia kredytu,
Quality Inspection required for Item {0} to submit,Kontrola jakości wymagana do przesłania pozycji {0},
Quantity to Manufacture,Ilość do wyprodukowania,
Quantity to Manufacture can not be zero for the operation {0},Ilość do wyprodukowania nie może wynosić zero dla operacji {0},
@@ -3981,8 +3917,6 @@
Relieving Date must be greater than or equal to Date of Joining,Data zwolnienia musi być większa lub równa dacie przystąpienia,
Rename,Zmień nazwę,
Rename Not Allowed,Zmień nazwę na Niedozwolone,
-Repayment Method is mandatory for term loans,Metoda spłaty jest obowiązkowa w przypadku pożyczek terminowych,
-Repayment Start Date is mandatory for term loans,Data rozpoczęcia spłaty jest obowiązkowa w przypadku pożyczek terminowych,
Report Item,Zgłoś przedmiot,
Report this Item,Zgłoś ten przedmiot,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Zarezerwowana ilość dla umowy podwykonawczej: ilość surowców do wytworzenia elementów podwykonawczych.,
@@ -4015,8 +3949,6 @@
Row({0}): {1} is already discounted in {2},Wiersz ({0}): {1} jest już zdyskontowany w {2},
Rows Added in {0},Rzędy dodane w {0},
Rows Removed in {0},Rzędy usunięte w {0},
-Sanctioned Amount limit crossed for {0} {1},Przekroczono limit kwoty usankcjonowanej dla {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Kwota sankcjonowanej pożyczki już istnieje dla {0} wobec firmy {1},
Save,Zapisz,
Save Item,Zapisz przedmiot,
Saved Items,Zapisane przedmioty,
@@ -4135,7 +4067,6 @@
User {0} is disabled,Użytkownik {0} jest wyłączony,
Users and Permissions,Użytkownicy i uprawnienia,
Vacancies cannot be lower than the current openings,Wolne miejsca nie mogą być niższe niż obecne otwarcia,
-Valid From Time must be lesser than Valid Upto Time.,Ważny od czasu musi być mniejszy niż Ważny do godziny.,
Valuation Rate required for Item {0} at row {1},Kurs wyceny wymagany dla pozycji {0} w wierszu {1},
Values Out Of Sync,Wartości niezsynchronizowane,
Vehicle Type is required if Mode of Transport is Road,"Typ pojazdu jest wymagany, jeśli tryb transportu to Droga",
@@ -4211,7 +4142,6 @@
Add to Cart,Dodaj do koszyka,
Days Since Last Order,Dni od ostatniego zamówienia,
In Stock,W magazynie,
-Loan Amount is mandatory,Kwota pożyczki jest obowiązkowa,
Mode Of Payment,Rodzaj płatności,
No students Found,Nie znaleziono studentów,
Not in Stock,Brak na stanie,
@@ -4240,7 +4170,6 @@
Group by,Grupuj według,
In stock,W magazynie,
Item name,Nazwa pozycji,
-Loan amount is mandatory,Kwota pożyczki jest obowiązkowa,
Minimum Qty,Minimalna ilość,
More details,Więcej szczegółów,
Nature of Supplies,Natura dostaw,
@@ -4409,9 +4338,6 @@
Total Completed Qty,Całkowita ukończona ilość,
Qty to Manufacture,Ilość do wyprodukowania,
Repay From Salary can be selected only for term loans,Spłata z wynagrodzenia może być wybrana tylko dla pożyczek terminowych,
-No valid Loan Security Price found for {0},Nie znaleziono prawidłowej ceny zabezpieczenia pożyczki dla {0},
-Loan Account and Payment Account cannot be same,Rachunek pożyczki i rachunek płatniczy nie mogą być takie same,
-Loan Security Pledge can only be created for secured loans,Zabezpieczenie pożyczki można ustanowić tylko w przypadku pożyczek zabezpieczonych,
Social Media Campaigns,Kampanie w mediach społecznościowych,
From Date can not be greater than To Date,Data początkowa nie może być większa niż data początkowa,
Please set a Customer linked to the Patient,Ustaw klienta powiązanego z pacjentem,
@@ -4516,7 +4442,6 @@
Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont,
Determine Address Tax Category From,Określ kategorię podatku adresowego od,
Over Billing Allowance (%),Over Billing Allowance (%),
-Credit Controller,,
Check Supplier Invoice Number Uniqueness,"Sprawdź, czy numer faktury dostawcy jest unikalny",
Make Payment via Journal Entry,Wykonywanie płatności za pośrednictwem Zapisów Księgowych dziennika,
Unlink Payment on Cancellation of Invoice,Odłączanie Przedpłata na Anulowanie faktury,
@@ -4625,16 +4550,13 @@
Budget Accounts,Rachunki ekonomiczne,
Budget Account,Budżet Konta,
Budget Amount,budżet Kwota,
-C-Form,,
ACC-CF-.YYYY.-,ACC-CF-.RRRR.-,
-C-Form No,,
Received Date,Data Otrzymania,
Quarter,Kwartał,
I,ja,
II,II,
III,III,
IV,IV,
-C-Form Invoice Detail,,
Invoice No,Nr faktury,
Cash Flow Mapper,Mapper przepływu gotówki,
Section Name,Nazwa sekcji,
@@ -4900,13 +4822,11 @@
Day(s) after invoice date,Dzień (dni) po dacie faktury,
Day(s) after the end of the invoice month,Dzień (dni) po zakończeniu miesiąca faktury,
Month(s) after the end of the invoice month,Miesiąc (y) po zakończeniu miesiąca faktury,
-Credit Days,,
Credit Months,Miesiące kredytowe,
Allocate Payment Based On Payment Terms,Przydziel płatność na podstawie warunków płatności,
"If this checkbox is checked, paid amount will be splitted and allocated as per the amounts in payment schedule against each payment term","Jeśli to pole wyboru jest zaznaczone, zapłacona kwota zostanie podzielona i przydzielona zgodnie z kwotami w harmonogramie płatności dla każdego terminu płatności",
Payment Terms Template Detail,Warunki płatności Szczegóły szablonu,
Closing Fiscal Year,Zamknięcie roku fiskalnego,
-Closing Account Head,,
"The account head under Liability or Equity, in which Profit/Loss will be booked","Głowica konto ramach odpowiedzialności lub kapitałowe, w których zysk / strata będzie zarezerwowane",
POS Customer Group,POS Grupa klientów,
POS Field,Pole POS,
@@ -4944,7 +4864,6 @@
Min Amt,Min Amt,
Max Amt,Max Amt,
Period Settings,Ustawienia okresu,
-Margin,,
Margin Type,margines Rodzaj,
Margin Rate or Amount,Margines szybkości lub wielkości,
Price Discount Scheme,System rabatów cenowych,
@@ -5092,8 +5011,6 @@
Valuation,Wycena,
Add or Deduct,Dodatki lub Potrącenia,
Deduct,Odlicz,
-On Previous Row Amount,,
-On Previous Row Total,,
On Item Quantity,Na ilość przedmiotu,
Reference Row #,Rząd Odniesienia #,
Is this Tax included in Basic Rate?,Czy podatek wliczony jest w opłaty?,
@@ -5143,8 +5060,6 @@
Overdue and Discounted,Zaległe i zdyskontowane,
Accounting Details,Dane księgowe,
Debit To,Debetowane Konto (Winien),
-Is Opening Entry,,
-C-Form Applicable,,
Commission Rate (%),Wartość prowizji (%),
Sales Team1,Team Sprzedażowy1,
Against Income Account,Konto przychodów,
@@ -5173,7 +5088,6 @@
Billing Hours,Godziny billingowe,
Timesheet Detail,Szczegółowy grafik,
Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy),
-Item Wise Tax Detail,,
Parenttype,Typ Nadrzędności,
"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standardowy szablon podatek, który może być stosowany do wszystkich transakcji sprzedaży. Ten szablon może zawierać listę szefów podatkowych, a także innych głów koszty / dochodów jak ""Żegluga"", ""Ubezpieczenia"", ""Obsługa"" itp \n\n #### Uwaga \n\n Stopa Ciebie podatku definiujemy tu będzie standardowa stawka podatku w odniesieniu do wszystkich pozycji ** **. Jeśli istnieją ** Pozycje **, które mają różne ceny, muszą być dodane w podatku od towaru ** ** tabeli w poz ** ** mistrza.\n\n #### Opis Kolumny \n\n 1. Obliczenie Typ: \n i - może to być na całkowita ** ** (to jest suma ilości wyjściowej).\n - ** Na Poprzedni Row Całkowita / Kwota ** (dla skumulowanych podatków lub opłat). Jeśli wybierzesz tę opcję, podatek będzie stosowana jako procent poprzedniego rzędu (w tabeli podatkowej) kwoty lub łącznie.\n - ** Rzeczywista ** (jak wspomniano).\n 2. Szef konta: księga konto, na którym podatek ten zostanie zaksięgowany \n 3. Centrum koszt: Jeżeli podatek / opłata jest dochód (jak wysyłką) lub kosztów musi zostać zaliczony na centrum kosztów.\n 4. Opis: Opis podatków (które będą drukowane w faktur / cudzysłowów).\n 5. Cena: Stawka podatku.\n 6. Kwota: Kwota podatku.\n 7. Razem: Zbiorcza sumie do tego punktu.\n 8. Wprowadź Row: Jeśli na podstawie ""Razem poprzedniego wiersza"" można wybrać numer wiersza, które będą brane jako baza do tego obliczenia (domyślnie jest to poprzednia wiersz).\n 9. Czy to podatki zawarte w podstawowej stawki ?: Jeśli to sprawdzić, oznacza to, że podatek ten nie będzie wyświetlany pod tabelą pozycji, ale będą włączone do stawki podstawowej w głównej tabeli poz. Jest to przydatne, gdy chcesz dać cenę mieszkania (z uwzględnieniem wszystkich podatków) cenę do klientów.",
* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.,
@@ -5493,8 +5407,6 @@
Billed Amt,Rozliczona Ilość,
Warehouse and Reference,Magazyn i punkt odniesienia,
To be delivered to customer,Być dostarczone do klienta,
-Material Request Item,,
-Supplier Quotation Item,,
Against Blanket Order,Przeciw Kocowi,
Blanket Order,Formularz zamówienia,
Blanket Order Rate,Ogólny koszt zamówienia,
@@ -5683,7 +5595,6 @@
Address & Contact,Adres i kontakt,
Mobile No.,Nr tel. Komórkowego,
Lead Type,Typ Tropu,
-Channel Partner,,
Consultant,Konsultant,
Market Segment,Segment rynku,
Industry,Przedsiębiorstwo,
@@ -6437,7 +6348,6 @@
HR User,Kadry - użytkownik,
Appointment Letter,List z terminem spotkania,
Job Applicant,Aplikujący o pracę,
-Applicant Name,Imię Aplikanta,
Appointment Date,Data spotkania,
Appointment Letter Template,Szablon listu z terminami,
Body,Ciało,
@@ -6552,7 +6462,6 @@
Place of Issue,Miejsce wydania,
Widowed,Wdowiec / Wdowa,
Family Background,Tło rodzinne,
-"Here you can maintain family details like name and occupation of parent, spouse and children",,
Health Details,Szczegóły Zdrowia,
"Here you can maintain height, weight, allergies, medical concerns etc","Tutaj wypełnij i przechowaj dane takie jak wzrost, waga, alergie, problemy medyczne itd",
Educational Qualification,Kwalifikacje edukacyjne,
@@ -6611,7 +6520,6 @@
Post Graduate,Podyplomowe,
Under Graduate,Absolwent,
Year of Passing,Mijający rok,
-Class / Percentage,,
Major/Optional Subjects,Główne/Opcjonalne Tematy,
Employee External Work History,Historia zatrudnienia pracownika poza firmą,
Total Experience,Całkowita kwota wydatków,
@@ -6763,7 +6671,6 @@
Total Leaves Allocated,Całkowita ilość przyznanych dni zwolnienia od pracy,
Total Leaves Encashed,Total Leaves Encashed,
Leave Period,Okres Nieobecności,
-Carry Forwarded Leaves,,
Apply / Approve Leaves,Zastosuj / Zatwierdź Nieobecności,
HR-LAP-.YYYY.-,HR-LAP-.YYYY.-,
Leave Balance Before Application,Status Nieobecności przed Wnioskiem,
@@ -6778,7 +6685,6 @@
Stop users from making Leave Applications on following days.,Zatrzymaj możliwość składania zwolnienia chorobowego użytkownikom w następujące dni.,
Leave Block List Dates,Daty dopuszczenia na Liście Blokowanych Nieobecności,
Allow Users,Zezwól Użytkownikom,
-Allow the following users to approve Leave Applications for block days.,,
Leave Block List Allowed,Dopuszczone na Liście Blokowanych Nieobecności,
Leave Block List Allow,Dopuść na Liście Blokowanych Nieobecności,
Allow User,Zezwól Użytkownikowi,
@@ -6802,7 +6708,6 @@
Encashment Amount,Kwota rabatu,
Leave Ledger Entry,Pozostaw wpis księgi głównej,
Transaction Name,Nazwa transakcji,
-Is Carry Forward,,
Is Expired,Straciła ważność,
Is Leave Without Pay,jest Urlopem Bezpłatnym,
Holiday List for Optional Leave,Lista urlopowa dla Opcjonalnej Nieobecności,
@@ -6834,7 +6739,6 @@
Bimonthly,Dwumiesięczny,
Employees,Pracowników,
Number Of Employees,Liczba pracowników,
-Employee Details,,
Validate Attendance,Zweryfikuj Frekfencję,
Salary Slip Based on Timesheet,Slip Wynagrodzenie podstawie grafiku,
Select Payroll Period,Wybierz Okres Payroll,
@@ -7059,99 +6963,12 @@
Sync in Progress,Synchronizacja w toku,
Hub Seller Name,Nazwa sprzedawcy Hub,
Custom Data,Dane niestandardowe,
-Member,Członek,
-Partially Disbursed,częściowo wypłacona,
-Loan Closure Requested,Zażądano zamknięcia pożyczki,
Repay From Salary,Spłaty z pensji,
-Loan Details,pożyczka Szczegóły,
-Loan Type,Rodzaj kredytu,
-Loan Amount,Kwota kredytu,
-Is Secured Loan,Jest zabezpieczona pożyczka,
-Rate of Interest (%) / Year,Stopa procentowa (% / rok),
-Disbursement Date,wypłata Data,
-Disbursed Amount,Kwota wypłacona,
-Is Term Loan,Jest pożyczką terminową,
-Repayment Method,Sposób spłaty,
-Repay Fixed Amount per Period,Spłacić ustaloną kwotę za okres,
-Repay Over Number of Periods,Spłaty przez liczbę okresów,
-Repayment Period in Months,Spłata Okres w miesiącach,
-Monthly Repayment Amount,Miesięczna kwota spłaty,
-Repayment Start Date,Data rozpoczęcia spłaty,
-Loan Security Details,Szczegóły bezpieczeństwa pożyczki,
-Maximum Loan Value,Maksymalna wartość pożyczki,
-Account Info,Informacje o koncie,
-Loan Account,Konto kredytowe,
-Interest Income Account,Konto przychodów odsetkowych,
-Penalty Income Account,Rachunek dochodów z kar,
-Repayment Schedule,Harmonogram spłaty,
-Total Payable Amount,Całkowita należna kwota,
-Total Principal Paid,Łącznie wypłacone główne zlecenie,
-Total Interest Payable,Razem odsetki płatne,
-Total Amount Paid,Łączna kwota zapłacona,
-Loan Manager,Menedżer pożyczek,
-Loan Info,pożyczka Info,
-Rate of Interest,Stopa procentowa,
-Proposed Pledges,Proponowane zobowiązania,
-Maximum Loan Amount,Maksymalna kwota kredytu,
-Repayment Info,Informacje spłata,
-Total Payable Interest,Całkowita zapłata odsetek,
-Against Loan ,Przed pożyczką,
-Loan Interest Accrual,Narosłe odsetki od pożyczki,
-Amounts,Kwoty,
-Pending Principal Amount,Oczekująca kwota główna,
-Payable Principal Amount,Kwota główna do zapłaty,
-Paid Principal Amount,Zapłacona kwota główna,
-Paid Interest Amount,Kwota zapłaconych odsetek,
-Process Loan Interest Accrual,Przetwarzanie naliczonych odsetek od kredytu,
-Repayment Schedule Name,Nazwa harmonogramu spłaty,
Regular Payment,Regularna płatność,
Loan Closure,Zamknięcie pożyczki,
-Payment Details,Szczegóły płatności,
-Interest Payable,Odsetki płatne,
-Amount Paid,Kwota zapłacona,
-Principal Amount Paid,Kwota główna wypłacona,
-Repayment Details,Szczegóły spłaty,
-Loan Repayment Detail,Szczegóły spłaty pożyczki,
-Loan Security Name,Nazwa zabezpieczenia pożyczki,
-Unit Of Measure,Jednostka miary,
-Loan Security Code,Kod bezpieczeństwa pożyczki,
-Loan Security Type,Rodzaj zabezpieczenia pożyczki,
-Haircut %,Strzyżenie%,
-Loan Details,Szczegóły pożyczki,
-Unpledged,Niepowiązane,
-Pledged,Obiecał,
-Partially Pledged,Częściowo obiecane,
-Securities,Papiery wartościowe,
-Total Security Value,Całkowita wartość bezpieczeństwa,
-Loan Security Shortfall,Niedobór bezpieczeństwa pożyczki,
-Loan ,Pożyczka,
-Shortfall Time,Czas niedoboru,
-America/New_York,America / New_York,
-Shortfall Amount,Kwota niedoboru,
-Security Value ,Wartość bezpieczeństwa,
-Process Loan Security Shortfall,Niedobór bezpieczeństwa pożyczki procesowej,
-Loan To Value Ratio,Wskaźnik pożyczki do wartości,
-Unpledge Time,Unpledge Time,
-Loan Name,pożyczka Nazwa,
Rate of Interest (%) Yearly,Stopa procentowa (%) Roczne,
-Penalty Interest Rate (%) Per Day,Kara odsetkowa (%) dziennie,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Kara odsetkowa naliczana jest codziennie od oczekującej kwoty odsetek w przypadku opóźnionej spłaty,
-Grace Period in Days,Okres karencji w dniach,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Liczba dni od daty wymagalności, do której kara nie będzie naliczana w przypadku opóźnienia w spłacie kredytu",
-Pledge,Zastaw,
-Post Haircut Amount,Kwota po ostrzyżeniu,
-Process Type,Typ procesu,
-Update Time,Czas aktualizacji,
-Proposed Pledge,Proponowane zobowiązanie,
-Total Payment,Całkowita płatność,
-Balance Loan Amount,Kwota salda kredytu,
-Is Accrued,Jest naliczony,
Salary Slip Loan,Salary Slip Loan,
Loan Repayment Entry,Wpis spłaty kredytu,
-Sanctioned Loan Amount,Kwota udzielonej sankcji,
-Sanctioned Amount Limit,Sankcjonowany limit kwoty,
-Unpledge,Unpledge,
-Haircut,Ostrzyżenie,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Utwórz Harmonogram,
Schedules,Harmonogramy,
@@ -7173,8 +6990,6 @@
Customer Feedback,Informacja zwrotna Klienta,
Maintenance Visit Purpose,Cel Wizyty Konserwacji,
Work Done,Praca wykonana,
-Against Document No,,
-Against Document Detail No,,
MFG-BLR-.YYYY.-,MFG-BLR-.RRRR.-,
Order Type,Typ zamówienia,
Blanket Order Item,Koc Zamówienie przedmiotu,
@@ -7212,14 +7027,11 @@
Show Items,jasnowidze,
Show Operations,Pokaż Operations,
Website Description,Opis strony WWW,
-BOM Explosion Item,,
Qty Consumed Per Unit,Ilość skonsumowana na Jednostkę,
Include Item In Manufacturing,Dołącz przedmiot do produkcji,
-BOM Item,,
Item operation,Obsługa przedmiotu,
Rate & Amount,Stawka i kwota,
Basic Rate (Company Currency),Podstawowy wskaźnik (Waluta Firmy),
-Scrap %,,
Original Item,Oryginalna pozycja,
BOM Operation,BOM Operacja,
Operation Time ,Czas operacji,
@@ -7479,15 +7291,15 @@
Project will be accessible on the website to these users,Projekt będzie dostępny na stronie internetowej dla tych użytkowników,
Copied From,Skopiowano z,
Start and End Dates,Daty rozpoczęcia i zakończenia,
-Actual Time (in Hours),Rzeczywisty czas (w godzinach),
+Actual Time in Hours (via Timesheet),Rzeczywisty czas (w godzinach),
Costing and Billing,Kalkulacja kosztów i fakturowanie,
-Total Costing Amount (via Timesheets),Łączna kwota kosztów (za pośrednictwem kart pracy),
-Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez zwrot kosztów),
+Total Costing Amount (via Timesheet),Łączna kwota kosztów (za pośrednictwem kart pracy),
+Total Expense Claim (via Expense Claim),Łączny koszt roszczenie (przez zwrot kosztów),
Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem),
Total Sales Amount (via Sales Order),Całkowita kwota sprzedaży (poprzez zamówienie sprzedaży),
-Total Billable Amount (via Timesheets),Całkowita kwota do naliczenia (za pośrednictwem kart pracy),
-Total Billed Amount (via Sales Invoices),Całkowita kwota faktury (za pośrednictwem faktur sprzedaży),
-Total Consumed Material Cost (via Stock Entry),Całkowity koszt materiałów konsumpcyjnych (poprzez wprowadzenie do magazynu),
+Total Billable Amount (via Timesheet),Całkowita kwota do naliczenia (za pośrednictwem kart pracy),
+Total Billed Amount (via Sales Invoice),Całkowita kwota faktury (za pośrednictwem faktur sprzedaży),
+Total Consumed Material Cost (via Stock Entry),Całkowity koszt materiałów konsumpcyjnych (poprzez wprowadzenie do magazynu),
Gross Margin,Marża brutto,
Gross Margin %,Marża brutto %,
Monitor Progress,Monitorowanie postępu,
@@ -7521,12 +7333,10 @@
Dependencies,Zależności,
Dependent Tasks,Zadania zależne,
Depends on Tasks,Zależy Zadania,
-Actual Start Date (via Time Sheet),Faktyczna data rozpoczęcia (przez czas arkuszu),
-Actual Time (in hours),Rzeczywisty czas (w godzinach),
-Actual End Date (via Time Sheet),Faktyczna data zakończenia (przez czas arkuszu),
-Total Costing Amount (via Time Sheet),Całkowita kwota Costing (przez czas arkuszu),
+Actual Start Date (via Timesheet),Faktyczna data rozpoczęcia (przez czas arkuszu),
+Actual Time in Hours (via Timesheet),Rzeczywisty czas (w godzinach),
+Actual End Date (via Timesheet),Faktyczna data zakończenia (przez czas arkuszu),
Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów),
-Total Billing Amount (via Time Sheet),Całkowita kwota płatności (poprzez Czas Sheet),
Review Date,Data Przeglądu,
Closing Date,Data zamknięcia,
Task Depends On,Zadanie zależne od,
@@ -7669,9 +7479,7 @@
MAT-INS-.YYYY.-,MAT-INS-.YYYY.-,
Installation Date,Data instalacji,
Installation Time,Czas instalacji,
-Installation Note Item,,
Installed Qty,Liczba instalacji,
-Lead Source,,
Period Start Date,Data rozpoczęcia okresu,
Period End Date,Data zakończenia okresu,
Cashier,Kasjer,
@@ -7692,11 +7500,8 @@
Rate at which Price list currency is converted to company's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty firmy,
Additional Discount and Coupon Code,Dodatkowy kod rabatowy i kuponowy,
Referral Sales Partner,Polecony partner handlowy,
-In Words will be visible once you save the Quotation.,,
Term Details,Szczegóły warunków,
Quotation Item,Przedmiot oferty,
-Against Doctype,,
-Against Docname,,
Additional Notes,Dodatkowe uwagi,
SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-,
Skip Delivery Note,Pomiń dowód dostawy,
@@ -7724,10 +7529,8 @@
Sales Partner Type,Typ partnera handlowego,
Contact No.,Numer Kontaktu,
Contribution (%),Udział (%),
-Contribution to Net Total,,
Selling Settings,Ustawienia sprzedaży,
Settings for Selling Module,Ustawienia modułu sprzedaży,
-Customer Naming By,,
Campaign Naming By,Konwencja nazewnictwa Kampanii przez,
Default Customer Group,Domyślna grupa klientów,
Default Territory,Domyślne terytorium,
@@ -7816,7 +7619,6 @@
Phone No,Nr telefonu,
Company Description,Opis Firmy,
Registration Details,Szczegóły Rejestracji,
-Company registration numbers for your reference. Tax numbers etc.,,
Delete Company Transactions,Usuń Transakcje Spółki,
Currency Exchange,Wymiana Walut,
Specify Exchange Rate to convert one currency into another,Określ Kursy walut konwersji jednej waluty w drugą,
@@ -7826,7 +7628,6 @@
For Selling,Do sprzedania,
Customer Group Name,Nazwa Grupy Klientów,
Parent Customer Group,Nadrzędna Grupa Klientów,
-Only leaf nodes are allowed in transaction,,
Mention if non-standard receivable account applicable,"Wspomnieć, jeśli nie standardowe konto należności dotyczy",
Credit Limits,Limity kredytowe,
Email Digest,przetwarzanie emaila,
@@ -7846,8 +7647,6 @@
Payables,Zobowiązania,
Sales Orders to Bill,Zlecenia sprzedaży do rachunku,
Purchase Orders to Bill,Zamówienia zakupu do rachunku,
-New Sales Orders,,
-New Purchase Orders,,
Sales Orders to Deliver,Zlecenia sprzedaży do realizacji,
Purchase Orders to Receive,Zamówienia zakupu do odbioru,
New Purchase Invoice,Nowa faktura zakupu,
@@ -7883,11 +7682,9 @@
Help HTML,Pomoc HTML,
Series List for this Transaction,Lista serii dla tej transakcji,
User must always select,Użytkownik musi zawsze zaznaczyć,
-Check this if you want to force the user to select a series before saving. There will be no default if you check this.,,
Update Series,Zaktualizuj Serię,
Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.,
Prefix,Prefiks,
-Current Value,Bieżąca Wartość,
This is the number of the last created transaction with this prefix,Jest to numer ostatniej transakcji utworzonego z tym prefiksem,
Update Series Number,Zaktualizuj Numer Serii,
Quotation Lost Reason,Utracony Powód Wyceny,
@@ -7910,7 +7707,6 @@
Parent Sales Person,Nadrzędny Przedstawiciel Handlowy,
Select company name first.,Wybierz najpierw nazwę firmy,
Sales Person Targets,Cele Sprzedawcy,
-Set targets Item Group-wise for this Sales Person.,,
Supplier Group Name,Nazwa grupy dostawcy,
Parent Supplier Group,Rodzicielska grupa dostawców,
Target Detail,Szczegóły celu,
@@ -7926,14 +7722,12 @@
Territory Manager,Kierownik Regionalny,
For reference,Dla referencji,
Territory Targets,Cele Regionalne,
-Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,,
UOM Name,Nazwa Jednostki Miary,
Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek),
Website Item Group,Grupa przedmiotów strony WWW,
Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach,
Default settings for Shopping Cart,Domyślne ustawienia koszyku,
Enable Shopping Cart,Włącz Koszyk,
-Display Settings,,
Show Public Attachments,Pokaż załączniki publiczne,
Show Price,Pokaż cenę,
Show Stock Availability,Pokaż dostępność zapasów,
@@ -7973,10 +7767,7 @@
Return Against Delivery Note,Powrót Przeciwko dostawy nocie,
Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta,
Billing Address Name,Nazwa Adresu do Faktury,
-Required only for sample item.,,
"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jeśli utworzono standardowy szablon w podatku od sprzedaży i Prowizji szablonu, wybierz jedną i kliknij na przycisk poniżej.",
-In Words will be visible once you save the Delivery Note.,,
-In Words (Export) will be visible once you save the Delivery Note.,,
Transporter Info,Informacje dotyczące przewoźnika,
Driver Name,Imię kierowcy,
Track this Delivery Note against any Project,Śledź potwierdzenie dostawy w każdym projekcie,
@@ -8204,7 +7995,6 @@
The gross weight of the package. Usually net weight + packaging material weight. (for print),Waga brutto opakowania. Zazwyczaj waga netto + waga materiału z jakiego jest wykonane opakowanie. (Do druku),
Gross Weight UOM,Waga brutto Jednostka miary,
Packing Slip Item,Pozycja listu przewozowego,
-DN Detail,,
STO-PICK-.YYYY.-,STO-PICK-.YYYY.-,
Material Transfer for Manufacture,Materiał transferu dla Produkcja,
Qty of raw materials will be decided based on the qty of the Finished Goods Item,Ilość surowców zostanie ustalona na podstawie ilości produktu gotowego,
@@ -8229,7 +8019,6 @@
Raw Materials Consumed,Zużyte surowce,
Get Current Stock,Pobierz aktualny stan magazynowy,
Consumed Items,Zużyte przedmioty,
-Add / Edit Taxes and Charges,,
Auto Repeat Detail,Auto Repeat Detail,
Transporter Details,Szczegóły transportu,
Vehicle Number,Numer pojazdu,
@@ -8264,8 +8053,6 @@
Distinct unit of an Item,Odrębna jednostka przedmiotu,
Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazyn może być tylko zmieniony poprzez Wpis Asortymentu / Notę Dostawy / Potwierdzenie zakupu,
Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji,
-Creation Document Type,,
-Creation Document No,,
Creation Date,Data utworzenia,
Creation Time,Czas utworzenia,
Asset Details,Szczegóły dotyczące aktywów,
@@ -8280,7 +8067,6 @@
Under Warranty,Pod Gwarancją,
Out of Warranty,Brak Gwarancji,
Under AMC,Pod AMC,
-Out of AMC,,
Warranty Period (Days),Okres gwarancji (dni),
Serial No Details,Szczegóły numeru seryjnego,
MAT-STE-.YYYY.-,MAT-STE-.YYYY.-,
@@ -8295,7 +8081,6 @@
Inspection Required,Wymagana kontrola,
From BOM,Od BOM,
For Quantity,Dla Ilości,
-As per Stock UOM,,
Including items for sub assemblies,W tym elementów dla zespołów sub,
Default Source Warehouse,Domyślny magazyn źródłowy,
Source Warehouse Address,Adres hurtowni,
@@ -8314,8 +8099,6 @@
Basic Amount,Kwota podstawowa,
Additional Cost,Dodatkowy koszt,
Serial No / Batch,Nr seryjny / partia,
-BOM No. for a Finished Good Item,,
-Material Request used to make this Stock Entry,,
Subcontracted Item,Element podwykonawstwa,
Against Stock Entry,Przeciwko wprowadzeniu akcji,
Stock Entry Child,Dziecko do wejścia na giełdę,
@@ -8325,8 +8108,6 @@
Outgoing Rate,Wychodzące Cena,
Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji,
Stock Value Difference,Różnica wartości zapasów,
-Stock Queue (FIFO),,
-Is Cancelled,,
Stock Reconciliation,Uzgodnienia stanu,
This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,To narzędzie pomaga uaktualnić lub ustalić ilość i wycenę akcji w systemie. To jest zwykle używany do synchronizacji wartości systemowych i co rzeczywiście istnieje w magazynach.,
MAT-RECO-.YYYY.-,MAT-RECO-.RRRR.-,
@@ -8452,7 +8233,6 @@
Bank Clearance Summary,Rozliczenia bankowe,
Bank Remittance,Przelew bankowy,
Batch Item Expiry Status,Batch Przedmiot status ważności,
-Batch-Wise Balance History,,
BOM Explorer,Eksplorator BOM,
BOM Search,BOM Szukaj,
BOM Stock Calculated,BOM Stock Obliczono,
@@ -8464,7 +8244,6 @@
Produced,Wyprodukowany,
Consolidated Financial Statement,Skonsolidowane sprawozdanie finansowe,
Course wise Assessment Report,Szeregowy raport oceny,
-Customer Acquisition and Loyalty,,
Customer Credit Balance,Saldo kredytowe klienta,
Customer Ledger Summary,Podsumowanie księgi klienta,
Customer-wise Item Price,Cena przedmiotu pod względem klienta,
@@ -8508,21 +8287,12 @@
Item Prices,Ceny,
Item Shortage Report,Element Zgłoś Niedobór,
Item Variant Details,Szczegóły wariantu przedmiotu,
-Item-wise Price List Rate,,
-Item-wise Purchase History,,
-Item-wise Purchase Register,,
-Item-wise Sales History,,
-Item-wise Sales Register,,
-Items To Be Requested,,
Reserved,Zarezerwowany,
Itemwise Recommended Reorder Level,Pozycja Zalecany poziom powtórnego zamówienia,
Lead Details,Dane Tropu,
Lead Owner Efficiency,Skuteczność właściciela wiodącego,
-Loan Repayment and Closure,Spłata i zamknięcie pożyczki,
-Loan Security Status,Status zabezpieczenia pożyczki,
Lost Opportunity,Stracona szansa,
Maintenance Schedules,Plany Konserwacji,
-Material Requests for which Supplier Quotations are not created,,
Monthly Attendance Sheet,Miesięczna karta obecności,
Open Work Orders,Otwórz zlecenia pracy,
Qty to Deliver,Ilość do dostarczenia,
@@ -8536,7 +8306,6 @@
Profitability Analysis,Analiza rentowności,
Project Billing Summary,Podsumowanie płatności za projekt,
Project wise Stock Tracking,Śledzenie zapasów według projektu,
-Project wise Stock Tracking ,,
Prospects Engaged But Not Converted,"Perspektywy zaręczone, ale nie przekształcone",
Purchase Analytics,Analiza Zakupów,
Purchase Invoice Trends,Trendy Faktur Zakupów,
@@ -8553,8 +8322,6 @@
Qty to Transfer,Ilość do transferu,
Salary Register,wynagrodzenie Rejestracja,
Sales Analytics,Analityka sprzedaży,
-Sales Invoice Trends,,
-Sales Order Trends,,
Sales Partner Commission Summary,Podsumowanie Komisji ds. Sprzedaży,
Sales Partner Target Variance based on Item Group,Zmienna docelowa partnera handlowego na podstawie grupy pozycji,
Sales Partner Transaction Summary,Podsumowanie transakcji partnera handlowego,
@@ -8564,7 +8331,6 @@
Sales Payment Summary,Podsumowanie płatności za sprzedaż,
Sales Person Commission Summary,Osoba odpowiedzialna za sprzedaż,
Sales Person Target Variance Based On Item Group,Zmienna docelowa osoby sprzedaży na podstawie grupy pozycji,
-Sales Person-wise Transaction Summary,,
Sales Register,Rejestracja Sprzedaży,
Serial No Service Contract Expiry,Umowa serwisowa o nr seryjnym wygasa,
Serial No Status,Status nr seryjnego,
@@ -8579,7 +8345,6 @@
Subcontracted Item To Be Received,Przedmiot podwykonawstwa do odbioru,
Subcontracted Raw Materials To Be Transferred,"Podwykonawstwo Surowce, które mają zostać przekazane",
Supplier Ledger Summary,Podsumowanie księgi dostawców,
-Supplier-Wise Sales Analytics,,
Support Hour Distribution,Dystrybucja godzin wsparcia,
TDS Computation Summary,Podsumowanie obliczeń TDS,
TDS Payable Monthly,Miesięczny płatny TDS,
@@ -8610,7 +8375,6 @@
Counts Targeted: {0},Docelowe liczby: {0},
Payment Account is mandatory,Konto płatnicze jest obowiązkowe,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Jeśli zaznaczone, pełna kwota zostanie odliczona od dochodu podlegającego opodatkowaniu przed obliczeniem podatku dochodowego bez składania deklaracji lub dowodów.",
-Disbursement Details,Szczegóły wypłaty,
Material Request Warehouse,Magazyn żądań materiałowych,
Select warehouse for material requests,Wybierz magazyn dla zapytań materiałowych,
Transfer Materials For Warehouse {0},Przenieś materiały do magazynu {0},
@@ -8998,9 +8762,6 @@
Repay unclaimed amount from salary,Zwróć nieodebraną kwotę z wynagrodzenia,
Deduction from salary,Odliczenie od wynagrodzenia,
Expired Leaves,Wygasłe liście,
-Reference No,Nr referencyjny,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Procent redukcji wartości to różnica procentowa między wartością rynkową Papieru Wartościowego Kredytu a wartością przypisaną temu Papierowi Wartościowemu Kredytowemu, gdy jest stosowany jako zabezpieczenie tej pożyczki.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Wskaźnik kredytu do wartości jest stosunkiem kwoty kredytu do wartości zastawionego zabezpieczenia. Niedobór zabezpieczenia pożyczki zostanie wyzwolony, jeśli spadnie poniżej określonej wartości dla jakiejkolwiek pożyczki",
If this is not checked the loan by default will be considered as a Demand Loan,"Jeśli opcja ta nie zostanie zaznaczona, pożyczka domyślnie zostanie uznana za pożyczkę na żądanie",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"To konto służy do księgowania spłat pożyczki od pożyczkobiorcy, a także do wypłaty pożyczki pożyczkobiorcy",
This account is capital account which is used to allocate capital for loan disbursal account ,"Rachunek ten jest rachunkiem kapitałowym, który służy do alokacji kapitału na rachunek wypłat pożyczki",
@@ -9464,13 +9225,6 @@
Operation {0} does not belong to the work order {1},Operacja {0} nie należy do zlecenia pracy {1},
Print UOM after Quantity,Drukuj UOM po Quantity,
Set default {0} account for perpetual inventory for non stock items,Ustaw domyślne konto {0} dla ciągłych zapasów dla pozycji spoza magazynu,
-Loan Security {0} added multiple times,Bezpieczeństwo pożyczki {0} zostało dodane wiele razy,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Dłużne Papiery Wartościowe o różnym wskaźniku LTV nie mogą być przedmiotem zastawu na jedną pożyczkę,
-Qty or Amount is mandatory for loan security!,Ilość lub kwota jest obowiązkowa dla zabezpieczenia kredytu!,
-Only submittted unpledge requests can be approved,Zatwierdzać można tylko przesłane żądania niezwiązane z próbą,
-Interest Amount or Principal Amount is mandatory,Kwota odsetek lub kwota główna jest obowiązkowa,
-Disbursed Amount cannot be greater than {0},Wypłacona kwota nie może być większa niż {0},
-Row {0}: Loan Security {1} added multiple times,Wiersz {0}: Bezpieczeństwo pożyczki {1} został dodany wiele razy,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Wiersz nr {0}: Element podrzędny nie powinien być pakietem produktów. Usuń element {1} i zapisz,
Credit limit reached for customer {0},Osiągnięto limit kredytowy dla klienta {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nie można automatycznie utworzyć klienta z powodu następujących brakujących pól obowiązkowych:,
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 26cd0a9..457d491 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",د تطبیق وړ که چیرې شرکت سپا ، SAPA یا SRL وي,
Applicable if the company is a limited liability company,د تطبیق وړ که چیرې شرکت محدود مسؤلیت شرکت وي,
Applicable if the company is an Individual or a Proprietorship,د تطبیق وړ که چیرې شرکت انفرادي یا مالکیت وي,
-Applicant,غوښتنلیک ورکوونکی,
-Applicant Type,د غوښتنلیک ډول,
Application of Funds (Assets),د بسپنو (شتمني) کاریال,
Application period cannot be across two allocation records,د غوښتنلیک موده نشي کولی د تخصیص دوه ریکارډونو کې وي,
Application period cannot be outside leave allocation period,کاریال موده نه شي بهر رخصت تخصيص موده وي,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,د فولیو شمېر سره د شته شریکانو لیست لیست,
Loading Payment System,د تادیاتو سیسټم پورته کول,
Loan,پور,
-Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0},
-Loan Application,د پور غوښتنلیک,
-Loan Management,د پور مدیریت,
-Loan Repayment,دبيرته,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,د پور پیل نیټه او د پور موده د رسید تخفیف خوندي کولو لپاره لازمي دي,
Loans (Liabilities),پورونه (مسؤلیتونه),
Loans and Advances (Assets),پورونو او پرمختګ (شتمني),
@@ -1611,7 +1605,6 @@
Monday,دوشنبه,
Monthly,میاشتنی,
Monthly Distribution,میاشتنی ویش,
-Monthly Repayment Amount cannot be greater than Loan Amount,میاشتنی پور بيرته مقدار نه شي کولای د پور مقدار زیات شي,
More,نور,
More Information,نور مالومات,
More than one selection for {0} not allowed,د {0} لپاره له یو څخه زیات انتخاب اجازه نشته,
@@ -1884,11 +1877,9 @@
Pay {0} {1},پیسې {0} {1},
Payable,د تادیې وړ,
Payable Account,د تادیې وړ حساب,
-Payable Amount,د ورکړې وړ پیسې,
Payment,د پیسو,
Payment Cancelled. Please check your GoCardless Account for more details,تادیات رد شوی. مهرباني وکړئ د نورو جزیاتو لپاره د ګرمسیرless حساب وګورئ,
Payment Confirmation,د تادیاتو تایید,
-Payment Date,د تادیاتو نېټه,
Payment Days,د پیسو ورځې,
Payment Document,د پیسو د سند,
Payment Due Date,د پیسو له امله نېټه,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,مهرباني وکړئ لومړی رانيول رسيد ننوځي,
Please enter Receipt Document,لطفا د رسيد سند ته ننوځي,
Please enter Reference date,لطفا ماخذ نېټې ته ننوځي,
-Please enter Repayment Periods,لطفا د پور بيرته پړاوونه داخل,
Please enter Reqd by Date,مهرباني وکړئ د رادډ نیټه په نیټه درج کړئ,
Please enter Woocommerce Server URL,مهرباني وکړئ د Woocommerce Server URL ولیکئ,
Please enter Write Off Account,لطفا حساب ولیکئ پړاو,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,لطفا مورنی لګښت مرکز ته ننوځي,
Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0},
Please enter relieving date.,لطفا کرارولو نیټه.,
-Please enter repayment Amount,لطفا د قسط اندازه ولیکۍ,
Please enter valid Financial Year Start and End Dates,لطفا د اعتبار وړ مالي کال د پیل او پای نیټی,
Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ,
Please enter {0} first,لطفا {0} په لومړي,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,د بیې اصول دي لا فلتر پر بنسټ اندازه.,
Primary Address Details,د ابتدائی پته تفصیلات,
Primary Contact Details,د اړیکو لومړني تفصیلات,
-Principal Amount,د مدیر مقدار,
Print Format,چاپ شکل,
Print IRS 1099 Forms,د IRS 1099 فورمې چاپ کړئ,
Print Report Card,د چاپ راپور کارت,
@@ -2550,7 +2538,6 @@
Sample Collection,نمونه راغونډول,
Sample quantity {0} cannot be more than received quantity {1},نمونۍ مقدار {0} د ترلاسه شوي مقدار څخه ډیر نه وي {1},
Sanctioned,تحریم,
-Sanctioned Amount,تحریم مقدار,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.,
Sand,رڼا,
Saturday,شنبه,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} د مخه د والدین پروسیجر {1} لري.,
API,API,
Annual,کلنی,
-Approved,تصویب شوې,
Change,د بدلون,
Contact Email,تماس دبرېښنا ليک,
Export Type,د صادرولو ډول,
@@ -3571,7 +3557,6 @@
Account Value,ګ Accountون ارزښت,
Account is mandatory to get payment entries,حساب د تادیې ننوتلو ترلاسه کولو لپاره لازمي دی,
Account is not set for the dashboard chart {0},حساب د ډشبورډ چارټ {0 for لپاره نه دی ټاکل شوی,
-Account {0} does not belong to company {1},ګڼون {0} کوي چې د دې شرکت سره تړاو نه لري {1},
Account {0} does not exists in the dashboard chart {1},اکاونټ {0} د ډشبورډ چارټ {1} کې شتون نلري,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ګ : <b>ون</b> : <b>{0}</b> سرمایه کار دی چې په پرمختګ کې دی او د ژورنال ننوتلو سره تازه کیدی نشي,
Account: {0} is not permitted under Payment Entry,حساب: Pay 0} د تادیې ننوتلو لاندې اجازه نلري,
@@ -3582,7 +3567,6 @@
Activity,فعالیت,
Add / Manage Email Accounts.,Add / اداره ليک حسابونه.,
Add Child,Add د ماشومانو د,
-Add Loan Security,د پور امنیت اضافه کړئ,
Add Multiple,Add ګڼ,
Add Participants,ګډون کونکي شامل کړئ,
Add to Featured Item,په ب .ه شوي توکي کې اضافه کړئ,
@@ -3593,15 +3577,12 @@
Address Line 1,پته کرښې 1,
Addresses,Addresses,
Admission End Date should be greater than Admission Start Date.,د داخلې پای نیټه باید د داخلې له پیل نیټې څخه لویه وي.,
-Against Loan,د پور په مقابل کې,
-Against Loan:,د پور په مقابل کې:,
All,ټول,
All bank transactions have been created,د بانک ټولې معاملې رامینځته شوي,
All the depreciations has been booked,ټول تخفیف لیکل شوی,
Allocation Expired!,د تخصیص موده پای ته ورسیده,
Allow Resetting Service Level Agreement from Support Settings.,د ملاتړ ترتیبات څخه د خدماتو کچې کچې بیا تنظیم کولو ته اجازه ورکړئ.,
Amount of {0} is required for Loan closure,د پور بندولو لپاره د {0} مقدار اړین دی,
-Amount paid cannot be zero,ورکړل شوې پیسې صفر نشي,
Applied Coupon Code,نافذ کوپن کوډ,
Apply Coupon Code,د کوپن کوډ پلي کړئ,
Appointment Booking,د ګمارنې بکنگ,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,د رسیدو وخت محاسبه نشی کولی ځکه چې د موټر چلونکي پته ورکه ده.,
Cannot Optimize Route as Driver Address is Missing.,لار نشي کولی مطلوب کړي ځکه چې د موټر چلوونکي پته ورکه ده.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,دنده {0 complete نشي بشپړولی ځکه چې د هغې پورې تړلې دندې {1} تکمیل / منسوخ شوی نه دی.,
-Cannot create loan until application is approved,پور نشي رامینځته کولی ترڅو غوښتنلیک تصویب شي,
Cannot find a matching Item. Please select some other value for {0}.,کولی کوم ساری توکی ونه موندل. لورينه وکړئ د {0} يو شمېر نورو ارزښت ټاکي.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",د توکي {0} لپاره په قطار کې b 1} د {2} څخه ډیر نشي. د ډیر بلینګ اجازه ورکولو لپاره ، مهرباني وکړئ د حسابونو ترتیباتو کې تخصیص وټاکئ,
"Capacity Planning Error, planned start time can not be same as end time",د وړتیا پلان کولو غلطي ، د پیل شوي وخت وخت د پای وخت سره ورته کیدی نشي,
@@ -3812,20 +3792,9 @@
Less Than Amount,له مقدار څخه کم,
Liabilities,مسؤلیتونه,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,د پور مقدار د وړاندیز شوي تضمینونو سره سم د پور له حد څخه تر {0} ډیر دی,
Loan Applications from customers and employees.,د پیرودونکو او کارمندانو څخه پور غوښتنې.,
-Loan Disbursement,د پور توزیع,
Loan Processes,د پور پروسې,
-Loan Security,د پور امنیت,
-Loan Security Pledge,د پور د امنیت ژمنه,
-Loan Security Pledge Created : {0},د پور د امنیت ژمنه جوړه شوه: {0},
-Loan Security Price,د پور امنیت قیمت,
-Loan Security Price overlapping with {0},د پور امنیت قیمت د {0 with سره پراخه کیږي,
-Loan Security Unpledge,د پور امنیت نه مني,
-Loan Security Value,د پور د امنیت ارزښت,
Loan Type for interest and penalty rates,د سود او جریمې نرخونو لپاره پور پور,
-Loan amount cannot be greater than {0},د پور اندازه له {0 than څخه لوی نشي.,
-Loan is mandatory,پور لازمي دی,
Loans,پورونه,
Loans provided to customers and employees.,پیرودونکو او کارمندانو ته پورونه چمتو شوي.,
Location,د ځای,
@@ -3894,7 +3863,6 @@
Pay,د تنخاوو,
Payment Document Type,د تادیه سند ډول,
Payment Name,د تادیې نوم,
-Penalty Amount,د جریمې اندازه,
Pending,په تمه,
Performance,فعالیت,
Period based On,موده په روانه ده,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,مهرباني وکړئ د دې توکي سمولو لپاره د بازار ځای کارونکي په توګه ننوځئ.,
Please login as a Marketplace User to report this item.,مهرباني وکړئ د دې توکي راپور ورکولو لپاره د بازار ځای کارونکي په توګه ننوتل.,
Please select <b>Template Type</b> to download template,مهرباني وکړئ د <b>ټیمپلیټ</b> ډاونلوډ لپاره د <b>ټیمپلیټ ډول</b> وټاکئ,
-Please select Applicant Type first,مهرباني وکړئ لومړی د غوښتونکي ډول وټاکئ,
Please select Customer first,مهرباني وکړئ لومړی پیرودونکی وټاکئ,
Please select Item Code first,مهرباني وکړئ لومړی د توکو کوډ غوره کړئ,
-Please select Loan Type for company {0},مهرباني وکړئ د شرکت لپاره د پور ډول وټاکئ {0},
Please select a Delivery Note,مهرباني وکړئ د تحویلي یادداشت وټاکئ,
Please select a Sales Person for item: {0},مهرباني وکړئ د توکو لپاره د پلور شخص وټاکئ: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',لطفا بل طریقه ټاکي. یاتوره په اسعارو د راکړې ورکړې ملاتړ نه کوي '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},مهرباني وکړئ د شرکت for 0} لپاره اصلي بانکي حساب تنظیم کړئ,
Please specify,څرګند یي کړي,
Please specify a {0},مهرباني وکړئ یو {0} وټاکئ,lead
-Pledge Status,ژمن دریځ,
-Pledge Time,ژمن وخت,
Printing,د چاپونې,
Priority,د لومړیتوب,
Priority has been changed to {0}.,لومړیتوب په {0} بدل شوی دی.,
@@ -3944,7 +3908,6 @@
Processing XML Files,د XML فایلونو پروسس کول,
Profitability,ګټه,
Project,د پروژې د,
-Proposed Pledges are mandatory for secured Loans,وړاندیز شوې ژمنې د خوندي پورونو لپاره لازمي دي,
Provide the academic year and set the starting and ending date.,تعلیمي کال چمتو کړئ او د پیل او پای نیټه یې وټاکئ.,
Public token is missing for this bank,د دې بانک لپاره عامه نښه نده,
Publish,خپرول,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,د پیرود رسید هیڅ توکی نلري د دې لپاره چې برقرار نمونه فعاله وي.,
Purchase Return,رانيول Return,
Qty of Finished Goods Item,د بشپړ شوي توکو توکي,
-Qty or Amount is mandatroy for loan security,مقدار یا مقدار د پور د امنیت لپاره لازمه ده,
Quality Inspection required for Item {0} to submit,د توکي submit 0} د سپارلو لپاره د کیفیت تفتیش اړین دي,
Quantity to Manufacture,مقدار تولید ته,
Quantity to Manufacture can not be zero for the operation {0},د تولید لپاره مقدار د عملیاتو zero 0 for لپاره صفر نشي کیدی,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,د نیټې نیټه باید د شاملیدو نیټې څخه لوی یا مساوي وي,
Rename,نوم بدلول,
Rename Not Allowed,نوم بدلول اجازه نلري,
-Repayment Method is mandatory for term loans,د لنډمهاله پورونو لپاره د تادیې میتود لازمي دی,
-Repayment Start Date is mandatory for term loans,د لنډمهاله پورونو لپاره د تادیې د پیل نیټه لازمي ده,
Report Item,توکي راپور کړئ,
Report this Item,دا توکي راپور کړئ,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,د فرعي تړون لپاره خوندي مقدار: د فرعي تړون شوي توکو جوړولو لپاره د خامو موادو مقدار.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},قطار ({0}): {1 already دمخه په {2 in کې تخفیف دی,
Rows Added in {0},صفونه په {0 in اضافه شوي,
Rows Removed in {0},قطارونه په {0 in کې لرې شوي,
-Sanctioned Amount limit crossed for {0} {1},د ټاکل شوي مقدار حد د {0} {1} لپاره تجاوز شو,
-Sanctioned Loan Amount already exists for {0} against company {1},د منل شوي پور مقدار مخکې د شرکت {1} پروړاندې د {0 for لپاره شتون لري,
Save,Save,
Save Item,توکي خوندي کړئ,
Saved Items,خوندي شوي توکي,
@@ -4135,7 +4093,6 @@
User {0} is disabled,کارن {0} معلول دی,
Users and Permissions,کارنان او حلال,
Vacancies cannot be lower than the current openings,رخصتۍ د اوسني خلاصیدو څخه ټیټ نشي,
-Valid From Time must be lesser than Valid Upto Time.,د وخت څخه اعتبار باید تر وخت څخه لږ وي.,
Valuation Rate required for Item {0} at row {1},د توکي {0 row لپاره په قطار {1} کې د ارزښت نرخ اړین دی,
Values Out Of Sync,له همغږۍ وتلې ارزښتونه,
Vehicle Type is required if Mode of Transport is Road,د ګاډو ډول اړین دی که د ټرانسپورټ حالت سړک وي,
@@ -4211,7 +4168,6 @@
Add to Cart,کارټ ته یی اضافه کړه,
Days Since Last Order,ورځې له وروستي امر څخه,
In Stock,په ګدام کښي,
-Loan Amount is mandatory,د پور مقدار لازمي دی,
Mode Of Payment,د تادیاتو اکر,
No students Found,هیڅ زده کونکی ونه موندل شو,
Not in Stock,نه په سټاک,
@@ -4240,7 +4196,6 @@
Group by,ډله په,
In stock,په ګدام کښي,
Item name,د قالب نوم,
-Loan amount is mandatory,د پور مقدار لازمي دی,
Minimum Qty,لږ تر لږه مقدار,
More details,نورولوله,
Nature of Supplies,د توکو طبیعت,
@@ -4409,9 +4364,6 @@
Total Completed Qty,ټول بشپړ شوی مقدار,
Qty to Manufacture,Qty تولید,
Repay From Salary can be selected only for term loans,د تنخوا څخه بیرته تادیه یوازې د مودې پورونو لپاره غوره کیدی شي,
-No valid Loan Security Price found for {0},د Security 0 for لپاره د اعتبار وړ د امنیت قیمت ندی موندل شوی,
-Loan Account and Payment Account cannot be same,د پور حساب او تادیه حساب یو شان نشي کیدی,
-Loan Security Pledge can only be created for secured loans,د پور امنیت ژمنه یوازې د خوندي پورونو لپاره رامینځته کیدی شي,
Social Media Campaigns,د ټولنیزو رسنیو کمپاینونه,
From Date can not be greater than To Date,له نیټې څخه نیټې تر نیټې نه لوی کیدی شي,
Please set a Customer linked to the Patient,مهرباني وکړئ له ناروغ سره تړلی پیرودونکی وټاکئ,
@@ -6437,7 +6389,6 @@
HR User,د بشري حقونو څانګې د کارن,
Appointment Letter,د ګمارنې لیک,
Job Applicant,دنده متقاضي,
-Applicant Name,متقاضي نوم,
Appointment Date,د ګمارنې نیټه,
Appointment Letter Template,د ګمارنې خط ټیمپلیټ,
Body,بدن,
@@ -7059,99 +7010,12 @@
Sync in Progress,په پرمختګ کې همکاري,
Hub Seller Name,د پلور پلورونکی نوم,
Custom Data,دودیز ډاټا,
-Member,غړی,
-Partially Disbursed,په نسبی ډول مصرف,
-Loan Closure Requested,د پور بندولو غوښتنه وشوه,
Repay From Salary,له معاش ورکول,
-Loan Details,د پور نورولوله,
-Loan Type,د پور ډول,
-Loan Amount,د پور مقدار,
-Is Secured Loan,خوندي پور دی,
-Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه,
-Disbursement Date,دویشلو نېټه,
-Disbursed Amount,ورکړل شوې پیسې,
-Is Term Loan,لنډمهاله پور دی,
-Repayment Method,دبيرته طريقه,
-Repay Fixed Amount per Period,هر دوره ثابته مقدار ورکول,
-Repay Over Number of Periods,بيرته د د پړاوونه شمیره,
-Repayment Period in Months,په میاشتو کې بیرته ورکړې دوره,
-Monthly Repayment Amount,میاشتنی پور بيرته مقدار,
-Repayment Start Date,د بیرته ورکولو تمدید نیټه,
-Loan Security Details,د پور د امنیت توضیحات,
-Maximum Loan Value,د پور ارزښت اعظمي ارزښت,
-Account Info,حساب پيژندنه,
-Loan Account,د پور حساب,
-Interest Income Account,په زړه د عوايدو د حساب,
-Penalty Income Account,د جریمې عاید حساب,
-Repayment Schedule,بیرته ورکړې مهالویش,
-Total Payable Amount,ټول د راتلوونکې مقدار,
-Total Principal Paid,بشپړه پرنسپل ورکړې,
-Total Interest Payable,ټولې ګټې د راتلوونکې,
-Total Amount Paid,ټولې پیسې ورکړل شوي,
-Loan Manager,د پور مدیر,
-Loan Info,د پور پيژندنه,
-Rate of Interest,د سود اندازه,
-Proposed Pledges,وړاندیز شوې ژمنې,
-Maximum Loan Amount,اعظمي پور مقدار,
-Repayment Info,دبيرته پيژندنه,
-Total Payable Interest,ټول د راتلوونکې په زړه پوری,
-Against Loan ,د پور په مقابل کې,
-Loan Interest Accrual,د پور د ګټې ګټې,
-Amounts,مقدارونه,
-Pending Principal Amount,د پرنسپل ارزښت پیسې,
-Payable Principal Amount,د تادیې وړ پیسې,
-Paid Principal Amount,تادیه شوې اصلي پیسې,
-Paid Interest Amount,د سود پیسې ورکړل شوې,
-Process Loan Interest Accrual,د پروسې د پور سود لاسته راوړل,
-Repayment Schedule Name,د بیرته تادیې مهالویش نوم,
Regular Payment,منظم تادیه,
Loan Closure,د پور تړل,
-Payment Details,د تاديې جزئيات,
-Interest Payable,سود ورکول,
-Amount Paid,پيسې ورکړل شوې,
-Principal Amount Paid,پرنسپل تادیه تادیه شوې,
-Repayment Details,د بیرته تادیاتو توضیحات,
-Loan Repayment Detail,د پور بیرته تادیه کول تفصیل,
-Loan Security Name,د پور امنیت نوم,
-Unit Of Measure,د اندازه کولو واحد,
-Loan Security Code,د پور امنیت کوډ,
-Loan Security Type,د پور امنیت ډول,
-Haircut %,ویښتان,
-Loan Details,د پور توضیحات,
-Unpledged,نه ژمنه شوې,
-Pledged,ژمنه شوې,
-Partially Pledged,یو څه ژمنه شوې,
-Securities,امنیتونه,
-Total Security Value,د امنیت ټول ارزښت,
-Loan Security Shortfall,د پور امنیت کمښت,
-Loan ,پور,
-Shortfall Time,کمښت وخت,
-America/New_York,امریکا / نیو یارک,
-Shortfall Amount,د کمښت مقدار,
-Security Value ,امنیت ارزښت,
-Process Loan Security Shortfall,د پور پور امنیتي کمښت,
-Loan To Value Ratio,د ارزښت تناسب ته پور,
-Unpledge Time,د نه منلو وخت,
-Loan Name,د پور نوم,
Rate of Interest (%) Yearly,د ګټې کچه)٪ (کلنی,
-Penalty Interest Rate (%) Per Day,په هره ورځ د جریمې د سود نرخ ()),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,د جریمې د سود نرخ د پاتې تادیې په صورت کې هره ورځ د پاتې سود مقدار باندې وضع کیږي,
-Grace Period in Days,په ورځو کې د فضل موده,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,د ټاکلې نیټې څخه نیټې پورې چې د پور بیرته تادیه کې ځنډ په صورت کې جریمه نه اخلي,
-Pledge,ژمنه,
-Post Haircut Amount,د ویښتو کڅوړه وروسته پوسټ,
-Process Type,د پروسې ډول,
-Update Time,د اوسمهالولو وخت,
-Proposed Pledge,وړاندیز شوې ژمنه,
-Total Payment,ټول تاديه,
-Balance Loan Amount,د توازن د پور مقدار,
-Is Accrued,مصرف شوی دی,
Salary Slip Loan,د معاش لپ ټاپ,
Loan Repayment Entry,د پور بیرته تادیه کول,
-Sanctioned Loan Amount,د منل شوي پور مقدار,
-Sanctioned Amount Limit,ټاکل شوې اندازه محدودیت,
-Unpledge,بې هوښه کول,
-Haircut,ویښتان,
MAT-MSH-.YYYY.-,MAT-MSH -YYYY-,
Generate Schedule,تولید مهال ويش,
Schedules,مهال ويش,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,پروژه به د دغو کاروونکو په ویب پاڼه د السرسي وړ وي,
Copied From,کاپي له,
Start and End Dates,بیا او نیټی پای,
-Actual Time (in Hours),اصل وخت (ساعتونو کې),
+Actual Time in Hours (via Timesheet),اصل وخت (ساعتونو کې),
Costing and Billing,لګښت او اولګښت,
-Total Costing Amount (via Timesheets),د ټول لګښت لګښت (د ټایټ شیټونو له لارې),
-Total Expense Claim (via Expense Claims),Total اخراجاتو ادعا (اخراجاتو د ادعا له لارې),
+Total Costing Amount (via Timesheet),د ټول لګښت لګښت (د ټایټ شیټونو له لارې),
+Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو د ادعا له لارې),
Total Purchase Cost (via Purchase Invoice),Total رانيول لګښت (له لارې رانيول صورتحساب),
Total Sales Amount (via Sales Order),د پلور مجموعي مقدار (د پلور امر له الرې),
-Total Billable Amount (via Timesheets),د ټول وړ وړ مقدار (د ټایټ شیټونو له لارې),
-Total Billed Amount (via Sales Invoices),د بشپړې شوې پیسې (د پلور انوګانو له لارې),
-Total Consumed Material Cost (via Stock Entry),د مصرف شوو موادو مجموعه لګښت (د ذخیرې ننوتلو له لارې),
+Total Billable Amount (via Timesheet),د ټول وړ وړ مقدار (د ټایټ شیټونو له لارې),
+Total Billed Amount (via Sales Invoice),د بشپړې شوې پیسې (د پلور انوګانو له لارې),
+Total Consumed Material Cost (via Stock Entry),د مصرف شوو موادو مجموعه لګښت (د ذخیرې ننوتلو له لارې),
Gross Margin,Gross څنډی,
Gross Margin %,د ناخالصه عايد٪,
Monitor Progress,پرمختګ څارنه,
@@ -7521,12 +7385,10 @@
Dependencies,انحصار,
Dependent Tasks,انحصاري وظایف,
Depends on Tasks,په دندې پورې تړاو لري,
-Actual Start Date (via Time Sheet),واقعي د پیل نیټه د (د وخت پاڼه له لارې),
-Actual Time (in hours),واقعي وخت (په ساعتونه),
-Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې),
-Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې),
+Actual Start Date (via Timesheet),واقعي د پیل نیټه د (د وخت پاڼه له لارې),
+Actual Time in Hours (via Timesheet),واقعي وخت (په ساعتونه),
+Actual End Date (via Timesheet),واقعي د پای نیټه (د وخت پاڼه له لارې),
Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې),
-Total Billing Amount (via Time Sheet),Total اولګښت مقدار (د وخت پاڼه له لارې),
Review Date,کتنه نېټه,
Closing Date,بنديدو نېټه,
Task Depends On,کاري پورې تړلی دی د,
@@ -7887,7 +7749,6 @@
Update Series,تازه لړۍ,
Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.,
Prefix,هغه مختاړی,
-Current Value,اوسنی ارزښت,
This is the number of the last created transaction with this prefix,دا په دې مختاړی د تېرو جوړ معامله شمیر,
Update Series Number,تازه لړۍ شمېر,
Quotation Lost Reason,د داوطلبۍ ورک دلیل,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,نورتسهیالت وړانديز شوي ترمیمي د ليول,
Lead Details,سرب د نورولوله,
Lead Owner Efficiency,مشري خاوند موثريت,
-Loan Repayment and Closure,د پور بیرته تادیه کول او بندول,
-Loan Security Status,د پور امنیت حالت,
Lost Opportunity,فرصت له لاسه ورکړ,
Maintenance Schedules,د ساتنې او ویش,
Material Requests for which Supplier Quotations are not created,مادي غوښتنې د کوم لپاره چې عرضه Quotations دي جوړ نه,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ټاکل شوې شمیرې: {0},
Payment Account is mandatory,د تادیې حساب لازمي دی,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",که چک شوی وي ، ټوله اندازه به د عایداتو مالیې محاسبه کولو دمخه پرته له کوم اعلان یا ثبوت وړاندې کولو څخه د مالیې عاید څخه وګرځول شي.,
-Disbursement Details,د توزیع توضیحات,
Material Request Warehouse,د موادو غوښتنه ګودام,
Select warehouse for material requests,د موادو غوښتنو لپاره ګودام غوره کړئ,
Transfer Materials For Warehouse {0},د ګودام For 0 For لپاره توکي انتقال کړئ,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,له تنخوا څخه نامعلومه اندازه پیسې بیرته ورکړئ,
Deduction from salary,له معاش څخه تخفیف,
Expired Leaves,ختم شوې پاvesې,
-Reference No,د,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,د ویښتو کښت سلنه د پور امنیت د بازار ارزښت او هغه پور امنیت ته ورته شوي ارزښت ترمنځ سلنه سلنه توپیر دی کله چې د دې پور لپاره د تضمین په توګه کارول کیږي.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,د ارزښت ارزښت تناسب د ژمنه شوي امنیت ارزښت سره د پور مقدار تناسب څرګندوي. د پور امنیت کمښت به رامینځته شي که چیرې دا د کوم پور لپاره ټاکل شوي ارزښت څخه ښکته راشي,
If this is not checked the loan by default will be considered as a Demand Loan,که چیرې دا چک نه شي نو په ډیفالټ ډول به د غوښتنې پور په توګه وګ .ل شي,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,دا حساب د پور ورکونکي څخه د پور بیرته تادیات کولو لپاره او هم پور اخیستونکي ته د پورونو توزیع لپاره کارول کیږي,
This account is capital account which is used to allocate capital for loan disbursal account ,دا حساب د پانګوونې حساب دی چې د پور توزیع شوي حساب لپاره د پانګو ځانګړي کولو لپاره کارول کیږي,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},عملیات {0} د کار له حکم سره تړاو نه لري {1},
Print UOM after Quantity,د مقدار وروسته UOM چاپ کړئ,
Set default {0} account for perpetual inventory for non stock items,د غیر سټاک توکو لپاره د تلپاتې انوینټري لپاره ډیفالټ {0} حساب تنظیم کړئ,
-Loan Security {0} added multiple times,د پور امنیت multiple 0} څو ځله اضافه کړ,
-Loan Securities with different LTV ratio cannot be pledged against one loan,د LTV مختلف تناسب سره د پور تضمین د یو پور په وړاندې ژمنه نشي کیدلی,
-Qty or Amount is mandatory for loan security!,مقدار یا مقدار د پور د امنیت لپاره لازمي دی!,
-Only submittted unpledge requests can be approved,یوازې سپارل شوې غیر موافقې غوښتنې تصویب کیدی شي,
-Interest Amount or Principal Amount is mandatory,د سود مقدار یا اصلي مقدار لازمي دی,
-Disbursed Amount cannot be greater than {0},ورکړل شوې پیسې له {0 than څخه لوی نشي.,
-Row {0}: Loan Security {1} added multiple times,قطار {0}: د پور امنیت {1 multiple څو ځله اضافه شو,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,قطار # {0}: د ماشوم توکي باید د محصول بنډل نه وي. مهرباني وکړئ توکي {1} لرې کړئ او خوندي کړئ,
Credit limit reached for customer {0},د پیرودونکي لپاره د اعتبار حد حد ته ورسید {0 {,
Could not auto create Customer due to the following missing mandatory field(s):,د لاندې ورک شوي لازمي ساحې (ګانو) له امله پیرودونکي نشي جوړولی:,
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index edaaddd..3843834 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -12,7 +12,7 @@
'To Date' is required,'Data Final' é necessária,
'Total',';Total';,
'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},
-'Update Stock' cannot be checked for fixed asset sale,"'Atualizar Estoque' não pode ser selecionado para venda de ativo fixo",
+'Update Stock' cannot be checked for fixed asset sale,'Atualizar Estoque' não pode ser selecionado para venda de ativo fixo,
) for {0},) para {0},
1 exact match.,1 correspondência exata.,
90-Above,Acima de 90,
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Aplicável se a empresa for SpA, SApA ou SRL",
Applicable if the company is a limited liability company,Aplicável se a empresa for uma sociedade de responsabilidade limitada,
Applicable if the company is an Individual or a Proprietorship,Aplicável se a empresa é um indivíduo ou uma propriedade,
-Applicant,Candidato,
-Applicant Type,Tipo de Candidato,
Application of Funds (Assets),Aplicação de Recursos (ativos),
Application period cannot be across two allocation records,O período de aplicação não pode ser realizado em dois registros de alocação,
Application period cannot be outside leave allocation period,Período de aplicação não pode estar fora do período de atribuição de licença,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lista de accionistas disponíveis com números folio,
Loading Payment System,Sistema de Pagamento de Carregamento,
Loan,Empréstimo,
-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},
-Loan Application,Pedido de Empréstimo,
-Loan Management,Gestão de Empréstimos,
-Loan Repayment,Pagamento do Empréstimo,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Data de Início do Empréstimo e Período do Empréstimo são obrigatórios para salvar o Desconto da Fatura,
Loans (Liabilities),Empréstimos (passivo),
Loans and Advances (Assets),Empréstimos e Adiantamentos (ativos),
@@ -1611,7 +1605,6 @@
Monday,Segunda-feira,
Monthly,Mensal,
Monthly Distribution,Distribuição Mensal,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mensal Reembolso Valor não pode ser maior do que o valor do empréstimo,
More,Mais,
More Information,Mais Informações,
More than one selection for {0} not allowed,Mais de uma seleção para {0} não permitida,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pague {0} {1},
Payable,A Pagar,
Payable Account,Conta Para Pagamento,
-Payable Amount,Valor a Pagar,
Payment,Pagamento,
Payment Cancelled. Please check your GoCardless Account for more details,Pagamento cancelado. Por favor verifique a sua conta GoCardless para mais detalhes,
Payment Confirmation,Confirmação de Pagamento,
-Payment Date,Data de Pagamento,
Payment Days,Datas de Pagamento,
Payment Document,Documento de Pagamento,
Payment Due Date,Data de Vencimento,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Digite Recibo de compra primeiro,
Please enter Receipt Document,Por favor insira o Documento de Recibo,
Please enter Reference date,Por favor indique data de referência,
-Please enter Repayment Periods,Por favor indique períodos de reembolso,
Please enter Reqd by Date,Digite Reqd by Date,
Please enter Woocommerce Server URL,Por favor indique o URL do servidor de Woocommerce,
Please enter Write Off Account,Por favor indique a conta de abatimento,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Por favor entre o centro de custo pai,
Please enter quantity for Item {0},Por favor indique a quantidade de item {0},
Please enter relieving date.,Por favor indique data da liberação.,
-Please enter repayment Amount,Por favor indique reembolso Valor,
Please enter valid Financial Year Start and End Dates,Por favor indique datas inicial e final válidas do Ano Financeiro,
Please enter valid email address,Por favor insira o endereço de e-mail válido,
Please enter {0} first,Por favor indique {0} primeiro,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.,
Primary Address Details,Detalhes Principais do Endereço,
Primary Contact Details,Detalhes Principais de Contato,
-Principal Amount,Valor Principal,
Print Format,Formato de Impressão,
Print IRS 1099 Forms,Imprimir Formulários do Irs 1099,
Print Report Card,Imprimir Boletim,
@@ -2550,7 +2538,6 @@
Sample Collection,Coleção de Amostras,
Sample quantity {0} cannot be more than received quantity {1},A quantidade de amostra {0} não pode ser superior à quantidade recebida {1},
Sanctioned,Liberada,
-Sanctioned Amount,Valor Liberado,
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}.,
Sand,Areia,
Saturday,Sábado,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} já tem um procedimento pai {1}.,
API,API,
Annual,Anual,
-Approved,Aprovado,
Change,Alteração,
Contact Email,Email de Contato,
Export Type,Tipo de Exportação,
@@ -3571,7 +3557,6 @@
Account Value,Valor da Conta,
Account is mandatory to get payment entries,A conta é obrigatória para obter entradas de pagamento,
Account is not set for the dashboard chart {0},A conta não está definida para o gráfico do painel {0},
-Account {0} does not belong to company {1},A conta {0} não pertence à empresa {1},
Account {0} does not exists in the dashboard chart {1},A conta {0} não existe no gráfico do painel {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Conta: <b>{0}</b> é capital em andamento e não pode ser atualizado pela entrada de diário,
Account: {0} is not permitted under Payment Entry,Conta: {0} não é permitida em Entrada de pagamento,
@@ -3582,7 +3567,6 @@
Activity,Atividade,
Add / Manage Email Accounts.,Adicionar / Gerenciar Contas de Email.,
Add Child,Adicionar Sub-item,
-Add Loan Security,Adicionar Garantia ao Empréstimo,
Add Multiple,Adicionar Múltiplos,
Add Participants,Adicione Participantes,
Add to Featured Item,Adicionar Ao Item Em Destaque,
@@ -3593,15 +3577,12 @@
Address Line 1,Endereço,
Addresses,Endereços,
Admission End Date should be greater than Admission Start Date.,A Data de término da admissão deve ser maior que a Data de início da admissão.,
-Against Loan,Contra Empréstimo,
-Against Loan:,Contra Empréstimo:,
All,Todos,
All bank transactions have been created,Todas as transações bancárias foram criadas,
All the depreciations has been booked,Todas as depreciações foram registradas,
Allocation Expired!,Alocação Expirada!,
Allow Resetting Service Level Agreement from Support Settings.,Permitir redefinir o contrato de nível de serviço das configurações de suporte.,
Amount of {0} is required for Loan closure,É necessário um valor de {0} para o fechamento do empréstimo,
-Amount paid cannot be zero,O valor pago não pode ser zero,
Applied Coupon Code,Código de Cupom Aplicado,
Apply Coupon Code,Aplicar Código de Cupom,
Appointment Booking,Marcação de Consultas,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Não É Possível Calcular o Horário de Chegada Pois o Endereço do Driver Está Ausente.,
Cannot Optimize Route as Driver Address is Missing.,Não É Possível Otimizar a Rota Pois o Endereço do Driver Está Ausente.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Não é possível concluir a tarefa {0} pois sua tarefa dependente {1} não está concluída / cancelada.,
-Cannot create loan until application is approved,Não é possível criar empréstimo até que o aplicativo seja aprovado,
Cannot find a matching Item. Please select some other value for {0}.,Não consegue encontrar um item correspondente. Por favor selecione algum outro valor para {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Não é possível exceder o item {0} na linha {1} mais que {2}. Para permitir cobrança excessiva, defina a permissão nas Configurações de contas",
"Capacity Planning Error, planned start time can not be same as end time","Erro de planejamento de capacidade, a hora de início planejada não pode ser igual à hora de término",
@@ -3812,20 +3792,9 @@
Less Than Amount,Menos Que Quantidade,
Liabilities,Passivo,
Loading...,Carregando...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,O valor do empréstimo excede o valor máximo do empréstimo de {0} conforme as garantias propostas,
Loan Applications from customers and employees.,Pedidos de empréstimo de clientes e funcionários.,
-Loan Disbursement,Desembolso de Empréstimos,
Loan Processes,Processos de Empréstimos,
-Loan Security,Garantias de Empréstimo,
-Loan Security Pledge,Gravame da Garantia de Empréstimo,
-Loan Security Pledge Created : {0},Gravame da Garantia do Empréstimo Criada: {0},
-Loan Security Price,Preço da Garantia do Empréstimo,
-Loan Security Price overlapping with {0},Preço da Garantia do Empréstimo sobreposto com {0},
-Loan Security Unpledge,Liberação da Garantia de Empréstimo,
-Loan Security Value,Valor da Garantia do Empréstimo,
Loan Type for interest and penalty rates,Tipo de empréstimo para taxas de juros e multas,
-Loan amount cannot be greater than {0},O valor do empréstimo não pode ser maior que {0},
-Loan is mandatory,O empréstimo é obrigatório,
Loans,Empréstimos,
Loans provided to customers and employees.,Empréstimos concedidos a clientes e funcionários.,
Location,Localização,
@@ -3894,7 +3863,6 @@
Pay,Pagar,
Payment Document Type,Tipo de Documento de Pagamento,
Payment Name,Nome do Pagamento,
-Penalty Amount,Valor da Penalidade,
Pending,Pendente,
Performance,Atuação,
Period based On,Período baseado em,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Faça o login como um usuário do Marketplace para editar este item.,
Please login as a Marketplace User to report this item.,Faça o login como usuário do Marketplace para relatar este item.,
Please select <b>Template Type</b> to download template,Selecione <b>Tipo</b> de modelo para fazer o download do modelo,
-Please select Applicant Type first,Selecione primeiro o tipo de candidato,
Please select Customer first,Por favor selecione o Cliente primeiro,
Please select Item Code first,Selecione primeiro o código do item,
-Please select Loan Type for company {0},Selecione Tipo de empréstimo para a empresa {0},
Please select a Delivery Note,Selecione uma nota de entrega,
Please select a Sales Person for item: {0},Selecione um vendedor para o item: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Selecione outro método de pagamento. Stripe não suporta transações em moeda ';{0}';,
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Por favor configure uma conta bancária padrão para a empresa {0},
Please specify,Por favor especifique,
Please specify a {0},Por favor especifique um {0},lead
-Pledge Status,Status da Promessa,
-Pledge Time,Tempo da Promessa,
Printing,Impressão,
Priority,Prioridade,
Priority has been changed to {0}.,A prioridade foi alterada para {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Processando Arquivos Xml,
Profitability,Rentabilidade,
Project,Projeto,
-Proposed Pledges are mandatory for secured Loans,As promessas propostas são obrigatórias para empréstimos garantidos,
Provide the academic year and set the starting and ending date.,Forneça o ano acadêmico e defina as datas inicial e final.,
Public token is missing for this bank,O token público está em falta neste banco,
Publish,Publicar,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,O recibo de compra não possui nenhum item para o qual a opção Retain Sample esteja ativada.,
Purchase Return,Devolução de Compra,
Qty of Finished Goods Item,Quantidade de Item de Produtos Acabados,
-Qty or Amount is mandatroy for loan security,Quantidade ou quantidade é mandatroy para garantia de empréstimo,
Quality Inspection required for Item {0} to submit,Inspeção de qualidade necessária para o item {0} enviar,
Quantity to Manufacture,Quantidade a Fabricar,
Quantity to Manufacture can not be zero for the operation {0},A quantidade a fabricar não pode ser zero para a operação {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,A Data de Alívio deve ser maior ou igual à Data de Ingresso,
Rename,Renomear,
Rename Not Allowed,Renomear Não Permitido,
-Repayment Method is mandatory for term loans,O método de reembolso é obrigatório para empréstimos a prazo,
-Repayment Start Date is mandatory for term loans,A data de início do reembolso é obrigatória para empréstimos a prazo,
Report Item,Item de Relatorio,
Report this Item,Denunciar este item,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Quantidade reservada para subcontratação: quantidade de matérias-primas para fazer itens subcontratados.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Linha ({0}): {1} já está com desconto em {2},
Rows Added in {0},Linhas Adicionadas Em {0},
Rows Removed in {0},Linhas Removidas Em {0},
-Sanctioned Amount limit crossed for {0} {1},Limite do valor sancionado cruzado para {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},O montante do empréstimo sancionado já existe para {0} contra a empresa {1},
Save,Salvar,
Save Item,Salvar Item,
Saved Items,Itens Salvos,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Usuário {0} está desativado,
Users and Permissions,Usuários e Permissões,
Vacancies cannot be lower than the current openings,As vagas não podem ser inferiores às aberturas atuais,
-Valid From Time must be lesser than Valid Upto Time.,O Valid From Time deve ser menor que o Valid Upto Time.,
Valuation Rate required for Item {0} at row {1},Taxa de avaliação necessária para o item {0} na linha {1},
Values Out Of Sync,Valores Fora de Sincronia,
Vehicle Type is required if Mode of Transport is Road,O tipo de veículo é obrigatório se o modo de transporte for rodoviário,
@@ -4211,7 +4168,6 @@
Add to Cart,Adicionar Ao Carrinho,
Days Since Last Order,Dias Desde a Última Compra,
In Stock,Em Estoque,
-Loan Amount is mandatory,Montante do empréstimo é obrigatório,
Mode Of Payment,Forma de Pagamento,
No students Found,Nenhum Aluno Encontrado,
Not in Stock,Esgotado,
@@ -4240,7 +4196,6 @@
Group by,Agrupar Por,
In stock,Em Estoque,
Item name,Nome do item,
-Loan amount is mandatory,Montante do empréstimo é obrigatório,
Minimum Qty,Qtd Mínima,
More details,Mais detalhes,
Nature of Supplies,Natureza Dos Suprimentos,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Total de Qtd Concluído,
Qty to Manufacture,Qtde Para Fabricar,
Repay From Salary can be selected only for term loans,Reembolso do salário pode ser selecionado apenas para empréstimos a prazo,
-No valid Loan Security Price found for {0},Nenhuma Garantia de Empréstimo válida encontrado para {0},
-Loan Account and Payment Account cannot be same,A conta de empréstimo e a conta de pagamento não podem ser iguais,
-Loan Security Pledge can only be created for secured loans,O Gravame de Garantia de Empréstimo só pode ser criado para empréstimos com garantias,
Social Media Campaigns,Campanhas de Mídia Social,
From Date can not be greater than To Date,A data inicial não pode ser maior que a data final,
Please set a Customer linked to the Patient,Defina um cliente vinculado ao paciente,
@@ -6437,7 +6389,6 @@
HR User,Usuário do Rh,
Appointment Letter,Carta de Nomeação,
Job Applicant,Candidato À Vaga,
-Applicant Name,Nome do Candidato,
Appointment Date,Data do Encontro,
Appointment Letter Template,Modelo de Carta de Nomeação,
Body,Corpo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sincronização Em Andamento,
Hub Seller Name,Nome do Vendedor do Hub,
Custom Data,Dados Personalizados,
-Member,Membro,
-Partially Disbursed,Parcialmente Desembolso,
-Loan Closure Requested,Solicitação de Encerramento de Empréstimo,
Repay From Salary,Reembolsar a Partir de Salário,
-Loan Details,Detalhes do Empréstimo,
-Loan Type,Tipo de Empréstimo,
-Loan Amount,Valor do Empréstimo,
-Is Secured Loan,É Empréstimo Garantido,
-Rate of Interest (%) / Year,Taxa de Juros (%) / Ano,
-Disbursement Date,Data do Desembolso,
-Disbursed Amount,Montante Desembolsado,
-Is Term Loan,É Empréstimo a Prazo,
-Repayment Method,Método de Reembolso,
-Repay Fixed Amount per Period,Pagar Quantia Fixa Por Período,
-Repay Over Number of Periods,Reembolsar Ao Longo Número de Períodos,
-Repayment Period in Months,Período de Reembolso Em Meses,
-Monthly Repayment Amount,Valor da Parcela Mensal,
-Repayment Start Date,Data de Início do Reembolso,
-Loan Security Details,Detalhes da Garantia do Empréstimo,
-Maximum Loan Value,Valor Máximo do Empréstimo,
-Account Info,Informações da Conta,
-Loan Account,Conta de Empréstimo,
-Interest Income Account,Conta Margem,
-Penalty Income Account,Conta de Rendimentos de Penalidades,
-Repayment Schedule,Agenda de Pagamentos,
-Total Payable Amount,Total a Pagar,
-Total Principal Paid,Total do Principal Pago,
-Total Interest Payable,Interesse Total a Pagar,
-Total Amount Paid,Valor Total Pago,
-Loan Manager,Gerente de Empréstimos,
-Loan Info,Informações do Empréstimo,
-Rate of Interest,Taxa de Juros,
-Proposed Pledges,Promessas Propostas,
-Maximum Loan Amount,Valor Máximo de Empréstimo,
-Repayment Info,Informações de Reembolso,
-Total Payable Interest,Total de Juros a Pagar,
-Against Loan ,Contra Empréstimo,
-Loan Interest Accrual,Provisão Para Juros de Empréstimos,
-Amounts,Montantes,
-Pending Principal Amount,Montante Principal Pendente,
-Payable Principal Amount,Montante Principal a Pagar,
-Paid Principal Amount,Valor Principal Pago,
-Paid Interest Amount,Montante de Juros Pagos,
-Process Loan Interest Accrual,Processar Provisão de Juros de Empréstimo,
-Repayment Schedule Name,Nome do Cronograma de Reembolso,
Regular Payment,Pagamento Frequente,
Loan Closure,Fechamento de Empréstimo,
-Payment Details,Detalhes do Pagamento,
-Interest Payable,Juros a Pagar,
-Amount Paid,Montante Pago,
-Principal Amount Paid,Montante Principal Pago,
-Repayment Details,Detalhes de Reembolso,
-Loan Repayment Detail,Detalhe de Reembolso de Empréstimo,
-Loan Security Name,Nome da Garantia do Empréstimo,
-Unit Of Measure,Unidade de Medida,
-Loan Security Code,Código da Garantia do Empréstimo,
-Loan Security Type,Tipo de Garantia de Empréstimo,
-Haircut %,% de corte de cabelo,
-Loan Details,Detalhes do Empréstimo,
-Unpledged,Unpledged,
-Pledged,Prometido,
-Partially Pledged,Parcialmente Comprometido,
-Securities,Valores Mobiliários,
-Total Security Value,Valor Total de Garantias,
-Loan Security Shortfall,Déficit na Garantia do Empréstimo,
-Loan ,Empréstimo,
-Shortfall Time,Tempo de Déficit,
-America/New_York,America/New_york,
-Shortfall Amount,Quantidade de Déficit,
-Security Value ,Valor de Segurança,
-Process Loan Security Shortfall,Processar Déficit na Garantia do Empréstimo,
-Loan To Value Ratio,Relação Empréstimo / Valor,
-Unpledge Time,Tempo de Liberação,
-Loan Name,Nome do Empréstimo,
Rate of Interest (%) Yearly,Taxa de Juros (%) Anual,
-Penalty Interest Rate (%) Per Day,Taxa de Juros de Penalidade (%) Por Dia,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,A taxa de juros de penalidade é cobrada diariamente sobre o valor dos juros pendentes em caso de atraso no pagamento,
-Grace Period in Days,Período de Carência Em Dias,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Número de dias a partir da data de vencimento até os quais a multa não será cobrada em caso de atraso no reembolso do empréstimo,
-Pledge,Juramento,
-Post Haircut Amount,Quantidade de Corte de Cabelo,
-Process Type,Tipo de Processo,
-Update Time,Tempo de Atualização,
-Proposed Pledge,Promessa Proposta,
-Total Payment,Pagamento Total,
-Balance Loan Amount,Saldo do Empréstimo,
-Is Accrued,É acumulado,
Salary Slip Loan,Empréstimo Salarial,
Loan Repayment Entry,Entrada de Reembolso de Empréstimo,
-Sanctioned Loan Amount,Montante do Empréstimo Sancionado,
-Sanctioned Amount Limit,Limite de Quantidade Sancionada,
-Unpledge,Prometer,
-Haircut,Corte de Cabelo,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Gerar Agenda,
Schedules,Horários,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projeto estará acessível no site para os usuários,
Copied From,Copiado De,
Start and End Dates,Datas de Início e Término,
-Actual Time (in Hours),Tempo Real (em Horas),
+Actual Time in Hours (via Timesheet),Tempo Real (em Horas),
Costing and Billing,Custos e Faturamento,
-Total Costing Amount (via Timesheets),Montante Total de Custeio (via Timesheets),
-Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via Relatórios de Despesas),
+Total Costing Amount (via Timesheet),Montante Total de Custeio (via Timesheets),
+Total Expense Claim (via Expense Claim),Reivindicação de Despesa Total (via Relatórios de Despesas),
Total Purchase Cost (via Purchase Invoice),Custo Total de Compra (via Fatura de Compra),
Total Sales Amount (via Sales Order),Valor Total Das Vendas (por Ordem do Cliente),
-Total Billable Amount (via Timesheets),Valor Billable Total (via Timesheets),
-Total Billed Amount (via Sales Invoices),Valor Total Faturado (através de Faturas de Vendas),
-Total Consumed Material Cost (via Stock Entry),Custo Total de Material Consumido (via Entrada Em Estoque),
+Total Billable Amount (via Timesheet),Valor Billable Total (via Timesheets),
+Total Billed Amount (via Sales Invoice),Valor Total Faturado (através de Faturas de Vendas),
+Total Consumed Material Cost (via Stock Entry),Custo Total de Material Consumido (via Entrada Em Estoque),
Gross Margin,Margem Bruta,
Gross Margin %,Margem Bruta %,
Monitor Progress,Monitorar o Progresso,
@@ -7521,12 +7385,10 @@
Dependencies,Dependências,
Dependent Tasks,Tarefas Dependentes,
Depends on Tasks,Depende de Tarefas,
-Actual Start Date (via Time Sheet),Data de Início Real (via Registro de Tempo),
-Actual Time (in hours),Tempo Real (em horas),
-Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo),
-Total Costing Amount (via Time Sheet),Custo Total (via Registro de Tempo),
+Actual Start Date (via Timesheet),Data de Início Real (via Registro de Tempo),
+Actual Time in Hours (via Timesheet),Tempo Real (em horas),
+Actual End Date (via Timesheet),Data Final Real (via Registro de Tempo),
Total Expense Claim (via Expense Claim),Reivindicação Despesa Total (via Despesa Claim),
-Total Billing Amount (via Time Sheet),Total Faturado (via Registro de Tempo),
Review Date,Data da Revisão,
Closing Date,Data de Encerramento,
Task Depends On,Tarefa Depende De,
@@ -7887,7 +7749,6 @@
Update Series,Atualizar Séries,
Change the starting / current sequence number of an existing series.,Alterar o número sequencial de início/atual de uma série existente.,
Prefix,Prefixo,
-Current Value,Valor Atual,
This is the number of the last created transaction with this prefix,Este é o número da última transação criada com este prefixo,
Update Series Number,Atualizar Números de Séries,
Quotation Lost Reason,Motivo da Perda do Orçamento,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Níves de Reposição Recomendados Por Item,
Lead Details,Detalhes do Lead,
Lead Owner Efficiency,Eficiência do Proprietário de Leads,
-Loan Repayment and Closure,Reembolso e Encerramento de Empréstimos,
-Loan Security Status,Status da Garantia do Empréstimo,
Lost Opportunity,Oportunidade Perdida,
Maintenance Schedules,Horários de Manutenção,
Material Requests for which Supplier Quotations are not created,Itens Requisitados mas não Cotados,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Contagens Direcionadas: {0},
Payment Account is mandatory,A conta de pagamento é obrigatória,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Se marcada, o valor total será deduzido do lucro tributável antes do cálculo do imposto de renda, sem qualquer declaração ou apresentação de comprovante.",
-Disbursement Details,Detalhes de Desembolso,
Material Request Warehouse,Armazém de Solicitação de Material,
Select warehouse for material requests,Selecione o armazém para pedidos de material,
Transfer Materials For Warehouse {0},Transferir Materiais Para Armazém {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Reembolsar quantia não reclamada do salário,
Deduction from salary,Dedução do salário,
Expired Leaves,Folhas Vencidas,
-Reference No,Nº de Referência,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,A porcentagem de haircut é a diferença percentual entre o valor de mercado da Garantia de Empréstimo e o valor atribuído a essa Garantia de Empréstimo quando usado como colateral para aquele empréstimo.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,A relação entre o valor do empréstimo e a garantia do empréstimo expressa a relação entre o valor do empréstimo e o valor da garantia oferecida. Um déficit de garantia de empréstimo será acionado se cair abaixo do valor especificado para qualquer empréstimo,
If this is not checked the loan by default will be considered as a Demand Loan,Se esta opção não for marcada o empréstimo por padrão será considerado um empréstimo à vista,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Esta conta é usada para registrar reembolsos de empréstimos do mutuário e também desembolsar empréstimos para o mutuário,
This account is capital account which is used to allocate capital for loan disbursal account ,Esta conta é a conta de capital que é usada para alocar capital para a conta de desembolso do empréstimo,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},A operação {0} não pertence à ordem de serviço {1},
Print UOM after Quantity,Imprimir UOM após a quantidade,
Set default {0} account for perpetual inventory for non stock items,Definir conta {0} padrão para estoque permanente para itens fora de estoque,
-Loan Security {0} added multiple times,Garantia de Empréstimo {0} adicionada várias vezes,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Garantia de Empréstimo com taxa de LTV diferente não podem ser garantidos por um empréstimo,
-Qty or Amount is mandatory for loan security!,Qty or Amount é obrigatório para garantia de empréstimo!,
-Only submittted unpledge requests can be approved,Somente solicitações de cancelamento de garantia enviadas podem ser aprovadas,
-Interest Amount or Principal Amount is mandatory,O valor dos juros ou o valor do principal são obrigatórios,
-Disbursed Amount cannot be greater than {0},O valor desembolsado não pode ser maior que {0},
-Row {0}: Loan Security {1} added multiple times,Linha {0}: Garantia de empréstimo {1} adicionada várias vezes,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Linha # {0}: o item filho não deve ser um pacote de produtos. Remova o item {1} e salve,
Credit limit reached for customer {0},Limite de crédito atingido para o cliente {0},
Could not auto create Customer due to the following missing mandatory field(s):,Não foi possível criar automaticamente o cliente devido aos seguintes campos obrigatórios ausentes:,
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 5cc486d..0581788 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Aplicável se a empresa for SpA, SApA ou SRL",
Applicable if the company is a limited liability company,Aplicável se a empresa for uma sociedade de responsabilidade limitada,
Applicable if the company is an Individual or a Proprietorship,Aplicável se a empresa é um indivíduo ou uma propriedade,
-Applicant,Candidato,
-Applicant Type,Tipo de candidato,
Application of Funds (Assets),Aplicação de Fundos (Ativos),
Application period cannot be across two allocation records,O período de aplicação não pode ser realizado em dois registros de alocação,
Application period cannot be outside leave allocation period,O período do pedido não pode estar fora do período de atribuição de licença,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lista de accionistas disponíveis com números folio,
Loading Payment System,Sistema de pagamento de carregamento,
Loan,Empréstimo,
-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},
-Loan Application,Pedido de Empréstimo,
-Loan Management,Gestão de Empréstimos,
-Loan Repayment,Pagamento de empréstimo,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Data de Início do Empréstimo e Período do Empréstimo são obrigatórios para salvar o Desconto da Fatura,
Loans (Liabilities),Empréstimos (Passivo),
Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativos),
@@ -1611,7 +1605,6 @@
Monday,Segunda-feira,
Monthly,Mensal,
Monthly Distribution,Distribuição Mensal,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mensal Reembolso Valor não pode ser maior do que o valor do empréstimo,
More,Mais,
More Information,Mais Informação,
More than one selection for {0} not allowed,Mais de uma seleção para {0} não permitida,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Pague {0} {1},
Payable,A pagar,
Payable Account,Conta a Pagar,
-Payable Amount,Valor a Pagar,
Payment,Pagamento,
Payment Cancelled. Please check your GoCardless Account for more details,"Pagamento cancelado. Por favor, verifique a sua conta GoCardless para mais detalhes",
Payment Confirmation,Confirmação de pagamento,
-Payment Date,Data de pagamento,
Payment Days,Dias de pagamento,
Payment Document,Documento de pagamento,
Payment Due Date,Data Limite de Pagamento,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Por favor, insira primeiro o Recibo de Compra",
Please enter Receipt Document,"Por favor, insira o Documento de Recepção",
Please enter Reference date,"Por favor, insira a Data de referência",
-Please enter Repayment Periods,"Por favor, indique períodos de reembolso",
Please enter Reqd by Date,Digite Reqd by Date,
Please enter Woocommerce Server URL,"Por favor, indique o URL do servidor de Woocommerce",
Please enter Write Off Account,"Por favor, insira a Conta de Liquidação",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Por favor, insira o centro de custos principal",
Please enter quantity for Item {0},"Por favor, insira a quantidade para o Item {0}",
Please enter relieving date.,"Por favor, insira a data de saída.",
-Please enter repayment Amount,"Por favor, indique reembolso Valor",
Please enter valid Financial Year Start and End Dates,"Por favor, insira as datas de Início e Término do Ano Fiscal",
Please enter valid email address,Por favor insira o endereço de e-mail válido,
Please enter {0} first,"Por favor, insira {0} primeiro",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,As Regras de Fixação de Preços são filtradas adicionalmente com base na quantidade.,
Primary Address Details,Detalhes principais do endereço,
Primary Contact Details,Detalhes principais de contato,
-Principal Amount,Quantia principal,
Print Format,Formato de Impressão,
Print IRS 1099 Forms,Imprimir formulários do IRS 1099,
Print Report Card,Imprimir boletim,
@@ -2550,7 +2538,6 @@
Sample Collection,Coleção de amostras,
Sample quantity {0} cannot be more than received quantity {1},A quantidade de amostra {0} não pode ser superior à quantidade recebida {1},
Sanctioned,sancionada,
-Sanctioned Amount,Quantidade Sancionada,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,O Montante Sancionado não pode ser maior do que o Montante de Reembolso na Fila {0}.,
Sand,Areia,
Saturday,Sábado,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} já tem um procedimento pai {1}.,
API,API,
Annual,Anual,
-Approved,Aprovado,
Change,mudança,
Contact Email,Email de Contacto,
Export Type,Tipo de exportação,
@@ -3571,7 +3557,6 @@
Account Value,Valor da conta,
Account is mandatory to get payment entries,A conta é obrigatória para obter entradas de pagamento,
Account is not set for the dashboard chart {0},A conta não está definida para o gráfico do painel {0},
-Account {0} does not belong to company {1},A conta {0} não pertence à empresa {1},
Account {0} does not exists in the dashboard chart {1},A conta {0} não existe no gráfico do painel {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Conta: <b>{0}</b> é capital em andamento e não pode ser atualizado pela entrada de diário,
Account: {0} is not permitted under Payment Entry,Conta: {0} não é permitida em Entrada de pagamento,
@@ -3582,7 +3567,6 @@
Activity,Atividade,
Add / Manage Email Accounts.,Adicionar / Gerir Contas de Email.,
Add Child,Adicionar Subgrupo,
-Add Loan Security,Adicionar segurança de empréstimo,
Add Multiple,Adicionar Múltiplos,
Add Participants,Adicione participantes,
Add to Featured Item,Adicionar ao item em destaque,
@@ -3593,15 +3577,12 @@
Address Line 1,Endereço Linha 1,
Addresses,Endereços,
Admission End Date should be greater than Admission Start Date.,A Data de término da admissão deve ser maior que a Data de início da admissão.,
-Against Loan,Contra Empréstimo,
-Against Loan:,Contra Empréstimo:,
All,Todos,
All bank transactions have been created,Todas as transações bancárias foram criadas,
All the depreciations has been booked,Todas as depreciações foram registradas,
Allocation Expired!,Alocação expirada!,
Allow Resetting Service Level Agreement from Support Settings.,Permitir redefinir o contrato de nível de serviço das configurações de suporte.,
Amount of {0} is required for Loan closure,É necessário um valor de {0} para o fechamento do empréstimo,
-Amount paid cannot be zero,O valor pago não pode ser zero,
Applied Coupon Code,Código de cupom aplicado,
Apply Coupon Code,Aplicar código de cupom,
Appointment Booking,Marcação de consultas,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Não é possível calcular o horário de chegada, pois o endereço do driver está ausente.",
Cannot Optimize Route as Driver Address is Missing.,"Não é possível otimizar a rota, pois o endereço do driver está ausente.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Não é possível concluir a tarefa {0}, pois sua tarefa dependente {1} não está concluída / cancelada.",
-Cannot create loan until application is approved,Não é possível criar empréstimo até que o aplicativo seja aprovado,
Cannot find a matching Item. Please select some other value for {0}.,"Não foi possível encontrar um item para esta pesquisa. Por favor, selecione outro valor para {0}.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Não é possível exceder o item {0} na linha {1} mais que {2}. Para permitir cobrança excessiva, defina a permissão nas Configurações de contas",
"Capacity Planning Error, planned start time can not be same as end time","Erro de planejamento de capacidade, a hora de início planejada não pode ser igual à hora de término",
@@ -3812,20 +3792,9 @@
Less Than Amount,Menos que quantidade,
Liabilities,Passivo,
Loading...,A Carregar...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,"O valor do empréstimo excede o valor máximo do empréstimo de {0}, conforme os valores mobiliários propostos",
Loan Applications from customers and employees.,Pedidos de empréstimo de clientes e funcionários.,
-Loan Disbursement,Desembolso de Empréstimos,
Loan Processes,Processos de Empréstimos,
-Loan Security,Segurança de Empréstimos,
-Loan Security Pledge,Garantia de Empréstimo,
-Loan Security Pledge Created : {0},Promessa de segurança do empréstimo criada: {0},
-Loan Security Price,Preço da garantia do empréstimo,
-Loan Security Price overlapping with {0},Preço do título de empréstimo sobreposto com {0},
-Loan Security Unpledge,Garantia de Empréstimo,
-Loan Security Value,Valor da segurança do empréstimo,
Loan Type for interest and penalty rates,Tipo de empréstimo para taxas de juros e multas,
-Loan amount cannot be greater than {0},O valor do empréstimo não pode ser maior que {0},
-Loan is mandatory,O empréstimo é obrigatório,
Loans,Empréstimos,
Loans provided to customers and employees.,Empréstimos concedidos a clientes e funcionários.,
Location,Localização,
@@ -3894,7 +3863,6 @@
Pay,Pagar,
Payment Document Type,Tipo de documento de pagamento,
Payment Name,Nome do pagamento,
-Penalty Amount,Valor da penalidade,
Pending,Pendente,
Performance,atuação,
Period based On,Período baseado em,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Faça o login como um usuário do Marketplace para editar este item.,
Please login as a Marketplace User to report this item.,Faça o login como usuário do Marketplace para relatar este item.,
Please select <b>Template Type</b> to download template,Selecione <b>Tipo</b> de modelo para fazer o download do modelo,
-Please select Applicant Type first,Selecione primeiro o tipo de candidato,
Please select Customer first,"Por favor, selecione o Cliente primeiro",
Please select Item Code first,Selecione primeiro o código do item,
-Please select Loan Type for company {0},Selecione Tipo de empréstimo para a empresa {0},
Please select a Delivery Note,Selecione uma nota de entrega,
Please select a Sales Person for item: {0},Selecione um vendedor para o item: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Selecione outro método de pagamento. Stripe não suporta transações em moeda '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},"Por favor, configure uma conta bancária padrão para a empresa {0}",
Please specify,"Por favor, especifique",
Please specify a {0},"Por favor, especifique um {0}",lead
-Pledge Status,Status da promessa,
-Pledge Time,Tempo da promessa,
Printing,Impressão,
Priority,Prioridade,
Priority has been changed to {0}.,A prioridade foi alterada para {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Processando arquivos XML,
Profitability,Rentabilidade,
Project,Projeto,
-Proposed Pledges are mandatory for secured Loans,As promessas propostas são obrigatórias para empréstimos garantidos,
Provide the academic year and set the starting and ending date.,Forneça o ano acadêmico e defina as datas inicial e final.,
Public token is missing for this bank,O token público está em falta neste banco,
Publish,Publicar,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,O recibo de compra não possui nenhum item para o qual a opção Retain Sample esteja ativada.,
Purchase Return,Devolução de Compra,
Qty of Finished Goods Item,Quantidade de item de produtos acabados,
-Qty or Amount is mandatroy for loan security,Quantidade ou quantidade é mandatroy para garantia de empréstimo,
Quality Inspection required for Item {0} to submit,Inspeção de qualidade necessária para o item {0} enviar,
Quantity to Manufacture,Quantidade a fabricar,
Quantity to Manufacture can not be zero for the operation {0},A quantidade a fabricar não pode ser zero para a operação {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,A Data de Alívio deve ser maior ou igual à Data de Ingresso,
Rename,Alterar Nome,
Rename Not Allowed,Renomear não permitido,
-Repayment Method is mandatory for term loans,O método de reembolso é obrigatório para empréstimos a prazo,
-Repayment Start Date is mandatory for term loans,A data de início do reembolso é obrigatória para empréstimos a prazo,
Report Item,Item de relatorio,
Report this Item,Denunciar este item,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Quantidade reservada para subcontratação: quantidade de matérias-primas para fazer itens subcontratados.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Linha ({0}): {1} já está com desconto em {2},
Rows Added in {0},Linhas adicionadas em {0},
Rows Removed in {0},Linhas removidas em {0},
-Sanctioned Amount limit crossed for {0} {1},Limite do valor sancionado cruzado para {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},O montante do empréstimo sancionado já existe para {0} contra a empresa {1},
Save,Salvar,
Save Item,Salvar item,
Saved Items,Itens salvos,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Utilizador {0} está desativado,
Users and Permissions,Utilizadores e Permissões,
Vacancies cannot be lower than the current openings,As vagas não podem ser inferiores às aberturas atuais,
-Valid From Time must be lesser than Valid Upto Time.,O Valid From Time deve ser menor que o Valid Upto Time.,
Valuation Rate required for Item {0} at row {1},Taxa de avaliação necessária para o item {0} na linha {1},
Values Out Of Sync,Valores fora de sincronia,
Vehicle Type is required if Mode of Transport is Road,O tipo de veículo é obrigatório se o modo de transporte for rodoviário,
@@ -4211,7 +4168,6 @@
Add to Cart,Adicionar ao carrinho,
Days Since Last Order,Dias Desde o Último Pedido,
In Stock,Em stock,
-Loan Amount is mandatory,Montante do empréstimo é obrigatório,
Mode Of Payment,Modo de pagamento,
No students Found,Nenhum aluno encontrado,
Not in Stock,Não há no Stock,
@@ -4240,7 +4196,6 @@
Group by,Agrupar Por,
In stock,Em estoque,
Item name,Nome do item,
-Loan amount is mandatory,Montante do empréstimo é obrigatório,
Minimum Qty,Qtd mínimo,
More details,Mais detalhes,
Nature of Supplies,Natureza dos Suprimentos,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Total de Qtd Concluído,
Qty to Manufacture,Qtd Para Fabrico,
Repay From Salary can be selected only for term loans,Reembolso do salário pode ser selecionado apenas para empréstimos a prazo,
-No valid Loan Security Price found for {0},Nenhum preço válido de garantia de empréstimo encontrado para {0},
-Loan Account and Payment Account cannot be same,A conta de empréstimo e a conta de pagamento não podem ser iguais,
-Loan Security Pledge can only be created for secured loans,A promessa de garantia de empréstimo só pode ser criada para empréstimos garantidos,
Social Media Campaigns,Campanhas de mídia social,
From Date can not be greater than To Date,A data inicial não pode ser maior que a data final,
Please set a Customer linked to the Patient,Defina um cliente vinculado ao paciente,
@@ -6437,7 +6389,6 @@
HR User,Utilizador de RH,
Appointment Letter,Carta de nomeação,
Job Applicant,Candidato a Emprego,
-Applicant Name,Nome do Candidato,
Appointment Date,Data do encontro,
Appointment Letter Template,Modelo de carta de nomeação,
Body,Corpo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sincronização em andamento,
Hub Seller Name,Nome do vendedor do hub,
Custom Data,Dados personalizados,
-Member,Membro,
-Partially Disbursed,parcialmente Desembolso,
-Loan Closure Requested,Solicitação de encerramento de empréstimo,
Repay From Salary,Reembolsar a partir de Salário,
-Loan Details,Detalhes empréstimo,
-Loan Type,Tipo de empréstimo,
-Loan Amount,Montante do empréstimo,
-Is Secured Loan,É Empréstimo Garantido,
-Rate of Interest (%) / Year,Taxa de juro (%) / Ano,
-Disbursement Date,Data de desembolso,
-Disbursed Amount,Montante desembolsado,
-Is Term Loan,É Empréstimo a Prazo,
-Repayment Method,Método de reembolso,
-Repay Fixed Amount per Period,Pagar quantia fixa por Período,
-Repay Over Number of Periods,Reembolsar Ao longo Número de Períodos,
-Repayment Period in Months,Período de reembolso em meses,
-Monthly Repayment Amount,Mensal montante de reembolso,
-Repayment Start Date,Data de início do reembolso,
-Loan Security Details,Detalhes da segurança do empréstimo,
-Maximum Loan Value,Valor Máximo do Empréstimo,
-Account Info,Informações da Conta,
-Loan Account,Conta de Empréstimo,
-Interest Income Account,Conta Margem,
-Penalty Income Account,Conta de Rendimentos de Penalidades,
-Repayment Schedule,Cronograma de amortização,
-Total Payable Amount,Valor Total a Pagar,
-Total Principal Paid,Total do Principal Pago,
-Total Interest Payable,Interesse total a pagar,
-Total Amount Paid,Valor Total Pago,
-Loan Manager,Gerente de Empréstimos,
-Loan Info,Informações empréstimo,
-Rate of Interest,Taxa de interesse,
-Proposed Pledges,Promessas propostas,
-Maximum Loan Amount,Montante máximo do empréstimo,
-Repayment Info,Informações de reembolso,
-Total Payable Interest,Juros a Pagar total,
-Against Loan ,Contra Empréstimo,
-Loan Interest Accrual,Provisão para Juros de Empréstimos,
-Amounts,Montantes,
-Pending Principal Amount,Montante principal pendente,
-Payable Principal Amount,Montante Principal a Pagar,
-Paid Principal Amount,Valor principal pago,
-Paid Interest Amount,Montante de juros pagos,
-Process Loan Interest Accrual,Processar provisão de juros de empréstimo,
-Repayment Schedule Name,Nome do cronograma de reembolso,
Regular Payment,Pagamento regular,
Loan Closure,Fechamento de Empréstimos,
-Payment Details,Detalhes do pagamento,
-Interest Payable,Juros a pagar,
-Amount Paid,Montante Pago,
-Principal Amount Paid,Montante Principal Pago,
-Repayment Details,Detalhes de Reembolso,
-Loan Repayment Detail,Detalhe de reembolso de empréstimo,
-Loan Security Name,Nome da segurança do empréstimo,
-Unit Of Measure,Unidade de medida,
-Loan Security Code,Código de Segurança do Empréstimo,
-Loan Security Type,Tipo de garantia de empréstimo,
-Haircut %,% De corte de cabelo,
-Loan Details,Detalhes do Empréstimo,
-Unpledged,Unpledged,
-Pledged,Prometido,
-Partially Pledged,Parcialmente comprometido,
-Securities,Valores mobiliários,
-Total Security Value,Valor total de segurança,
-Loan Security Shortfall,Déficit na segurança do empréstimo,
-Loan ,Empréstimo,
-Shortfall Time,Tempo de Déficit,
-America/New_York,America / New_York,
-Shortfall Amount,Quantidade de déficit,
-Security Value ,Valor de segurança,
-Process Loan Security Shortfall,Déficit de segurança do empréstimo de processo,
-Loan To Value Ratio,Relação Empréstimo / Valor,
-Unpledge Time,Tempo de Promessa,
-Loan Name,Nome do empréstimo,
Rate of Interest (%) Yearly,Taxa de juro (%) Anual,
-Penalty Interest Rate (%) Per Day,Taxa de juros de penalidade (%) por dia,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,A taxa de juros de penalidade é cobrada diariamente sobre o valor dos juros pendentes em caso de atraso no pagamento,
-Grace Period in Days,Período de carência em dias,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Número de dias a partir da data de vencimento até os quais a multa não será cobrada em caso de atraso no reembolso do empréstimo,
-Pledge,Juramento,
-Post Haircut Amount,Quantidade de corte de cabelo,
-Process Type,Tipo de Processo,
-Update Time,Tempo de atualização,
-Proposed Pledge,Promessa proposta,
-Total Payment,Pagamento total,
-Balance Loan Amount,Saldo Valor do Empréstimo,
-Is Accrued,É acumulado,
Salary Slip Loan,Empréstimo Salarial,
Loan Repayment Entry,Entrada de reembolso de empréstimo,
-Sanctioned Loan Amount,Montante do empréstimo sancionado,
-Sanctioned Amount Limit,Limite de quantidade sancionada,
-Unpledge,Prometer,
-Haircut,Corte de cabelo,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Gerar Cronograma,
Schedules,Horários,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,O projeto estará acessível no website para estes utilizadores,
Copied From,Copiado de,
Start and End Dates,Datas de início e Término,
-Actual Time (in Hours),Tempo real (em horas),
+Actual Time in Hours (via Timesheet),Tempo real (em horas),
Costing and Billing,Custos e Faturação,
-Total Costing Amount (via Timesheets),Montante total de custeio (via timesheets),
-Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (através de Reinvidicações de Despesas),
+Total Costing Amount (via Timesheet),Montante total de custeio (via timesheets),
+Total Expense Claim (via Expense Claim),Reivindicação de Despesa Total (através de Reinvidicações de Despesas),
Total Purchase Cost (via Purchase Invoice),Custo total de compra (através da Fatura de Compra),
Total Sales Amount (via Sales Order),Valor total das vendas (por ordem do cliente),
-Total Billable Amount (via Timesheets),Valor Billable total (via timesheets),
-Total Billed Amount (via Sales Invoices),Valor total faturado (através de faturas de vendas),
-Total Consumed Material Cost (via Stock Entry),Custo total de material consumido (via entrada em estoque),
+Total Billable Amount (via Timesheet),Valor Billable total (via timesheets),
+Total Billed Amount (via Sales Invoice),Valor total faturado (através de faturas de vendas),
+Total Consumed Material Cost (via Stock Entry),Custo total de material consumido (via entrada em estoque),
Gross Margin,Margem Bruta,
Gross Margin %,Margem Bruta %,
Monitor Progress,Monitorar o progresso,
@@ -7521,12 +7385,10 @@
Dependencies,Dependências,
Dependent Tasks,Tarefas Dependentes,
Depends on Tasks,Depende de Tarefas,
-Actual Start Date (via Time Sheet),Data de Início Efetiva (através da Folha de Presenças),
-Actual Time (in hours),Tempo Real (em Horas),
-Actual End Date (via Time Sheet),Data de Término Efetiva (através da Folha de Presenças),
-Total Costing Amount (via Time Sheet),Quantia de Custo Total (através da Folha de Serviço),
+Actual Start Date (via Timesheet),Data de Início Efetiva (através da Folha de Presenças),
+Actual Time in Hours (via Timesheet),Tempo Real (em Horas),
+Actual End Date (via Timesheet),Data de Término Efetiva (através da Folha de Presenças),
Total Expense Claim (via Expense Claim),Reivindicação de Despesa Total (através de Reembolso de Despesas),
-Total Billing Amount (via Time Sheet),Montante de Faturação Total (através da Folha de Presenças),
Review Date,Data de Revisão,
Closing Date,Data de Encerramento,
Task Depends On,A Tarefa Depende De,
@@ -7887,7 +7749,6 @@
Update Series,Atualizar Séries,
Change the starting / current sequence number of an existing series.,Altera o número de sequência inicial / atual duma série existente.,
Prefix,Prefixo,
-Current Value,Valor Atual,
This is the number of the last created transaction with this prefix,Este é o número da última transacção criada com este prefixo,
Update Series Number,Atualização de Número de Série,
Quotation Lost Reason,Motivo de Perda de Cotação,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Nível de Reposição Recomendada por Item,
Lead Details,Dados de Potencial Cliente,
Lead Owner Efficiency,Eficiência do proprietário principal,
-Loan Repayment and Closure,Reembolso e encerramento de empréstimos,
-Loan Security Status,Status de segurança do empréstimo,
Lost Opportunity,Oportunidade perdida,
Maintenance Schedules,Cronogramas de Manutenção,
Material Requests for which Supplier Quotations are not created,As Solicitações de Material cujas Cotações de Fornecedor não foram criadas,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Contagens direcionadas: {0},
Payment Account is mandatory,A conta de pagamento é obrigatória,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Se marcada, o valor total será deduzido do lucro tributável antes do cálculo do imposto de renda, sem qualquer declaração ou apresentação de comprovante.",
-Disbursement Details,Detalhes de Desembolso,
Material Request Warehouse,Armazém de solicitação de material,
Select warehouse for material requests,Selecione o armazém para pedidos de material,
Transfer Materials For Warehouse {0},Transferir materiais para armazém {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Reembolsar quantia não reclamada do salário,
Deduction from salary,Dedução do salário,
Expired Leaves,Folhas Vencidas,
-Reference No,Nº de referência,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,A porcentagem de haircut é a diferença percentual entre o valor de mercado do Título de Empréstimo e o valor atribuído a esse Título de Empréstimo quando usado como garantia para aquele empréstimo.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,A relação entre o valor do empréstimo e o empréstimo expressa a relação entre o valor do empréstimo e o valor do título oferecido. Um déficit de garantia de empréstimo será acionado se cair abaixo do valor especificado para qualquer empréstimo,
If this is not checked the loan by default will be considered as a Demand Loan,"Se esta opção não for marcada, o empréstimo, por padrão, será considerado um empréstimo à vista",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Esta conta é usada para registrar reembolsos de empréstimos do mutuário e também desembolsar empréstimos para o mutuário,
This account is capital account which is used to allocate capital for loan disbursal account ,Esta conta é a conta de capital que é usada para alocar capital para a conta de desembolso do empréstimo,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},A operação {0} não pertence à ordem de serviço {1},
Print UOM after Quantity,Imprimir UOM após a quantidade,
Set default {0} account for perpetual inventory for non stock items,Definir conta {0} padrão para estoque permanente para itens fora de estoque,
-Loan Security {0} added multiple times,Garantia de empréstimo {0} adicionada várias vezes,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Títulos de empréstimo com taxa de LTV diferente não podem ser garantidos por um empréstimo,
-Qty or Amount is mandatory for loan security!,Qty or Amount é obrigatório para garantia de empréstimo!,
-Only submittted unpledge requests can be approved,Somente solicitações de cancelamento de garantia enviadas podem ser aprovadas,
-Interest Amount or Principal Amount is mandatory,O valor dos juros ou o valor do principal são obrigatórios,
-Disbursed Amount cannot be greater than {0},O valor desembolsado não pode ser maior que {0},
-Row {0}: Loan Security {1} added multiple times,Linha {0}: Garantia de empréstimo {1} adicionada várias vezes,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Linha # {0}: o item filho não deve ser um pacote de produtos. Remova o item {1} e salve,
Credit limit reached for customer {0},Limite de crédito atingido para o cliente {0},
Could not auto create Customer due to the following missing mandatory field(s):,Não foi possível criar automaticamente o cliente devido aos seguintes campos obrigatórios ausentes:,
diff --git a/erpnext/translations/quc.csv b/erpnext/translations/quc.csv
index 4493d2d..a69d23b 100644
--- a/erpnext/translations/quc.csv
+++ b/erpnext/translations/quc.csv
@@ -1,13 +1,13 @@
-apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Riq jun ajilib’al jechataj chupam re le nima wuj teq xa sach che le uk’exik
-DocType: Company,Create Chart Of Accounts Based On,Kujak uwach etal pa ri
-DocType: Program Enrollment Fee,Program Enrollment Fee,Rajil re utz’ib’axik pale cholb’al chak
-DocType: Employee Transfer,New Company,K’ak’ chakulib’al
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Utz re uk’ayixik le q’atoj le copanawi le ka loq’ik
-DocType: Opportunity,Opportunity Type,Uwach ramajil
-DocType: Fee Schedule,Fee Schedule,Cholb’al chak utojik jujunal
-DocType: Cheque Print Template,Cheque Width,Nim uxach uk’exwach pwaq
-apps/erpnext/erpnext/hr/doctype/employee/employee.js,Please enter Preferred Contact Email,Taquqxa’n kematz’ib’m uj’el
-DocType: Item,Supplier Items,Q’ataj che uyaik
-,Stock Ageing,Najtir k’oji’k
-apps/erpnext/erpnext/education/doctype/student/student.py,Date of Birth cannot be greater than today.,Ler q’ij k’ojik kumaj taj che le q’ij re kamik
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py,Transactions can only be deleted by the creator of the Company,Le uk’exik xaqxu’ kakiw uk’exik le b’anowik le chakulib’al
+Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Riq jun ajilib’al jechataj chupam re le nima wuj teq xa sach che le uk’exik,
+Create Chart Of Accounts Based On,Kujak uwach etal pa ri,
+Program Enrollment Fee,Rajil re utz’ib’axik pale cholb’al chak,
+New Company,K’ak’ chakulib’al,
+Validate Selling Price for Item against Purchase Rate or Valuation Rate,Utz re uk’ayixik le q’atoj le copanawi le ka loq’ik,
+Opportunity Type,Uwach ramajil,
+Fee Schedule,Cholb’al chak utojik jujunal,
+Cheque Width,Nim uxach uk’exwach pwaq,
+Please enter Preferred Contact Email,Taquqxa’n kematz’ib’m uj’el,
+Supplier Items,Q’ataj che uyaik,
+Stock Ageing,Najtir k’oji’k,
+Date of Birth cannot be greater than today.,Ler q’ij k’ojik kumaj taj che le q’ij re kamik,
+Transactions can only be deleted by the creator of the Company,Le uk’exik xaqxu’ kakiw uk’exik le b’anowik le chakulib’al,
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 8f97d07..59ab80a 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Se aplică dacă compania este SpA, SApA sau SRL",
Applicable if the company is a limited liability company,Se aplică dacă compania este o societate cu răspundere limitată,
Applicable if the company is an Individual or a Proprietorship,Se aplică dacă compania este o persoană fizică sau o proprietate,
-Applicant,Solicitant,
-Applicant Type,Tipul solicitantului,
Application of Funds (Assets),Aplicarea fondurilor (active),
Application period cannot be across two allocation records,Perioada de aplicare nu poate fi cuprinsă între două înregistrări de alocare,
Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lista Acționarilor disponibili cu numere folio,
Loading Payment System,Încărcarea sistemului de plată,
Loan,Împrumut,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0},
-Loan Application,Cerere de împrumut,
-Loan Management,Managementul împrumuturilor,
-Loan Repayment,Rambursare a creditului,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Data de început a împrumutului și perioada de împrumut sunt obligatorii pentru a salva reducerea facturilor,
Loans (Liabilities),Imprumuturi (Raspunderi),
Loans and Advances (Assets),Împrumuturi și avansuri (active),
@@ -1611,7 +1605,6 @@
Monday,Luni,
Monthly,Lunar,
Monthly Distribution,Distributie lunar,
-Monthly Repayment Amount cannot be greater than Loan Amount,Rambursarea lunară Suma nu poate fi mai mare decât Suma creditului,
More,Mai mult,
More Information,Mai multe informatii,
More than one selection for {0} not allowed,Nu sunt permise mai multe selecții pentru {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Plătește {0} {1},
Payable,plătibil,
Payable Account,Contul furnizori,
-Payable Amount,Sumă plătibilă,
Payment,Plată,
Payment Cancelled. Please check your GoCardless Account for more details,Plata anulată. Verificați contul GoCardless pentru mai multe detalii,
Payment Confirmation,Confirmarea platii,
-Payment Date,Data de plată,
Payment Days,Zile de plată,
Payment Document,Documentul de plată,
Payment Due Date,Data scadentă de plată,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Va rugam sa introduceti Primirea achiziția,
Please enter Receipt Document,Vă rugăm să introduceți Document Primirea,
Please enter Reference date,Vă rugăm să introduceți data de referință,
-Please enter Repayment Periods,Vă rugăm să introduceți perioada de rambursare,
Please enter Reqd by Date,Introduceți Reqd după dată,
Please enter Woocommerce Server URL,Introduceți adresa URL a serverului Woocommerce,
Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Vă rugăm să introduceți centru de cost părinte,
Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0},
Please enter relieving date.,Vă rugăm să introduceți data alinarea.,
-Please enter repayment Amount,Vă rugăm să introduceți Suma de rambursare,
Please enter valid Financial Year Start and End Dates,Va rugam sa introduceti valabil financiare Anul începe și a termina Perioada,
Please enter valid email address,Introduceți adresa de e-mail validă,
Please enter {0} first,Va rugam sa introduceti {0} primul,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.,
Primary Address Details,Detalii despre adresa primară,
Primary Contact Details,Detalii de contact primare,
-Principal Amount,Sumă principală,
Print Format,Print Format,
Print IRS 1099 Forms,Tipărire formulare IRS 1099,
Print Report Card,Print Print Card,
@@ -2550,7 +2538,6 @@
Sample Collection,Colectie de mostre,
Sample quantity {0} cannot be more than received quantity {1},Cantitatea de probe {0} nu poate fi mai mare decât cantitatea primită {1},
Sanctioned,consacrat,
-Sanctioned Amount,Sancționate Suma,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.,
Sand,Nisip,
Saturday,Sâmbătă,
@@ -3293,7 +3280,6 @@
Week,Săptămână,
Weekdays,Zilele saptamanii,
Weekly,Săptămânal,
-"Weight is mentioned,\nPlease mention ""Weight UOM"" too",,
Welcome email sent,E-mailul de bun venit a fost trimis,
Welcome to ERPNext,Bine ati venit la ERPNext,
What do you need help with?,La ce ai nevoie de ajutor?,
@@ -3541,7 +3527,6 @@
{0} already has a Parent Procedure {1}.,{0} are deja o procedură părinte {1}.,
API,API-ul,
Annual,Anual,
-Approved,Aprobat,
Change,Schimbă,
Contact Email,Email Persoana de Contact,
Export Type,Tipul de export,
@@ -3571,7 +3556,6 @@
Account Value,Valoarea contului,
Account is mandatory to get payment entries,Contul este obligatoriu pentru a obține înregistrări de plată,
Account is not set for the dashboard chart {0},Contul nu este setat pentru graficul de bord {0},
-Account {0} does not belong to company {1},Contul {0} nu aparține companiei {1},
Account {0} does not exists in the dashboard chart {1},Contul {0} nu există în graficul de bord {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Cont: <b>{0}</b> este capital de lucru în desfășurare și nu poate fi actualizat de jurnalul de intrare,
Account: {0} is not permitted under Payment Entry,Cont: {0} nu este permis în baza intrării de plată,
@@ -3582,7 +3566,6 @@
Activity,Activitate,
Add / Manage Email Accounts.,Adăugați / gestionați conturi de e-mail.,
Add Child,Adăugă Copil,
-Add Loan Security,Adăugați securitatea împrumutului,
Add Multiple,Adăugați mai multe,
Add Participants,Adăugă Participanți,
Add to Featured Item,Adăugați la elementele prezentate,
@@ -3593,15 +3576,12 @@
Address Line 1,Adresă Linie 1,
Addresses,Adrese,
Admission End Date should be greater than Admission Start Date.,Data de încheiere a admisiei ar trebui să fie mai mare decât data de începere a admiterii.,
-Against Loan,Contra împrumutului,
-Against Loan:,Împrumut contra,
All,Toate,
All bank transactions have been created,Toate tranzacțiile bancare au fost create,
All the depreciations has been booked,Toate amortizările au fost înregistrate,
Allocation Expired!,Alocare expirată!,
Allow Resetting Service Level Agreement from Support Settings.,Permiteți resetarea acordului de nivel de serviciu din setările de asistență,
Amount of {0} is required for Loan closure,Suma de {0} este necesară pentru închiderea împrumutului,
-Amount paid cannot be zero,Suma plătită nu poate fi zero,
Applied Coupon Code,Codul cuponului aplicat,
Apply Coupon Code,Aplicați codul promoțional,
Appointment Booking,Rezervare rezervare,
@@ -3649,7 +3629,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Nu se poate calcula ora de sosire deoarece adresa șoferului lipsește.,
Cannot Optimize Route as Driver Address is Missing.,Nu se poate optimiza ruta deoarece adresa șoferului lipsește.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Nu se poate finaliza sarcina {0} ca sarcină dependentă {1} nu sunt completate / anulate.,
-Cannot create loan until application is approved,Nu se poate crea împrumut până la aprobarea cererii,
Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nu se poate depăși pentru articolul {0} din rândul {1} mai mult decât {2}. Pentru a permite supra-facturarea, vă rugăm să setați alocația în Setările conturilor",
"Capacity Planning Error, planned start time can not be same as end time","Eroare de planificare a capacității, ora de pornire planificată nu poate fi aceeași cu ora finală",
@@ -3812,20 +3791,9 @@
Less Than Amount,Mai puțin decât suma,
Liabilities,pasive,
Loading...,Se încarcă...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Suma împrumutului depășește valoarea maximă a împrumutului de {0} conform valorilor mobiliare propuse,
Loan Applications from customers and employees.,Aplicații de împrumut de la clienți și angajați.,
-Loan Disbursement,Decontarea împrumutului,
Loan Processes,Procese de împrumut,
-Loan Security,Securitatea împrumutului,
-Loan Security Pledge,Gaj de securitate pentru împrumuturi,
-Loan Security Pledge Created : {0},Creditul de securitate al împrumutului creat: {0},
-Loan Security Price,Prețul securității împrumutului,
-Loan Security Price overlapping with {0},Prețul securității împrumutului care se suprapune cu {0},
-Loan Security Unpledge,Unplingge de securitate a împrumutului,
-Loan Security Value,Valoarea securității împrumutului,
Loan Type for interest and penalty rates,Tip de împrumut pentru dobânzi și rate de penalizare,
-Loan amount cannot be greater than {0},Valoarea împrumutului nu poate fi mai mare de {0},
-Loan is mandatory,Împrumutul este obligatoriu,
Loans,Credite,
Loans provided to customers and employees.,Împrumuturi acordate clienților și angajaților.,
Location,Închiriere,
@@ -3894,7 +3862,6 @@
Pay,Plăti,
Payment Document Type,Tip de document de plată,
Payment Name,Numele de plată,
-Penalty Amount,Suma pedepsei,
Pending,În așteptarea,
Performance,Performanţă,
Period based On,Perioada bazată pe,
@@ -3916,10 +3883,8 @@
Please login as a Marketplace User to edit this item.,Vă rugăm să vă autentificați ca utilizator de piață pentru a edita acest articol.,
Please login as a Marketplace User to report this item.,Vă rugăm să vă autentificați ca utilizator de piață pentru a raporta acest articol.,
Please select <b>Template Type</b> to download template,Vă rugăm să selectați <b>Tip de șablon</b> pentru a descărca șablonul,
-Please select Applicant Type first,Vă rugăm să selectați mai întâi tipul de solicitant,
Please select Customer first,Vă rugăm să selectați Clientul mai întâi,
Please select Item Code first,Vă rugăm să selectați mai întâi Codul articolului,
-Please select Loan Type for company {0},Vă rugăm să selectați Tip de împrumut pentru companie {0},
Please select a Delivery Note,Vă rugăm să selectați o notă de livrare,
Please select a Sales Person for item: {0},Vă rugăm să selectați o persoană de vânzări pentru articol: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Selectați o altă metodă de plată. Stripe nu acceptă tranzacțiile în valută "{0}",
@@ -3935,8 +3900,6 @@
Please setup a default bank account for company {0},Vă rugăm să configurați un cont bancar implicit pentru companie {0},
Please specify,Vă rugăm să specificați,
Please specify a {0},Vă rugăm să specificați un {0},lead
-Pledge Status,Starea gajului,
-Pledge Time,Timp de gaj,
Printing,Tipărire,
Priority,Prioritate,
Priority has been changed to {0}.,Prioritatea a fost modificată la {0}.,
@@ -3944,7 +3907,6 @@
Processing XML Files,Procesarea fișierelor XML,
Profitability,Rentabilitatea,
Project,Proiect,
-Proposed Pledges are mandatory for secured Loans,Promisiunile propuse sunt obligatorii pentru împrumuturile garantate,
Provide the academic year and set the starting and ending date.,Furnizați anul universitar și stabiliți data de început și de încheiere.,
Public token is missing for this bank,Jurnalul public lipsește pentru această bancă,
Publish,Publica,
@@ -3960,7 +3922,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Încasarea de cumpărare nu are niciun articol pentru care este activat eșantionul de păstrare.,
Purchase Return,Înapoi cumpărare,
Qty of Finished Goods Item,Cantitatea articolului de produse finite,
-Qty or Amount is mandatroy for loan security,Cantitatea sau suma este mandatroy pentru securitatea împrumutului,
Quality Inspection required for Item {0} to submit,Inspecția de calitate necesară pentru trimiterea articolului {0},
Quantity to Manufacture,Cantitate de fabricare,
Quantity to Manufacture can not be zero for the operation {0},Cantitatea de fabricație nu poate fi zero pentru operațiune {0},
@@ -3981,8 +3942,6 @@
Relieving Date must be greater than or equal to Date of Joining,Data scutirii trebuie să fie mai mare sau egală cu data aderării,
Rename,Redenumire,
Rename Not Allowed,Redenumirea nu este permisă,
-Repayment Method is mandatory for term loans,Metoda de rambursare este obligatorie pentru împrumuturile la termen,
-Repayment Start Date is mandatory for term loans,Data de începere a rambursării este obligatorie pentru împrumuturile la termen,
Report Item,Raport articol,
Report this Item,Raportați acest articol,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Cantitate rezervată pentru subcontract: cantitate de materii prime pentru a face obiecte subcontractate.,
@@ -4015,8 +3974,6 @@
Row({0}): {1} is already discounted in {2},Rândul ({0}): {1} este deja actualizat în {2},
Rows Added in {0},Rânduri adăugate în {0},
Rows Removed in {0},Rândurile eliminate în {0},
-Sanctioned Amount limit crossed for {0} {1},Limita sumei sancționate depășită pentru {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Suma de împrumut sancționat există deja pentru {0} față de compania {1},
Save,Salvează,
Save Item,Salvare articol,
Saved Items,Articole salvate,
@@ -4135,7 +4092,6 @@
User {0} is disabled,Utilizatorul {0} este dezactivat,
Users and Permissions,Utilizatori și permisiuni,
Vacancies cannot be lower than the current openings,Posturile vacante nu pot fi mai mici decât deschiderile actuale,
-Valid From Time must be lesser than Valid Upto Time.,Valid From Time trebuie să fie mai mic decât Valid Upto Time.,
Valuation Rate required for Item {0} at row {1},Rata de evaluare necesară pentru articolul {0} la rândul {1},
Values Out Of Sync,Valori ieșite din sincronizare,
Vehicle Type is required if Mode of Transport is Road,Tip de vehicul este necesar dacă modul de transport este rutier,
@@ -4211,7 +4167,6 @@
Add to Cart,Adăugaţi în Coş,
Days Since Last Order,Zile de la ultima comandă,
In Stock,In stoc,
-Loan Amount is mandatory,Suma împrumutului este obligatorie,
Mode Of Payment,Modul de plată,
No students Found,Nu au fost găsiți studenți,
Not in Stock,Nu este în stoc,
@@ -4240,7 +4195,6 @@
Group by,Grupul De,
In stock,In stoc,
Item name,Denumire Articol,
-Loan amount is mandatory,Suma împrumutului este obligatorie,
Minimum Qty,Cantitatea minimă,
More details,Mai multe detalii,
Nature of Supplies,Natura aprovizionării,
@@ -4409,9 +4363,6 @@
Total Completed Qty,Cantitatea totală completată,
Qty to Manufacture,Cantitate pentru fabricare,
Repay From Salary can be selected only for term loans,Rambursarea din salariu poate fi selectată numai pentru împrumuturile pe termen,
-No valid Loan Security Price found for {0},Nu s-a găsit un preț valid de securitate a împrumutului pentru {0},
-Loan Account and Payment Account cannot be same,Contul de împrumut și Contul de plată nu pot fi aceleași,
-Loan Security Pledge can only be created for secured loans,Garanția de securitate a împrumutului poate fi creată numai pentru împrumuturile garantate,
Social Media Campaigns,Campanii de socializare,
From Date can not be greater than To Date,From Date nu poate fi mai mare decât To Date,
Please set a Customer linked to the Patient,Vă rugăm să setați un client legat de pacient,
@@ -5055,7 +5006,6 @@
UOM Conversion Factor,Factorul de conversie UOM,
Discount on Price List Rate (%),Reducere la Lista de preturi Rate (%),
Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta),
-Rate ,,
Rate (Company Currency),Rata de (Compania de valuta),
Amount (Company Currency),Sumă (monedă companie),
Is Free Item,Este articol gratuit,
@@ -6437,7 +6387,6 @@
HR User,Utilizator HR,
Appointment Letter,Scrisoare de programare,
Job Applicant,Solicitant loc de muncă,
-Applicant Name,Nume solicitant,
Appointment Date,Data de intalnire,
Appointment Letter Template,Model de scrisoare de numire,
Body,Corp,
@@ -7059,99 +7008,12 @@
Sync in Progress,Sincronizați în curs,
Hub Seller Name,Numele vânzătorului Hub,
Custom Data,Date personalizate,
-Member,Membru,
-Partially Disbursed,parţial Se eliberează,
-Loan Closure Requested,Solicitare de închidere a împrumutului,
Repay From Salary,Rambursa din salariu,
-Loan Details,Creditul Detalii,
-Loan Type,Tip credit,
-Loan Amount,Sumă împrumutată,
-Is Secured Loan,Este împrumut garantat,
-Rate of Interest (%) / Year,Rata dobânzii (%) / An,
-Disbursement Date,debursare,
-Disbursed Amount,Suma plătită,
-Is Term Loan,Este împrumut pe termen,
-Repayment Method,Metoda de rambursare,
-Repay Fixed Amount per Period,Rambursa Suma fixă pentru fiecare perioadă,
-Repay Over Number of Periods,Rambursa Peste Număr de Perioade,
-Repayment Period in Months,Rambursarea Perioada în luni,
-Monthly Repayment Amount,Suma de rambursare lunar,
-Repayment Start Date,Data de începere a rambursării,
-Loan Security Details,Detalii privind securitatea împrumutului,
-Maximum Loan Value,Valoarea maximă a împrumutului,
-Account Info,Informaţii cont,
-Loan Account,Contul împrumutului,
-Interest Income Account,Contul Interes Venit,
-Penalty Income Account,Cont de venituri din penalități,
-Repayment Schedule,rambursare Program,
-Total Payable Amount,Suma totală de plată,
-Total Principal Paid,Total plătit principal,
-Total Interest Payable,Dobânda totală de plată,
-Total Amount Paid,Suma totală plătită,
-Loan Manager,Managerul de împrumut,
-Loan Info,Creditul Info,
-Rate of Interest,Rata Dobânzii,
-Proposed Pledges,Promisiuni propuse,
-Maximum Loan Amount,Suma maximă a împrumutului,
-Repayment Info,Info rambursarea,
-Total Payable Interest,Dobânda totală de plată,
-Against Loan ,Împotriva împrumutului,
-Loan Interest Accrual,Dobândirea dobânzii împrumutului,
-Amounts,sume,
-Pending Principal Amount,Suma pendintei principale,
-Payable Principal Amount,Suma principală plătibilă,
-Paid Principal Amount,Suma principală plătită,
-Paid Interest Amount,Suma dobânzii plătite,
-Process Loan Interest Accrual,Procesul de dobândă de împrumut,
-Repayment Schedule Name,Numele programului de rambursare,
Regular Payment,Plată regulată,
Loan Closure,Închiderea împrumutului,
-Payment Details,Detalii de plata,
-Interest Payable,Dobândi de plătit,
-Amount Paid,Sumă plătită,
-Principal Amount Paid,Suma principală plătită,
-Repayment Details,Detalii de rambursare,
-Loan Repayment Detail,Detaliu rambursare împrumut,
-Loan Security Name,Numele securității împrumutului,
-Unit Of Measure,Unitate de măsură,
-Loan Security Code,Codul de securitate al împrumutului,
-Loan Security Type,Tip de securitate împrumut,
-Haircut %,Tunsori%,
-Loan Details,Detalii despre împrumut,
-Unpledged,Unpledged,
-Pledged,gajat,
-Partially Pledged,Parțial Gajat,
-Securities,Titluri de valoare,
-Total Security Value,Valoarea totală a securității,
-Loan Security Shortfall,Deficitul de securitate al împrumutului,
-Loan ,Împrumut,
-Shortfall Time,Timpul neajunsurilor,
-America/New_York,America / New_York,
-Shortfall Amount,Suma deficiențelor,
-Security Value ,Valoarea de securitate,
-Process Loan Security Shortfall,Deficitul de securitate a împrumutului de proces,
-Loan To Value Ratio,Raportul împrumut / valoare,
-Unpledge Time,Timp de neîncărcare,
-Loan Name,Nume de împrumut,
Rate of Interest (%) Yearly,Rata Dobânzii (%) Anual,
-Penalty Interest Rate (%) Per Day,Rata dobânzii de penalizare (%) pe zi,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Rata dobânzii pentru penalități este percepută zilnic pe valoarea dobânzii în curs de rambursare întârziată,
-Grace Period in Days,Perioada de har în zile,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Numărul de zile de la data scadenței până la care nu se va percepe penalitatea în cazul întârzierii rambursării împrumutului,
-Pledge,Angajament,
-Post Haircut Amount,Postează cantitatea de tuns,
-Process Type,Tipul procesului,
-Update Time,Timpul de actualizare,
-Proposed Pledge,Gajă propusă,
-Total Payment,Plată totală,
-Balance Loan Amount,Soldul Suma creditului,
-Is Accrued,Este acumulat,
Salary Slip Loan,Salariu Slip împrumut,
Loan Repayment Entry,Intrarea rambursării împrumutului,
-Sanctioned Loan Amount,Suma de împrumut sancționată,
-Sanctioned Amount Limit,Limita sumei sancționate,
-Unpledge,Unpledge,
-Haircut,Tunsoare,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generează orar,
Schedules,Orarele,
@@ -7479,15 +7341,15 @@
Project will be accessible on the website to these users,Proiectul va fi accesibil pe site-ul acestor utilizatori,
Copied From,Copiat de la,
Start and End Dates,Începere și de încheiere Date,
-Actual Time (in Hours),Ora reală (în ore),
+Actual Time in Hours (via Timesheet),Ora reală (în ore),
Costing and Billing,Calculație a cheltuielilor și veniturilor,
-Total Costing Amount (via Timesheets),Suma totală a costurilor (prin intermediul foilor de pontaj),
-Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont),
+Total Costing Amount (via Timesheet),Suma totală a costurilor (prin intermediul foilor de pontaj),
+Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin formularele de decont),
Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură),
Total Sales Amount (via Sales Order),Suma totală a vânzărilor (prin comandă de vânzări),
-Total Billable Amount (via Timesheets),Sumă totală facturată (prin intermediul foilor de pontaj),
-Total Billed Amount (via Sales Invoices),Suma facturată totală (prin facturi de vânzare),
-Total Consumed Material Cost (via Stock Entry),Costul total al materialelor consumate (prin intrarea în stoc),
+Total Billable Amount (via Timesheet),Sumă totală facturată (prin intermediul foilor de pontaj),
+Total Billed Amount (via Sales Invoice),Suma facturată totală (prin facturi de vânzare),
+Total Consumed Material Cost (via Stock Entry),Costul total al materialelor consumate (prin intrarea în stoc),
Gross Margin,Marja Brută,
Gross Margin %,Marja Bruta%,
Monitor Progress,Monitorizați progresul,
@@ -7521,9 +7383,9 @@
Dependencies,dependenţe,
Dependent Tasks,Sarcini dependente,
Depends on Tasks,Depinde de Sarcini,
-Actual Start Date (via Time Sheet),Data Efectiva de Început (prin Pontaj),
-Actual Time (in hours),Timpul efectiv (în ore),
-Actual End Date (via Time Sheet),Dată de Încheiere Efectivă (prin Pontaj),
+Actual Start Date (via Timesheet),Data Efectiva de Început (prin Pontaj),
+Actual Time in Hours (via Timesheet),Timpul efectiv (în ore),
+Actual End Date (via Timesheet),Dată de Încheiere Efectivă (prin Pontaj),
Total Costing Amount (via Time Sheet),Suma totală de calculație a costurilor (prin timp Sheet),
Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea),
Total Billing Amount (via Time Sheet),Suma totală de facturare (prin timp Sheet),
@@ -7887,7 +7749,6 @@
Update Series,Actualizare Series,
Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.,
Prefix,Prefix,
-Current Value,Valoare curenta,
This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții create cu acest prefix,
Update Series Number,Actualizare Serii Număr,
Quotation Lost Reason,Ofertă pierdut rațiunea,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome,
Lead Details,Detalii Pistă,
Lead Owner Efficiency,Lead Efficiency Owner,
-Loan Repayment and Closure,Rambursarea împrumutului și închiderea,
-Loan Security Status,Starea de securitate a împrumutului,
Lost Opportunity,Oportunitate pierdută,
Maintenance Schedules,Program de Mentenanta,
Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Număruri vizate: {0},
Payment Account is mandatory,Contul de plată este obligatoriu,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Dacă este bifat, suma totală va fi dedusă din venitul impozabil înainte de calcularea impozitului pe venit fără nicio declarație sau depunere de dovadă.",
-Disbursement Details,Detalii despre debursare,
Material Request Warehouse,Depozit cerere material,
Select warehouse for material requests,Selectați depozitul pentru solicitări de materiale,
Transfer Materials For Warehouse {0},Transfer de materiale pentru depozit {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Rambursați suma nepreluată din salariu,
Deduction from salary,Deducerea din salariu,
Expired Leaves,Frunze expirate,
-Reference No,Nr. De referință,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Procentul de tunsoare este diferența procentuală dintre valoarea de piață a titlului de împrumut și valoarea atribuită respectivului titlu de împrumut atunci când este utilizat ca garanție pentru împrumutul respectiv.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Raportul împrumut la valoare exprimă raportul dintre suma împrumutului și valoarea garanției gajate. O deficiență a garanției împrumutului va fi declanșată dacă aceasta scade sub valoarea specificată pentru orice împrumut,
If this is not checked the loan by default will be considered as a Demand Loan,"Dacă acest lucru nu este verificat, împrumutul implicit va fi considerat un împrumut la cerere",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Acest cont este utilizat pentru rezervarea rambursărilor de împrumut de la împrumutat și, de asemenea, pentru a plăti împrumuturi către împrumutat",
This account is capital account which is used to allocate capital for loan disbursal account ,Acest cont este un cont de capital care este utilizat pentru alocarea de capital pentru contul de debursare a împrumutului,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operația {0} nu aparține comenzii de lucru {1},
Print UOM after Quantity,Imprimați UOM după Cantitate,
Set default {0} account for perpetual inventory for non stock items,Setați contul {0} implicit pentru inventarul perpetuu pentru articolele care nu sunt în stoc,
-Loan Security {0} added multiple times,Securitatea împrumutului {0} adăugată de mai multe ori,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Titlurile de împrumut cu un raport LTV diferit nu pot fi gajate împotriva unui singur împrumut,
-Qty or Amount is mandatory for loan security!,Cantitatea sau suma este obligatorie pentru securitatea împrumutului!,
-Only submittted unpledge requests can be approved,Numai cererile unpledge trimise pot fi aprobate,
-Interest Amount or Principal Amount is mandatory,Suma dobânzii sau suma principală este obligatorie,
-Disbursed Amount cannot be greater than {0},Suma plătită nu poate fi mai mare de {0},
-Row {0}: Loan Security {1} added multiple times,Rândul {0}: Securitatea împrumutului {1} adăugat de mai multe ori,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rândul # {0}: articolul secundar nu trebuie să fie un pachet de produse. Eliminați articolul {1} și Salvați,
Credit limit reached for customer {0},Limita de credit atinsă pentru clientul {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nu s-a putut crea automat Clientul din cauza următoarelor câmpuri obligatorii lipsă:,
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 1fc37dd..6bb3633 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -12,7 +12,7 @@
'To Date' is required,Поле 'До Даты' является обязательным для заполнения,
'Total','Итого',
'Update Stock' can not be checked because items are not delivered via {0},"Нельзя выбрать 'Обновить запасы', так как продукты не поставляются через {0}",
-'Update Stock' cannot be checked for fixed asset sale,"'Обновить запасы' нельзя выбрать при продаже основных средств",
+'Update Stock' cannot be checked for fixed asset sale,'Обновить запасы' нельзя выбрать при продаже основных средств,
) for {0},) для {0},
1 exact match.,1 точное совпадение.,
90-Above,90-Над,
@@ -208,7 +208,7 @@
Amount of Integrated Tax,Сумма Интегрированного Налога,
Amount of TDS Deducted,Количество вычитаемых TDS,
Amount should not be less than zero.,Сумма не должна быть меньше нуля.,
-Amount to Bill,"Сумма к оплате",
+Amount to Bill,Сумма к оплате,
Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3},
Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2},
Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3},
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Применимо, если компания SpA, SApA или SRL",
Applicable if the company is a limited liability company,"Применимо, если компания является обществом с ограниченной ответственностью",
Applicable if the company is an Individual or a Proprietorship,"Применимо, если компания является частным лицом или собственником",
-Applicant,Заявитель,
-Applicant Type,Тип заявителя,
Application of Funds (Assets),Применение средств (активов),
Application period cannot be across two allocation records,Период применения не может быть через две записи распределения,
Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск,
@@ -927,7 +925,7 @@
Employee Referral,Перечень сотрудников,
Employee Transfer cannot be submitted before Transfer Date ,Передача сотрудника не может быть отправлена до даты передачи,
Employee cannot report to himself.,Сотрудник не может сообщить самому себе.,
-Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как 'Покинул'",
+Employee relieved on {0} must be set as 'Left',Сотрудник освобожден от {0} должен быть установлен как 'Покинул',
Employee {0} already submited an apllication {1} for the payroll period {2},Сотрудник {0} уже отправил заявку {1} для периода расчета {2},
Employee {0} has already applied for {1} between {2} and {3} : ,Сотрудник {0} уже подал заявку на {1} между {2} и {3}:,
Employee {0} has no maximum benefit amount,Сотрудник {0} не имеет максимальной суммы пособия,
@@ -984,7 +982,7 @@
Expected Hrs,Ожидаемая длительность,
Expected Start Date,Ожидаемая дата начала,
Expense,Расходы,
-Expense / Difference account ({0}) must be a 'Profit or Loss' account,Счет расходов / разницы ({0}) должен быть счетом "Прибыль или убыток",
+Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Счет расходов / разницы ({0}) должен быть счетом ""Прибыль или убыток""",
Expense Account,Расходов счета,
Expense Claim,Заявка на возмещение,
Expense Claim for Vehicle Log {0},Авансовый Отчет для для журнала автомобиля {0},
@@ -1469,10 +1467,6 @@
List of available Shareholders with folio numbers,Список доступных акционеров с номерами фолио,
Loading Payment System,Загрузка платежной системы,
Loan,Ссуда,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0},
-Loan Application,Заявка на получение ссуды,
-Loan Management,Управление кредитами,
-Loan Repayment,погашение займа,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Дата начала и срок кредита являются обязательными для сохранения дисконтирования счета,
Loans (Liabilities),Кредиты (обязательства),
Loans and Advances (Assets),Кредиты и авансы (активы),
@@ -1609,7 +1603,6 @@
Monday,Понедельник,
Monthly,Ежемесячно,
Monthly Distribution,Ежемесячно дистрибуция,
-Monthly Repayment Amount cannot be greater than Loan Amount,"Ежемесячное погашение Сумма не может быть больше, чем сумма займа",
More,Далее,
More Information,Больше информации,
More than one selection for {0} not allowed,Не допускается более одного выбора для {0},
@@ -1882,11 +1875,9 @@
Pay {0} {1},Оплатить {0} {1},
Payable,К оплате,
Payable Account,Счёт оплаты,
-Payable Amount,Сумма к оплате,
Payment,Оплата,
Payment Cancelled. Please check your GoCardless Account for more details,"Оплата отменена. Пожалуйста, проверьте свою учетную запись GoCardless для получения более подробной информации.",
Payment Confirmation,Подтверждение об оплате,
-Payment Date,Дата оплаты,
Payment Days,Платежные дни,
Payment Document,Платежный документ,
Payment Due Date,Дата платежа,
@@ -1980,7 +1971,6 @@
Please enter Purchase Receipt first,"Пожалуйста, введите ТОВАРНЫЙ ЧЕК первый",
Please enter Receipt Document,"Пожалуйста, введите Квитанция документ",
Please enter Reference date,"Пожалуйста, введите дату Ссылка",
-Please enter Repayment Periods,"Пожалуйста, введите сроки погашения",
Please enter Reqd by Date,"Пожалуйста, введите Reqd by Date",
Please enter Woocommerce Server URL,Введите URL-адрес сервера Woocommerce,
Please enter Write Off Account,"Пожалуйста, введите списать счет",
@@ -1992,7 +1982,6 @@
Please enter parent cost center,"Пожалуйста, введите МВЗ родительский",
Please enter quantity for Item {0},"Пожалуйста, введите количество продукта {0}",
Please enter relieving date.,"Пожалуйста, введите даты снятия.",
-Please enter repayment Amount,"Пожалуйста, введите Сумма погашения",
Please enter valid Financial Year Start and End Dates,"Пожалуйста, введите действительный финансовый год даты начала и окончания",
Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты",
Please enter {0} first,"Пожалуйста, введите {0} в первую очередь",
@@ -2158,7 +2147,6 @@
Pricing Rules are further filtered based on quantity.,Правила ценообразования далее фильтруются в зависимости от количества.,
Primary Address Details,Основная информация о адресе,
Primary Contact Details,Основные контактные данные,
-Principal Amount,Основная сумма,
Print Format,Формат печати,
Print IRS 1099 Forms,Печать IRS 1099 форм,
Print Report Card,Распечатать отчет,
@@ -2505,7 +2493,7 @@
Salary Slip ID,Зарплата скольжения ID,
Salary Slip of employee {0} already created for this period,Зарплата Скольжение работника {0} уже создано за этот период,
Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1},
-Salary Slip submitted for period from {0} to {1},"Зарплатная ведомость отправлена за период с {0} по {1}",
+Salary Slip submitted for period from {0} to {1},Зарплатная ведомость отправлена за период с {0} по {1},
Salary Structure Assignment for Employee already exists,Присвоение структуры зарплаты сотруднику уже существует,
Salary Structure Missing,Структура заработной платы отсутствует,
Salary Structure must be submitted before submission of Tax Ememption Declaration,Структура заработной платы должна быть представлена до подачи декларации об освобождении от налогов,
@@ -2548,7 +2536,6 @@
Sample Collection,Сбор образцов,
Sample quantity {0} cannot be more than received quantity {1},"Количество образцов {0} не может быть больше, чем полученное количество {1}",
Sanctioned,санкционированные,
-Sanctioned Amount,Санкционированный Количество,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}.",
Sand,песок,
Saturday,Суббота,
@@ -2672,11 +2659,11 @@
Set Project and all Tasks to status {0}?,Установить проект и все задачи в статус {0}?,
Set Status,Установить статус,
Set Tax Rule for shopping cart,Установить налоговое правило для корзины,
-Set as Closed,Установить как "Закрыт",
-Set as Completed,Установить как "Завершен",
-Set as Default,Установить "По умолчанию",
-Set as Lost,Установить как "Потерянный",
-Set as Open,Установить как "Открытый",
+Set as Closed,"Установить как ""Закрыт""",
+Set as Completed,"Установить как ""Завершен""",
+Set as Default,"Установить ""По умолчанию""",
+Set as Lost,"Установить как ""Потерянный""",
+Set as Open,"Установить как ""Открытый""",
Set default inventory account for perpetual inventory,Установить учетную запись по умолчанию для вечной инвентаризации,
Set this if the customer is a Public Administration company.,"Установите это, если клиент является компанией государственного управления.",
Set {0} in asset category {1} or company {2},Установите {0} в категории активов {1} или компании {2},
@@ -3032,7 +3019,7 @@
To Date cannot be before From Date,На сегодняшний день не может быть раньше от даты,
To Date cannot be less than From Date,"Дата не может быть меньше, чем с даты",
To Date must be greater than From Date,"До даты должно быть больше, чем с даты",
-"To Date should be within the Fiscal Year. Assuming To Date = {0}","Дата должна быть в пределах финансового года. Предположим, до даты = {0}",
+To Date should be within the Fiscal Year. Assuming To Date = {0},"Дата должна быть в пределах финансового года. Предположим, до даты = {0}",
To Datetime,Ко времени,
To Deliver,Для доставки,
To Deliver and Bill,Для доставки и оплаты,
@@ -3333,7 +3320,7 @@
You can't redeem Loyalty Points having more value than the Grand Total.,"Вы не можете использовать баллы лояльности, имеющие большую ценность, чем общая стоимость.",
You cannot credit and debit same account at the same time,Нельзя кредитовать и дебетовать один счёт за один раз,
You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Нельзя удалить {0} финансовый год. Финансовый год {0} установлен основным в глобальных параметрах,
-You cannot delete Project Type 'External',Вы не можете удалить проект типа "Внешний",
+You cannot delete Project Type 'External',"Вы не можете удалить проект типа ""Внешний""",
You cannot edit root node.,Вы не можете редактировать корневой узел.,
You cannot restart a Subscription that is not cancelled.,"Вы не можете перезапустить подписку, которая не отменена.",
You don't have enought Loyalty Points to redeem,У вас недостаточно очков лояльности для выкупа,
@@ -3539,7 +3526,6 @@
{0} already has a Parent Procedure {1}.,{0} уже имеет родительскую процедуру {1}.,
API,API,
Annual,За год,
-Approved,Утверждено,
Change,Изменение,
Contact Email,Эл.почта для связи,
Export Type,Тип экспорта,
@@ -3560,7 +3546,7 @@
Video,Видео,
Webhook Secret,Webhook Secret,
% Of Grand Total,% От общего итога,
-'employee_field_value' and 'timestamp' are required.,"employee_field_value" и "timestamp" являются обязательными.,
+'employee_field_value' and 'timestamp' are required.,"employee_field_value и ""timestamp"" являются обязательными.",
<b>Company</b> is a mandatory filter.,<b>Компания</b> является обязательным фильтром.,
<b>From Date</b> is a mandatory filter.,<b>С даты</b> является обязательным фильтром.,
<b>From Time</b> cannot be later than <b>To Time</b> for {0},"<b>Начально время</b> не может быть позже, чем <b>конечное время</b> для {0}",
@@ -3569,7 +3555,6 @@
Account Value,Стоимость счета,
Account is mandatory to get payment entries,Счет обязателен для получения платежных записей,
Account is not set for the dashboard chart {0},Счет не настроен для диаграммы панели мониторинга {0},
-Account {0} does not belong to company {1},Счет {0} не принадлежит компании {1},
Account {0} does not exists in the dashboard chart {1},Счет {0} не существует в диаграмме панели {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Счет: <b>{0}</b> является незавершенным и не может быть обновлен в журнале,
Account: {0} is not permitted under Payment Entry,Счет: {0} не разрешен при вводе платежа,
@@ -3580,7 +3565,6 @@
Activity,Активность,
Add / Manage Email Accounts.,Добавление / Управление учетными записями электронной почты,
Add Child,Добавить потомка,
-Add Loan Security,Добавить обеспечение по кредиту,
Add Multiple,Добавить несколько,
Add Participants,Добавить участников,
Add to Featured Item,Добавить в избранное,
@@ -3591,15 +3575,12 @@
Address Line 1,Адрес (1-я строка),
Addresses,Адреса,
Admission End Date should be greater than Admission Start Date.,Дата окончания приема должна быть больше даты начала приема.,
-Against Loan,Против займа,
-Against Loan:,Против займа:,
All,Все,
All bank transactions have been created,Все банковские операции созданы,
All the depreciations has been booked,Все амортизации были забронированы,
Allocation Expired!,Распределение истекло!,
Allow Resetting Service Level Agreement from Support Settings.,Разрешить сброс соглашения об уровне обслуживания из настроек поддержки.,
Amount of {0} is required for Loan closure,Для закрытия ссуды требуется сумма {0},
-Amount paid cannot be zero,Оплаченная сумма не может быть нулевой,
Applied Coupon Code,Прикладной код купона,
Apply Coupon Code,Применить код купона,
Appointment Booking,Назначение Бронирование,
@@ -3647,7 +3628,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Невозможно рассчитать время прибытия, так как отсутствует адрес водителя.",
Cannot Optimize Route as Driver Address is Missing.,"Не удается оптимизировать маршрут, так как отсутствует адрес водителя.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Невозможно выполнить задачу {0}, поскольку ее зависимая задача {1} не завершена / не отменена.",
-Cannot create loan until application is approved,"Невозможно создать кредит, пока заявка не будет утверждена",
Cannot find a matching Item. Please select some other value for {0}.,"Нет столько продуктов. Пожалуйста, выберите другое количество для {0}.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Невозможно переплатить за элемент {0} в строке {1} более чем {2}. Чтобы разрешить перерасчет, пожалуйста, установите скидку в настройках аккаунта",
"Capacity Planning Error, planned start time can not be same as end time","Ошибка планирования емкости, запланированное время начала не может совпадать со временем окончания",
@@ -3810,20 +3790,9 @@
Less Than Amount,Меньше чем сумма,
Liabilities,Обязательства,
Loading...,Загрузка...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Сумма кредита превышает максимальную сумму кредита {0} в соответствии с предлагаемыми ценными бумагами,
Loan Applications from customers and employees.,Кредитные заявки от клиентов и сотрудников.,
-Loan Disbursement,Выдача кредита,
Loan Processes,Кредитные процессы,
-Loan Security,Кредитная безопасность,
-Loan Security Pledge,Залог безопасности займа,
-Loan Security Pledge Created : {0},Создано залоговое обеспечение займа: {0},
-Loan Security Price,Цена займа,
-Loan Security Price overlapping with {0},Цена залогового кредита перекрывается с {0},
-Loan Security Unpledge,Залог по кредиту,
-Loan Security Value,Ценность займа,
Loan Type for interest and penalty rates,Тип кредита для процентов и пеней,
-Loan amount cannot be greater than {0},Сумма кредита не может превышать {0},
-Loan is mandatory,Кредит обязателен,
Loans,Кредиты,
Loans provided to customers and employees.,"Кредиты, предоставленные клиентам и сотрудникам.",
Location,Местоположение,
@@ -3896,7 +3865,6 @@
Pay,Оплатить,
Payment Document Type,Тип платежного документа,
Payment Name,Название платежа,
-Penalty Amount,Сумма штрафа,
Pending,В ожидании,
Performance,Производительность,
Period based On,Период на основе,
@@ -3918,10 +3886,8 @@
Please login as a Marketplace User to edit this item.,"Пожалуйста, войдите как пользователь Marketplace, чтобы редактировать этот элемент.",
Please login as a Marketplace User to report this item.,"Пожалуйста, войдите как пользователь Marketplace, чтобы сообщить об этом товаре.",
Please select <b>Template Type</b> to download template,"Пожалуйста, выберите <b>Тип шаблона,</b> чтобы скачать шаблон",
-Please select Applicant Type first,"Пожалуйста, сначала выберите Тип заявителя",
Please select Customer first,"Пожалуйста, сначала выберите клиента",
Please select Item Code first,"Пожалуйста, сначала выберите код продукта",
-Please select Loan Type for company {0},"Пожалуйста, выберите тип кредита для компании {0}",
Please select a Delivery Note,"Пожалуйста, выберите накладную",
Please select a Sales Person for item: {0},"Пожалуйста, выберите продавца для позиции: {0}",
Please select another payment method. Stripe does not support transactions in currency '{0}',Выберите другой способ оплаты. Полоса не поддерживает транзакции в валюте '{0}',
@@ -3937,8 +3903,6 @@
Please setup a default bank account for company {0},"Пожалуйста, настройте банковский счет по умолчанию для компании {0}",
Please specify,"Пожалуйста, сформулируйте",
Please specify a {0},"Пожалуйста, укажите {0}",lead
-Pledge Status,Статус залога,
-Pledge Time,Время залога,
Printing,Печать,
Priority,Приоритет,
Priority has been changed to {0}.,Приоритет был изменен на {0}.,
@@ -3946,7 +3910,6 @@
Processing XML Files,Обработка файлов XML,
Profitability,Рентабельность,
Project,Проект,
-Proposed Pledges are mandatory for secured Loans,Предлагаемые залоги являются обязательными для обеспеченных займов,
Provide the academic year and set the starting and ending date.,Укажите учебный год и установите дату начала и окончания.,
Public token is missing for this bank,Публичный токен отсутствует для этого банка,
Publish,Публиковать,
@@ -3962,7 +3925,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"В квитанции о покупке нет ни одного предмета, для которого включена функция сохранения образца.",
Purchase Return,Возврат покупки,
Qty of Finished Goods Item,Кол-во готовых товаров,
-Qty or Amount is mandatroy for loan security,Кол-во или сумма является мандатрой для обеспечения кредита,
Quality Inspection required for Item {0} to submit,Инспекция по качеству требуется для отправки элемента {0},
Quantity to Manufacture,Количество для производства,
Quantity to Manufacture can not be zero for the operation {0},Количество для производства не может быть нулевым для операции {0},
@@ -3983,8 +3945,6 @@
Relieving Date must be greater than or equal to Date of Joining,Дата освобождения должна быть больше или равна дате присоединения,
Rename,Переименовать,
Rename Not Allowed,Переименовывать запрещено,
-Repayment Method is mandatory for term loans,Метод погашения обязателен для срочных кредитов,
-Repayment Start Date is mandatory for term loans,Дата начала погашения обязательна для срочных кредитов,
Report Item,Элемент отчета,
Report this Item,Сообщить об этом товаре,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Зарезервированное кол-во для субконтракта: количество сырья для изготовления субподрядов.,
@@ -4017,8 +3977,6 @@
Row({0}): {1} is already discounted in {2},Строка({0}): {1} уже дисконтирован в {2},
Rows Added in {0},Строки добавлены в {0},
Rows Removed in {0},Строки удалены в {0},
-Sanctioned Amount limit crossed for {0} {1},Предел санкционированной суммы для {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Сумма санкционированного кредита уже существует для {0} против компании {1},
Save,Сохранить,
Save Item,Сохранить элемент,
Saved Items,Сохраненные предметы,
@@ -4137,7 +4095,6 @@
User {0} is disabled,Пользователь {0} отключен,
Users and Permissions,Пользователи и Права,
Vacancies cannot be lower than the current openings,Вакансии не могут быть ниже текущих вакансий,
-Valid From Time must be lesser than Valid Upto Time.,"Действителен со времени должен быть меньше, чем действительный до времени.",
Valuation Rate required for Item {0} at row {1},Коэффициент оценки требуется для позиции {0} в строке {1},
Values Out Of Sync,Значения не синхронизированы,
Vehicle Type is required if Mode of Transport is Road,"Тип транспортного средства требуется, если вид транспорта - дорога",
@@ -4213,7 +4170,6 @@
Add to Cart,добавить в корзину,
Days Since Last Order,Дней с последнего заказа,
In Stock,В наличии,
-Loan Amount is mandatory,Сумма кредита обязательна,
Mode Of Payment,Способ оплаты,
No students Found,Студенты не найдены,
Not in Stock,Нет в наличии,
@@ -4242,7 +4198,6 @@
Group by,Группировать по,
In stock,В наличии,
Item name,Название продукта,
-Loan amount is mandatory,Сумма кредита обязательна,
Minimum Qty,Минимальное количество,
More details,Больше параметров,
Nature of Supplies,Характер поставок,
@@ -4411,9 +4366,6 @@
Total Completed Qty,Всего завершено кол-во,
Qty to Manufacture,Кол-во для производства,
Repay From Salary can be selected only for term loans,Погашение из зарплаты можно выбрать только для срочных кредитов,
-No valid Loan Security Price found for {0},Не найдена действительная цена обеспечения кредита для {0},
-Loan Account and Payment Account cannot be same,Ссудный счет и платежный счет не могут совпадать,
-Loan Security Pledge can only be created for secured loans,Залог обеспечения кредита может быть создан только для обеспеченных кредитов,
Social Media Campaigns,Кампании в социальных сетях,
From Date can not be greater than To Date,From Date не может быть больше чем To Date,
Please set a Customer linked to the Patient,"Укажите клиента, связанного с пациентом.",
@@ -6389,7 +6341,6 @@
HR User,Сотрудник отдела кадров,
Appointment Letter,Назначение письмо,
Job Applicant,Соискатель работы,
-Applicant Name,Имя заявителя,
Appointment Date,Назначенная дата,
Appointment Letter Template,Шаблон письма о назначении,
Body,Содержимое,
@@ -6863,7 +6814,7 @@
Working Hours Threshold for Half Day,Порог рабочего времени на полдня,
Working hours below which Half Day is marked. (Zero to disable),"Рабочее время, ниже которого отмечается полдня. (Ноль отключить)",
Working Hours Threshold for Absent,Порог рабочего времени для отсутствующих,
-"Working hours below which Absent is marked. (Zero to disable)","Порог рабочего времени, ниже которого устанавливается отметка «Отсутствует». (Ноль для отключения)",
+Working hours below which Absent is marked. (Zero to disable),"Порог рабочего времени, ниже которого устанавливается отметка «Отсутствует». (Ноль для отключения)",
Process Attendance After,Посещаемость процесса после,
Attendance will be marked automatically only after this date.,Посещаемость будет отмечена автоматически только после этой даты.,
Last Sync of Checkin,Последняя синхронизация регистрации,
@@ -7006,99 +6957,12 @@
Sync in Progress,Выполняется синхронизация,
Hub Seller Name,Имя продавца-концентратора,
Custom Data,Пользовательские данные,
-Member,член,
-Partially Disbursed,Частично Освоено,
-Loan Closure Requested,Требуется закрытие кредита,
Repay From Salary,Погашать из заработной платы,
-Loan Details,Кредит Подробнее,
-Loan Type,Тип кредита,
-Loan Amount,Сумма кредита,
-Is Secured Loan,Обеспеченный кредит,
-Rate of Interest (%) / Year,Процентная ставка (%) / год,
-Disbursement Date,Расходование Дата,
-Disbursed Amount,Выплаченная сумма,
-Is Term Loan,Срок кредита,
-Repayment Method,Способ погашения,
-Repay Fixed Amount per Period,Погашать фиксированную сумму за период,
-Repay Over Number of Periods,Погашать Over Количество периодов,
-Repayment Period in Months,Период погашения в месяцах,
-Monthly Repayment Amount,Ежемесячная сумма погашения,
-Repayment Start Date,Дата начала погашения,
-Loan Security Details,Детали безопасности ссуды,
-Maximum Loan Value,Максимальная стоимость кредита,
-Account Info,Информация об аккаунте,
-Loan Account,Ссудная ссуда,
-Interest Income Account,Счет Процентные доходы,
-Penalty Income Account,Счет пенальти,
-Repayment Schedule,График погашения,
-Total Payable Amount,Общая сумма оплачивается,
-Total Principal Paid,Всего основной оплачено,
-Total Interest Payable,Общий процент кредиторов,
-Total Amount Paid,Общая сумма,
-Loan Manager,Кредитный менеджер,
-Loan Info,Заем информация,
-Rate of Interest,Процентная ставка,
-Proposed Pledges,Предлагаемые обязательства,
-Maximum Loan Amount,Максимальная сумма кредита,
-Repayment Info,Погашение информация,
-Total Payable Interest,Общая задолженность по процентам,
-Against Loan ,Против ссуды,
-Loan Interest Accrual,Начисление процентов по кредитам,
-Amounts,Суммы,
-Pending Principal Amount,Ожидающая основная сумма,
-Payable Principal Amount,Основная сумма к оплате,
-Paid Principal Amount,Выплаченная основная сумма,
-Paid Interest Amount,Выплаченная сумма процентов,
-Process Loan Interest Accrual,Процесс начисления процентов по кредитам,
-Repayment Schedule Name,Название графика погашения,
Regular Payment,Регулярный платеж,
Loan Closure,Закрытие кредита,
-Payment Details,Детали оплаты,
-Interest Payable,Проценты к выплате,
-Amount Paid,Выплачиваемая сумма,
-Principal Amount Paid,Выплаченная основная сумма,
-Repayment Details,Детали погашения,
-Loan Repayment Detail,Детали погашения кредита,
-Loan Security Name,Название обеспечительного займа,
-Unit Of Measure,Единица измерения,
-Loan Security Code,Кредитный код безопасности,
-Loan Security Type,Тип безопасности ссуды,
-Haircut %,Стрижка волос %,
-Loan Details,Детали займа,
-Unpledged,необещанный,
-Pledged,Заложенные,
-Partially Pledged,Частично объявлено,
-Securities,ценные бумаги,
-Total Security Value,Общая ценность безопасности,
-Loan Security Shortfall,Недостаток кредита,
-Loan ,ссуда,
-Shortfall Time,Время нехватки,
-America/New_York,Америка / Триатлон,
-Shortfall Amount,Сумма дефицита,
-Security Value ,Значение безопасности ,
-Process Loan Security Shortfall,Недостаток безопасности процесса займа,
-Loan To Value Ratio,Соотношение займа к стоимости,
-Unpledge Time,Время невыплаты,
-Loan Name,Название кредита,
Rate of Interest (%) Yearly,Процентная ставка (%) Годовой,
-Penalty Interest Rate (%) Per Day,Процентная ставка штрафа (%) в день,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Штрафная процентная ставка взимается на сумму отложенного процента на ежедневной основе в случае задержки выплаты,
-Grace Period in Days,Льготный период в днях,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Кол-во дней с даты платежа, до которого не будет взиматься штраф в случае просрочки возврата кредита",
-Pledge,Залог,
-Post Haircut Amount,Сумма после стрижки,
-Process Type,Тип процесса,
-Update Time,Время обновления,
-Proposed Pledge,Предлагаемый залог,
-Total Payment,Всего к оплате,
-Balance Loan Amount,Баланс Сумма кредита,
-Is Accrued,Начислено,
Salary Slip Loan,Ссуда на зарплату,
Loan Repayment Entry,Запись о погашении кредита,
-Sanctioned Loan Amount,Санкционированная сумма кредита,
-Sanctioned Amount Limit,Утвержденный лимит суммы,
-Unpledge,Отменить залог,
-Haircut,Стрижка волос,
Generate Schedule,Создать расписание,
Schedules,Расписание,
Maintenance Schedule Detail,График технического обслуживания Подробно,
@@ -7288,9 +7152,9 @@
Actual Time and Cost,Фактическое время и стоимость,
Actual Start Time,Фактическое время начала,
Actual End Time,Фактическое время окончания,
-Updated via 'Time Log',"Обновлено через 'Журнал времени'",
+Updated via 'Time Log',Обновлено через 'Журнал времени',
Actual Operation Time,Фактическая время работы,
-in Minutes\nUpdated via 'Time Log',"в минутах \n Обновлено через 'Журнал времени'",
+in Minutes\nUpdated via 'Time Log',в минутах \n Обновлено через 'Журнал времени',
(Hour Rate / 60) * Actual Operation Time,(часовая ставка ÷ 60) × фактическое время работы,
Workstation Name,Название рабочего места,
Production Capacity,Производственная мощность,
@@ -7372,7 +7236,7 @@
Company Tagline for website homepage,Слоган компании на главной странице сайта,
Company Description for website homepage,Описание компании на главной странице сайта,
Homepage Slideshow,Слайдшоу на домашней странице,
-"URL for ""All Products""",URL для ""Все продукты""",
+"URL for ""All Products""","URL для """"Все продукты""""""",
Products to be shown on website homepage,Продукты будут показаны на главной странице сайта,
Homepage Featured Product,Рекомендуемые продукты на главной страницу,
route,маршрут,
@@ -7417,15 +7281,15 @@
Project will be accessible on the website to these users,Проект будет доступен на веб-сайте для этих пользователей,
Copied From,Скопировано из,
Start and End Dates,Даты начала и окончания,
-Actual Time (in Hours),Фактическое время (в часах),
+Actual Time in Hours (via Timesheet),Фактическое время (в часах),
Costing and Billing,Стоимость и платежи,
-Total Costing Amount (via Timesheets),Общая стоимость (по табелю учета рабочего времени),
-Total Expense Claim (via Expense Claims),Итоговая сумма аванса (через возмещение расходов),
+Total Costing Amount (via Timesheet),Общая стоимость (по табелю учета рабочего времени),
+Total Expense Claim (via Expense Claim),Итоговая сумма аванса (через возмещение расходов),
Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (по счетам закупок),
Total Sales Amount (via Sales Order),Общая сумма продажи (по сделке),
-Total Billable Amount (via Timesheets),Общая сумма платежа (по табелю учета рабочего времени),
-Total Billed Amount (via Sales Invoices),Общая сумма выставленных счетов (по счетам продаж),
-Total Consumed Material Cost (via Stock Entry),Общая потребляемая материальная стоимость (через записи на складе),
+Total Billable Amount (via Timesheet),Общая сумма платежа (по табелю учета рабочего времени),
+Total Billed Amount (via Sales Invoice),Общая сумма выставленных счетов (по счетам продаж),
+Total Consumed Material Cost (via Stock Entry),Общая потребляемая материальная стоимость (через записи на складе),
Gross Margin,Валовая прибыль,
Gross Margin %,Валовая маржа %,
Monitor Progress,Мониторинг готовности,
@@ -7459,12 +7323,10 @@
Dependencies,Зависимости,
Dependent Tasks,Зависит от задач,
Depends on Tasks,Зависит от задач,
-Actual Start Date (via Time Sheet),Фактическая дата начала (по табелю учета рабочего времени),
-Actual Time (in hours),Фактическое время (в часах),
-Actual End Date (via Time Sheet),Фактическая дата окончания (по табелю учета рабочего времени),
-Total Costing Amount (via Time Sheet),Общая калькуляция Сумма (по табелю учета рабочего времени),
+Actual Start Date (via Timesheet),Фактическая дата начала (по табелю учета рабочего времени),
+Actual Time in Hours (via Timesheet),Фактическое время (в часах),
+Actual End Date (via Timesheet),Фактическая дата окончания (по табелю учета рабочего времени),
Total Expense Claim (via Expense Claim),Итоговая сумма аванса (через Авансовый Отчет),
-Total Billing Amount (via Time Sheet),Общая сумма Billing (по табелю учета рабочего времени),
Review Date,Дата проверки,
Closing Date,Дата закрытия,
Task Depends On,Задача зависит от,
@@ -7819,7 +7681,6 @@
Update Series,Обновить Идентификаторы,
Change the starting / current sequence number of an existing series.,Измените начальный / текущий порядковый номер существующей идентификации.,
Prefix,Префикс,
-Current Value,Текущее значение,
This is the number of the last created transaction with this prefix,Это число последнего созданного сделки с этим префиксом,
Update Series Number,Обновить серийный номер,
Quotation Lost Reason,Причина Отказа от Предложения,
@@ -8433,8 +8294,6 @@
Itemwise Recommended Reorder Level,Рекомендация пополнения уровня продукта,
Lead Details,Подробнее об лиде,
Lead Owner Efficiency,Эффективность ответственного за лид,
-Loan Repayment and Closure,Погашение и закрытие кредита,
-Loan Security Status,Состояние безопасности ссуды,
Lost Opportunity,Потерянная возможность,
Maintenance Schedules,Графики технического обслуживания,
Material Requests for which Supplier Quotations are not created,"Запросы на Материалы, для которых не создаются Предложения Поставщика",
@@ -8525,7 +8384,6 @@
Counts Targeted: {0},Количество целевых: {0},
Payment Account is mandatory,Платежный счет является обязательным,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Если этот флажок установлен, полная сумма будет вычтена из налогооблагаемого дохода до расчета подоходного налога без какой-либо декларации или представления доказательств.",
-Disbursement Details,Подробная информация о выплате,
Material Request Warehouse,Склад запросов на материалы,
Select warehouse for material requests,Выберите склад для запросов материалов,
Transfer Materials For Warehouse {0},Передача материалов на склад {0},
@@ -8906,9 +8764,6 @@
Repay unclaimed amount from salary,Вернуть невостребованную сумму из заработной платы,
Deduction from salary,Удержание из заработной платы,
Expired Leaves,Просроченные листья,
-Reference No,Номер ссылки,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Процент скидки - это процентная разница между рыночной стоимостью Обеспечения ссуды и стоимостью, приписываемой этому Обеспечению ссуды, когда она используется в качестве обеспечения для этой ссуды.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Коэффициент ссуды к стоимости выражает отношение суммы ссуды к стоимости заложенного обеспечения. Дефицит обеспечения кредита будет вызван, если оно упадет ниже указанного значения для любого кредита",
If this is not checked the loan by default will be considered as a Demand Loan,"Если этот флажок не установлен, ссуда по умолчанию будет считаться ссудой до востребования.",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Этот счет используется для регистрации платежей по ссуде от заемщика, а также для выдачи ссуд заемщику.",
This account is capital account which is used to allocate capital for loan disbursal account ,"Этот счет является счетом движения капитала, который используется для распределения капитала на счет выдачи кредита.",
@@ -9368,13 +9223,6 @@
Operation {0} does not belong to the work order {1},Операция {0} не относится к рабочему заданию {1},
Print UOM after Quantity,Печать единиц измерения после количества,
Set default {0} account for perpetual inventory for non stock items,"Установить учетную запись {0} по умолчанию для постоянного хранения товаров, отсутствующих на складе",
-Loan Security {0} added multiple times,Обеспечение ссуды {0} добавлено несколько раз,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Заем Ценные бумаги с различным коэффициентом LTV не могут быть переданы в залог под одну ссуду,
-Qty or Amount is mandatory for loan security!,Количество или сумма обязательны для обеспечения кредита!,
-Only submittted unpledge requests can be approved,Могут быть одобрены только отправленные запросы на необеспечение залога,
-Interest Amount or Principal Amount is mandatory,Сумма процентов или основная сумма обязательна,
-Disbursed Amount cannot be greater than {0},Выплаченная сумма не может быть больше {0},
-Row {0}: Loan Security {1} added multiple times,Строка {0}: Обеспечение ссуды {1} добавлено несколько раз.,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Строка № {0}: дочерний элемент не должен быть набором продукта. Удалите элемент {1} и сохраните,
Credit limit reached for customer {0},Достигнут кредитный лимит для клиента {0},
Could not auto create Customer due to the following missing mandatory field(s):,Не удалось автоматически создать клиента из-за отсутствия следующих обязательных полей:,
diff --git a/erpnext/translations/rw.csv b/erpnext/translations/rw.csv
index 741f117..b661932 100644
--- a/erpnext/translations/rw.csv
+++ b/erpnext/translations/rw.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Bikurikizwa niba isosiyete ari SpA, SApA cyangwa SRL",
Applicable if the company is a limited liability company,Bikurikizwa niba isosiyete ari isosiyete idafite inshingano,
Applicable if the company is an Individual or a Proprietorship,Bikurikizwa niba isosiyete ari Umuntu ku giti cye cyangwa nyirubwite,
-Applicant,Usaba,
-Applicant Type,Ubwoko bw'abasaba,
Application of Funds (Assets),Gukoresha Amafaranga (Umutungo),
Application period cannot be across two allocation records,Igihe cyo gusaba ntigishobora kurenga inyandiko ebyiri zagenewe,
Application period cannot be outside leave allocation period,Igihe cyo gusaba ntigishobora kuba hanze igihe cyo gutanga ikiruhuko,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Urutonde rwabanyamigabane baboneka bafite numero ya folio,
Loading Payment System,Sisitemu yo Kwishura Sisitemu,
Loan,Inguzanyo,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Umubare w'inguzanyo ntushobora kurenza umubare ntarengwa w'inguzanyo {0},
-Loan Application,Gusaba Inguzanyo,
-Loan Management,Gucunga inguzanyo,
-Loan Repayment,Kwishura Inguzanyo,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Itariki yo Gutangiriraho Inguzanyo nigihe cyinguzanyo ni itegeko kugirango uzigame inyemezabuguzi,
Loans (Liabilities),Inguzanyo (Inshingano),
Loans and Advances (Assets),Inguzanyo n'Iterambere (Umutungo),
@@ -1611,7 +1605,6 @@
Monday,Ku wa mbere,
Monthly,Buri kwezi,
Monthly Distribution,Ikwirakwizwa rya buri kwezi,
-Monthly Repayment Amount cannot be greater than Loan Amount,Amafaranga yo kwishyura buri kwezi ntashobora kurenza Amafaranga y'inguzanyo,
More,Ibindi,
More Information,Ibisobanuro byinshi,
More than one selection for {0} not allowed,Birenzeho guhitamo kuri {0} ntibyemewe,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Kwishura {0} {1},
Payable,Yishyuwe,
Payable Account,Konti yishyuwe,
-Payable Amount,Amafaranga yishyuwe,
Payment,Kwishura,
Payment Cancelled. Please check your GoCardless Account for more details,Ubwishyu bwahagaritswe. Nyamuneka reba Konti yawe ya GoCardless kugirango ubone ibisobanuro birambuye,
Payment Confirmation,Kwemeza Kwishura,
-Payment Date,Itariki yo Kwishura,
Payment Days,Iminsi yo Kwishura,
Payment Document,Inyandiko yo Kwishura,
Payment Due Date,Itariki yo Kwishura,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Nyamuneka andika inyemezabuguzi,
Please enter Receipt Document,Nyamuneka andika Inyandiko,
Please enter Reference date,Nyamuneka andika itariki,
-Please enter Repayment Periods,Nyamuneka andika ibihe byo kwishyura,
Please enter Reqd by Date,Nyamuneka andika Reqd kumunsi,
Please enter Woocommerce Server URL,Nyamuneka andika URL ya Woocommerce,
Please enter Write Off Account,Nyamuneka andika Kwandika Konti,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Nyamuneka andika ikigo cyababyeyi,
Please enter quantity for Item {0},Nyamuneka andika ingano yikintu {0},
Please enter relieving date.,Nyamuneka andika itariki yo kugabanya.,
-Please enter repayment Amount,Nyamuneka andika amafaranga yo kwishyura,
Please enter valid Financial Year Start and End Dates,Nyamuneka andika umwaka wemewe w'Imari Itangira n'iherezo,
Please enter valid email address,Nyamuneka andika imeri yemewe,
Please enter {0} first,Nyamuneka andika {0} mbere,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Amategeko agenga ibiciro arayungurura akurikije ubwinshi.,
Primary Address Details,Aderesi Yibanze Ibisobanuro,
Primary Contact Details,Ibisobanuro Byibanze Byamakuru,
-Principal Amount,Umubare w'ingenzi,
Print Format,Shira Imiterere,
Print IRS 1099 Forms,Shira impapuro za IRS 1099,
Print Report Card,Shira Ikarita Raporo,
@@ -2550,7 +2538,6 @@
Sample Collection,Icyegeranyo cy'icyitegererezo,
Sample quantity {0} cannot be more than received quantity {1},Ingano ntangarugero {0} ntishobora kurenza umubare wakiriwe {1},
Sanctioned,Yemerewe,
-Sanctioned Amount,Amafaranga yemejwe,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amafaranga yemejwe ntashobora kuba arenze Amafaranga yo gusaba kumurongo {0}.,
Sand,Umusenyi,
Saturday,Ku wa gatandatu,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} isanzwe ifite uburyo bwababyeyi {1}.,
API,API,
Annual,Buri mwaka,
-Approved,Byemejwe,
Change,Hindura,
Contact Email,Menyesha imeri,
Export Type,Ubwoko bwo kohereza hanze,
@@ -3571,7 +3557,6 @@
Account Value,Agaciro Konti,
Account is mandatory to get payment entries,Konti ni itegeko kugirango ubone ibyinjira,
Account is not set for the dashboard chart {0},Konti ntabwo yashyizweho kubishushanyo mbonera {0},
-Account {0} does not belong to company {1},Konti {0} ntabwo ari iy'isosiyete {1},
Account {0} does not exists in the dashboard chart {1},Konti {0} ntabwo ibaho mubishushanyo mbonera {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konti: <b>{0}</b> nigishoro Imirimo ikomeje kandi ntishobora kuvugururwa nibinyamakuru byinjira,
Account: {0} is not permitted under Payment Entry,Konti: {0} ntabwo byemewe munsi yo Kwishura,
@@ -3582,7 +3567,6 @@
Activity,Igikorwa,
Add / Manage Email Accounts.,Ongeraho / Gucunga Konti imeri.,
Add Child,Ongeraho Umwana,
-Add Loan Security,Ongeraho Inguzanyo,
Add Multiple,Ongera Kugwiza,
Add Participants,Ongeramo Abitabiriye,
Add to Featured Item,Ongeraho Ikintu cyihariye,
@@ -3593,15 +3577,12 @@
Address Line 1,Umurongo wa aderesi 1,
Addresses,Aderesi,
Admission End Date should be greater than Admission Start Date.,Itariki yo kurangiriraho igomba kuba irenze itariki yo gutangiriraho.,
-Against Loan,Kurwanya Inguzanyo,
-Against Loan:,Kurwanya Inguzanyo:,
All,Byose,
All bank transactions have been created,Ibikorwa byose bya banki byarakozwe,
All the depreciations has been booked,Guta agaciro kwose byanditswe,
Allocation Expired!,Isaranganya ryararangiye!,
Allow Resetting Service Level Agreement from Support Settings.,Emera Kugarura Serivise Urwego Rurwego rwo Gushigikira Igenamiterere.,
Amount of {0} is required for Loan closure,Umubare wa {0} urakenewe kugirango inguzanyo irangire,
-Amount paid cannot be zero,Amafaranga yishyuwe ntashobora kuba zeru,
Applied Coupon Code,Ikoreshwa rya Coupon Code,
Apply Coupon Code,Koresha Kode ya Coupon,
Appointment Booking,Kwiyandikisha,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Ntushobora Kubara Igihe cyo Kugera nkuko Umushoferi Aderesi yabuze.,
Cannot Optimize Route as Driver Address is Missing.,Ntushobora Guhindura Inzira nkuko Aderesi Yumushoferi Yabuze.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Ntushobora kurangiza umurimo {0} nkigikorwa cyacyo {1} ntabwo cyarangiye / gihagaritswe.,
-Cannot create loan until application is approved,Ntushobora gutanga inguzanyo kugeza igihe byemewe,
Cannot find a matching Item. Please select some other value for {0}.,Ntushobora kubona Ikintu gihuye. Nyamuneka hitamo izindi gaciro kuri {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Ntushobora kurenga kubintu {0} kumurongo {1} kurenza {2}. Kwemerera kwishura-fagitire, nyamuneka shiraho amafaranga muri Igenamiterere rya Konti",
"Capacity Planning Error, planned start time can not be same as end time","Ubushobozi bwo Gutegura Ubushobozi, igihe cyateganijwe cyo gutangira ntigishobora kumera nkigihe cyanyuma",
@@ -3812,20 +3792,9 @@
Less Than Amount,Ntarengwa Umubare,
Liabilities,Inshingano,
Loading...,Kuremera ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Amafaranga y'inguzanyo arenze umubare ntarengwa w'inguzanyo {0} nkuko byateganijwe,
Loan Applications from customers and employees.,Inguzanyo zisaba abakiriya n'abakozi.,
-Loan Disbursement,Gutanga Inguzanyo,
Loan Processes,Inzira y'inguzanyo,
-Loan Security,Inguzanyo y'inguzanyo,
-Loan Security Pledge,Inguzanyo y'umutekano,
-Loan Security Pledge Created : {0},Ingwate Yumutekano Yinguzanyo Yashyizweho: {0},
-Loan Security Price,Inguzanyo yumutekano,
-Loan Security Price overlapping with {0},Inguzanyo Umutekano Igiciro cyuzuye {0},
-Loan Security Unpledge,Inguzanyo z'umutekano,
-Loan Security Value,Inguzanyo Yumutekano,
Loan Type for interest and penalty rates,Ubwoko bw'inguzanyo ku nyungu n'ibiciro by'ibihano,
-Loan amount cannot be greater than {0},Umubare w'inguzanyo ntushobora kurenza {0},
-Loan is mandatory,Inguzanyo ni itegeko,
Loans,Inguzanyo,
Loans provided to customers and employees.,Inguzanyo ihabwa abakiriya n'abakozi.,
Location,Aho biherereye,
@@ -3894,7 +3863,6 @@
Pay,Kwishura,
Payment Document Type,Ubwoko bw'inyandiko yo kwishyura,
Payment Name,Izina ryo Kwishura,
-Penalty Amount,Amafaranga y'ibihano,
Pending,Bitegereje,
Performance,Imikorere,
Period based On,Ikiringo gishingiye,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Nyamuneka injira nkumukoresha wamasoko kugirango uhindure iki kintu.,
Please login as a Marketplace User to report this item.,Nyamuneka injira nkumukoresha wamasoko kugirango utangaze iki kintu.,
Please select <b>Template Type</b> to download template,Nyamuneka hitamo <b>Ubwoko bw'icyitegererezo</b> kugirango ukuremo inyandikorugero,
-Please select Applicant Type first,Nyamuneka hitamo Ubwoko bw'abasaba mbere,
Please select Customer first,Nyamuneka hitamo umukiriya mbere,
Please select Item Code first,Nyamuneka banza uhitemo kode yikintu,
-Please select Loan Type for company {0},Nyamuneka hitamo Ubwoko bw'inguzanyo kuri sosiyete {0},
Please select a Delivery Note,Nyamuneka hitamo Icyitonderwa,
Please select a Sales Person for item: {0},Nyamuneka hitamo Umuntu ugurisha kubintu: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Nyamuneka hitamo ubundi buryo bwo kwishyura. Stripe ntabwo ishigikira ibikorwa byamafaranga '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Nyamuneka shiraho konti ya banki isanzwe ya sosiyete {0},
Please specify,Nyamuneka sobanura,
Please specify a {0},Nyamuneka sobanura {0},lead
-Pledge Status,Imiterere y'imihigo,
-Pledge Time,Igihe cy'Imihigo,
Printing,Gucapa,
Priority,Ibyingenzi,
Priority has been changed to {0}.,Ibyingenzi byahinduwe kuri {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Gutunganya dosiye ya XML,
Profitability,Inyungu,
Project,Umushinga,
-Proposed Pledges are mandatory for secured Loans,Imihigo isabwa ni itegeko ku nguzanyo zishingiye,
Provide the academic year and set the starting and ending date.,Tanga umwaka w'amashuri hanyuma ushireho itariki yo gutangiriraho no kurangiriraho.,
Public token is missing for this bank,Ikimenyetso rusange kibuze iyi banki,
Publish,Tangaza,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Inyemezabuguzi yo kugura ntabwo ifite Ikintu icyo aricyo cyose cyo kugumana urugero.,
Purchase Return,Kugura,
Qty of Finished Goods Item,Qty Ibicuruzwa Byarangiye Ikintu,
-Qty or Amount is mandatroy for loan security,Qty cyangwa Amafaranga ni mandatroy kubwishingizi bwinguzanyo,
Quality Inspection required for Item {0} to submit,Ubugenzuzi Bwiza busabwa Ingingo {0} gutanga,
Quantity to Manufacture,Umubare wo gukora,
Quantity to Manufacture can not be zero for the operation {0},Umubare wo gukora ntushobora kuba zeru kubikorwa {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Itariki Yoroheje igomba kuba irenze cyangwa ingana nitariki yo Kwinjira,
Rename,Hindura izina,
Rename Not Allowed,Guhindura izina Ntabwo byemewe,
-Repayment Method is mandatory for term loans,Uburyo bwo kwishyura ni itegeko ku nguzanyo zigihe gito,
-Repayment Start Date is mandatory for term loans,Itariki yo Gutangiriraho ni itegeko ku nguzanyo zigihe,
Report Item,Raporo Ingingo,
Report this Item,Menyesha iyi ngingo,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Yabitswe Qty kubikorwa byamasezerano: Ibikoresho bito byo gukora ibintu byasezeranijwe.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Umurongo ({0}): {1} yamaze kugabanywa muri {2},
Rows Added in {0},Imirongo Yongeweho muri {0},
Rows Removed in {0},Imirongo Yakuweho muri {0},
-Sanctioned Amount limit crossed for {0} {1},Amafaranga yemejwe ntarengwa yarenze {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Amafaranga y'inguzanyo yemerewe asanzweho kuri {0} kurwanya sosiyete {1},
Save,Bika,
Save Item,Bika Ikintu,
Saved Items,Ibintu Byabitswe,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Umukoresha {0} arahagaritswe,
Users and Permissions,Abakoresha nimpushya,
Vacancies cannot be lower than the current openings,Imyanya ntishobora kuba munsi yifungura ryubu,
-Valid From Time must be lesser than Valid Upto Time.,Byemewe Kuva Igihe bigomba kuba bito kurenza Byemewe Igihe.,
Valuation Rate required for Item {0} at row {1},Igipimo cyagaciro gisabwa kubintu {0} kumurongo {1},
Values Out Of Sync,Indangagaciro Zihuza,
Vehicle Type is required if Mode of Transport is Road,Ubwoko bwibinyabiziga burakenewe niba uburyo bwo gutwara abantu ari Umuhanda,
@@ -4211,7 +4168,6 @@
Add to Cart,Ongera ku Ikarita,
Days Since Last Order,Iminsi Kuva Urutonde Rwanyuma,
In Stock,Mububiko,
-Loan Amount is mandatory,Amafaranga y'inguzanyo ni itegeko,
Mode Of Payment,Uburyo bwo Kwishura,
No students Found,Nta banyeshuri babonetse,
Not in Stock,Ntabwo ari mububiko,
@@ -4240,7 +4196,6 @@
Group by,Itsinda by,
In stock,Mububiko,
Item name,Izina ryikintu,
-Loan amount is mandatory,Amafaranga y'inguzanyo ni itegeko,
Minimum Qty,Ntarengwa Qty,
More details,Ibisobanuro birambuye,
Nature of Supplies,Kamere y'ibikoresho,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Byuzuye Byuzuye Qty,
Qty to Manufacture,Qty to Manufacture,
Repay From Salary can be selected only for term loans,Kwishura Kuva kumishahara birashobora gutoranywa gusa mugihe cyinguzanyo,
-No valid Loan Security Price found for {0},Nta giciro cyemewe cyinguzanyo cyabonetse kuri {0},
-Loan Account and Payment Account cannot be same,Konti y'inguzanyo na Konti yo Kwishura ntibishobora kuba bimwe,
-Loan Security Pledge can only be created for secured loans,Ingwate y’inguzanyo irashobora gushirwaho gusa ku nguzanyo zishingiye,
Social Media Campaigns,Kwamamaza imbuga nkoranyambaga,
From Date can not be greater than To Date,Kuva Itariki ntishobora kuba irenze Itariki,
Please set a Customer linked to the Patient,Nyamuneka shiraho Umukiriya uhujwe nUmurwayi,
@@ -6437,7 +6389,6 @@
HR User,Umukoresha HR,
Appointment Letter,Ibaruwa ishyirwaho,
Job Applicant,Usaba akazi,
-Applicant Name,Izina ry'abasaba,
Appointment Date,Itariki yo gushyirwaho,
Appointment Letter Template,Inyandiko Ibaruwa Igenamigambi,
Body,Umubiri,
@@ -7059,99 +7010,12 @@
Sync in Progress,Guhuza,
Hub Seller Name,Hub Kugurisha Izina,
Custom Data,Amakuru yihariye,
-Member,Umunyamuryango,
-Partially Disbursed,Yatanzwe igice,
-Loan Closure Requested,Gusaba Inguzanyo Birasabwa,
Repay From Salary,Kwishura Umushahara,
-Loan Details,Inguzanyo irambuye,
-Loan Type,Ubwoko bw'inguzanyo,
-Loan Amount,Amafaranga y'inguzanyo,
-Is Secured Loan,Ni Inguzanyo Yishingiwe,
-Rate of Interest (%) / Year,Igipimo cyinyungu (%) / Umwaka,
-Disbursement Date,Itariki yo Gutanga,
-Disbursed Amount,Amafaranga yatanzwe,
-Is Term Loan,Ni Inguzanyo y'igihe,
-Repayment Method,Uburyo bwo Kwishura,
-Repay Fixed Amount per Period,Subiza Amafaranga ateganijwe mugihe runaka,
-Repay Over Number of Periods,Kwishura Umubare Wibihe,
-Repayment Period in Months,Igihe cyo Kwishura mu mezi,
-Monthly Repayment Amount,Amafaranga yo kwishyura buri kwezi,
-Repayment Start Date,Itariki yo Kwishura,
-Loan Security Details,Inguzanyo Yumutekano,
-Maximum Loan Value,Agaciro ntarengwa k'inguzanyo,
-Account Info,Amakuru ya Konti,
-Loan Account,Konti y'inguzanyo,
-Interest Income Account,Konti yinjira,
-Penalty Income Account,Konti yinjira,
-Repayment Schedule,Gahunda yo Kwishura,
-Total Payable Amount,Amafaranga yose yishyuwe,
-Total Principal Paid,Umuyobozi mukuru yishyuwe,
-Total Interest Payable,Inyungu zose Zishyuwe,
-Total Amount Paid,Amafaranga yose yishyuwe,
-Loan Manager,Umuyobozi w'inguzanyo,
-Loan Info,Inguzanyo,
-Rate of Interest,Igipimo cy'inyungu,
-Proposed Pledges,Imihigo yatanzwe,
-Maximum Loan Amount,Umubare w'inguzanyo ntarengwa,
-Repayment Info,Amakuru yo Kwishura,
-Total Payable Interest,Inyungu zose zishyuwe,
-Against Loan ,Kurwanya Inguzanyo,
-Loan Interest Accrual,Inguzanyo zinguzanyo,
-Amounts,Amafaranga,
-Pending Principal Amount,Gutegereza Amafaranga Yingenzi,
-Payable Principal Amount,Amafaranga yishyuwe,
-Paid Principal Amount,Amafaranga yishyuwe,
-Paid Interest Amount,Amafaranga yishyuwe,
-Process Loan Interest Accrual,Gutunganya Inyungu Zinguzanyo,
-Repayment Schedule Name,Gahunda yo Kwishura Izina,
Regular Payment,Kwishura bisanzwe,
Loan Closure,Gufunga Inguzanyo,
-Payment Details,Ibisobanuro byo Kwishura,
-Interest Payable,Inyungu Yishyuwe,
-Amount Paid,Amafaranga yishyuwe,
-Principal Amount Paid,Umubare w'amafaranga yishyuwe,
-Repayment Details,Ibisobanuro byo Kwishura,
-Loan Repayment Detail,Ibisobanuro birambuye byo kwishyura inguzanyo,
-Loan Security Name,Inguzanyo Izina ry'umutekano,
-Unit Of Measure,Igice cyo gupima,
-Loan Security Code,Amategeko agenga umutekano,
-Loan Security Type,Ubwoko bw'inguzanyo,
-Haircut %,Umusatsi%,
-Loan Details,Inguzanyo irambuye,
-Unpledged,Ntabwo byemewe,
-Pledged,Imihigo,
-Partially Pledged,Imihigo,
-Securities,Impapuro zagaciro,
-Total Security Value,Agaciro k'umutekano wose,
-Loan Security Shortfall,Inguzanyo Yumutekano,
-Loan ,Inguzanyo,
-Shortfall Time,Igihe gito,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Umubare w'amafaranga make,
-Security Value ,Agaciro k'umutekano,
-Process Loan Security Shortfall,Gutunganya Inguzanyo Zumutekano,
-Loan To Value Ratio,Inguzanyo yo guha agaciro igipimo,
-Unpledge Time,Igihe cyo Kudasezerana,
-Loan Name,Izina ry'inguzanyo,
Rate of Interest (%) Yearly,Igipimo cyinyungu (%) Buri mwaka,
-Penalty Interest Rate (%) Per Day,Igipimo cyinyungu (%) kumunsi,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Igipimo cyinyungu cyigihano gitangwa kumafaranga ategereje kumunsi burimunsi mugihe cyo gutinda kwishyura,
-Grace Period in Days,Igihe cyubuntu muminsi,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Oya y'iminsi uhereye igihe cyagenwe kugeza igihano kitazatangwa mugihe cyo gutinda kwishyura inguzanyo,
-Pledge,Imihigo,
-Post Haircut Amount,Kohereza Amafaranga yo Kogosha,
-Process Type,Ubwoko bwibikorwa,
-Update Time,Kuvugurura Igihe,
-Proposed Pledge,Imihigo,
-Total Payment,Amafaranga yose yishyuwe,
-Balance Loan Amount,Amafaranga y'inguzanyo asigaye,
-Is Accrued,Yabaruwe,
Salary Slip Loan,Inguzanyo y'imishahara,
Loan Repayment Entry,Inguzanyo yo Kwishura Inguzanyo,
-Sanctioned Loan Amount,Amafaranga y'inguzanyo yemewe,
-Sanctioned Amount Limit,Umubare ntarengwa w'amafaranga,
-Unpledge,Amasezerano,
-Haircut,Umusatsi,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Kora Gahunda,
Schedules,Imikorere,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Umushinga uzagerwaho kurubuga kubakoresha,
Copied From,Yandukuwe Kuva,
Start and End Dates,Amatariki yo Gutangiriraho no Kurangiza,
-Actual Time (in Hours),Igihe nyacyo (mu masaha),
+Actual Time in Hours (via Timesheet),Igihe nyacyo (mu masaha),
Costing and Billing,Igiciro na fagitire,
-Total Costing Amount (via Timesheets),Amafaranga Yuzuye Yuzuye (ukoresheje Timesheets),
-Total Expense Claim (via Expense Claims),Ikirego cyose gisabwa (binyuze mubisabwa),
+Total Costing Amount (via Timesheet),Amafaranga Yuzuye Yuzuye (ukoresheje Timesheets),
+Total Expense Claim (via Expense Claim),Ikirego cyose gisabwa (binyuze mubisabwa),
Total Purchase Cost (via Purchase Invoice),Igiciro cyose cyubuguzi (binyuze muri fagitire yubuguzi),
Total Sales Amount (via Sales Order),Amafaranga yagurishijwe yose (binyuze mubicuruzwa),
-Total Billable Amount (via Timesheets),Umubare wuzuye wuzuye (ukoresheje Timesheets),
-Total Billed Amount (via Sales Invoices),Umubare wuzuye wuzuye (ukoresheje inyemezabuguzi zo kugurisha),
-Total Consumed Material Cost (via Stock Entry),Igiciro Cyuzuye Cyakoreshejwe (Binyuze Kwinjira),
+Total Billable Amount (via Timesheet),Umubare wuzuye wuzuye (ukoresheje Timesheets),
+Total Billed Amount (via Sales Invoice),Umubare wuzuye wuzuye (ukoresheje inyemezabuguzi zo kugurisha),
+Total Consumed Material Cost (via Stock Entry),Igiciro Cyuzuye Cyakoreshejwe (Binyuze Kwinjira),
Gross Margin,Amafaranga menshi,
Gross Margin %,Inyungu rusange,
Monitor Progress,Kurikirana iterambere,
@@ -7521,12 +7385,10 @@
Dependencies,Kwishingikiriza,
Dependent Tasks,Inshingano Biterwa,
Depends on Tasks,Biterwa n'inshingano,
-Actual Start Date (via Time Sheet),Itariki nyayo yo gutangiriraho (ukoresheje urupapuro rwigihe),
-Actual Time (in hours),Igihe nyacyo (mu masaha),
-Actual End Date (via Time Sheet),Itariki yo kurangiriraho (ukoresheje urupapuro rwigihe),
-Total Costing Amount (via Time Sheet),Amafaranga Yuzuye Yuzuye (Binyuze kurupapuro),
+Actual Start Date (via Timesheet),Itariki nyayo yo gutangiriraho (ukoresheje urupapuro rwigihe),
+Actual Time in Hours (via Timesheet),Igihe nyacyo (mu masaha),
+Actual End Date (via Timesheet),Itariki yo kurangiriraho (ukoresheje urupapuro rwigihe),
Total Expense Claim (via Expense Claim),Ikirego cyose gisabwa (binyuze mu gusaba amafaranga),
-Total Billing Amount (via Time Sheet),Umubare w'amafaranga yishyurwa yose (ukoresheje urupapuro rw'igihe),
Review Date,Itariki yo Gusubiramo,
Closing Date,Itariki yo gusoza,
Task Depends On,Inshingano Biterwa na,
@@ -7887,7 +7749,6 @@
Update Series,Kuvugurura Urukurikirane,
Change the starting / current sequence number of an existing series.,Hindura intangiriro / ikurikirana ikurikirana yumubare uriho.,
Prefix,Ijambo ryibanze,
-Current Value,Agaciro,
This is the number of the last created transaction with this prefix,Numubare wanyuma wakozwe hamwe niyi prefix,
Update Series Number,Kuvugurura inomero yuruhererekane,
Quotation Lost Reason,Amagambo Yatakaye Impamvu,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Basabwe Urwego Urwego,
Lead Details,Kuyobora Ibisobanuro,
Lead Owner Efficiency,Kuyobora neza nyirubwite,
-Loan Repayment and Closure,Kwishura inguzanyo no gufunga,
-Loan Security Status,Inguzanyo z'umutekano,
Lost Opportunity,Amahirwe Yatakaye,
Maintenance Schedules,Ibikorwa byo Kubungabunga,
Material Requests for which Supplier Quotations are not created,Gusaba Ibikoresho Kubitanga Byatanzwe,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Ibitego bigenewe: {0},
Payment Account is mandatory,Konti yo kwishyura ni itegeko,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Iyo bigenzuwe, amafaranga yose azakurwa ku musoro usoreshwa mbere yo kubara umusoro ku nyungu nta tangazo cyangwa ibimenyetso byatanzwe.",
-Disbursement Details,Ibisobanuro birambuye,
Material Request Warehouse,Ububiko busaba ibikoresho,
Select warehouse for material requests,Hitamo ububiko bwibisabwa,
Transfer Materials For Warehouse {0},Kohereza Ibikoresho Kububiko {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Subiza amafaranga atasabwe kuva kumushahara,
Deduction from salary,Gukurwa ku mushahara,
Expired Leaves,Amababi yarangiye,
-Reference No,Reba No.,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Ijanisha ryimisatsi ni itandukaniro ryijanisha hagati yagaciro kisoko ryumutekano winguzanyo nagaciro kavuzwe kuri uwo mutekano winguzanyo mugihe ukoreshwa nkingwate kuri iyo nguzanyo.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Inguzanyo yo Guha Agaciro Igipimo cyerekana igipimo cyamafaranga yinguzanyo nagaciro k’ingwate yatanzwe. Ikibazo cyo kubura inguzanyo kizaterwa niba ibi biri munsi yagaciro kagenewe inguzanyo iyo ari yo yose,
If this is not checked the loan by default will be considered as a Demand Loan,Niba ibi bitagenzuwe inguzanyo byanze bikunze bizafatwa nkinguzanyo isabwa,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Iyi konti ikoreshwa mugutanga inguzanyo zishyuwe nuwagurijwe kandi ikanatanga inguzanyo kubagurijwe,
This account is capital account which is used to allocate capital for loan disbursal account ,Konti ni konti shingiro ikoreshwa mugutanga igishoro kuri konti yo gutanga inguzanyo,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Igikorwa {0} ntabwo kiri mubikorwa byakazi {1},
Print UOM after Quantity,Shira UOM nyuma yumubare,
Set default {0} account for perpetual inventory for non stock items,Shiraho isanzwe {0} konte yo kubara ibihe byose kubintu bitari ububiko,
-Loan Security {0} added multiple times,Inguzanyo y'inguzanyo {0} yongeyeho inshuro nyinshi,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Inguzanyo zinguzanyo zingana na LTV zitandukanye ntizishobora gutangwaho inguzanyo imwe,
-Qty or Amount is mandatory for loan security!,Qty cyangwa Amafaranga ni itegeko kubwishingizi bwinguzanyo!,
-Only submittted unpledge requests can be approved,Gusa ibyifuzo byatanzwe bidasezeranijwe birashobora kwemerwa,
-Interest Amount or Principal Amount is mandatory,Umubare w'inyungu cyangwa umubare w'ingenzi ni itegeko,
-Disbursed Amount cannot be greater than {0},Amafaranga yatanzwe ntashobora kurenza {0},
-Row {0}: Loan Security {1} added multiple times,Umurongo {0}: Inguzanyo Umutekano {1} wongeyeho inshuro nyinshi,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Umurongo # {0}: Ikintu cyumwana ntigikwiye kuba ibicuruzwa. Nyamuneka kura Ikintu {1} hanyuma ubike,
Credit limit reached for customer {0},Umubare w'inguzanyo wageze kubakiriya {0},
Could not auto create Customer due to the following missing mandatory field(s):,Ntushobora kwikora kurema Umukiriya bitewe numwanya wabuze wabuze:,
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index e5ea9bf..b1d50a9 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","සමාගම ස්පා, සාපා හෝ එස්ආර්එල් නම් අදාළ වේ",
Applicable if the company is a limited liability company,සමාගම සීමිත වගකීම් සහිත සමාගමක් නම් අදාළ වේ,
Applicable if the company is an Individual or a Proprietorship,සමාගම තනි පුද්ගලයෙක් හෝ හිමිකාරත්වයක් තිබේ නම් අදාළ වේ,
-Applicant,ඉල්ලුම්කරු,
-Applicant Type,අයදුම්කරු වර්ගය,
Application of Funds (Assets),අරමුදල් ඉල්ලුම් පත්රය (වත්කම්),
Application period cannot be across two allocation records,අයදුම්පත්ර කාලය වෙන් කළ ලේඛන දෙකක් අතර විය නොහැක,
Application period cannot be outside leave allocation period,අයදුම් කාලය පිටත නිවාඩු වෙන් කාලය විය නොහැකි,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,කොටස් හිමියන්ගේ කොටස් ලැයිස්තුව,
Loading Payment System,ගෙවීම් පද්ධතියක් පැටවීම,
Loan,ණය,
-Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි,
-Loan Application,ණය අයදුම්පත,
-Loan Management,ණය කළමනාකරණය,
-Loan Repayment,ණය ආපසු ගෙවීමේ,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ඉන්වොයිස් වට්ටම් සුරැකීමට ණය ආරම්භක දිනය සහ ණය කාලය අනිවාර්ය වේ,
Loans (Liabilities),ණය (වගකීම්),
Loans and Advances (Assets),"ණය හා අත්තිකාරම්, (වත්කම්)",
@@ -1611,7 +1605,6 @@
Monday,සදුදා,
Monthly,මාසික,
Monthly Distribution,මාසික බෙදාහැරීම්,
-Monthly Repayment Amount cannot be greater than Loan Amount,මාසික නැවත ගෙවීමේ ප්රමාණය ණය මුදල වඩා වැඩි විය නොහැකි,
More,තව,
More Information,වැඩිදුර තොරතුරු,
More than one selection for {0} not allowed,{0} සඳහා එක් තේරීමක් සඳහා අවසර නැත,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1},
Payable,ගෙවිය යුතු,
Payable Account,ගෙවිය යුතු ගිණුම්,
-Payable Amount,ගෙවිය යුතු මුදල,
Payment,ගෙවීම,
Payment Cancelled. Please check your GoCardless Account for more details,ගෙවීම් අවලංගු වේ. වැඩි විස්තර සඳහා ඔබගේ GoCardless ගිණුම පරීක්ෂා කරන්න,
Payment Confirmation,ගෙවීම් තහවුරු කිරීම,
-Payment Date,ගෙවීමේ දිනය,
Payment Days,ගෙවීම් දින,
Payment Document,ගෙවීම් ලේඛන,
Payment Due Date,ගෙවීම් නියමිත දිනය,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,මිලදී ගැනීම රිසිට්පත පළමු ඇතුලත් කරන්න,
Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න,
Please enter Reference date,විමර්ශන දිනය ඇතුලත් කරන්න,
-Please enter Repayment Periods,ණය ආපසු ගෙවීමේ කාල සීමාවක් ඇතුල් කරන්න,
Please enter Reqd by Date,කරුණාකර Date by Reqd ඇතුලත් කරන්න,
Please enter Woocommerce Server URL,කරුණාකර Woocommerce සේවාදායකයේ URL එක ඇතුලත් කරන්න,
Please enter Write Off Account,ගිණුම අක්රිය ලියන්න ඇතුලත් කරන්න,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,මව් වියදම් මධ්යස්ථානය ඇතුලත් කරන්න,
Please enter quantity for Item {0},විෂය {0} සඳහා ප්රමාණය ඇතුලත් කරන්න,
Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.,
-Please enter repayment Amount,ණය ආපසු ගෙවීමේ ප්රමාණය ඇතුලත් කරන්න,
Please enter valid Financial Year Start and End Dates,වලංගු මුදල් වර්ෂය ආරම්භය හා අවසානය දිනයන් ඇතුලත් කරන්න,
Please enter valid email address,වලංගු ඊ-තැපැල් ලිපිනයක් ඇතුලත් කරන්න,
Please enter {0} first,{0} ඇතුලත් කරන්න පළමු,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,ප්රමාණය මත පදනම් මිල ගණන් රීති තවදුරටත් පෙරනු ලබයි.,
Primary Address Details,ප්රාථමික ලිපිනයන් විස්තර,
Primary Contact Details,ප්රාථමික ඇමතුම් විස්තර,
-Principal Amount,විදුහල්පති මුදල,
Print Format,මුද්රණය ආකෘතිය,
Print IRS 1099 Forms,IRS 1099 ආකෘති මුද්රණය කරන්න,
Print Report Card,මුද්රණ වාර්තා කාඩ්පත මුද්රණය කරන්න,
@@ -2550,7 +2538,6 @@
Sample Collection,සාම්පල එකතුව,
Sample quantity {0} cannot be more than received quantity {1},සාම්පල ප්රමාණය {0} ප්රමාණයට වඩා වැඩි විය නොහැක {1},
Sanctioned,අනුමත,
-Sanctioned Amount,අනුමැතිය ලත් මුදල,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,අනුමැතිය ලත් මුදල ෙරෝ {0} තුළ හිමිකම් ප්රමාණය ට වඩා වැඩි විය නොහැක.,
Sand,වැලි,
Saturday,සෙනසුරාදා,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} දැනටමත් දෙමාපිය ක්රියා පටිපාටියක් ඇත {1}.,
API,API,
Annual,වාර්ෂික,
-Approved,අනුමත,
Change,වෙනස්,
Contact Email,අප අමතන්න විද්යුත්,
Export Type,අපනයන වර්ගය,
@@ -3571,7 +3557,6 @@
Account Value,ගිණුම් වටිනාකම,
Account is mandatory to get payment entries,ගෙවීම් ඇතුළත් කිරීම් ලබා ගැනීම සඳහා ගිණුම අනිවාර්ය වේ,
Account is not set for the dashboard chart {0},උපකරණ පුවරුව {0 for සඳහා ගිණුම සකසා නොමැත,
-Account {0} does not belong to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ,
Account {0} does not exists in the dashboard chart {1},ගිණුම් පුවරුව {1 the උපකරණ පුවරුවේ නොමැත {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ගිණුම: <b>{0</b> capital ප්රාග්ධනය වැඩ කරමින් පවතින අතර ජර්නල් ප්රවේශය මඟින් යාවත්කාලීන කළ නොහැක,
Account: {0} is not permitted under Payment Entry,ගිණුම: ගෙවීම් ප්රවේශය යටතේ {0 අවසර නැත,
@@ -3582,7 +3567,6 @@
Activity,ක්රියාකාරකම්,
Add / Manage Email Accounts.,එකතු කරන්න / විද්යුත් ගිණුම් කළමනාකරණය කරන්න.,
Add Child,ළමා එකතු කරන්න,
-Add Loan Security,ණය ආරක්ෂාව එක් කරන්න,
Add Multiple,බහු එකතු,
Add Participants,සහභාගිවන්න එකතු කරන්න,
Add to Featured Item,විශේෂිත අයිතමයට එක් කරන්න,
@@ -3593,15 +3577,12 @@
Address Line 1,ලිපින පේළි 1,
Addresses,ලිපින,
Admission End Date should be greater than Admission Start Date.,ඇතුළත් වීමේ අවසන් දිනය ඇතුළත් වීමේ ආරම්භක දිනයට වඩා වැඩි විය යුතුය.,
-Against Loan,ණයට එරෙහිව,
-Against Loan:,ණයට එරෙහිව:,
All,සෑම,
All bank transactions have been created,සියලුම බැංකු ගනුදෙනු නිර්මාණය කර ඇත,
All the depreciations has been booked,සියලුම ක්ෂය කිරීම් වෙන් කර ඇත,
Allocation Expired!,වෙන් කිරීම කල් ඉකුත් විය!,
Allow Resetting Service Level Agreement from Support Settings.,උපකාරක සැකසුම් වලින් සේවා මට්ටමේ ගිවිසුම නැවත සැකසීමට ඉඩ දෙන්න.,
Amount of {0} is required for Loan closure,ණය වසා දැමීම සඳහා {0 of අවශ්ය වේ,
-Amount paid cannot be zero,ගෙවන මුදල ශුන්ය විය නොහැක,
Applied Coupon Code,ව්යවහාරික කූපන් කේතය,
Apply Coupon Code,කූපන් කේතය යොදන්න,
Appointment Booking,පත්වීම් වෙන්කරවා ගැනීම,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,රියදුරු ලිපිනය අස්ථානගත වී ඇති බැවින් පැමිණීමේ වේලාව ගණනය කළ නොහැක.,
Cannot Optimize Route as Driver Address is Missing.,රියදුරු ලිපිනය අස්ථානගත වී ඇති බැවින් මාර්ගය ප්රශස්තිකරණය කළ නොහැක.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,රඳා පවතින කාර්යය {1 c සම්පුර්ණ කළ නොහැක / අවලංගු කර නැත.,
-Cannot create loan until application is approved,අයදුම්පත අනුමත වන තුරු ණය නිර්මාණය කළ නොහැක,
Cannot find a matching Item. Please select some other value for {0}.,ගැලපෙන විෂය සොයා ගැනීමට නොහැක. කරුණාකර {0} සඳහා තවත් අගය තෝරන්න.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{1 row පේළියේ {0} {2} ට වඩා වැඩි අයිතමයක් සඳහා අධික ලෙස ගෙවිය නොහැක. වැඩිපුර බිල් කිරීමට ඉඩ දීම සඳහා, කරුණාකර ගිණුම් සැකසුම් තුළ දීමනාව සකසන්න",
"Capacity Planning Error, planned start time can not be same as end time","ධාරිතා සැලසුම් කිරීමේ දෝෂය, සැලසුම් කළ ආරම්භක වේලාව අවසන් කාලය හා සමාන විය නොහැක",
@@ -3812,20 +3792,9 @@
Less Than Amount,මුදලට වඩා අඩුය,
Liabilities,වගකීම්,
Loading...,Loading ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,යෝජිත සුරැකුම්පත් අනුව ණය මුදල උපරිම ණය මුදල {0 ඉක්මවයි,
Loan Applications from customers and employees.,ගනුදෙනුකරුවන්ගෙන් සහ සේවකයින්ගෙන් ණය අයදුම්පත්.,
-Loan Disbursement,ණය බෙදා හැරීම,
Loan Processes,ණය ක්රියාවලි,
-Loan Security,ණය ආරක්ෂාව,
-Loan Security Pledge,ණය ආරක්ෂක පොරොන්දුව,
-Loan Security Pledge Created : {0},ණය ආරක්ෂණ ප්රති ledge ාව නිර්මාණය කරන ලදි: {0},
-Loan Security Price,ණය ආරක්ෂණ මිල,
-Loan Security Price overlapping with {0},Security 0 with සමඟ ණය ආරක්ෂණ මිල අතිච්ඡාදනය වේ,
-Loan Security Unpledge,ණය ආරක්ෂණ අසම්පූර්ණයි,
-Loan Security Value,ණය ආරක්ෂණ වටිනාකම,
Loan Type for interest and penalty rates,පොලී සහ දඩ ගාස්තු සඳහා ණය වර්ගය,
-Loan amount cannot be greater than {0},ණය මුදල {0 than ට වඩා වැඩි විය නොහැක,
-Loan is mandatory,ණය අනිවාර්ය වේ,
Loans,ණය,
Loans provided to customers and employees.,ගනුදෙනුකරුවන්ට සහ සේවකයින්ට ලබා දෙන ණය.,
Location,ස්ථානය,
@@ -3894,7 +3863,6 @@
Pay,වැටුප්,
Payment Document Type,ගෙවීම් ලේඛන වර්ගය,
Payment Name,ගෙවීම් නම,
-Penalty Amount,දඩ මුදල,
Pending,විභාග,
Performance,කාර්ය සාධනය,
Period based On,කාල සීමාව පදනම් කරගෙන,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,මෙම අයිතමය සංස්කරණය කිරීමට කරුණාකර වෙළඳපල පරිශීලකයෙකු ලෙස පිවිසෙන්න.,
Please login as a Marketplace User to report this item.,මෙම අයිතමය වාර්තා කිරීම සඳහා කරුණාකර වෙළඳපල පරිශීලකයෙකු ලෙස පුරනය වන්න.,
Please select <b>Template Type</b> to download template,අච්චුව බාගත කිරීම සඳහා කරුණාකර <b>අච්චු වර්ගය</b> තෝරන්න,
-Please select Applicant Type first,කරුණාකර පළමුව අයදුම්කරු වර්ගය තෝරන්න,
Please select Customer first,කරුණාකර පළමුව පාරිභෝගිකයා තෝරන්න,
Please select Item Code first,කරුණාකර පළමුව අයිතම කේතය තෝරන්න,
-Please select Loan Type for company {0},කරුණාකර company 0 company සමාගම සඳහා ණය වර්ගය තෝරන්න,
Please select a Delivery Note,කරුණාකර බෙදා හැරීමේ සටහනක් තෝරන්න,
Please select a Sales Person for item: {0},කරුණාකර අයිතමය සඳහා විකුණුම් පුද්ගලයෙකු තෝරන්න: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',කරුණාකර වෙනත් ගෙවීමේ ක්රමයක් තෝරාගන්න. Stripe මුදල් ගනුදෙනු සඳහා පහසුකම් සපයන්නේ නැත '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},කරුණාකර company 0 company සමාගම සඳහා සුපුරුදු බැංකු ගිණුමක් සකසන්න,
Please specify,සඳහන් කරන්න,
Please specify a {0},කරුණාකර {0} සඳහන් කරන්න,lead
-Pledge Status,ප්රති ledge ා තත්ත්වය,
-Pledge Time,ප්රති ledge ා කාලය,
Printing,මුද්රණ,
Priority,ප්රමුඛ,
Priority has been changed to {0}.,ප්රමුඛතාවය {0 to ලෙස වෙනස් කර ඇත.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML ගොනු සැකසීම,
Profitability,ලාභදායීතාවය,
Project,ව්යාපෘති,
-Proposed Pledges are mandatory for secured Loans,සුරක්ෂිත ණය සඳහා යෝජිත ප්රති led ා අනිවාර්ය වේ,
Provide the academic year and set the starting and ending date.,අධ්යයන වර්ෂය ලබා දී ආරම්භක හා අවසන් දිනය නියම කරන්න.,
Public token is missing for this bank,මෙම බැංකුව සඳහා පොදු ටෝකනයක් නොමැත,
Publish,පළ කරන්න,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,මිලදී ගැනීමේ කුවිතාන්සිය තුළ රඳවා ගැනීමේ නියැදිය සක්රීය කර ඇති අයිතමයක් නොමැත.,
Purchase Return,මිලදී ගැනීම ප්රතිලාභ,
Qty of Finished Goods Item,නිමි භාණ්ඩ අයිතමයේ ප්රමාණය,
-Qty or Amount is mandatroy for loan security,ණය සුරක්ෂිතතාවය සඳහා Qty හෝ මුදල මැන්ඩට්රෝයි,
Quality Inspection required for Item {0} to submit,Item 0 item අයිතමය ඉදිරිපත් කිරීම සඳහා තත්ත්ව පරීක්ෂාව අවශ්ය වේ,
Quantity to Manufacture,නිෂ්පාදනය සඳහා ප්රමාණය,
Quantity to Manufacture can not be zero for the operation {0},To 0 the මෙහෙයුම සඳහා නිෂ්පාදනයේ ප්රමාණය ශුන්ය විය නොහැක,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,සහන දිනය එක්වන දිනයට වඩා වැඩි හෝ සමාන විය යුතුය,
Rename,නැවත නම් කරන්න,
Rename Not Allowed,නැවත නම් කිරීමට අවසර නැත,
-Repayment Method is mandatory for term loans,කාලීන ණය සඳහා ආපසු ගෙවීමේ ක්රමය අනිවාර්ය වේ,
-Repayment Start Date is mandatory for term loans,කාලීන ණය සඳහා ආපසු ගෙවීමේ ආරම්භක දිනය අනිවාර්ය වේ,
Report Item,අයිතමය වාර්තා කරන්න,
Report this Item,මෙම අයිතමය වාර්තා කරන්න,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,උප කොන්ත්රාත්තු සඳහා වෙන් කර ඇති Qty: උප කොන්ත්රාත් අයිතම සෑදීම සඳහා අමුද්රව්ය ප්රමාණය.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},පේළිය ({0}): {1 already දැනටමත් {2 in වලින් වට්ටම් කර ඇත,
Rows Added in {0},{0 in හි පේළි එකතු කරන ලදි,
Rows Removed in {0},{0 in වලින් ඉවත් කළ පේළි,
-Sanctioned Amount limit crossed for {0} {1},අනුමත කළ මුදල සීමාව {0} {1 for සඳහා ඉක්මවා ඇත,
-Sanctioned Loan Amount already exists for {0} against company {1},{1 company සමාගමට එරෙහිව {0 for සඳහා අනුමත ණය මුදල දැනටමත් පවතී,
Save,සුරකින්න,
Save Item,අයිතමය සුරකින්න,
Saved Items,සුරකින ලද අයිතම,
@@ -4135,7 +4093,6 @@
User {0} is disabled,පරිශීලක {0} අක්රීය,
Users and Permissions,පරිශීලකයන් හා අවසර,
Vacancies cannot be lower than the current openings,පුරප්පාඩු වත්මන් විවෘත කිරීම් වලට වඩා අඩු විය නොහැක,
-Valid From Time must be lesser than Valid Upto Time.,වලංගු කාලය කාලයට වඩා වලංගු විය යුතුය.,
Valuation Rate required for Item {0} at row {1},{1 row පේළියේ {0 item අයිතමය සඳහා තක්සේරු අනුපාතය අවශ්ය වේ,
Values Out Of Sync,සමමුහුර්තතාවයෙන් පිටත වටිනාකම්,
Vehicle Type is required if Mode of Transport is Road,ප්රවාහන ක්රමය මාර්ගයක් නම් වාහන වර්ගය අවශ්ය වේ,
@@ -4211,7 +4168,6 @@
Add to Cart,ගැලට එක් කරන්න,
Days Since Last Order,අවසාන ඇණවුමේ දින සිට,
In Stock,ගබඩාවේ ඇත,
-Loan Amount is mandatory,ණය මුදල අනිවාර්ය වේ,
Mode Of Payment,ගෙවීම් ක්රමය,
No students Found,සිසුන් හමු නොවීය,
Not in Stock,නැහැ දී කොටස්,
@@ -4240,7 +4196,6 @@
Group by,කණ්ඩායම විසින්,
In stock,ගබඩාවේ ඇත,
Item name,අයිතමය නම,
-Loan amount is mandatory,ණය මුදල අනිවාර්ය වේ,
Minimum Qty,අවම වශයෙන් Qty,
More details,වැඩිපුර විස්තර,
Nature of Supplies,සැපයුම් ස්වභාවය,
@@ -4409,9 +4364,6 @@
Total Completed Qty,සම්පුර්ණ කරන ලද Qty,
Qty to Manufacture,යවන ලද නිෂ්පාදනය කිරීම සඳහා,
Repay From Salary can be selected only for term loans,වැටුපෙන් ආපසු ගෙවීම තෝරා ගත හැක්කේ කාලීන ණය සඳහා පමණි,
-No valid Loan Security Price found for {0},Valid 0 for සඳහා වලංගු ණය ආරක්ෂණ මිලක් හමු නොවීය,
-Loan Account and Payment Account cannot be same,ණය ගිණුම සහ ගෙවීම් ගිණුම සමාන විය නොහැක,
-Loan Security Pledge can only be created for secured loans,ණය ආරක්ෂක ප්රති ledge ාව නිර්මාණය කළ හැක්කේ සුරක්ෂිත ණය සඳහා පමණි,
Social Media Campaigns,සමාජ මාධ්ය ව්යාපාර,
From Date can not be greater than To Date,දිනය සිට දිනට වඩා වැඩි විය නොහැක,
Please set a Customer linked to the Patient,කරුණාකර රෝගියාට සම්බන්ධ පාරිභෝගිකයෙකු සකසන්න,
@@ -6437,7 +6389,6 @@
HR User,මානව සම්පත් පරිශීලක,
Appointment Letter,පත්වීම් ලිපිය,
Job Applicant,රැකියා අයදුම්කරු,
-Applicant Name,අයදුම්කරු නම,
Appointment Date,පත්වීම් දිනය,
Appointment Letter Template,පත්වීම් ලිපි ආකෘතිය,
Body,සිරුර,
@@ -7059,99 +7010,12 @@
Sync in Progress,ප්රගතිය සමමුහුර්ත කරන්න,
Hub Seller Name,විකුණුම්කරුගේ නම,
Custom Data,අභිරුචි දත්ත,
-Member,සාමාජිකයෙකි,
-Partially Disbursed,අර්ධ වශයෙන් මුදාහැරේ,
-Loan Closure Requested,ණය වසා දැමීම ඉල්ලා ඇත,
Repay From Salary,වැටුප් සිට ආපසු ගෙවීම,
-Loan Details,ණය තොරතුරු,
-Loan Type,ණය වර්ගය,
-Loan Amount,ණය මුදල,
-Is Secured Loan,සුරක්ෂිත ණය වේ,
-Rate of Interest (%) / Year,පොලී අනුපාතය (%) / අවුරුද්ද,
-Disbursement Date,ටහිර දිනය,
-Disbursed Amount,බෙදා හරින ලද මුදල,
-Is Term Loan,කාලීන ණය වේ,
-Repayment Method,ණය ආපසු ගෙවීමේ ක්රමය,
-Repay Fixed Amount per Period,කාලය අනුව ස්ථාවර මුදල ආපසු ගෙවීම,
-Repay Over Number of Periods,"කාල පරිච්ඡේදය, සංඛ්යාව අධික ආපසු ගෙවීම",
-Repayment Period in Months,මාස තුළ ආපසු ගෙවීමේ කාලය,
-Monthly Repayment Amount,මාසික නැවත ගෙවන ප්රමාණය,
-Repayment Start Date,ආපසු ගෙවීමේ ආරම්භක දිනය,
-Loan Security Details,ණය ආරක්ෂණ තොරතුරු,
-Maximum Loan Value,උපරිම ණය වටිනාකම,
-Account Info,ගිණුමක් තොරතුරු,
-Loan Account,ණය ගිණුම,
-Interest Income Account,පොලී ආදායම ගිණුම,
-Penalty Income Account,දඩ ආදායම් ගිණුම,
-Repayment Schedule,ණය ආපසු ගෙවීමේ කාලසටහන,
-Total Payable Amount,මුළු ගෙවිය යුතු මුදල,
-Total Principal Paid,ගෙවන ලද මුළු විදුහල්පති,
-Total Interest Payable,සම්පූර්ණ පොලී ගෙවිය යුතු,
-Total Amount Paid,මුළු මුදල ගෙවා ඇත,
-Loan Manager,ණය කළමනාකරු,
-Loan Info,ණය තොරතුරු,
-Rate of Interest,පොලී අනුපාතය,
-Proposed Pledges,යෝජිත පොරොන්දු,
-Maximum Loan Amount,උපරිම ණය මුදල,
-Repayment Info,ණය ආපසු ගෙවීමේ තොරතුරු,
-Total Payable Interest,මුළු ගෙවිය යුතු පොලී,
-Against Loan ,ණයට එරෙහිව,
-Loan Interest Accrual,ණය පොලී උපචිතය,
-Amounts,මුදල්,
-Pending Principal Amount,ප්රධාන මුදල ඉතිරිව තිබේ,
-Payable Principal Amount,ගෙවිය යුතු ප්රධාන මුදල,
-Paid Principal Amount,ගෙවන ලද ප්රධාන මුදල,
-Paid Interest Amount,ගෙවූ පොලී මුදල,
-Process Loan Interest Accrual,ණය පොලී උපචිත ක්රියාවලිය,
-Repayment Schedule Name,ආපසු ගෙවීමේ උපලේඛනයේ නම,
Regular Payment,නිතිපතා ගෙවීම,
Loan Closure,ණය වසා දැමීම,
-Payment Details,ගෙවීම් තොරතුරු,
-Interest Payable,පොලී ගෙවිය යුතු,
-Amount Paid,ු ර්,
-Principal Amount Paid,ගෙවන ලද ප්රධාන මුදල,
-Repayment Details,ආපසු ගෙවීමේ විස්තර,
-Loan Repayment Detail,ණය ආපසු ගෙවීමේ විස්තරය,
-Loan Security Name,ණය ආරක්ෂණ නම,
-Unit Of Measure,මිනුම් ඒකකය,
-Loan Security Code,ණය ආරක්ෂක කේතය,
-Loan Security Type,ණය ආරක්ෂණ වර්ගය,
-Haircut %,කප්පාදුව%,
-Loan Details,ණය විස්තර,
-Unpledged,නොකැඩූ,
-Pledged,ප්රති led ා දී ඇත,
-Partially Pledged,අර්ධ වශයෙන් ප්රති led ා දී ඇත,
-Securities,සුරැකුම්පත්,
-Total Security Value,සම්පූර්ණ ආරක්ෂක වටිනාකම,
-Loan Security Shortfall,ණය ආරක්ෂණ හිඟය,
-Loan ,ණය,
-Shortfall Time,හිඟ කාලය,
-America/New_York,ඇමරිකාව / නිව්_යෝක්,
-Shortfall Amount,හිඟ මුදල,
-Security Value ,ආරක්ෂක වටිනාකම,
-Process Loan Security Shortfall,ක්රියාවලි ණය ආරක්ෂණ හිඟය,
-Loan To Value Ratio,අගය අනුපාතයට ණය,
-Unpledge Time,කාලය ඉවත් කරන්න,
-Loan Name,ණය නම,
Rate of Interest (%) Yearly,පොලී අනුපාතය (%) වාර්ෂික,
-Penalty Interest Rate (%) Per Day,දඩ පොලී අනුපාතය (%) දිනකට,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,ආපසු ගෙවීම ප්රමාද වුවහොත් දිනපතා අපේක්ෂිත පොලී මුදල මත දඩ පොලී අනුපාතය අය කෙරේ,
-Grace Period in Days,දින තුළ ග්රේස් කාලය,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,ණය ආපසු ගෙවීම ප්රමාද වුවහොත් දඩ මුදලක් අය නොකෙරෙන දින සිට නියමිත දින දක්වා,
-Pledge,ප්රති ledge ාව,
-Post Haircut Amount,කප්පාදුවේ මුදල,
-Process Type,ක්රියාවලි වර්ගය,
-Update Time,යාවත්කාලීන කාලය,
-Proposed Pledge,යෝජිත පොරොන්දුව,
-Total Payment,මුළු ගෙවීම්,
-Balance Loan Amount,ඉතිරි ණය මුදල,
-Is Accrued,උපචිත වේ,
Salary Slip Loan,වැටුප් ස්ලිප් ණය,
Loan Repayment Entry,ණය ආපසු ගෙවීමේ ප්රවේශය,
-Sanctioned Loan Amount,අනුමත ණය මුදල,
-Sanctioned Amount Limit,අනුමත කළ සීමාව,
-Unpledge,ඉවත් කරන්න,
-Haircut,කප්පාදුව,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY-,
Generate Schedule,උපෙල්ඛනෙය් උත්පාදනය,
Schedules,කාලසටහන්,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,ව්යාපෘති මේ පරිශීලකයන්ට එම වෙබ් අඩවිය පිවිසිය හැකි වනු ඇත,
Copied From,සිට පිටපත්,
Start and End Dates,ආරම්භ කිරීම හා අවසන් දිනයන්,
-Actual Time (in Hours),තථ්ය කාලය (පැය වලින්),
+Actual Time in Hours (via Timesheet),තථ්ය කාලය (පැය වලින්),
Costing and Billing,පිරිවැය හා බිල්පත්,
-Total Costing Amount (via Timesheets),මුළු පිරිවැය ප්රමාණය (පත්රිකා මගින්),
-Total Expense Claim (via Expense Claims),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්,
+Total Costing Amount (via Timesheet),මුළු පිරිවැය ප්රමාණය (පත්රිකා මගින්),
+Total Expense Claim (via Expense Claim),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්,
Total Purchase Cost (via Purchase Invoice),(මිලදී ගැනීමේ ඉන්වොයිසිය හරහා) මුළු මිලදී ගැනීම පිරිවැය,
Total Sales Amount (via Sales Order),මුළු විකුණුම් මුදල (විකුණුම් නියෝගය හරහා),
-Total Billable Amount (via Timesheets),මුළු බිල්පත් ප්රමාණය (පත්රිකා මගින්),
-Total Billed Amount (via Sales Invoices),මුළු බිල්පත් ප්රමාණය (විකුණුම් ඉන්වොයිසි හරහා),
-Total Consumed Material Cost (via Stock Entry),මුළු පාරිභේාිත ද්රව්ය පිරිවැය (කොටස් තොගය හරහා),
+Total Billable Amount (via Timesheet),මුළු බිල්පත් ප්රමාණය (පත්රිකා මගින්),
+Total Billed Amount (via Sales Invoice),මුළු බිල්පත් ප්රමාණය (විකුණුම් ඉන්වොයිසි හරහා),
+Total Consumed Material Cost (via Stock Entry),මුළු පාරිභේාිත ද්රව්ය පිරිවැය (කොටස් තොගය හරහා),
Gross Margin,දළ ආන්තිකය,
Gross Margin %,දළ ආන්තිකය%,
Monitor Progress,ප්රගතිය අධීක්ෂණය කරන්න,
@@ -7521,12 +7385,10 @@
Dependencies,යැපීම්,
Dependent Tasks,යැපෙන කාර්යයන්,
Depends on Tasks,කාර්යයන් මත රඳා පවතී,
-Actual Start Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ ඇරඹුම් දිනය,
-Actual Time (in hours),සැබෑ කාලය (පැය දී),
-Actual End Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය,
-Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල,
+Actual Start Date (via Timesheet),(කාල පත්රය හරහා) සැබෑ ඇරඹුම් දිනය,
+Actual Time in Hours (via Timesheet),සැබෑ කාලය (පැය දී),
+Actual End Date (via Timesheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය,
Total Expense Claim (via Expense Claim),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්,
-Total Billing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු බිල්පත් ප්රමාණය,
Review Date,සමාලෝචන දිනය,
Closing Date,අවසන් දිනය,
Task Depends On,කාර්ය සාධක මත රඳා පවතී,
@@ -7887,7 +7749,6 @@
Update Series,යාවත්කාලීන ශ්රේණි,
Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.,
Prefix,උපසර්ගය,
-Current Value,වත්මන් වටිනාකම,
This is the number of the last created transaction with this prefix,මෙය මේ උපසර්ගය සහිත පසුගිය නිර්මාණය ගනුදෙනුව සංඛ්යාව වේ,
Update Series Number,යාවත්කාලීන ශ්රේණි අංකය,
Quotation Lost Reason,උද්ධෘත ලොස්ට් හේතුව,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise සීරුමාරු කිරීමේ පෙළ නිර්දේශිත,
Lead Details,ඊයම් විස්තර,
Lead Owner Efficiency,ඊයම් හිමිකරු කාර්යක්ෂමතා,
-Loan Repayment and Closure,ණය ආපසු ගෙවීම සහ වසා දැමීම,
-Loan Security Status,ණය ආරක්ෂණ තත්ත්වය,
Lost Opportunity,අවස්ථාව අහිමි විය,
Maintenance Schedules,නඩත්තු කාලසටහන,
Material Requests for which Supplier Quotations are not created,සැපයුම්කරු මිල ගණන් නිර්මාණය නොවන සඳහා ද්රව්ය ඉල්ලීම්,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ඉලක්ක කළ ගණන්: {0},
Payment Account is mandatory,ගෙවීම් ගිණුම අනිවාර්ය වේ,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","පරික්ෂා කර බැලුවහොත්, කිසිදු ප්රකාශයක් හෝ සාක්ෂි ඉදිරිපත් කිරීමකින් තොරව ආදායම් බදු ගණනය කිරීමට පෙර සම්පූර්ණ මුදල බදු අය කළ හැකි ආදායමෙන් අඩු කරනු ලැබේ.",
-Disbursement Details,බෙදා හැරීමේ විස්තර,
Material Request Warehouse,ද්රව්ය ඉල්ලීම් ගබඩාව,
Select warehouse for material requests,ද්රව්යමය ඉල්ලීම් සඳහා ගබඩාව තෝරන්න,
Transfer Materials For Warehouse {0},ගබඩාව සඳහා ද්රව්ය මාරු කිරීම {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,ඉල්ලුම් නොකළ මුදල වැටුපෙන් ආපසු ගෙවන්න,
Deduction from salary,වැටුපෙන් අඩු කිරීම,
Expired Leaves,කල් ඉකුත් වූ කොළ,
-Reference No,යොමු අංකය,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,කප්පාදුවේ ප්රතිශතය යනු ණය සුරක්ෂිතතාවයේ වෙළඳපල වටිනාකම සහ එම ණය සඳහා ඇපකරයක් ලෙස භාවිතා කරන විට එම ණය සුරක්ෂිතතාවයට නියම කර ඇති වටිනාකම අතර ප්රතිශත වෙනසයි.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,ණය සඳහා වටිනාකම් අනුපාතය මඟින් පොරොන්දු වූ සුරක්ෂිතතාවයේ වටිනාකමට ණය මුදල අනුපාතය ප්රකාශ කරයි. කිසියම් ණයක් සඳහා නිශ්චිත වටිනාකමට වඩා පහත වැටුණහොත් ණය ආරක්ෂණ හිඟයක් ඇති වේ,
If this is not checked the loan by default will be considered as a Demand Loan,මෙය පරීක්ෂා නොකළ හොත් ණය පෙරනිමියෙන් ඉල්ලුම් ණය ලෙස සැලකේ,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,මෙම ගිණුම ණය ගැනුම්කරුගෙන් ණය ආපසු ගෙවීම් වෙන්කරවා ගැනීම සඳහා සහ ණය ගැනුම්කරුට ණය ලබා දීම සඳහා යොදා ගනී,
This account is capital account which is used to allocate capital for loan disbursal account ,මෙම ගිණුම ණය බෙදා හැරීමේ ගිණුම සඳහා ප්රාග්ධනය වෙන් කිරීම සඳහා භාවිතා කරන ප්රාග්ධන ගිණුමකි,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Order 0 the මෙහෙයුම order 1 order වැඩ ඇණවුමට අයත් නොවේ,
Print UOM after Quantity,ප්රමාණයෙන් පසු UOM මුද්රණය කරන්න,
Set default {0} account for perpetual inventory for non stock items,කොටස් නොවන අයිතම සඳහා නිරන්තර ඉන්වෙන්ටරි සඳහා පෙරනිමි {0} ගිණුම සකසන්න,
-Loan Security {0} added multiple times,ණය ආරක්ෂාව {0 multiple කිහිප වතාවක් එකතු කරන ලදි,
-Loan Securities with different LTV ratio cannot be pledged against one loan,විවිධ LTV අනුපාතයක් සහිත ණය සුරැකුම්පත් එක් ණයක් සඳහා පොරොන්දු විය නොහැක,
-Qty or Amount is mandatory for loan security!,ණය සුරක්ෂිතතාව සඳහා ප්රමාණය හෝ මුදල අනිවාර්ය වේ!,
-Only submittted unpledge requests can be approved,අනුමත කළ හැක්කේ ඉදිරිපත් නොකළ ඉල්ලීම් පමණි,
-Interest Amount or Principal Amount is mandatory,පොලී මුදල හෝ ප්රධාන මුදල අනිවාර්ය වේ,
-Disbursed Amount cannot be greater than {0},බෙදා හරින ලද මුදල {0 than ට වඩා වැඩි විය නොහැක,
-Row {0}: Loan Security {1} added multiple times,පේළිය {0}: ණය ආරක්ෂාව {1 multiple කිහිප වතාවක් එකතු කරන ලදි,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,පේළිය # {0}: ළමා අයිතමය නිෂ්පාදන මිටියක් නොවිය යුතුය. කරුණාකර අයිතමය {1 ඉවත් කර සුරකින්න,
Credit limit reached for customer {0},පාරිභෝගික සීමාව සඳහා ණය සීමාව ළඟා විය {0},
Could not auto create Customer due to the following missing mandatory field(s):,පහත දැක්වෙන අනිවාර්ය ක්ෂේත්ර (ය) හේතුවෙන් පාරිභෝගිකයා ස්වයංක්රීයව නිර්මාණය කිරීමට නොහැකි විය:,
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index d16c492..74c4cb6 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Uplatniteľné, ak je spoločnosť SpA, SApA alebo SRL",
Applicable if the company is a limited liability company,"Uplatniteľné, ak je spoločnosť spoločnosť s ručením obmedzeným",
Applicable if the company is an Individual or a Proprietorship,"Uplatniteľné, ak je spoločnosť fyzická osoba alebo vlastníčka",
-Applicant,žiadateľ,
-Applicant Type,Typ žiadateľa,
Application of Funds (Assets),Aplikace fondů (aktiv),
Application period cannot be across two allocation records,Obdobie žiadosti nemôže prebiehať medzi dvoma alokačnými záznamami,
Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Zoznam dostupných akcionárov s číslami fotiek,
Loading Payment System,Načítanie platobného systému,
Loan,pôžička,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0},
-Loan Application,Aplikácia úveru,
-Loan Management,Správa úverov,
-Loan Repayment,splácania úveru,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Dátum začatia pôžičky a obdobie pôžičky sú povinné na uloženie diskontovania faktúry,
Loans (Liabilities),Úvěry (závazky),
Loans and Advances (Assets),Úvěrů a půjček (aktiva),
@@ -1611,7 +1605,6 @@
Monday,Pondělí,
Monthly,Měsíčně,
Monthly Distribution,Měsíční Distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mesačné splátky suma nemôže byť vyššia ako suma úveru,
More,Viac,
More Information,Viac informácií,
More than one selection for {0} not allowed,Nie je povolený viac ako jeden výber pre {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Plaťte {0} {1},
Payable,splatný,
Payable Account,Splatnost účtu,
-Payable Amount,Splatná suma,
Payment,Splátka,
Payment Cancelled. Please check your GoCardless Account for more details,Platba bola zrušená. Skontrolujte svoj účet GoCardless pre viac informácií,
Payment Confirmation,Potvrdenie platby,
-Payment Date,Dátum platby,
Payment Days,Platební dny,
Payment Document,platba Document,
Payment Due Date,Splatné dňa,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení",
Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu",
Please enter Reference date,"Prosím, zadejte Referenční den",
-Please enter Repayment Periods,"Prosím, zadajte dobu splácania",
Please enter Reqd by Date,Zadajte Reqd podľa dátumu,
Please enter Woocommerce Server URL,Zadajte URL servera Woocommerce,
Please enter Write Off Account,"Prosím, zadejte odepsat účet",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský",
Please enter quantity for Item {0},Zadajte prosím množstvo pre Položku {0},
Please enter relieving date.,Zadejte zmírnění datum.,
-Please enter repayment Amount,"Prosím, zadajte splácanie Čiastka",
Please enter valid Financial Year Start and End Dates,Zadajte platné dátumy začiatku a konca finančného roka,
Please enter valid email address,Zadajte platnú e-mailovú adresu,
Please enter {0} first,"Prosím, najprv zadajte {0}",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.,
Primary Address Details,Údaje o primárnej adrese,
Primary Contact Details,Priame kontaktné údaje,
-Principal Amount,istina,
Print Format,Formát tlače,
Print IRS 1099 Forms,Tlačte formuláre IRS 1099,
Print Report Card,Vytlačiť kartu správ,
@@ -2550,7 +2538,6 @@
Sample Collection,Zbierka vzoriek,
Sample quantity {0} cannot be more than received quantity {1},Množstvo vzorky {0} nemôže byť väčšie ako prijaté množstvo {1},
Sanctioned,Sankcionované,
-Sanctioned Amount,Sankcionovaná čiastka,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.,
Sand,piesok,
Saturday,Sobota,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} už má rodičovský postup {1}.,
API,API,
Annual,Roční,
-Approved,Schválený,
Change,Zmena,
Contact Email,Kontaktný e-mail,
Export Type,Typ exportu,
@@ -3571,7 +3557,6 @@
Account Value,Hodnota účtu,
Account is mandatory to get payment entries,Účet je povinný na získanie platobných záznamov,
Account is not set for the dashboard chart {0},Účet nie je nastavený pre tabuľku dashboardov {0},
-Account {0} does not belong to company {1},Účet {0} nepatří do společnosti {1},
Account {0} does not exists in the dashboard chart {1},Účet {0} v grafe dashboardu neexistuje {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Účet: <b>{0}</b> je kapitál Prebieha spracovanie a nedá sa aktualizovať zápisom do denníka,
Account: {0} is not permitted under Payment Entry,Účet: {0} nie je povolený v rámci zadania platby,
@@ -3582,7 +3567,6 @@
Activity,Aktivita,
Add / Manage Email Accounts.,Pridanie / Správa e-mailových účtov.,
Add Child,Pridať potomka,
-Add Loan Security,Pridajte zabezpečenie úveru,
Add Multiple,Pridať viacero,
Add Participants,Pridať účastníkov,
Add to Featured Item,Pridať k odporúčanej položke,
@@ -3593,15 +3577,12 @@
Address Line 1,Riadok adresy 1,
Addresses,Adresy,
Admission End Date should be greater than Admission Start Date.,Dátum ukončenia prijímania by mal byť vyšší ako dátum začatia prijímania.,
-Against Loan,Proti pôžičke,
-Against Loan:,Proti pôžičke:,
All,ALL,
All bank transactions have been created,Všetky bankové transakcie boli vytvorené,
All the depreciations has been booked,Všetky odpisy boli zaúčtované,
Allocation Expired!,Platnosť pridelenia vypršala!,
Allow Resetting Service Level Agreement from Support Settings.,Povoľte obnovenie dohody o úrovni služieb z nastavení podpory.,
Amount of {0} is required for Loan closure,Na uzatvorenie úveru je potrebná suma {0},
-Amount paid cannot be zero,Vyplatená suma nemôže byť nula,
Applied Coupon Code,Kód použitého kupónu,
Apply Coupon Code,Použite kód kupónu,
Appointment Booking,Rezervácia schôdzky,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Nie je možné vypočítať čas príchodu, pretože chýba adresa vodiča.",
Cannot Optimize Route as Driver Address is Missing.,"Nie je možné optimalizovať trasu, pretože chýba adresa vodiča.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Nie je možné dokončiť úlohu {0}, pretože jej závislá úloha {1} nie je dokončená / zrušená.",
-Cannot create loan until application is approved,"Úver nie je možné vytvoriť, kým nebude žiadosť schválená",
Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nie je možné preplatiť položku {0} v riadku {1} viac ako {2}. Ak chcete povoliť nadmernú fakturáciu, nastavte príspevok v nastaveniach účtov",
"Capacity Planning Error, planned start time can not be same as end time","Chyba plánovania kapacity, plánovaný čas začiatku nemôže byť rovnaký ako čas ukončenia",
@@ -3812,20 +3792,9 @@
Less Than Amount,Menej ako suma,
Liabilities,záväzky,
Loading...,Nahrávám...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Suma úveru presahuje maximálnu výšku úveru {0} podľa navrhovaných cenných papierov,
Loan Applications from customers and employees.,Žiadosti o pôžičky od zákazníkov a zamestnancov.,
-Loan Disbursement,Vyplatenie úveru,
Loan Processes,Úverové procesy,
-Loan Security,Zabezpečenie pôžičky,
-Loan Security Pledge,Pôžička za zabezpečenie úveru,
-Loan Security Pledge Created : {0},Vytvorené záložné právo na pôžičku: {0},
-Loan Security Price,Cena zabezpečenia úveru,
-Loan Security Price overlapping with {0},Cena za pôžičku sa prekrýva s {0},
-Loan Security Unpledge,Zabezpečenie pôžičky nie je viazané,
-Loan Security Value,Hodnota zabezpečenia úveru,
Loan Type for interest and penalty rates,Typ úveru pre úroky a penále,
-Loan amount cannot be greater than {0},Suma úveru nemôže byť vyššia ako {0},
-Loan is mandatory,Pôžička je povinná,
Loans,pôžičky,
Loans provided to customers and employees.,Pôžičky poskytnuté zákazníkom a zamestnancom.,
Location,Místo,
@@ -3894,7 +3863,6 @@
Pay,Platiť,
Payment Document Type,Druh platobného dokladu,
Payment Name,Názov platby,
-Penalty Amount,Suma pokuty,
Pending,Čakajúce,
Performance,výkon,
Period based On,Obdobie založené na,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Ak chcete upraviť túto položku, prihláste sa ako používateľ služby Marketplace.",
Please login as a Marketplace User to report this item.,"Ak chcete nahlásiť túto položku, prihláste sa ako používateľ Marketplace.",
Please select <b>Template Type</b> to download template,Vyberte <b>šablónu</b> pre stiahnutie šablóny,
-Please select Applicant Type first,Najskôr vyberte typ žiadateľa,
Please select Customer first,Najskôr vyberte zákazníka,
Please select Item Code first,Najskôr vyberte kód položky,
-Please select Loan Type for company {0},Vyberte typ úveru pre spoločnosť {0},
Please select a Delivery Note,Vyberte dodací list,
Please select a Sales Person for item: {0},Vyberte obchodnú osobu pre položku: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Vyberte iný spôsob platby. Stripe nepodporuje transakcie s menou "{0}",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Nastavte predvolený bankový účet spoločnosti {0},
Please specify,Prosím upresnite,
Please specify a {0},Zadajte {0},lead
-Pledge Status,Stav záložného práva,
-Pledge Time,Pledge Time,
Printing,Tlačenie,
Priority,Priorita,
Priority has been changed to {0}.,Priorita sa zmenila na {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Spracovanie súborov XML,
Profitability,Ziskovosť,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Navrhované záložné práva sú povinné pre zabezpečené pôžičky,
Provide the academic year and set the starting and ending date.,Uveďte akademický rok a stanovte počiatočný a konečný dátum.,
Public token is missing for this bank,V tejto banke chýba verejný token,
Publish,publikovať,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Potvrdenie o kúpe nemá žiadnu položku, pre ktorú je povolená vzorka ponechania.",
Purchase Return,Nákup Return,
Qty of Finished Goods Item,Množstvo dokončeného tovaru,
-Qty or Amount is mandatroy for loan security,Množstvo alebo suma je mandatroy pre zabezpečenie úveru,
Quality Inspection required for Item {0} to submit,"Vyžaduje sa kontrola kvality, aby sa položka {0} mohla predložiť",
Quantity to Manufacture,Množstvo na výrobu,
Quantity to Manufacture can not be zero for the operation {0},Množstvo na výrobu nemôže byť pre operáciu nulové {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Dátum vydania musí byť väčší alebo rovný dátumu pripojenia,
Rename,Premenovať,
Rename Not Allowed,Premenovať nie je povolené,
-Repayment Method is mandatory for term loans,Spôsob splácania je povinný pre termínované pôžičky,
-Repayment Start Date is mandatory for term loans,Dátum začiatku splácania je povinný pre termínované pôžičky,
Report Item,Položka správy,
Report this Item,Nahláste túto položku,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Vyhradené množstvo pre subdodávky: Množstvo surovín na výrobu subdodávateľských položiek.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Riadok ({0}): {1} je už zľavnený v {2},
Rows Added in {0},Riadky pridané v {0},
Rows Removed in {0},Riadky odstránené o {0},
-Sanctioned Amount limit crossed for {0} {1},Prekročený limit sankcie pre {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Čiastka schválenej pôžičky už existuje pre {0} proti spoločnosti {1},
Save,Uložiť,
Save Item,Uložiť položku,
Saved Items,Uložené položky,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Uživatel {0} je zakázána,
Users and Permissions,Uživatelé a oprávnění,
Vacancies cannot be lower than the current openings,Počet voľných pracovných miest nemôže byť nižší ako súčasné,
-Valid From Time must be lesser than Valid Upto Time.,Platný od času musí byť kratší ako platný až do času.,
Valuation Rate required for Item {0} at row {1},Sadzba ocenenia požadovaná pre položku {0} v riadku {1},
Values Out Of Sync,Hodnoty nie sú synchronizované,
Vehicle Type is required if Mode of Transport is Road,"Ak je spôsob dopravy cestný, vyžaduje sa typ vozidla",
@@ -4211,7 +4168,6 @@
Add to Cart,Pridať do košíka,
Days Since Last Order,Dni od poslednej objednávky,
In Stock,Na skladě,
-Loan Amount is mandatory,Suma úveru je povinná,
Mode Of Payment,Způsob platby,
No students Found,Nenašli sa žiadni študenti,
Not in Stock,Nie je na sklade,
@@ -4240,7 +4196,6 @@
Group by,Seskupit podle,
In stock,Skladom,
Item name,Názov položky,
-Loan amount is mandatory,Suma úveru je povinná,
Minimum Qty,Minimálny počet,
More details,Další podrobnosti,
Nature of Supplies,Povaha spotrebného materiálu,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Celkom dokončené množstvo,
Qty to Manufacture,Množství K výrobě,
Repay From Salary can be selected only for term loans,Výplatu zo mzdy je možné zvoliť iba pri termínovaných pôžičkách,
-No valid Loan Security Price found for {0},Pre {0} sa nenašla platná cena zabezpečenia pôžičky.,
-Loan Account and Payment Account cannot be same,Pôžičkový účet a platobný účet nemôžu byť rovnaké,
-Loan Security Pledge can only be created for secured loans,Sľub zabezpečenia úveru je možné vytvoriť iba pre zabezpečené pôžičky,
Social Media Campaigns,Kampane na sociálnych sieťach,
From Date can not be greater than To Date,Od dátumu nemôže byť väčšie ako Od dátumu,
Please set a Customer linked to the Patient,Nastavte zákazníka prepojeného s pacientom,
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Menovací list,
Job Applicant,Job Žadatel,
-Applicant Name,Meno žiadateľa,
Appointment Date,Dátum stretnutia,
Appointment Letter Template,Šablóna menovacieho listu,
Body,telo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Priebeh synchronizácie,
Hub Seller Name,Názov predajcu Hubu,
Custom Data,Vlastné údaje,
-Member,člen,
-Partially Disbursed,čiastočne Vyplatené,
-Loan Closure Requested,Vyžaduje sa uzavretie úveru,
Repay From Salary,Splatiť z platu,
-Loan Details,pôžička Podrobnosti,
-Loan Type,pôžička Type,
-Loan Amount,Výška pôžičky,
-Is Secured Loan,Je zabezpečená pôžička,
-Rate of Interest (%) / Year,Úroková sadzba (%) / rok,
-Disbursement Date,vyplatenie Date,
-Disbursed Amount,Vyplatená suma,
-Is Term Loan,Je termín úver,
-Repayment Method,splácanie Method,
-Repay Fixed Amount per Period,Splácať paušálna čiastka za obdobie,
-Repay Over Number of Periods,Splatiť Over počet období,
-Repayment Period in Months,Doba splácania v mesiacoch,
-Monthly Repayment Amount,Mesačné splátky čiastka,
-Repayment Start Date,Dátum začiatku splácania,
-Loan Security Details,Podrobnosti o zabezpečení pôžičky,
-Maximum Loan Value,Maximálna hodnota úveru,
-Account Info,Informácie o účte,
-Loan Account,Úverový účet,
-Interest Income Account,Účet Úrokové výnosy,
-Penalty Income Account,Trestný účet,
-Repayment Schedule,splátkový kalendár,
-Total Payable Amount,Celková suma Splatné,
-Total Principal Paid,Celková zaplatená istina,
-Total Interest Payable,Celkové úroky splatné,
-Total Amount Paid,Celková čiastka bola zaplatená,
-Loan Manager,Úverový manažér,
-Loan Info,pôžička Informácie,
-Rate of Interest,Úroková sadzba,
-Proposed Pledges,Navrhované sľuby,
-Maximum Loan Amount,Maximálna výška úveru,
-Repayment Info,splácanie Info,
-Total Payable Interest,Celková splatný úrok,
-Against Loan ,Proti pôžičke,
-Loan Interest Accrual,Prírastok úrokov z úveru,
-Amounts,množstvo,
-Pending Principal Amount,Čakajúca hlavná suma,
-Payable Principal Amount,Splatná istina,
-Paid Principal Amount,Vyplatená istina,
-Paid Interest Amount,Výška zaplateného úroku,
-Process Loan Interest Accrual,Časové rozlíšenie úrokov z úveru na spracovanie,
-Repayment Schedule Name,Názov splátkového kalendára,
Regular Payment,Pravidelná platba,
Loan Closure,Uzavretie úveru,
-Payment Details,Platobné údaje,
-Interest Payable,Splatný úrok,
-Amount Paid,Zaplacené částky,
-Principal Amount Paid,Vyplatená istina,
-Repayment Details,Podrobnosti o splácaní,
-Loan Repayment Detail,Podrobnosti o splácaní pôžičky,
-Loan Security Name,Názov zabezpečenia úveru,
-Unit Of Measure,Merná jednotka,
-Loan Security Code,Bezpečnostný kód úveru,
-Loan Security Type,Druh zabezpečenia pôžičky,
-Haircut %,Zrážka%,
-Loan Details,Podrobnosti o pôžičke,
-Unpledged,Unpledged,
-Pledged,zastavené,
-Partially Pledged,Čiastočne prisľúbené,
-Securities,cenné papiere,
-Total Security Value,Celková hodnota zabezpečenia,
-Loan Security Shortfall,Nedostatok úverovej bezpečnosti,
-Loan ,pôžička,
-Shortfall Time,Čas výpadku,
-America/New_York,America / New_York,
-Shortfall Amount,Suma schodku,
-Security Value ,Hodnota zabezpečenia,
-Process Loan Security Shortfall,Nedostatok zabezpečenia procesných úverov,
-Loan To Value Ratio,Pomer pôžičky k hodnote,
-Unpledge Time,Čas uvoľnenia,
-Loan Name,pôžička Name,
Rate of Interest (%) Yearly,Úroková sadzba (%) Ročné,
-Penalty Interest Rate (%) Per Day,Trestná úroková sadzba (%) za deň,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,V prípade omeškania splácania sa každý deň vyberá sankčná úroková sadzba z omeškanej úrokovej sadzby,
-Grace Period in Days,Milosť v dňoch,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Počet dní od dátumu splatnosti, do ktorých vám nebude účtovaná pokuta v prípade oneskorenia so splácaním úveru",
-Pledge,zástava,
-Post Haircut Amount,Suma po zrážke,
-Process Type,Typ procesu,
-Update Time,Aktualizovať čas,
-Proposed Pledge,Navrhovaný prísľub,
-Total Payment,celkové platby,
-Balance Loan Amount,Bilancia Výška úveru,
-Is Accrued,Je nahromadené,
Salary Slip Loan,Úverový splátkový úver,
Loan Repayment Entry,Zadanie splátky úveru,
-Sanctioned Loan Amount,Suma schváleného úveru,
-Sanctioned Amount Limit,Sankčný limit sumy,
-Unpledge,Unpledge,
-Haircut,strih,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generování plán,
Schedules,Plány,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekt bude k dispozícii na webových stránkach k týmto užívateľom,
Copied From,Skopírované z,
Start and End Dates,Dátum začatia a ukončenia,
-Actual Time (in Hours),Skutočný čas (v hodinách),
+Actual Time in Hours (via Timesheet),Skutočný čas (v hodinách),
Costing and Billing,Kalkulácia a fakturácia,
-Total Costing Amount (via Timesheets),Celková výška sumy (prostredníctvom časových rozpisov),
-Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nárokov),
+Total Costing Amount (via Timesheet),Celková výška sumy (prostredníctvom časových rozpisov),
+Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nárokov),
Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry),
Total Sales Amount (via Sales Order),Celková výška predaja (prostredníctvom objednávky predaja),
-Total Billable Amount (via Timesheets),Celková fakturovaná suma (prostredníctvom dochádzky),
-Total Billed Amount (via Sales Invoices),Celková fakturovaná suma (prostredníctvom faktúr za predaj),
-Total Consumed Material Cost (via Stock Entry),Celková spotreba materiálových nákladov (prostredníctvom vkladu),
+Total Billable Amount (via Timesheet),Celková fakturovaná suma (prostredníctvom dochádzky),
+Total Billed Amount (via Sales Invoice),Celková fakturovaná suma (prostredníctvom faktúr za predaj),
+Total Consumed Material Cost (via Stock Entry),Celková spotreba materiálových nákladov (prostredníctvom vkladu),
Gross Margin,Hrubá marža,
Gross Margin %,Hrubá Marža %,
Monitor Progress,Monitorovanie pokroku,
@@ -7521,12 +7385,10 @@
Dependencies,závislosti,
Dependent Tasks,Závislé úlohy,
Depends on Tasks,Závisí na úlohách,
-Actual Start Date (via Time Sheet),Skutočný dátum začatia (cez Časový rozvrh),
-Actual Time (in hours),Skutočná doba (v hodinách),
-Actual End Date (via Time Sheet),Skutočný dátum ukončenia (cez Time Sheet),
-Total Costing Amount (via Time Sheet),Celková kalkulácie Čiastka (cez Time Sheet),
+Actual Start Date (via Timesheet),Skutočný dátum začatia (cez Časový rozvrh),
+Actual Time in Hours (via Timesheet),Skutočná doba (v hodinách),
+Actual End Date (via Timesheet),Skutočný dátum ukončenia (cez Time Sheet),
Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku),
-Total Billing Amount (via Time Sheet),Celková suma Billing (cez Time Sheet),
Review Date,Review Datum,
Closing Date,Uzávěrka Datum,
Task Depends On,Úloha je závislá na,
@@ -7887,7 +7749,6 @@
Update Series,Řada Aktualizace,
Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.,
Prefix,Prefix,
-Current Value,Current Value,
This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem,
Update Series Number,Aktualizace Series Number,
Quotation Lost Reason,Dôvod neúspešnej ponuky,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level,
Lead Details,Podrobnosti Obchodnej iniciatívy,
Lead Owner Efficiency,Efektívnosť vlastníka iniciatívy,
-Loan Repayment and Closure,Splácanie a ukončenie pôžičky,
-Loan Security Status,Stav zabezpečenia úveru,
Lost Opportunity,Stratená príležitosť,
Maintenance Schedules,Plány údržby,
Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Zacielené počty: {0},
Payment Account is mandatory,Platobný účet je povinný,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ak je to začiarknuté, pred výpočtom dane z príjmu sa bez zdanenia a odpočítania dane odpočíta celá suma od zdaniteľného príjmu.",
-Disbursement Details,Podrobnosti o platbe,
Material Request Warehouse,Sklad žiadosti o materiál,
Select warehouse for material requests,Vyberte sklad pre požiadavky na materiál,
Transfer Materials For Warehouse {0},Prenos materiálov do skladu {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Vrátiť nevyzdvihnutú sumu z platu,
Deduction from salary,Odpočet z platu,
Expired Leaves,Vypršala platnosť,
-Reference No,Referenčné č,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Percento zrážky je percentuálny rozdiel medzi trhovou hodnotou Zabezpečenia pôžičky a hodnotou pripísanou tomuto Zabezpečeniu pôžičky, ak sa použije ako zábezpeka pre tento úver.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Pomer pôžičky k hodnote vyjadruje pomer výšky úveru k hodnote založeného cenného papiera. Nedostatok zabezpečenia pôžičky sa spustí, ak poklesne pod stanovenú hodnotu pre akýkoľvek úver",
If this is not checked the loan by default will be considered as a Demand Loan,"Pokiaľ to nie je zaškrtnuté, pôžička sa štandardne bude považovať za pôžičku na požiadanie",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Tento účet sa používa na rezerváciu splátok pôžičky od dlžníka a tiež na vyplácanie pôžičiek dlžníkovi,
This account is capital account which is used to allocate capital for loan disbursal account ,"Tento účet je kapitálovým účtom, ktorý sa používa na pridelenie kapitálu pre účet vyplácania pôžičiek",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operácia {0} nepatrí do pracovného príkazu {1},
Print UOM after Quantity,Tlač MJ po množstve,
Set default {0} account for perpetual inventory for non stock items,"Nastaviť predvolený účet {0} pre večný inventár pre položky, ktoré nie sú na sklade",
-Loan Security {0} added multiple times,Zabezpečenie pôžičky {0} bolo pridané viackrát,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Úverové cenné papiere s rôznym pomerom LTV nemožno založiť proti jednej pôžičke,
-Qty or Amount is mandatory for loan security!,Množstvo alebo suma je povinná pre zabezpečenie pôžičky!,
-Only submittted unpledge requests can be approved,Schválené môžu byť iba predložené žiadosti o odpojenie,
-Interest Amount or Principal Amount is mandatory,Suma úroku alebo Suma istiny je povinná,
-Disbursed Amount cannot be greater than {0},Vyplatená suma nemôže byť vyššia ako {0},
-Row {0}: Loan Security {1} added multiple times,Riadok {0}: Zabezpečenie pôžičky {1} pridané viackrát,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Riadok č. {0}: Podradená položka by nemala byť balíkom produktov. Odstráňte položku {1} a uložte,
Credit limit reached for customer {0},Dosiahol sa úverový limit pre zákazníka {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nepodarilo sa automaticky vytvoriť zákazníka z dôvodu nasledujúcich chýbajúcich povinných polí:,
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 0890160..95f8b8a 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Uporablja se, če je podjetje SpA, SApA ali SRL",
Applicable if the company is a limited liability company,"Uporablja se, če je družba z omejeno odgovornostjo",
Applicable if the company is an Individual or a Proprietorship,"Uporablja se, če je podjetje posameznik ali lastnik",
-Applicant,Vlagatelj,
-Applicant Type,Vrsta vlagatelja,
Application of Funds (Assets),Uporaba sredstev (sredstva),
Application period cannot be across two allocation records,Obdobje uporabe ne more biti v dveh evidencah dodelitve,
Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Seznam razpoložljivih delničarjev s številkami folije,
Loading Payment System,Nalaganje plačilnega sistema,
Loan,Posojilo,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0},
-Loan Application,Loan Application,
-Loan Management,Upravljanje posojil,
-Loan Repayment,vračila posojila,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Datum začetka posojila in obdobje posojila sta obvezna za varčevanje s popustom na računu,
Loans (Liabilities),Posojili (obveznosti),
Loans and Advances (Assets),Posojila in predujmi (sredstva),
@@ -1611,7 +1605,6 @@
Monday,Ponedeljek,
Monthly,Mesečni,
Monthly Distribution,Mesečni Distribution,
-Monthly Repayment Amount cannot be greater than Loan Amount,Mesečni Povračilo Znesek ne sme biti večja od zneska kredita,
More,Več,
More Information,Več informacij,
More than one selection for {0} not allowed,Več kot en izbor za {0} ni dovoljen,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Plačajte {0} {1},
Payable,Plačljivo,
Payable Account,Plačljivo račun,
-Payable Amount,Plačljivi znesek,
Payment,Plačilo,
Payment Cancelled. Please check your GoCardless Account for more details,Plačilo preklicano. Preverite svoj GoCardless račun za več podrobnosti,
Payment Confirmation,Potrdilo plačila,
-Payment Date,Dan plačila,
Payment Days,Plačilni dnevi,
Payment Document,plačilo dokumentov,
Payment Due Date,Datum zapadlosti,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Prosimo, da najprej vnesete Potrdilo o nakupu",
Please enter Receipt Document,Vnesite Prejem dokumenta,
Please enter Reference date,Vnesite Referenčni datum,
-Please enter Repayment Periods,Vnesite roki odplačevanja,
Please enter Reqd by Date,Vnesite Reqd po datumu,
Please enter Woocommerce Server URL,Vnesite URL strežnika Woocommerce,
Please enter Write Off Account,Vnesite račun za odpis,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Vnesite stroškovno mesto matično,
Please enter quantity for Item {0},Vnesite količino za postavko {0},
Please enter relieving date.,Vnesite lajšanje datum.,
-Please enter repayment Amount,Vnesite odplačevanja Znesek,
Please enter valid Financial Year Start and End Dates,"Prosimo, vnesite veljaven proračunsko leto, datum začetka in konca",
Please enter valid email address,Vnesite veljaven e-poštni naslov,
Please enter {0} first,Vnesite {0} najprej,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini.,
Primary Address Details,Osnovni podatki o naslovu,
Primary Contact Details,Primarni kontaktni podatki,
-Principal Amount,Glavni znesek,
Print Format,Print Format,
Print IRS 1099 Forms,Natisni obrazci IRS 1099,
Print Report Card,Kartica za tiskanje poročila,
@@ -2550,7 +2538,6 @@
Sample Collection,Zbiranje vzorcev,
Sample quantity {0} cannot be more than received quantity {1},Količina vzorca {0} ne sme biti večja od prejete količine {1},
Sanctioned,Sankcionirano,
-Sanctioned Amount,Sankcionirano Znesek,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.,
Sand,Pesek,
Saturday,Sobota,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} že ima nadrejeni postopek {1}.,
API,API,
Annual,Letno,
-Approved,Odobreno,
Change,Spremeni,
Contact Email,Kontakt E-pošta,
Export Type,Izvozna vrsta,
@@ -3571,7 +3557,6 @@
Account Value,Vrednost računa,
Account is mandatory to get payment entries,Za vnos plačil je obvezen račun,
Account is not set for the dashboard chart {0},Za grafikon nadzorne plošče račun ni nastavljen {0},
-Account {0} does not belong to company {1},Račun {0} ne pripada družbi {1},
Account {0} does not exists in the dashboard chart {1},Račun {0} ne obstaja v grafikonu nadzorne plošče {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Račun: <b>{0}</b> je kapital Delo v teku in ga vnos v časopis ne more posodobiti,
Account: {0} is not permitted under Payment Entry,Račun: {0} ni dovoljen pri vnosu plačila,
@@ -3582,7 +3567,6 @@
Activity,Dejavnost,
Add / Manage Email Accounts.,Dodaj / Upravljanje e-poštnih računov.,
Add Child,Dodaj Child,
-Add Loan Security,Dodaj varnost posojila,
Add Multiple,Dodaj več,
Add Participants,Dodaj udeležence,
Add to Featured Item,Dodaj med predstavljene izdelke,
@@ -3593,15 +3577,12 @@
Address Line 1,Naslov Line 1,
Addresses,Naslovi,
Admission End Date should be greater than Admission Start Date.,Končni datum sprejema bi moral biti večji od začetnega datuma sprejema.,
-Against Loan,Proti posojilom,
-Against Loan:,Proti posojilu:,
All,Vse,
All bank transactions have been created,Vse bančne transakcije so bile ustvarjene,
All the depreciations has been booked,Vse amortizacije so bile knjižene,
Allocation Expired!,Dodelitev je potekla!,
Allow Resetting Service Level Agreement from Support Settings.,Dovoli ponastavitev sporazuma o ravni storitve iz nastavitev podpore.,
Amount of {0} is required for Loan closure,Za zaprtje posojila je potreben znesek {0},
-Amount paid cannot be zero,Plačani znesek ne sme biti nič,
Applied Coupon Code,Uporabljena koda kupona,
Apply Coupon Code,Uporabi kodo kupona,
Appointment Booking,Rezervacija termina,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Časa prihoda ni mogoče izračunati, ker manjka naslov gonilnika.",
Cannot Optimize Route as Driver Address is Missing.,"Ne morem optimizirati poti, ker manjka naslov gonilnika.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Naloge ni mogoče dokončati {0}, ker njegova odvisna naloga {1} ni dokončana / preklicana.",
-Cannot create loan until application is approved,"Posojila ni mogoče ustvariti, dokler aplikacija ni odobrena",
Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Za postavko {0} v vrstici {1} več kot {2} ni mogoče preplačati. Če želite dovoliti preplačilo, nastavite dovoljenje v nastavitvah računov",
"Capacity Planning Error, planned start time can not be same as end time","Napaka pri načrtovanju zmogljivosti, načrtovani začetni čas ne more biti enak končnemu času",
@@ -3812,20 +3792,9 @@
Less Than Amount,Manj kot znesek,
Liabilities,Obveznosti,
Loading...,Nalaganje ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Znesek posojila presega najvišji znesek posojila {0} glede na predlagane vrednostne papirje,
Loan Applications from customers and employees.,Prošnje za posojilo strank in zaposlenih.,
-Loan Disbursement,Izplačilo posojila,
Loan Processes,Posojilni procesi,
-Loan Security,Varnost posojila,
-Loan Security Pledge,Zaloga za posojilo,
-Loan Security Pledge Created : {0},Izdelano jamstvo za posojilo: {0},
-Loan Security Price,Cena zavarovanja posojila,
-Loan Security Price overlapping with {0},"Cena zavarovanja posojila, ki se prekriva z {0}",
-Loan Security Unpledge,Varnost posojila ni dovoljena,
-Loan Security Value,Vrednost zavarovanja posojila,
Loan Type for interest and penalty rates,Vrsta posojila za obresti in kazenske stopnje,
-Loan amount cannot be greater than {0},Znesek posojila ne sme biti večji od {0},
-Loan is mandatory,Posojilo je obvezno,
Loans,Posojila,
Loans provided to customers and employees.,Krediti strankam in zaposlenim.,
Location,Kraj,
@@ -3894,7 +3863,6 @@
Pay,Plačajte,
Payment Document Type,Vrsta plačilnega dokumenta,
Payment Name,Ime plačila,
-Penalty Amount,Kazenski znesek,
Pending,V teku,
Performance,Izvedba,
Period based On,Obdobje na podlagi,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Prosimo, prijavite se kot uporabnik tržnice, če želite urediti ta element.",
Please login as a Marketplace User to report this item.,"Prijavite se kot uporabnik tržnice, če želite prijaviti ta element.",
Please select <b>Template Type</b> to download template,Izberite <b>vrsto predloge</b> za prenos predloge,
-Please select Applicant Type first,Najprej izberite vrsto prosilca,
Please select Customer first,Najprej izberite stranko,
Please select Item Code first,Najprej izberite kodo predmeta,
-Please select Loan Type for company {0},Izberite vrsto posojila za podjetje {0},
Please select a Delivery Note,Izberite dobavnico,
Please select a Sales Person for item: {0},Izberite prodajno osebo za izdelek: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',"Izberite drug način plačila. Stripe ne podpira transakcije v valuti, "{0}"",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Nastavite privzeti bančni račun za podjetje {0},
Please specify,"Prosimo, navedite",
Please specify a {0},Navedite {0},lead
-Pledge Status,Stanje zastave,
-Pledge Time,Čas zastave,
Printing,Tiskanje,
Priority,Prednost,
Priority has been changed to {0}.,Prednost je spremenjena na {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Obdelava datotek XML,
Profitability,Donosnost,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Predlagane zastave so obvezne za zavarovana posojila,
Provide the academic year and set the starting and ending date.,Navedite študijsko leto in določite datum začetka in konca.,
Public token is missing for this bank,Za to banko manjka javni žeton,
Publish,Objavi,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Potrdilo o nakupu nima nobenega predmeta, za katerega bi bil omogočen Retain Sample.",
Purchase Return,nakup Return,
Qty of Finished Goods Item,Količina izdelka končnega blaga,
-Qty or Amount is mandatroy for loan security,Količina ali znesek je mandatroy za zavarovanje posojila,
Quality Inspection required for Item {0} to submit,"Inšpekcijski pregled kakovosti, potreben za pošiljanje predmeta {0}",
Quantity to Manufacture,Količina za izdelavo,
Quantity to Manufacture can not be zero for the operation {0},Količina za izdelavo ne more biti nič pri operaciji {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Datum razrešitve mora biti večji ali enak datumu pridružitve,
Rename,Preimenovanje,
Rename Not Allowed,Preimenovanje ni dovoljeno,
-Repayment Method is mandatory for term loans,Način vračila je obvezen za posojila,
-Repayment Start Date is mandatory for term loans,Datum začetka poplačila je obvezen za posojila,
Report Item,Postavka poročila,
Report this Item,Prijavite to postavko,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Količina za naročila podizvajalcev: Količina surovin za izdelavo podizvajalcev.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Vrstica ({0}): {1} je že znižana v {2},
Rows Added in {0},Vrstice dodane v {0},
Rows Removed in {0},Vrstice so odstranjene v {0},
-Sanctioned Amount limit crossed for {0} {1},Omejena dovoljena količina presežena za {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Doseženi znesek posojila že obstaja za {0} proti podjetju {1},
Save,Shrani,
Save Item,Shrani element,
Saved Items,Shranjeni predmeti,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Uporabnik {0} je onemogočena,
Users and Permissions,Uporabniki in dovoljenja,
Vacancies cannot be lower than the current openings,Prosta delovna mesta ne smejo biti nižja od trenutnih,
-Valid From Time must be lesser than Valid Upto Time.,"Velja od časa, mora biti krajši od veljavnega Upto časa.",
Valuation Rate required for Item {0} at row {1},"Stopnja vrednotenja, potrebna za postavko {0} v vrstici {1}",
Values Out Of Sync,Vrednosti niso sinhronizirane,
Vehicle Type is required if Mode of Transport is Road,"Vrsta vozila je potrebna, če je način prevoza cestni",
@@ -4211,7 +4168,6 @@
Add to Cart,Dodaj v voziček,
Days Since Last Order,Dnevi od zadnjega naročila,
In Stock,Na zalogi,
-Loan Amount is mandatory,Znesek posojila je obvezen,
Mode Of Payment,Način plačila,
No students Found,Študentov ni mogoče najti,
Not in Stock,Ni na zalogi,
@@ -4240,7 +4196,6 @@
Group by,Skupina avtorja,
In stock,Na zalogi,
Item name,Ime predmeta,
-Loan amount is mandatory,Znesek posojila je obvezen,
Minimum Qty,Najmanjša količina,
More details,Več podrobnosti,
Nature of Supplies,Narava potrebščin,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Skupaj opravljeno Količina,
Qty to Manufacture,Količina za izdelavo,
Repay From Salary can be selected only for term loans,Povračilo s plače lahko izberete samo za ročna posojila,
-No valid Loan Security Price found for {0},Za {0} ni bila najdena veljavna cena zavarovanja posojila,
-Loan Account and Payment Account cannot be same,Posojilni račun in plačilni račun ne moreta biti enaka,
-Loan Security Pledge can only be created for secured loans,Obljubo zavarovanja posojila je mogoče ustvariti samo za zavarovana posojila,
Social Media Campaigns,Kampanje za družabne medije,
From Date can not be greater than To Date,Od datuma ne sme biti daljši od datuma,
Please set a Customer linked to the Patient,"Nastavite stranko, ki je povezana s pacientom",
@@ -6437,7 +6389,6 @@
HR User,Uporabnik človeških virov,
Appointment Letter,Pismo o imenovanju,
Job Applicant,Job Predlagatelj,
-Applicant Name,Predlagatelj Ime,
Appointment Date,Datum imenovanja,
Appointment Letter Template,Predloga pisma o imenovanju,
Body,Telo,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinhronizacija v toku,
Hub Seller Name,Ime prodajalca vozlišča,
Custom Data,Podatki po meri,
-Member,Član,
-Partially Disbursed,delno črpanju,
-Loan Closure Requested,Zahtevano je zaprtje posojila,
Repay From Salary,Poplačilo iz Plača,
-Loan Details,posojilo Podrobnosti,
-Loan Type,posojilo Vrsta,
-Loan Amount,Znesek posojila,
-Is Secured Loan,Je zavarovana posojila,
-Rate of Interest (%) / Year,Obrestna mera (%) / leto,
-Disbursement Date,izplačilo Datum,
-Disbursed Amount,Izplačana znesek,
-Is Term Loan,Je Term Posojilo,
-Repayment Method,Povračilo Metoda,
-Repay Fixed Amount per Period,Povrne fiksni znesek na obdobje,
-Repay Over Number of Periods,Odplačilo Over število obdobij,
-Repayment Period in Months,Vračilo Čas v mesecih,
-Monthly Repayment Amount,Mesečni Povračilo Znesek,
-Repayment Start Date,Datum začetka odplačevanja,
-Loan Security Details,Podrobnosti o posojilu,
-Maximum Loan Value,Najvišja vrednost posojila,
-Account Info,Informacije o računu,
-Loan Account,Kreditni račun,
-Interest Income Account,Prihodki od obresti račun,
-Penalty Income Account,Račun dohodkov,
-Repayment Schedule,Povračilo Urnik,
-Total Payable Amount,Skupaj plačljivo Znesek,
-Total Principal Paid,Skupna plačana glavnica,
-Total Interest Payable,Skupaj Obresti plačljivo,
-Total Amount Paid,Skupni znesek plačan,
-Loan Manager,Vodja posojil,
-Loan Info,posojilo Info,
-Rate of Interest,Obrestna mera,
-Proposed Pledges,Predlagane obljube,
-Maximum Loan Amount,Največja Znesek posojila,
-Repayment Info,Povračilo Info,
-Total Payable Interest,Skupaj plačljivo Obresti,
-Against Loan ,Proti Posojilu,
-Loan Interest Accrual,Porazdelitev posojil,
-Amounts,Zneski,
-Pending Principal Amount,Nerešeni glavni znesek,
-Payable Principal Amount,Plačljiva glavnica,
-Paid Principal Amount,Plačani znesek glavnice,
-Paid Interest Amount,Znesek plačanih obresti,
-Process Loan Interest Accrual,Proračun za obresti za posojila,
-Repayment Schedule Name,Ime razporeda odplačevanja,
Regular Payment,Redno plačilo,
Loan Closure,Zaprtje posojila,
-Payment Details,Podatki o plačilu,
-Interest Payable,Obresti za plačilo,
-Amount Paid,Plačani znesek,
-Principal Amount Paid,Plačani glavni znesek,
-Repayment Details,Podrobnosti o odplačilu,
-Loan Repayment Detail,Podrobnosti o odplačilu posojila,
-Loan Security Name,Varnostno ime posojila,
-Unit Of Measure,Merska enota,
-Loan Security Code,Kodeks za posojilo,
-Loan Security Type,Vrsta zavarovanja posojila,
-Haircut %,Odbitki%,
-Loan Details,Podrobnosti o posojilu,
-Unpledged,Neodključeno,
-Pledged,Založeno,
-Partially Pledged,Delno zastavljeno,
-Securities,Vrednostni papirji,
-Total Security Value,Skupna vrednost varnosti,
-Loan Security Shortfall,Pomanjkanje varnosti posojila,
-Loan ,Posojilo,
-Shortfall Time,Čas pomanjkanja,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Znesek primanjkljaja,
-Security Value ,Vrednost varnosti,
-Process Loan Security Shortfall,Pomanjkanje varnosti posojila,
-Loan To Value Ratio,Razmerje med posojilom in vrednostjo,
-Unpledge Time,Čas odstranjevanja,
-Loan Name,posojilo Ime,
Rate of Interest (%) Yearly,Obrestna mera (%) Letna,
-Penalty Interest Rate (%) Per Day,Kazenska obrestna mera (%) na dan,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,V primeru zamude pri odplačilu se dnevno plačuje obrestna mera za odmerjene obresti,
-Grace Period in Days,Milostno obdobje v dnevih,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Število dni od datuma zapadlosti, do katerega kazen ne bo zaračunana v primeru zamude pri odplačilu posojila",
-Pledge,Obljuba,
-Post Haircut Amount,Količina odbitka po pošti,
-Process Type,Vrsta procesa,
-Update Time,Čas posodobitve,
-Proposed Pledge,Predlagana zastava,
-Total Payment,Skupaj plačila,
-Balance Loan Amount,Bilanca Znesek posojila,
-Is Accrued,Je zapadlo v plačilo,
Salary Slip Loan,Posojilo za plačilo,
Loan Repayment Entry,Vnos vračila posojila,
-Sanctioned Loan Amount,Doseženi znesek posojila,
-Sanctioned Amount Limit,Omejena omejitev zneska,
-Unpledge,Odveči,
-Haircut,Pričeska,
MAT-MSH-.YYYY.-,MAT-MSH-YYYY.-,
Generate Schedule,Ustvarjajo Urnik,
Schedules,Urniki,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekt bo na voljo na spletni strani teh uporabnikov,
Copied From,Kopirano iz,
Start and End Dates,Začetni in končni datum,
-Actual Time (in Hours),Dejanski čas (v urah),
+Actual Time in Hours (via Timesheet),Dejanski čas (v urah),
Costing and Billing,Obračunavanje stroškov in plačevanja,
-Total Costing Amount (via Timesheets),Skupni znesek stroškov (prek časopisov),
-Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov),
+Total Costing Amount (via Timesheet),Skupni znesek stroškov (prek časopisov),
+Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevkov),
Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu),
Total Sales Amount (via Sales Order),Skupni znesek prodaje (preko prodajnega naloga),
-Total Billable Amount (via Timesheets),Skupni znesek zneska (prek časopisov),
-Total Billed Amount (via Sales Invoices),Skupni fakturirani znesek (prek prodajnih računov),
-Total Consumed Material Cost (via Stock Entry),Skupni stroški porabljenega materiala (preko zaloge na borzi),
+Total Billable Amount (via Timesheet),Skupni znesek zneska (prek časopisov),
+Total Billed Amount (via Sales Invoice),Skupni fakturirani znesek (prek prodajnih računov),
+Total Consumed Material Cost (via Stock Entry),Skupni stroški porabljenega materiala (preko zaloge na borzi),
Gross Margin,Gross Margin,
Gross Margin %,Gross Margin%,
Monitor Progress,Spremljajte napredek,
@@ -7521,12 +7385,10 @@
Dependencies,Odvisnosti,
Dependent Tasks,Odvisne naloge,
Depends on Tasks,Odvisno od Opravila,
-Actual Start Date (via Time Sheet),Dejanski začetni datum (preko Čas lista),
-Actual Time (in hours),Dejanski čas (v urah),
-Actual End Date (via Time Sheet),Dejanski končni datum (preko Čas lista),
-Total Costing Amount (via Time Sheet),Skupaj Costing Znesek (preko Čas lista),
+Actual Start Date (via Timesheet),Dejanski začetni datum (preko Čas lista),
+Actual Time in Hours (via Timesheet),Dejanski čas (v urah),
+Actual End Date (via Timesheet),Dejanski končni datum (preko Čas lista),
Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka),
-Total Billing Amount (via Time Sheet),Skupni znesek plačevanja (preko Čas lista),
Review Date,Pregled Datum,
Closing Date,Zapiranje Datum,
Task Depends On,Naloga je odvisna od,
@@ -7887,7 +7749,6 @@
Update Series,Posodobi zaporedje,
Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.,
Prefix,Predpona,
-Current Value,Trenutna vrednost,
This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono,
Update Series Number,Posodobi številko zaporedja,
Quotation Lost Reason,Kotacija Lost Razlog,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven,
Lead Details,Podrobnosti ponudbe,
Lead Owner Efficiency,Svinec Lastnik Učinkovitost,
-Loan Repayment and Closure,Povračilo in zaprtje posojila,
-Loan Security Status,Stanje varnosti posojila,
Lost Opportunity,Izgubljena priložnost,
Maintenance Schedules,Vzdrževanje Urniki,
Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Število ciljev: {0},
Payment Account is mandatory,Plačilni račun je obvezen,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Če je označeno, se pred izračunom dohodnine odšteje celotni znesek od obdavčljivega dohodka brez kakršne koli izjave ali predložitve dokazila.",
-Disbursement Details,Podrobnosti o izplačilu,
Material Request Warehouse,Skladišče zahtev za material,
Select warehouse for material requests,Izberite skladišče za zahteve po materialu,
Transfer Materials For Warehouse {0},Prenos materiala za skladišče {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Vrnite neizterjani znesek iz plače,
Deduction from salary,Odbitek od plače,
Expired Leaves,Potekli listi,
-Reference No,Referenčna št,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Odstotek odbitka je odstotna razlika med tržno vrednostjo varščine za posojilo in vrednostjo, pripisano tej garanciji za posojilo, če se uporablja kot zavarovanje za to posojilo.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Razmerje med posojilom in vrednostjo izraža razmerje med zneskom posojila in vrednostjo zastavljene vrednostne papirje. Pomanjkanje varščine za posojilo se sproži, če ta pade pod določeno vrednost za katero koli posojilo",
If this is not checked the loan by default will be considered as a Demand Loan,"Če to ni potrjeno, bo posojilo privzeto obravnavano kot posojilo na zahtevo",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ta račun se uporablja za rezervacijo odplačil posojilojemalca in tudi za izplačilo posojil posojilojemalcu,
This account is capital account which is used to allocate capital for loan disbursal account ,"Ta račun je račun kapitala, ki se uporablja za dodelitev kapitala za račun izplačila posojila",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operacija {0} ne spada v delovni nalog {1},
Print UOM after Quantity,Natisni UOM po količini,
Set default {0} account for perpetual inventory for non stock items,Nastavite privzeti račun {0} za večni inventar za neoskrbljene predmete,
-Loan Security {0} added multiple times,Varnost posojila {0} je bila dodana večkrat,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Vrednostnih papirjev z drugačnim razmerjem LTV ni mogoče zastaviti za eno posojilo,
-Qty or Amount is mandatory for loan security!,Količina ali znesek je obvezen za zavarovanje posojila!,
-Only submittted unpledge requests can be approved,Odobriti je mogoče samo predložene zahtevke za neuporabo,
-Interest Amount or Principal Amount is mandatory,Znesek obresti ali znesek glavnice je obvezen,
-Disbursed Amount cannot be greater than {0},Izplačani znesek ne sme biti večji od {0},
-Row {0}: Loan Security {1} added multiple times,Vrstica {0}: Varnost posojila {1} je bila dodana večkrat,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Vrstica št. {0}: podrejeni element ne sme biti paket izdelkov. Odstranite element {1} in shranite,
Credit limit reached for customer {0},Dosežena kreditna omejitev za stranko {0},
Could not auto create Customer due to the following missing mandatory field(s):,Kupca ni bilo mogoče samodejno ustvariti zaradi naslednjih manjkajočih obveznih polj:,
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 987211a..2e939fc 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Aplikohet nëse kompania është SpA, SApA ose SRL",
Applicable if the company is a limited liability company,Aplikohet nëse kompania është një kompani me përgjegjësi të kufizuar,
Applicable if the company is an Individual or a Proprietorship,Aplikohet nëse kompania është një Individ apo Pronë,
-Applicant,kërkues,
-Applicant Type,Lloji i aplikantit,
Application of Funds (Assets),Aplikimi i mjeteve (aktiveve),
Application period cannot be across two allocation records,Periudha e aplikimit nuk mund të jetë në të dy regjistrimet e shpërndarjes,
Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Lista e Aksionarëve në dispozicion me numra foli,
Loading Payment System,Duke ngarkuar sistemin e pagesave,
Loan,hua,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0},
-Loan Application,Aplikimi i huasë,
-Loan Management,Menaxhimi i Kredive,
-Loan Repayment,shlyerjen e kredisë,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Data e fillimit të huasë dhe periudha e huasë janë të detyrueshme për të kursyer zbritjen e faturës,
Loans (Liabilities),Kredi (obligimeve),
Loans and Advances (Assets),Kreditë dhe paradhëniet (aktiveve),
@@ -1611,7 +1605,6 @@
Monday,E hënë,
Monthly,Mujor,
Monthly Distribution,Shpërndarja mujore,
-Monthly Repayment Amount cannot be greater than Loan Amount,Shuma mujore e pagesës nuk mund të jetë më e madhe se Shuma e Kredisë,
More,Më shumë,
More Information,Me shume informacion,
More than one selection for {0} not allowed,Më shumë se një përzgjedhje për {0} nuk lejohet,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Paguaj {0} {1},
Payable,për t'u paguar,
Payable Account,Llogaria e pagueshme,
-Payable Amount,Shuma e pagueshme,
Payment,Pagesa,
Payment Cancelled. Please check your GoCardless Account for more details,Pagesa u anulua. Kontrollo llogarinë tënde GoCardless për më shumë detaje,
Payment Confirmation,Konfirmim pagese,
-Payment Date,Data e pagesës,
Payment Days,Ditët e pagesës,
Payment Document,Dokumenti pagesa,
Payment Due Date,Afati i pageses,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Ju lutemi shkruani vërtetim Blerje parë,
Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes,
Please enter Reference date,Ju lutem shkruani datën Reference,
-Please enter Repayment Periods,Ju lutemi shkruani Periudhat Ripagimi,
Please enter Reqd by Date,Ju lutemi shkruani Reqd by Date,
Please enter Woocommerce Server URL,Ju lutemi shkruani URL Woocommerce Server,
Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Ju lutemi shkruani qendra kosto prind,
Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0},
Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.,
-Please enter repayment Amount,Ju lutemi shkruani shlyerjes Shuma,
Please enter valid Financial Year Start and End Dates,Ju lutem shkruani Viti Financiar i vlefshëm Start dhe Datat Fundi,
Please enter valid email address,Ju lutemi shkruani adresën vlefshme email,
Please enter {0} first,Ju lutem shkruani {0} parë,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë.,
Primary Address Details,Detajet e Fillores,
Primary Contact Details,Detajet e Fillimit të Kontaktit,
-Principal Amount,shumën e principalit,
Print Format,Format Print,
Print IRS 1099 Forms,Shtypni formularët IRS 1099,
Print Report Card,Kartela e Raportimit të Printimit,
@@ -2550,7 +2538,6 @@
Sample Collection,Sample Collection,
Sample quantity {0} cannot be more than received quantity {1},Sasia e mostrës {0} nuk mund të jetë më e madhe sesa {1},
Sanctioned,sanksionuar,
-Sanctioned Amount,Shuma e Sanksionuar,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.,
Sand,rërë,
Saturday,E shtunë,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} tashmë ka një procedurë prindërore {1}.,
API,API,
Annual,Vjetor,
-Approved,I miratuar,
Change,Ndryshim,
Contact Email,Kontakti Email,
Export Type,Lloji i eksportit,
@@ -3571,7 +3557,6 @@
Account Value,Vlera e llogarisë,
Account is mandatory to get payment entries,Llogaria është e detyrueshme për të marrë hyrje në pagesa,
Account is not set for the dashboard chart {0},Llogaria nuk është e vendosur për grafikun e tabelave të tryezës {0,
-Account {0} does not belong to company {1},Llogaria {0} nuk i përket kompanisë {1},
Account {0} does not exists in the dashboard chart {1},Llogaria {0} nuk ekziston në tabelën e pultit {1,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Llogaria: <b>{0}</b> është kapital Puna në zhvillim e sipër dhe nuk mund të azhurnohet nga Journal Entry,
Account: {0} is not permitted under Payment Entry,Llogaria: {0} nuk lejohet nën Hyrjen e Pagesave,
@@ -3582,7 +3567,6 @@
Activity,Aktivitet,
Add / Manage Email Accounts.,Add / Manage llogaritë e-mail.,
Add Child,Shto Fëmija,
-Add Loan Security,Shtoni sigurinë e kredisë,
Add Multiple,Shto Multiple,
Add Participants,Shto pjesëmarrësit,
Add to Featured Item,Shtoni në artikullin e preferuar,
@@ -3593,15 +3577,12 @@
Address Line 1,Adresa Line 1,
Addresses,Adresat,
Admission End Date should be greater than Admission Start Date.,Data e përfundimit të pranimit duhet të jetë më e madhe se data e fillimit të pranimit.,
-Against Loan,Kundër huasë,
-Against Loan:,Kundër huasë:,
All,ALL,
All bank transactions have been created,Të gjitha transaksionet bankare janë krijuar,
All the depreciations has been booked,Të gjitha amortizimet janë prenotuar,
Allocation Expired!,Alokimi skadoi!,
Allow Resetting Service Level Agreement from Support Settings.,Lejoni rivendosjen e marrëveshjes së nivelit të shërbimit nga Cilësimet e mbështetjes.,
Amount of {0} is required for Loan closure,Shuma e {0 kërkohet për mbylljen e huasë,
-Amount paid cannot be zero,Shuma e paguar nuk mund të jetë zero,
Applied Coupon Code,Kodi i Kuponit të Aplikuar,
Apply Coupon Code,Aplikoni Kodin e Kuponit,
Appointment Booking,Rezervimi i Emërimeve,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Nuk mund të llogaritet koha e mbërritjes pasi mungon Adresa e Shoferit.,
Cannot Optimize Route as Driver Address is Missing.,Nuk mund të Optimizohet Rruga pasi Adresa e Shoferit mungon.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Nuk mund të përfundojë detyra {0} pasi detyra e saj e varur {1} nuk përmblidhen / anulohen.,
-Cannot create loan until application is approved,Nuk mund të krijojë kredi derisa të miratohet aplikacioni,
Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nuk mund të mbingarkohet për Artikullin {0} në rresht {1} më shumë se {2. Për të lejuar faturimin e tepërt, ju lutemi vendosni lejimin në Cilësimet e Llogarive",
"Capacity Planning Error, planned start time can not be same as end time","Gabimi i planifikimit të kapacitetit, koha e planifikuar e fillimit nuk mund të jetë e njëjtë me kohën e përfundimit",
@@ -3812,20 +3792,9 @@
Less Than Amount,Më pak se shuma,
Liabilities,detyrimet,
Loading...,Duke u ngarkuar ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Shuma e kredisë tejkalon shumën maksimale të kredisë prej {0} sipas letrave me vlerë të propozuara,
Loan Applications from customers and employees.,Aplikime për hua nga klientët dhe punonjësit.,
-Loan Disbursement,Disbursimi i huasë,
Loan Processes,Proceset e huasë,
-Loan Security,Sigurimi i huasë,
-Loan Security Pledge,Pengu i sigurimit të huasë,
-Loan Security Pledge Created : {0},Krijuar peng për sigurinë e kredisë: {0},
-Loan Security Price,Mimi i sigurisë së huasë,
-Loan Security Price overlapping with {0},Mbivendosja e çmimit të sigurisë së kredisë me {0,
-Loan Security Unpledge,Mosmarrëveshja e Sigurisë së Kredisë,
-Loan Security Value,Vlera e sigurisë së huasë,
Loan Type for interest and penalty rates,Lloji i huasë për normat e interesit dhe dënimit,
-Loan amount cannot be greater than {0},Shuma e kredisë nuk mund të jetë më e madhe se {0,
-Loan is mandatory,Kredia është e detyrueshme,
Loans,Loans,
Loans provided to customers and employees.,Kredi për klientët dhe punonjësit.,
Location,Vend,
@@ -3894,7 +3863,6 @@
Pay,Kushtoj,
Payment Document Type,Lloji i dokumentit të pagesës,
Payment Name,Emri i Pagesës,
-Penalty Amount,Shuma e dënimit,
Pending,Në pritje të,
Performance,Performance,
Period based On,Periudha e bazuar në,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Ju lutemi identifikohuni si një përdorues i Tregut për të modifikuar këtë artikull.,
Please login as a Marketplace User to report this item.,Ju lutemi identifikohuni si një përdorues i Tregut për të raportuar këtë artikull.,
Please select <b>Template Type</b> to download template,Ju lutemi zgjidhni <b>Llojin e modelit</b> për të shkarkuar modelin,
-Please select Applicant Type first,Ju lutemi zgjidhni së pari Llojin e Aplikuesit,
Please select Customer first,Ju lutemi zgjidhni së pari Konsumatorin,
Please select Item Code first,Ju lutemi zgjidhni së pari Kodin e Artikullit,
-Please select Loan Type for company {0},Ju lutemi zgjidhni Llojin e kredisë për kompaninë {0,
Please select a Delivery Note,Ju lutemi zgjidhni një Shënim Dorëzimi,
Please select a Sales Person for item: {0},Ju lutemi zgjidhni një person shitje për artikullin: {0,
Please select another payment method. Stripe does not support transactions in currency '{0}',Ju lutem zgjidhni një tjetër metodë e pagesës. Stripe nuk e mbështet transaksionet në monedhë të '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Ju lutemi vendosni një llogari bankare të paracaktuar për kompaninë {0,
Please specify,Ju lutem specifikoni,
Please specify a {0},Ju lutemi specifikoni një {0,lead
-Pledge Status,Statusi i pengut,
-Pledge Time,Koha e pengut,
Printing,Shtypje,
Priority,Prioritet,
Priority has been changed to {0}.,Prioriteti është ndryshuar në {0.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Përpunimi i skedarëve XML,
Profitability,profitabilitetit,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Premtimet e propozuara janë të detyrueshme për kreditë e siguruara,
Provide the academic year and set the starting and ending date.,Siguroni vitin akademik dhe caktoni datën e fillimit dhe mbarimit.,
Public token is missing for this bank,Shenja publike mungon për këtë bankë,
Publish,publikoj,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Pranimi i Blerjes nuk ka ndonjë artikull për të cilin është aktivizuar Shembulli i Mbajtjes.,
Purchase Return,Kthimi Blerje,
Qty of Finished Goods Item,Sasia e artikullit të mallrave të përfunduar,
-Qty or Amount is mandatroy for loan security,Sasia ose Shuma është mandatroy për sigurinë e kredisë,
Quality Inspection required for Item {0} to submit,Inspektimi i cilësisë i kërkohet që artikulli {0} të paraqesë,
Quantity to Manufacture,Sasia e Prodhimit,
Quantity to Manufacture can not be zero for the operation {0},Sasia e Prodhimit nuk mund të jetë zero për operacionin {0,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Data e besimit duhet të jetë më e madhe se ose e barabartë me datën e bashkimit,
Rename,Riemërtoj,
Rename Not Allowed,Riemërtimi nuk lejohet,
-Repayment Method is mandatory for term loans,Metoda e ripagimit është e detyrueshme për kreditë me afat,
-Repayment Start Date is mandatory for term loans,Data e fillimit të ripagimit është e detyrueshme për kreditë me afat,
Report Item,Raporti Artikull,
Report this Item,Raporto këtë artikull,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Sasia e rezervuar për nënkontrakt: Sasia e lëndëve të para për të bërë artikuj nënkontraktues.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rreshti ({0}): {1} është zbritur tashmë në {2,
Rows Added in {0},Rreshtat e shtuar në {0,
Rows Removed in {0},Rreshtat hiqen në {0,
-Sanctioned Amount limit crossed for {0} {1},Kufiri i shumës së sanksionuar të kryqëzuar për {0} {1,
-Sanctioned Loan Amount already exists for {0} against company {1},Shuma e kredisë së sanksionuar tashmë ekziston për {0} kundër kompanisë {1,
Save,Ruaj,
Save Item,Ruaj artikullin,
Saved Items,Artikujt e ruajtur,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Përdoruesi {0} është me aftësi të kufizuara,
Users and Permissions,Përdoruesit dhe Lejet,
Vacancies cannot be lower than the current openings,Vendet e lira të punës nuk mund të jenë më të ulëta se hapjet aktuale,
-Valid From Time must be lesser than Valid Upto Time.,Vlefshëm nga Koha duhet të jetë më e vogël se Koha e Vlefshme e Upto.,
Valuation Rate required for Item {0} at row {1},Shkalla e vlerësimit e kërkuar për artikullin {0} në rreshtin {1,
Values Out Of Sync,Vlerat jashtë sinkronizimit,
Vehicle Type is required if Mode of Transport is Road,Lloji i automjetit kërkohet nëse mënyra e transportit është rrugore,
@@ -4211,7 +4168,6 @@
Add to Cart,Futeni në kosh,
Days Since Last Order,Ditët që nga porosia e fundit,
In Stock,Në magazinë,
-Loan Amount is mandatory,Shuma e huasë është e detyrueshme,
Mode Of Payment,Mënyra e pagesës,
No students Found,Nuk u gjet asnjë student,
Not in Stock,Jo në magazinë,
@@ -4240,7 +4196,6 @@
Group by,Grupi Nga,
In stock,Në gjendje,
Item name,Item Emri,
-Loan amount is mandatory,Shuma e huasë është e detyrueshme,
Minimum Qty,Qty. Minimale,
More details,Më shumë detaje,
Nature of Supplies,Natyra e furnizimeve,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Sasia totale e përfunduar,
Qty to Manufacture,Qty Për Prodhimi,
Repay From Salary can be selected only for term loans,Shlyerja nga rroga mund të zgjidhet vetëm për kreditë me afat,
-No valid Loan Security Price found for {0},Nuk u gjet asnjë çmim i vlefshëm i sigurisë së huasë për {0},
-Loan Account and Payment Account cannot be same,Llogaria e huasë dhe llogaria e pagesës nuk mund të jenë të njëjta,
-Loan Security Pledge can only be created for secured loans,Pengu i Sigurimit të Huasë mund të krijohet vetëm për kredi të siguruara,
Social Media Campaigns,Fushatat e mediave sociale,
From Date can not be greater than To Date,Nga Data nuk mund të jetë më e madhe se Te Data,
Please set a Customer linked to the Patient,Ju lutemi vendosni një klient të lidhur me pacientin,
@@ -6437,7 +6389,6 @@
HR User,HR User,
Appointment Letter,Letra e Emërimeve,
Job Applicant,Job Aplikuesi,
-Applicant Name,Emri i aplikantit,
Appointment Date,Data e emërimit,
Appointment Letter Template,Modeli i Letrës së Emërimeve,
Body,trup,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sync in Progress,
Hub Seller Name,Emri i shitësit të Hub,
Custom Data,Të Dhënat Custom,
-Member,anëtar,
-Partially Disbursed,lëvrohet pjesërisht,
-Loan Closure Requested,Kërkohet mbyllja e huasë,
Repay From Salary,Paguajë nga paga,
-Loan Details,kredi Details,
-Loan Type,Lloji Loan,
-Loan Amount,Shuma e kredisë,
-Is Secured Loan,A është hua e siguruar,
-Rate of Interest (%) / Year,Norma e interesit (%) / Viti,
-Disbursement Date,disbursimi Date,
-Disbursed Amount,Shuma e disbursuar,
-Is Term Loan,A është hua me afat,
-Repayment Method,Metoda Ripagimi,
-Repay Fixed Amount per Period,Paguaj shuma fikse për një periudhë,
-Repay Over Number of Periods,Paguaj Over numri i periudhave,
-Repayment Period in Months,Afati i pagesës në muaj,
-Monthly Repayment Amount,Shuma mujore e pagesës,
-Repayment Start Date,Data e fillimit të ripagimit,
-Loan Security Details,Detaje të Sigurisë së Kredisë,
-Maximum Loan Value,Vlera maksimale e huasë,
-Account Info,Llogaria Info,
-Loan Account,Llogaria e huasë,
-Interest Income Account,Llogaria ardhurat nga interesi,
-Penalty Income Account,Llogaria e të ardhurave nga gjobat,
-Repayment Schedule,sHLYERJES,
-Total Payable Amount,Shuma totale e pagueshme,
-Total Principal Paid,Pagesa kryesore e paguar,
-Total Interest Payable,Interesi i përgjithshëm për t'u paguar,
-Total Amount Paid,Shuma totale e paguar,
-Loan Manager,Menaxheri i huasë,
-Loan Info,kredi Info,
-Rate of Interest,Norma e interesit,
-Proposed Pledges,Premtimet e propozuara,
-Maximum Loan Amount,Shuma maksimale e kredisë,
-Repayment Info,Info Ripagimi,
-Total Payable Interest,Interesi i përgjithshëm për t'u paguar,
-Against Loan ,Kundër Huasë,
-Loan Interest Accrual,Interesi i Kredisë Accrual,
-Amounts,shumat,
-Pending Principal Amount,Në pritje të shumës kryesore,
-Payable Principal Amount,Shuma kryesore e pagueshme,
-Paid Principal Amount,Shuma kryesore e paguar,
-Paid Interest Amount,Shuma e kamatës së paguar,
-Process Loan Interest Accrual,Interesi i kredisë së procesit akrual,
-Repayment Schedule Name,Emri i Programit të Shlyerjes,
Regular Payment,Pagesa e rregullt,
Loan Closure,Mbyllja e huasë,
-Payment Details,Detajet e pagesës,
-Interest Payable,Kamatë e pagueshme,
-Amount Paid,Shuma e paguar,
-Principal Amount Paid,Shuma e paguar e principalit,
-Repayment Details,Detajet e ripagimit,
-Loan Repayment Detail,Detaji i ripagimit të kredisë,
-Loan Security Name,Emri i Sigurisë së Huasë,
-Unit Of Measure,Njësia matëse,
-Loan Security Code,Kodi i Sigurisë së Kredisë,
-Loan Security Type,Lloji i sigurisë së huasë,
-Haircut %,Prerje flokësh%,
-Loan Details,Detajet e huasë,
-Unpledged,Unpledged,
-Pledged,u zotua,
-Partially Pledged,Premtuar pjeserisht,
-Securities,Securities,
-Total Security Value,Vlera totale e sigurisë,
-Loan Security Shortfall,Mungesa e sigurisë së huasë,
-Loan ,hua,
-Shortfall Time,Koha e mungesës,
-America/New_York,America / New_York,
-Shortfall Amount,Shuma e mungesës,
-Security Value ,Vlera e sigurisë,
-Process Loan Security Shortfall,Mungesa e sigurisë së huasë në proces,
-Loan To Value Ratio,Raporti i huasë ndaj vlerës,
-Unpledge Time,Koha e bllokimit,
-Loan Name,kredi Emri,
Rate of Interest (%) Yearly,Norma e interesit (%) vjetore,
-Penalty Interest Rate (%) Per Day,Shkalla e interesit të dënimit (%) në ditë,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Norma e interesit të ndëshkimit vendoset në shumën e interesit në pritje çdo ditë në rast të ripagimit të vonuar,
-Grace Period in Days,Periudha e hirit në ditë,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Nr. I ditëve nga data e caktuar deri në të cilën gjobë nuk do të ngarkohet në rast të vonesës në ripagimin e kredisë,
-Pledge,premtim,
-Post Haircut Amount,Shuma e prerjes së flokëve,
-Process Type,Lloji i procesit,
-Update Time,Koha e azhurnimit,
-Proposed Pledge,Premtimi i propozuar,
-Total Payment,Pagesa Total,
-Balance Loan Amount,Bilanci Shuma e Kredisë,
-Is Accrued,Acshtë përvetësuar,
Salary Slip Loan,Kredia për paga,
Loan Repayment Entry,Hyrja e ripagimit të huasë,
-Sanctioned Loan Amount,Shuma e kredisë së sanksionuar,
-Sanctioned Amount Limit,Limiti i shumës së sanksionuar,
-Unpledge,Unpledge,
-Haircut,prerje,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generate Orari,
Schedules,Oraret,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projekti do të jetë në dispozicion në faqen e internetit të këtyre përdoruesve,
Copied From,kopjuar nga,
Start and End Dates,Filloni dhe Fundi Datat,
-Actual Time (in Hours),Koha aktuale (në orë),
+Actual Time in Hours (via Timesheet),Koha aktuale (në orë),
Costing and Billing,Kushton dhe Faturimi,
-Total Costing Amount (via Timesheets),Shuma totale e kostos (përmes Timesheets),
-Total Expense Claim (via Expense Claims),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime),
+Total Costing Amount (via Timesheet),Shuma totale e kostos (përmes Timesheets),
+Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime),
Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës),
Total Sales Amount (via Sales Order),Shuma totale e shitjeve (me anë të shitjes),
-Total Billable Amount (via Timesheets),Shuma totale e faturimit (përmes Timesheets),
-Total Billed Amount (via Sales Invoices),Shuma Totale e Faturuar (përmes Faturat e Shitjes),
-Total Consumed Material Cost (via Stock Entry),Kostoja totale e materialit të konsumuar (nëpërmjet regjistrimit të stoqeve),
+Total Billable Amount (via Timesheet),Shuma totale e faturimit (përmes Timesheets),
+Total Billed Amount (via Sales Invoice),Shuma Totale e Faturuar (përmes Faturat e Shitjes),
+Total Consumed Material Cost (via Stock Entry),Kostoja totale e materialit të konsumuar (nëpërmjet regjistrimit të stoqeve),
Gross Margin,Marzhi bruto,
Gross Margin %,Marzhi bruto%,
Monitor Progress,Monitorimi i progresit,
@@ -7521,12 +7385,10 @@
Dependencies,Dependencies,
Dependent Tasks,Detyrat e varura,
Depends on Tasks,Varet Detyrat,
-Actual Start Date (via Time Sheet),Aktuale Start Date (via Koha Sheet),
-Actual Time (in hours),Koha aktuale (në orë),
-Actual End Date (via Time Sheet),Aktuale End Date (via Koha Sheet),
-Total Costing Amount (via Time Sheet),Total Kostoja Shuma (via Koha Sheet),
+Actual Start Date (via Timesheet),Aktuale Start Date (via Koha Sheet),
+Actual Time in Hours (via Timesheet),Koha aktuale (në orë),
+Actual End Date (via Timesheet),Aktuale End Date (via Koha Sheet),
Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës),
-Total Billing Amount (via Time Sheet),Total Shuma Faturimi (via Koha Sheet),
Review Date,Data shqyrtim,
Closing Date,Data e mbylljes,
Task Depends On,Detyra varet,
@@ -7887,7 +7749,6 @@
Update Series,Update Series,
Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.,
Prefix,Parashtesë,
-Current Value,Vlera e tanishme,
This is the number of the last created transaction with this prefix,Ky është numri i transaksionit të fundit të krijuar me këtë prefiks,
Update Series Number,Update Seria Numri,
Quotation Lost Reason,Citat Humbur Arsyeja,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli,
Lead Details,Detajet Lead,
Lead Owner Efficiency,Efikasiteti Lead Owner,
-Loan Repayment and Closure,Shlyerja dhe mbyllja e huasë,
-Loan Security Status,Statusi i Sigurisë së Kredisë,
Lost Opportunity,Mundësia e Humbur,
Maintenance Schedules,Mirëmbajtja Oraret,
Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Numërimet e synuara: {0},
Payment Account is mandatory,Llogaria e Pagesës është e detyrueshme,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Nëse kontrollohet, shuma e plotë do të zbritet nga të ardhurat e tatueshme para llogaritjes së tatimit mbi të ardhurat pa ndonjë deklaratë ose paraqitje provë.",
-Disbursement Details,Detajet e disbursimit,
Material Request Warehouse,Depo për Kërkesë Materiali,
Select warehouse for material requests,Zgjidhni magazinën për kërkesat materiale,
Transfer Materials For Warehouse {0},Transferimi i materialeve për magazinën {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Shlyeni shumën e pakërkuar nga paga,
Deduction from salary,Zbritja nga paga,
Expired Leaves,Gjethet e skaduara,
-Reference No,Referenca Nr,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Përqindja e prerjes së flokëve është diferenca në përqindje midis vlerës së tregut të Sigurimit të Huasë dhe vlerës së përshkruar asaj Sigurimi të Huasë kur përdoret si kolateral për atë hua.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Raporti i Huasë me Vlerën shpreh raportin e shumës së kredisë me vlerën e garancisë së lënë peng. Një mungesë e sigurisë së kredisë do të shkaktohet nëse kjo bie nën vlerën e specifikuar për çdo kredi,
If this is not checked the loan by default will be considered as a Demand Loan,"Nëse kjo nuk kontrollohet, kredia si parazgjedhje do të konsiderohet si një Kredi e Kërkesës",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Kjo llogari përdoret për rezervimin e ripagimeve të huasë nga huamarrësi dhe gjithashtu disbursimin e huamarrësve,
This account is capital account which is used to allocate capital for loan disbursal account ,Kjo llogari është llogari kapitale e cila përdoret për të alokuar kapitalin për llogarinë e disbursimit të kredisë,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operacioni {0} nuk i përket urdhrit të punës {1},
Print UOM after Quantity,Shtypni UOM pas Sasisë,
Set default {0} account for perpetual inventory for non stock items,Vendosni llogarinë e paracaktuar {0} për inventarin e përhershëm për artikujt jo të aksioneve,
-Loan Security {0} added multiple times,Siguria e kredisë {0} u shtua shumë herë,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Letrat me vlerë të Huasë me raport të ndryshëm LTV nuk mund të lihen peng ndaj një kredie,
-Qty or Amount is mandatory for loan security!,Shuma ose Shuma është e detyrueshme për sigurinë e kredisë!,
-Only submittted unpledge requests can be approved,Vetëm kërkesat e paraqitura për peng nuk mund të aprovohen,
-Interest Amount or Principal Amount is mandatory,Shuma e interesit ose shuma e principalit është e detyrueshme,
-Disbursed Amount cannot be greater than {0},Shuma e disbursuar nuk mund të jetë më e madhe se {0},
-Row {0}: Loan Security {1} added multiple times,Rreshti {0}: Siguria e huasë {1} e shtuar shumë herë,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rreshti # {0}: Artikulli i Fëmijëve nuk duhet të jetë Pako e Produktit. Ju lutemi hiqni Artikullin {1} dhe Ruajeni,
Credit limit reached for customer {0},U arrit kufiri i kredisë për klientin {0},
Could not auto create Customer due to the following missing mandatory field(s):,Nuk mund të krijonte automatikisht Klientin për shkak të fushave (eve) të detyrueshme që mungojnë:,
diff --git a/erpnext/translations/sr-SP.csv b/erpnext/translations/sr-SP.csv
index 27ac944..25223db 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -1,1001 +1,1001 @@
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +153,'Opening','Početno stanje'
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Prosjek dnevne isporuke
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Kreirajte uplatu
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Uvoz nije uspio!
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti obrisano dok postoji zaliha za artikal {1}
-DocType: Item,Is Purchase Item,Artikal je za poručivanje
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Skladište {0} ne postoji
-apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrđene porudžbine od strane kupaca
-apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Klinika (beta)
-DocType: Salary Slip,Salary Structure,Структура плата
-DocType: Item Reorder,Item Reorder,Dopuna artikla
-apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi grešku
-DocType: Salary Slip,Net Pay,Neto plaćanje
-DocType: Payment Entry,Internal Transfer,Interni prenos
-DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1548,Create a new Customer,Kreirajte novog kupca
-DocType: Item Variant Attribute,Attribute,Atribut
-DocType: POS Profile,POS Profile,POS profil
-DocType: Pricing Rule,Min Qty,Min količina
-DocType: Purchase Invoice,Currency and Price List,Valuta i cjenovnik
-DocType: POS Profile,Write Off Account,Otpisati nalog
-DocType: Stock Entry,Delivery Note No,Broj otpremnice
-DocType: Item,Serial Nos and Batches,Serijski brojevi i paketi
-DocType: HR Settings,Employee Records to be created by,Izvještaje o Zaposlenima će kreirati
-DocType: Activity Cost,Projects User,Projektni korisnik
-DocType: Lead,Address Desc,Opis adrese
-DocType: Bank Statement Transaction Payment Item,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +32,Balance (Dr - Cr),Saldo (Du - Po)
-apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Moja korpa
-DocType: Payment Entry,Payment From / To,Plaćanje od / za
-DocType: Purchase Invoice,Grand Total (Company Currency),Za plaćanje (Valuta preduzeća)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Insufficient Stock,Nedovoljna količina
-DocType: Purchase Invoice,Shipping Rule,Pravila nabavke
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Bruto dobit / gubitak
-apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Pritisnite na artikal da bi ga dodali ovdje
-,Sales Order Trends,Trendovi prodajnih naloga
-DocType: Sales Invoice,Offline POS Name,POS naziv u režimu van mreže (offline)
-apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Можете обновити само ако ваше чланство истиче за мање од 30 дана
-DocType: Request for Quotation Item,Project Name,Naziv Projekta
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +14,Material Transfer,Prenos robe
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +555,Change POS Profile,Promijenite POS korisnika
-apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Napravi predračun
-DocType: Bank Guarantee,Customer,Kupac
-DocType: Purchase Order Item,Supplier Quotation Item,Stavka na dobavljačevoj ponudi
-DocType: Item Group,General Settings,Opšta podešavanja
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +15,Ageing Based On,Staros bazirana na
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Poručeno
-DocType: Email Digest,Credit Balance,Stanje kredita
-apps/erpnext/erpnext/utilities/user_progress.py +147,Gram,Gram
-DocType: Bank Statement Transaction Invoice Item,Purchase Invoice,Faktura nabavke
-DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje fiskalne godine
-apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,Из листе поља за потврду можете изабрати највише једну опцију.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,Group by Voucher,Grupiši po knjiženjima
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Ukupno preostalo
-DocType: HR Settings,Email Salary Slip to Employee,Pošalji platnu listu Zaposlenom
-DocType: Item,Customer Code,Šifra kupca
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dozvolite više prodajnih naloga koji su vezani sa porudžbenicom kupca
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno isporučeno
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +166,User {0} is already assigned to Employee {1},Korisnik {0} je već označen kao Zaposleni {1}
-,Sales Register,Pregled Prodaje
-DocType: Sales Order,% Delivered,% Isporučeno
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} kreirana za Zaposlenog {1} za dati period
-DocType: Journal Entry Account,Party Balance,Stanje kupca
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +73,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno zaposlenom {1} za period {2} {3}
-apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +218,Please set User ID field in an Employee record to set Employee Role,Molimo podesite polje Korisnički ID u evidenciji Zaposlenih radi podešavanja zaduženja Zaposlenih
-DocType: Project,Task Completion,Završenost zadataka
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Set as Lost,Obilježi kao izgubljenu
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupovina
-apps/erpnext/erpnext/accounts/party.py +429,{0} {1} is not active,{0} {1} nije aktivan
-DocType: Bin,Reserved Quantity,Rezervisana količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +866,Return / Credit Note,Povraćaj / knjižno odobrenje
-DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +997,Get Items from BOM,Dodaj stavke iz БОМ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2052,Please select customer,Odaberite kupca
-apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
-,Stock Summary,Pregled zalihe
-DocType: Appraisal,For Employee Name,Za ime Zaposlenog
-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
-DocType: Production Plan Sales Order,Sales Order Date,Datum prodajnog naloga
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,Otpremnica {0} se ne može potvrditi
-apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status je {2}
-DocType: BOM,Item Image (if not slideshow),Slika artikla (ako nije prezentacija)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +372,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prebačen iz {2} u {3}
-apps/erpnext/erpnext/stock/doctype/item/item.py +304," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} Zadrži Uzorak je zasnovano na serijama, molimo označite Ima Broj Serije da bi zadržali uzorak stavke."
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Pregledi
-DocType: Territory,Classification of Customers by region,Klasifikacija kupaca po regiji
-DocType: Quotation,Quotation To,Ponuda za
-DocType: Payroll Employee Detail,Payroll Employee Detail,Detalji o platnom spisku Zaposlenih
-apps/erpnext/erpnext/config/projects.py +46,Timesheet for tasks.,Potrošeno vrijeme za zadatke
-DocType: Journal Entry,Remark,Napomena
-apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Stablo Vrste artikala
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji konkretnom Zaposlenom mogu odobriti odsustvo
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +142,Accounts Receivable Summary,Pregled potraživanja od kupaca
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Iz otpremnice
-DocType: Account,Tax,Porez
-DocType: Bank Reconciliation,Account Currency,Valuta računa
-DocType: Purchase Invoice,Y,Y
-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
-DocType: Purchase Invoice,Supplier Name,Naziv dobavljača
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +256,Closing (Opening + Total),Ukupno (P.S + promet u periodu)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +778,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 Plan,Sales Orders,Prodajni nalozi
-DocType: Item,Manufacturer Part Number,Proizvođačka šifra
-DocType: Sales Invoice Item,Discount and Margin,Popust i marža
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Prosječna vrijednost nabavke
-DocType: Sales Order Item,Gross Profit,Bruto dobit
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +51,Group by Account,Grupiši po računu.
-DocType: Opening Invoice Creation Tool Item,Item Name,Naziv artikla
-DocType: Salary Structure Employee,Salary Structure Employee,Struktura plata Zaposlenih
-DocType: Item,Will also apply for variants,Biće primijenjena i na varijante
-DocType: Purchase Invoice,Total Advance,Ukupno Avans
-apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Prodajni nalog za plaćanje
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +243,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada ni jednom skladištu
-,Sales Analytics,Prodajna analitika
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Zamrzni akcije starije"" trebalo bi da budu manje %d dana."
-DocType: Patient Appointment,Patient Age,Starost pacijenta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +171,Employee cannot report to himself.,Zaposleni ne može izvještavati sebi
-apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,Можете поднети Исплату одсуства само са валидном количином за исплату.
-DocType: Sales Invoice,Customer Address,Adresa kupca
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1557,Total Amount {0},Ukupan iznos {0}
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +70,Total (Credit),Ukupno bez PDV-a (duguje)
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Slovima (izvoz) će biti vidljiv onda kad sačuvate otpremnicu
-DocType: Opportunity,Opportunity Date,Datum prilike
-DocType: Employee Attendance Tool,Marked Attendance HTML,Označeno prisustvo HTML
-DocType: Sales Invoice Item,Delivery Note Item,Pozicija otpremnice
-DocType: Sales Invoice,Customer's Purchase Order,Porudžbenica kupca
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Get items from,Dodaj stavke iz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +36,From {0} to {1},Od {0} do {1}
-DocType: C-Form,Total Invoiced Amount,Ukupno fakturisano
-DocType: Purchase Invoice,Supplier Invoice Date,Datum fakture dobavljača
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Journal Entry {0} does not have account {1} or already matched against other voucher,Knjiženje {0} nema nalog {1} ili je već povezan sa drugim izvodom
-DocType: Lab Test,Lab Test,Lab test
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +78,-Above,- Iznad
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +227,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili stopiran
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade dodate (valuta preduzeća)
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Molimo Vas da unesete ID zaposlenog prodavca
-DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email će biti poslat svim Aktivnim Zaposlenima preduzeća u određeno vrijeme, ako nisu na odmoru. Presjek odziva biće poslat u ponoć."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,Note: {0},Bilješka: {0}
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Troškovi aktivnosti zaposlenog {0} na osnovu vrste aktivnosti - {1}
-DocType: Lead,Lost Quotation,Izgubljen Predračun
-DocType: Cash Flow Mapping Accounts,Account,Račun
-DocType: Company,Default Employee Advance Account,Podrazumjevani račun zaposlenog
-apps/erpnext/erpnext/accounts/general_ledger.py +113,Account: {0} can only be updated via Stock Transactions,Računovodstvo: {0} može samo da se ažurira u dijelu Promjene na zalihama
-DocType: Department,Leave Approver,Odobrava izlaske s posla
-DocType: Authorization Rule,Customer or Item,Kupac ili proizvod
-DocType: Upload Attendance,Attendance To Date,Prisustvo do danas
-DocType: Material Request Plan Item,Requested Qty,Tražena kol
-DocType: Education Settings,Attendance Freeze Date,Datum zamrzavanja prisustva
-apps/erpnext/erpnext/stock/get_item_details.py +150,No Item with Serial No {0},Ne postoji artikal sa serijskim brojem {0}
-DocType: POS Profile,Taxes and Charges,Porezi i naknade
-DocType: Item,Serial Number Series,Serijski broj serije
-DocType: Purchase Order,Delivered,Isporučeno
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Zaposleni nije pronađen
-DocType: Selling Settings,Default Territory,Podrazumijevana država
-DocType: Asset,Asset Category,Grupe osnovnih sredstava
-DocType: Sales Invoice Item,Customer Warehouse (Optional),Skladište kupca (opciono)
-DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
-apps/erpnext/erpnext/public/js/utils.js +538,You have already selected items from {0} {1},Већ сте изабрали ставке из {0} {1}
-DocType: Payment Entry,Receive,Prijem
-DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +220,Payment Entry already exists,Uplata već postoji
-DocType: Project,Customer Details,Korisnički detalji
-DocType: Item,"Example: ABCD.#####
+'Opening','Početno stanje'
+Avg Daily Outgoing,Prosjek dnevne isporuke,
+Make Payment Entry,Kreirajte uplatu,
+Import Failed!,Uvoz nije uspio!
+Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti obrisano dok postoji zaliha za artikal {1}
+Is Purchase Item,Artikal je za poručivanje,
+Warehouse {0} does not exist,Skladište {0} ne postoji,
+Confirmed orders from Customers.,Potvrđene porudžbine od strane kupaca,
+Healthcare (beta),Klinika (beta)
+Salary Structure,Структура плата
+Item Reorder,Dopuna artikla,
+Report an Issue,Prijavi grešku,
+Net Pay,Neto plaćanje,
+Internal Transfer,Interni prenos,
+Item Tax Rate,Poreska stopa,
+Create a new Customer,Kreirajte novog kupca,
+Attribute,Atribut,
+POS Profile,POS profil,
+Min Qty,Min količina,
+Currency and Price List,Valuta i cjenovnik,
+Write Off Account,Otpisati nalog,
+Delivery Note No,Broj otpremnice,
+Serial Nos and Batches,Serijski brojevi i paketi,
+Employee Records to be created by,Izvještaje o Zaposlenima će kreirati,
+Projects User,Projektni korisnik,
+Address Desc,Opis adrese,
+Mode of Payment,Način plaćanja,
+Balance (Dr - Cr),Saldo (Du - Po)
+My Cart,Moja korpa,
+Payment From / To,Plaćanje od / za,
+Grand Total (Company Currency),Za plaćanje (Valuta preduzeća)
+Insufficient Stock,Nedovoljna količina,
+Shipping Rule,Pravila nabavke,
+Gross Profit / Loss,Bruto dobit / gubitak,
+Tap items to add them here,Pritisnite na artikal da bi ga dodali ovdje,
+Sales Order Trends,Trendovi prodajnih naloga,
+Offline POS Name,POS naziv u režimu van mreže (offline)
+You can only renew if your membership expires within 30 days,Можете обновити само ако ваше чланство истиче за мање од 30 дана
+Project Name,Naziv Projekta,
+Material Transfer,Prenos robe,
+Change POS Profile,Promijenite POS korisnika,
+Make Quotation,Napravi predračun,
+Customer,Kupac,
+Supplier Quotation Item,Stavka na dobavljačevoj ponudi,
+General Settings,Opšta podešavanja,
+Ageing Based On,Staros bazirana na,
+Ordered,Poručeno,
+Credit Balance,Stanje kredita,
+Gram,Gram,
+Purchase Invoice,Faktura nabavke,
+Closing Fiscal Year,Zatvaranje fiskalne godine,
+You can only select a maximum of one option from the list of check boxes.,Из листе поља за потврду можете изабрати највише једну опцију.
+Group by Voucher,Grupiši po knjiženjima,
+Total Outstanding,Ukupno preostalo,
+Email Salary Slip to Employee,Pošalji platnu listu Zaposlenom,
+Customer Code,Šifra kupca,
+Allow multiple Sales Orders against a Customer's Purchase Order,Dozvolite više prodajnih naloga koji su vezani sa porudžbenicom kupca,
+Total Outgoing,Ukupno isporučeno,
+User {0} is already assigned to Employee {1},Korisnik {0} je već označen kao Zaposleni {1}
+Sales Register,Pregled Prodaje,
+% Delivered,% Isporučeno,
+Appraisal {0} created for Employee {1} in the given date range,Procjena {0} kreirana za Zaposlenog {1} za dati period,
+Party Balance,Stanje kupca,
+{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno zaposlenom {1} za period {2} {3}
+Customers,Kupci,
+Please set User ID field in an Employee record to set Employee Role,Molimo podesite polje Korisnički ID u evidenciji Zaposlenih radi podešavanja zaduženja Zaposlenih,
+Task Completion,Završenost zadataka,
+Set as Lost,Obilježi kao izgubljenu,
+Buy,Kupovina,
+{0} {1} is not active,{0} {1} nije aktivan,
+Reserved Quantity,Rezervisana količina,
+Return / Credit Note,Povraćaj / knjižno odobrenje,
+All Employee (Active),Svi zaposleni (aktivni)
+Get Items from BOM,Dodaj stavke iz БОМ
+Please select customer,Odaberite kupca,
+New Address,Nova adresa,
+Stock Summary,Pregled zalihe,
+For Employee Name,Za ime Zaposlenog,
+Net Rate (Company Currency),Neto cijena sa rabatom (Valuta preduzeća)
+Additional Cost,Dodatni trošak,
+Purchase Invoice Trends,Trendovi faktura dobavljaća,
+Item Price,Cijena artikla,
+Sales Order Date,Datum prodajnog naloga,
+Delivery Note {0} must not be submitted,Otpremnica {0} se ne može potvrditi,
+{0} {1} status is {2},{0} {1} status je {2}
+Item Image (if not slideshow),Slika artikla (ako nije prezentacija)
+Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prebačen iz {2} u {3}
+" {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} Zadrži Uzorak je zasnovano na serijama, molimo označite Ima Broj Serije da bi zadržali uzorak stavke."
+Consultations,Pregledi,
+Classification of Customers by region,Klasifikacija kupaca po regiji,
+Quotation To,Ponuda za,
+Payroll Employee Detail,Detalji o platnom spisku Zaposlenih,
+Timesheet for tasks.,Potrošeno vrijeme za zadatke,
+Remark,Napomena,
+Tree of Item Groups.,Stablo Vrste artikala,
+Users who can approve a specific employee's leave applications,Korisnici koji konkretnom Zaposlenom mogu odobriti odsustvo,
+Accounts Receivable Summary,Pregled potraživanja od kupaca,
+From Delivery Note,Iz otpremnice,
+Tax,Porez,
+Account Currency,Valuta računa,
+Y,Y,
+Open Projects,Otvoreni projekti,
+Price List,Cjenovnik,
+Rate (Company Currency),Cijena sa rabatom (Valuta preduzeća)
+Projects,Projekti,
+Supplier Name,Naziv dobavljača,
+Closing (Opening + Total),Ukupno (P.S + promet u periodu)
+Supplier Invoice Date cannot be greater than Posting Date,Datum fakture dobavljača ne može biti veći od datuma otvaranja fakture,
+Sales Orders,Prodajni nalozi,
+Manufacturer Part Number,Proizvođačka šifra,
+Discount and Margin,Popust i marža,
+Avg. Buying Rate,Prosječna vrijednost nabavke,
+Gross Profit,Bruto dobit,
+Group by Account,Grupiši po računu.
+Item Name,Naziv artikla,
+Salary Structure Employee,Struktura plata Zaposlenih,
+Will also apply for variants,Biće primijenjena i na varijante,
+Total Advance,Ukupno Avans,
+Sales Order to Payment,Prodajni nalog za plaćanje,
+Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada ni jednom skladištu,
+Sales Analytics,Prodajna analitika,
+`Freeze Stocks Older Than` should be smaller than %d days.,"""Zamrzni akcije starije"" trebalo bi da budu manje %d dana."
+Patient Age,Starost pacijenta,
+Employee cannot report to himself.,Zaposleni ne može izvještavati sebi,
+You can only submit Leave Encashment for a valid encashment amount,Можете поднети Исплату одсуства само са валидном количином за исплату.
+Customer Address,Adresa kupca,
+Total Amount {0},Ukupan iznos {0}
+Total (Credit),Ukupno bez PDV-a (duguje)
+In Words (Export) will be visible once you save the Delivery Note.,Slovima (izvoz) će biti vidljiv onda kad sačuvate otpremnicu,
+Opportunity Date,Datum prilike,
+Marked Attendance HTML,Označeno prisustvo HTML,
+Delivery Note Item,Pozicija otpremnice,
+Customer's Purchase Order,Porudžbenica kupca,
+Get items from,Dodaj stavke iz,
+From {0} to {1},Od {0} do {1}
+Total Invoiced Amount,Ukupno fakturisano,
+Supplier Invoice Date,Datum fakture dobavljača,
+Journal Entry {0} does not have account {1} or already matched against other voucher,Knjiženje {0} nema nalog {1} ili je već povezan sa drugim izvodom,
+Lab Test,Lab test,
+-Above,- Iznad,
+{0} {1} is cancelled or stopped,{0} {1} je otkazan ili stopiran,
+Taxes and Charges Added (Company Currency),Porezi i naknade dodate (valuta preduzeća)
+Please enter Employee Id of this sales person,Molimo Vas da unesete ID zaposlenog prodavca,
+"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email će biti poslat svim Aktivnim Zaposlenima preduzeća u određeno vrijeme, ako nisu na odmoru. Presjek odziva biće poslat u ponoć."
+Note: {0},Bilješka: {0}
+Activity Cost exists for Employee {0} against Activity Type - {1},Troškovi aktivnosti zaposlenog {0} na osnovu vrste aktivnosti - {1}
+Lost Quotation,Izgubljen Predračun,
+Account,Račun,
+Default Employee Advance Account,Podrazumjevani račun zaposlenog,
+Account: {0} can only be updated via Stock Transactions,Računovodstvo: {0} može samo da se ažurira u dijelu Promjene na zalihama,
+Leave Approver,Odobrava izlaske s posla,
+Customer or Item,Kupac ili proizvod,
+Attendance To Date,Prisustvo do danas,
+Requested Qty,Tražena kol,
+Attendance Freeze Date,Datum zamrzavanja prisustva,
+No Item with Serial No {0},Ne postoji artikal sa serijskim brojem {0}
+Taxes and Charges,Porezi i naknade,
+Serial Number Series,Serijski broj serije,
+Delivered,Isporučeno,
+No employee found,Zaposleni nije pronađen,
+Default Territory,Podrazumijevana država,
+Asset Category,Grupe osnovnih sredstava,
+Customer Warehouse (Optional),Skladište kupca (opciono)
+From Warehouse,Iz skladišta,
+Show closed,Prikaži zatvorene,
+You have already selected items from {0} {1},Већ сте изабрали ставке из {0} {1}
+Receive,Prijem,
+Additional information regarding the customer.,Dodatne informacije o kupcu,
+Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
+Payment Entry already exists,Uplata već postoji,
+Customer Details,Korisnički detalji,
+"Example: ABCD.#####
If 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.","Primjer:. ABCD #####
Ако Радња је смештена i serijski broj se ne pominje u transakcijama, onda će automatski serijski broj biti kreiran na osnovu ove serije. Ukoliko uvijek želite da eksplicitno spomenete serijski broj ove šifre, onda je ostavite praznu."
-apps/erpnext/erpnext/config/selling.py +322,Customer and Supplier,Kupac i dobavljač
-DocType: Project,% Completed,% završen
-DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Faktura prodaje
-DocType: Journal Entry,Accounting Entries,Računovodstveni unosi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +253,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
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Na osnovu"" и ""Grupiši po"" ne mogu biti identični"
-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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +530,[Error],[Greška]
-DocType: Supplier,Supplier Details,Detalji o dobavljaču
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum zajednice
-,Batch Item Expiry Status,Pregled artikala sa rokom trajanja
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +887,Payment,Plaćanje
-,Sales Partners Commission,Provizija za prodajne partnere
-DocType: C-Form Invoice Detail,Territory,Teritorija
-DocType: Notification Control,Sales Order Message,Poruka prodajnog naloga
-DocType: Employee Attendance Tool,Employees HTML,HTML Zaposlenih
-,Employee Leave Balance,Pregled odsustva Zaposlenih
-apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,Minut
-DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Pošalji platnu listu Zaposlenom na željenu adresu označenu u tab-u ZAPOSLENI
-apps/erpnext/erpnext/utilities/user_progress.py +147,Litre,Litar
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +250,Opening (Cr),Početno stanje (Po)
-DocType: Academic Term,Academics User,Akademski korisnik
-DocType: Student,Blood Group,Krvna grupa
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Izjava o računu
-DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +451,All Territories,Sve države
-DocType: Payment Entry,Received Amount (Company Currency),Iznos uplate (Valuta preduzeća)
-DocType: Blanket Order Item,Ordered Quantity,Poručena količina
-DocType: Lab Test Template,Standard Selling Rate,Standarna prodajna cijena
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +58,Total Outstanding: {0},Ukupno preostalo: {0}
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ljudski resursi
-DocType: Sales Invoice Item,Rate With Margin,Cijena sa popustom
-DocType: Student Attendance,Student Attendance,Prisustvo učenika
-apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,Dodaj potrošeno vrijeme
-apps/erpnext/erpnext/public/js/setup_wizard.js +254,Collapse All,Skupi sve
-apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Korisnički portal
-DocType: Purchase Order Item Supplied,Stock UOM,JM zalihe
-DocType: Fee Validity,Valid Till,Važi do
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1399,Select or add new customer,Izaberite ili dodajte novog kupca
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposleni i prisustvo
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Odsustvo i prisustvo
-,Trial Balance for Party,Struktura dugovanja
-DocType: Program Enrollment Tool,New Program,Novi program
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +603,Taxable Amount,Oporezivi iznos
-DocType: Production Plan Item,Product Bundle Item,Sastavljeni proizvodi
-DocType: Payroll Entry,Select Employees,Odaberite Zaposlene
-apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Kreiraj evidenciju o Zaposlenom kako bi upravljali odsustvom, potraživanjima za troškove i platnim spiskovima"
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ovo se zasniva na pohađanju ovog zaposlenog
-DocType: Lead,Address & Contact,Adresa i kontakt
-DocType: Bin,Reserved Qty for Production,Rezervisana kol. za proizvodnju
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ovo praćenje je zasnovano na kretanje zaliha. Pogledajte {0} za više detalja
-DocType: Training Event Employee,Training Event Employee,Obuke Zaposlenih
-apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodajni agent
-DocType: QuickBooks Migrator,Default Warehouse,Podrazumijevano skladište
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно не постоје залихе у складишту
-DocType: Company,Default Letter Head,Podrazumijevano zaglavlje
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Prodajni nalog {0} nije validan
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Датум почетка или краја године се преклапа са {0}. Да бисте избегли молимо поставите компанију
-DocType: Account,Credit,Potražuje
-DocType: C-Form Invoice Detail,Grand Total,Za plaćanje
-apps/erpnext/erpnext/config/learn.py +229,Human Resource,Ljudski resursi
-DocType: Payroll Entry,Employees,Zaposleni
-DocType: Selling Settings,Delivery Note Required,Otpremnica je obavezna
-DocType: Payment Entry,Type of Payment,Vrsta plaćanja
-DocType: Purchase Invoice Item,UOM,JM
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +66,Difference Amount must be zero,Razlika u iznosu mora biti nula
-DocType: Sales Order,Not Delivered,Nije isporučeno
-apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne kampanje
-DocType: Item,Auto re-order,Automatska porudžbina
-,Profit and Loss Statement,Bilans uspjeha
-apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,Metar
-apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,Par
-,Profitability Analysis,Analiza profitabilnosti
-DocType: Contract,HR Manager,Menadžer za ljudske resurse
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Porez (valuta preduzeća)
-DocType: Asset,Quality Manager,Menadžer za kvalitet
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +280,Sales Invoice {0} has already been submitted,Faktura prodaje {0} je već potvrđena
-DocType: Project Task,Weight,Težina
-DocType: Sales Invoice Timesheet,Timesheet Detail,Detalji potrošenog vremena
-DocType: Delivery Note,Is Return,Da li je povratak
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Material Receipt,Prijem robe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Broj fakture dobavljača već postoji u fakturi nabavke {0}
-DocType: BOM Explosion Item,Source Warehouse,Izvorno skladište
-apps/erpnext/erpnext/config/learn.py +253,Managing Projects,Upravljanje projektima
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +26,Pricing,Kalkulacija
-DocType: Supplier,Name and Type,Ime i tip
-DocType: Customs Tariff Number,Customs Tariff Number,Carinska tarifa
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +65,"You can claim only an amount of {0}, the rest amount {1} should be in the application \
+Customer and Supplier,Kupac i dobavljač
+% Completed,% završen,
+Sales Invoice,Faktura prodaje,
+Accounting Entries,Računovodstveni unosi,
+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.
+Print Language,Jezik za štampu,
+'Based On' and 'Group By' can not be same,"""Na osnovu"" и ""Grupiši po"" ne mogu biti identični"
+Healthcare Administrator,Administrator klinike,
+Track this Sales Order against any Project,Prati ovaj prodajni nalog na bilo kom projektu,
+Stock Balance,Pregled trenutne zalihe,
+[Error],[Greška]
+Supplier Details,Detalji o dobavljaču,
+Community Forum,Forum zajednice,
+Batch Item Expiry Status,Pregled artikala sa rokom trajanja,
+Payment,Plaćanje,
+Sales Partners Commission,Provizija za prodajne partnere,
+Territory,Teritorija,
+Sales Order Message,Poruka prodajnog naloga,
+Employees HTML,HTML Zaposlenih,
+Employee Leave Balance,Pregled odsustva Zaposlenih,
+Minute,Minut,
+Emails salary slip to employee based on preferred email selected in Employee,Pošalji platnu listu Zaposlenom na željenu adresu označenu u tab-u ZAPOSLENI,
+Litre,Litar,
+Opening (Cr),Početno stanje (Po)
+Academics User,Akademski korisnik,
+Blood Group,Krvna grupa,
+Statement of Account,Izjava o računu,
+Billing Address,Adresa za naplatu,
+All Territories,Sve države,
+Received Amount (Company Currency),Iznos uplate (Valuta preduzeća)
+Ordered Quantity,Poručena količina,
+Standard Selling Rate,Standarna prodajna cijena,
+Total Outstanding: {0},Ukupno preostalo: {0}
+Human Resources,Ljudski resursi,
+Rate With Margin,Cijena sa popustom,
+Student Attendance,Prisustvo učenika,
+Add Timesheets,Dodaj potrošeno vrijeme,
+Collapse All,Skupi sve,
+User Forum,Korisnički portal,
+Stock UOM,JM zalihe,
+Valid Till,Važi do,
+Select or add new customer,Izaberite ili dodajte novog kupca,
+Employee and Attendance,Zaposleni i prisustvo,
+Leave and Attendance,Odsustvo i prisustvo,
+Trial Balance for Party,Struktura dugovanja,
+New Program,Novi program,
+Taxable Amount,Oporezivi iznos,
+Product Bundle Item,Sastavljeni proizvodi,
+Select Employees,Odaberite Zaposlene,
+"Create Employee records to manage leaves, expense claims and payroll","Kreiraj evidenciju o Zaposlenom kako bi upravljali odsustvom, potraživanjima za troškove i platnim spiskovima"
+This is based on the attendance of this Employee,Ovo se zasniva na pohađanju ovog zaposlenog,
+Address & Contact,Adresa i kontakt,
+Reserved Qty for Production,Rezervisana kol. za proizvodnju,
+This is based on stock movement. See {0} for details,Ovo praćenje je zasnovano na kretanje zaliha. Pogledajte {0} za više detalja,
+Training Event Employee,Obuke Zaposlenih,
+All Contacts.,Svi kontakti,
+Sales Person,Prodajni agent,
+Default Warehouse,Podrazumijevano skladište,
+ Currently no stock available in any warehouse,Тренутно не постоје залихе у складишту
+Default Letter Head,Podrazumijevano zaglavlje,
+Sales Order {0} is not valid,Prodajni nalog {0} nije validan,
+Year start date or end date is overlapping with {0}. To avoid please set company,Датум почетка или краја године се преклапа са {0}. Да бисте избегли молимо поставите компанију
+Credit,Potražuje,
+Grand Total,Za plaćanje,
+Human Resource,Ljudski resursi,
+Employees,Zaposleni,
+Delivery Note Required,Otpremnica je obavezna,
+Type of Payment,Vrsta plaćanja,
+UOM,JM,
+Difference Amount must be zero,Razlika u iznosu mora biti nula,
+Not Delivered,Nije isporučeno,
+Sales campaigns.,Prodajne kampanje,
+Auto re-order,Automatska porudžbina,
+Profit and Loss Statement,Bilans uspjeha,
+Meter,Metar,
+Pair,Par,
+Profitability Analysis,Analiza profitabilnosti,
+HR Manager,Menadžer za ljudske resurse,
+Total Taxes and Charges (Company Currency),Porez (valuta preduzeća)
+Quality Manager,Menadžer za kvalitet,
+Sales Invoice {0} has already been submitted,Faktura prodaje {0} je već potvrđena,
+Weight,Težina,
+Timesheet Detail,Detalji potrošenog vremena,
+Is Return,Da li je povratak,
+Material Receipt,Prijem robe,
+Supplier Invoice No exists in Purchase Invoice {0},Broj fakture dobavljača već postoji u fakturi nabavke {0}
+Source Warehouse,Izvorno skladište,
+Managing Projects,Upravljanje projektima,
+Pricing,Kalkulacija,
+Name and Type,Ime i tip,
+Customs Tariff Number,Carinska tarifa,
+"You can claim only an amount of {0}, the rest amount {1} should be in the application \
as pro-rata component","Можете тражити само износ од {0}, остатак од {1} би требао бити у апликацији \ као про-рата компонента."
-DocType: Crop,Yield UOM,Јединица мере приноса
-DocType: Item Default,Default Supplier,Podrazumijevani dobavljač
-apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Izaberite pacijenta
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Opening,Početno stanje
-DocType: POS Profile,Customer Groups,Grupe kupaca
-DocType: Hub Tracked Item,Item Manager,Menadžer artikala
-DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina preduzeća
-DocType: Patient Appointment,Patient Appointment,Zakazivanje pacijenata
-DocType: BOM,Show In Website,Prikaži na web sajtu
-DocType: Payment Entry,Paid Amount,Uplaćeno
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +137,Total Paid Amount,Ukupno plaćeno
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +267,Purchase Receipt {0} is not submitted,Prijem robe {0} nije potvrđen
-apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Proizvodi i cijene
-DocType: Payment Entry,Account Paid From,Račun plaćen preko
-apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,Kreirajte bilješke kupca
-DocType: Purchase Invoice,Supplier Warehouse,Skladište dobavljača
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je obavezan podatak
-DocType: Item,Manufacturer,Proizvođač
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodajni iznos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},Molimo podesite datum zasnivanja radnog odnosa {0}
-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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +183,You are not authorized to approve leaves on Block Dates,Немате дозволу да одобравате одсуства на Блок Датумима.
-,Daily Timesheet Summary,Pregled dnevnog potrošenog vremena
-DocType: Project Task,View Timesheet,Pogledaj potrošeno vrijeme
-DocType: Purchase Invoice,Rounded Total (Company Currency),Zaokruženi ukupan iznos (valuta preduzeća)
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Salary Slip of employee {0} already created for this period,Isplatna lista Zaposlenog {0} kreirana je već za ovaj period
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ovaj artikal ima varijante, onda ne može biti biran u prodajnom nalogu."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1517,You can only redeem max {0} points in this order.,Можете унети највише {0} поена у овој наруџбини.
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +38,No leave record found for employee {0} for {1},Nije nađena evidancija o odsustvu Zaposlenog {0} za {1}
-DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijene iz cjenovnika (%)
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +17,Groups,Grupe
-DocType: Item,Item Attribute,Atribut artikla
-DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Skladište je obavezan podatak
-,Stock Ageing,Starost zaliha
-DocType: Email Digest,New Sales Orders,Novi prodajni nalozi
-apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Kreirana faktura
-DocType: Employee Internal Work History,Employee Internal Work History,Interna radna istorija Zaposlenog
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Korpa je prazna
-DocType: Patient,Patient Details,Detalji o pacijentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,Unos zaliha {0} nije potvrđen
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Rest Of The World,Ostatak svijeta
-DocType: Work Order,Additional Operating Cost,Dodatni operativni troškovi
-DocType: Purchase Invoice,Rejected Warehouse,Odbijeno skladište
-DocType: Asset Repair,Manufacturing Manager,Menadžer proizvodnje
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +39,You are not present all day(s) between compensatory leave request days,Нисте присутни свих дана између захтева за компензацијски одмор.
-DocType: Purchase Invoice Item,Is Fixed Asset,Artikal je osnovno sredstvo
-,POS,POS
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +367,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 +526, (Half Day),(Pola dana)
-DocType: Shipping Rule,Net Weight,Neto težina
-apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Zapis o prisustvu {0} постоји kod studenata {1}
-DocType: Payment Entry Reference,Outstanding,Preostalo
-DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Popust (%)
-DocType: Purchase Invoice,Select Shipping Address,Odaberite adresu isporuke
-apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Iznos za fakturisanje
-apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,Kreiranje prodajnog naloga će vam pomoći da isplanirate svoje vrijeme i dostavite robu na vrijeme
-apps/erpnext/erpnext/accounts/page/pos/pos.js +809,Sync Offline Invoices,Sinhronizuj offline fakture
-DocType: Blanket Order,Manufacturing,Proizvodnja
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Prisustvo
-DocType: Delivery Note,Customer's Purchase Order No,Broj porudžbenice kupca
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,U tabelu iznad unesite prodajni nalog
-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 +72,Gross Profit %,Bruto dobit%
-DocType: Crop,"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ","Овде можете дефинисати све задатке које је потребно извршити за ову жетву. Поље Дан говори дан на који је задатак потребно извршити, 1 је 1. дан, итд."
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +7,Payment Request,Upit za plaćanje
-,Purchase Analytics,Analiza nabavke
-DocType: Location,Tree Details,Detalji stabla
-DocType: Upload Attendance,Upload Attendance,Priloži evidenciju
-DocType: GL Entry,Against,Povezano sa
-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
-apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,Detalji o primarnoj adresi
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +98,Above,Iznad
-DocType: Item,Variant Based On,Varijanta zasnovana na
-DocType: Project,Task Weight,Težina zadataka
-DocType: Payment Entry,Transaction ID,Transakcije
-DocType: Payment Entry Reference,Allocated,Dodijeljeno
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +180,Add more items or open full form,Dodaj još stavki ili otvori kompletan prozor
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervisana za prodaju
-DocType: POS Item Group,Item Group,Vrste artikala
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +84,Age (Days),Starost (Dani)
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +243,Opening (Dr),Početno stanje (Du)
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +50,Total Outstanding Amt,Preostalo za plaćanje
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idite na radnu površinu i krenite sa radom u programu
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +71,You can only have Plans with the same billing cycle in a Subscription,Сви Планови у Претплати морају имати исти циклус наплате
-DocType: Sales Person,Name and Employee ID,Ime i ID Zaposlenog
-DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
-DocType: Bank Statement Transaction Invoice Item,Invoice Date,Datum fakture
-DocType: Customer,From Lead,Od Lead-a
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status Projekta
-apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,Sve vrste artikala
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski broj {0} ne postoji
-apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Još uvijek nema dodatih kontakata
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +42,Ageing Range 3,Opseg dospijeća 3
-DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
-DocType: Payment Entry,Account Paid To,Račun plaćen u
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,Učesnik ne može biti označen za buduće datume
-DocType: Stock Entry,Sales Invoice No,Broj fakture prodaje
-apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Potrošeno vrijeme
-DocType: HR Settings,Don't send Employee Birthday Reminders,Nemojte slati podsjetnik o rođendanima Zaposlenih
-DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
-DocType: Item,Foreign Trade Details,Spoljnotrgovinski detalji
-DocType: Item,Minimum Order Qty,Minimalna količina za poručivanje
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Za traženi kriterijum nema Zaposlenih
-DocType: Budget,Fiscal Year,Fiskalna godina
-DocType: Stock Entry,Repack,Prepakovati
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Izaberite skladište
-DocType: Purchase Receipt Item,Received and Accepted,Primio i prihvatio
-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
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +34,Total Paid Amt,Ukupno plaćeno
-DocType: Warehouse,Warehouse Detail,Detalji o skldištu
-DocType: Quotation Item,Quotation Item,Stavka sa ponude
-DocType: Journal Entry Account,Employee Advance,Napredak Zaposlenog
-DocType: Purchase Order Item,Warehouse and Reference,Skladište i veza
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Nalog {2} je neaktivan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +121,No Remarks,Nema napomene
-DocType: Notification Control,Purchase Receipt Message,Poruka u Prijemu robe
-DocType: Purchase Invoice,Taxes and Charges Deducted,Umanjeni porezi i naknade
-DocType: Sales Invoice,Include Payment (POS),Uključi POS plaćanje
-DocType: Sales Invoice,Customer PO Details,Pregled porudžbine kupca
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,Total Invoiced Amt,Ukupno fakturisano
-apps/erpnext/erpnext/public/js/stock_analytics.js +54,Select Brand...,Izaberite brend
-DocType: Item,Default Unit of Measure,Podrazumijevana jedinica mjere
-DocType: Purchase Invoice Item,Serial No,Serijski broj
-DocType: Supplier,Supplier Type,Tip dobavljača
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Trenutna kol. {0} / Na čekanju {1}
-DocType: Supplier,Individual,Fizičko lice
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Djelimično poručeno
-DocType: Bank Reconciliation Detail,Posting Date,Datum dokumenta
-DocType: Cheque Print Template,Date Settings,Podešavanje datuma
-DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupan povezani iznos (Valuta)
-DocType: Account,Income,Prihod
-apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Dodaj stavke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1731,Price List not found or disabled,Cjenovnik nije pronađen ili je zaključan
-DocType: Vital Signs,Weight (In Kilogram),Težina (u kg)
-apps/erpnext/erpnext/accounts/page/pos/pos.js +796,New Sales Invoice,Nova faktura
-DocType: Employee Transfer,New Company,Novo preduzeće
-DocType: Issue,Support Team,Tim za podršku
-DocType: Item,Valuation Method,Način vrednovanja
-DocType: Project,Project Type,Tip Projekta
-DocType: Purchase Order Item,Returned Qty,Vraćena kol.
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Iznos dodatnog popusta (valuta preduzeća)
-,Employee Information,Informacije o Zaposlenom
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dana od poslednje porudžbine"" mora biti veće ili jednako nuli"
-DocType: Asset,Maintenance,Održavanje
-DocType: Item Price,Multiple Item prices.,Više cijena artikala
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +379,Received From,je primljen od
-DocType: Payment Entry,Write Off Difference Amount,Otpis razlike u iznosu
-DocType: Task,Closing Date,Datum zatvaranja
-DocType: Payment Entry,Cheque/Reference Date,Datum izvoda
-DocType: Production Plan Item,Planned Qty,Planirana količina
-DocType: Repayment Schedule,Payment Date,Datum plaćanja
-DocType: Vehicle,Additional Details,Dodatni detalji
-DocType: Company,Create Chart Of Accounts Based On,Kreiraj kontni plan prema
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +244,You can not change rate if BOM mentioned agianst any item,Не можете променити цену ако постоји Саставница за било коју ставку.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otvori To Do
-DocType: Authorization Rule,Average Discount,Prosječan popust
-DocType: Item,Material Issue,Reklamacija robe
-DocType: Purchase Order Item,Billed Amt,Fakturisani iznos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Ponuda dobavljaču {0} је kreirana
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dozvoljeno mijenjati Promjene na zalihama starije od {0}
-apps/erpnext/erpnext/public/js/event.js +27,Add Employees,Dodaj Zaposlenog
-apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Podešavanja Zaposlenih
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladište nije pronađeno u sistemu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +264,Attendance for employee {0} is already marked for this day,Prisustvo zaposlenog {0} је već označeno za ovaj dan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +349,Employee relieved on {0} must be set as 'Left',"Zaposleni smijenjen na {0} mora biti označen kao ""Napustio"""
-DocType: Sales Invoice, Shipping Bill Number,Broj isporuke
-,Lab Test Report,Izvještaj labaratorijskog testa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +331,You cannot credit and debit same account at the same time,Не можете кредитирати и дебитовати исти налог у исто време.
-DocType: Sales Invoice,Customer Name,Naziv kupca
-DocType: Employee,Current Address,Trenutna adresa
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Predstojeći događaji u kalendaru
-DocType: Accounts Settings,Make Payment via Journal Entry,Kreiraj uplatu kroz knjiženje
-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 +24,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
-DocType: Item Default,Default Selling Cost Center,Podrazumijevani centar troškova
-apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,Još uvijek nema kupaca!
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +909,Sales Return,Povraćaj prodaje
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +628,No Items added to cart,Nema dodatih artikala na računu
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ovo je zasnovano na transkcijama ovog klijenta. Pogledajte vremensku liniju ispod za dodatne informacije
-DocType: Project Task,Make Timesheet,Kreiraj potrošeno vrijeme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +69,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: Prodajni nalog {0}već postoji veza sa porudžbenicom kupca {1}
-DocType: Healthcare Settings,Healthcare Settings,Podešavanje klinike
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,Analitička kartica
-DocType: Stock Entry,Total Outgoing Value,Ukupna vrijednost isporuke
-apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodajni nalog {0} је {1}
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Podesi automatski serijski broj da koristi FIFO
-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
-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ć
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +35,Ageing Range 2,Opseg dospijeća 2
-DocType: Employee Benefit Application,Employee Benefits,Primanja Zaposlenih
-DocType: POS Item Group,POS Item Group,POS Vrsta artikala
-DocType: Lead,Lead,Lead
-DocType: HR Settings,Employee Settings,Podešavanja zaposlenih
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Pogledajte sve proizvode
-DocType: Patient Medical Record,Patient Medical Record,Medicinski karton pacijenta
-DocType: Student Attendance Tool,Batch,Serija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +928,Purchase Receipt,Prijem robe
-DocType: Item,Warranty Period (in days),Garantni rok (u danima)
-apps/erpnext/erpnext/config/selling.py +28,Customer database.,Korisnička baza podataka
-DocType: Attendance,Attendance Date,Datum prisustva
-DocType: Supplier Scorecard,Notify Employee,Obavijestiti Zaposlenog
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +46,User ID not set for Employee {0},Korisnički ID nije podešen za Zaposlenog {0}
-,Stock Projected Qty,Projektovana količina na zalihama
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +408,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 +382,{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..
-,Item-wise Sales Register,Prodaja po artiklima
-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
-DocType: Products Settings,Products Settings,Podešavanje proizvoda
-DocType: Healthcare Practitioner,Mobile,Mobilni
-DocType: Purchase Invoice Item,Price List Rate,Cijena
-DocType: Purchase Invoice Item,Discount Amount,Vrijednost popusta
-,Sales Invoice Trends,Trendovi faktura prodaje
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +110,You don't have enought Loyalty Points to redeem,Немате довољно Бодова Лојалности.
-DocType: Purchase Invoice,Tax Breakup,Porez po pozicijama
-DocType: Asset Maintenance Log,Task,Zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.js +359,Add / Edit Prices,Dodaj / Izmijeni cijene
-,Item Prices,Cijene artikala
-DocType: Additional Salary,Salary Component,Компонента плате
-DocType: Sales Invoice,Customer's Purchase Order Date,Datum porudžbenice kupca
-DocType: Item,Country of Origin,Zemlja porijekla
-apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,Molimo izaberite registar Zaposlenih prvo
-DocType: Blanket Order,Order Type,Vrsta porudžbine
-DocType: BOM Item,Rate & Amount,Cijena i iznos sa rabatom
-DocType: Pricing Rule,For Price List,Za cjenovnik
-DocType: Purchase Invoice,Tax ID,Poreski broj
-DocType: Job Card,WIP Warehouse,Wip skladište
-,Itemwise Recommended Reorder Level,Pregled preporučenih nivoa dopune
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +408,{0} against Bill {1} dated {2},{0} veza sa računom {1} na datum {2}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,You are not authorized to set Frozen value,Немате дозволу да постављате замрзнуту вредност
-,Requested Items To Be Ordered,Tražene stavke za isporuku
-DocType: Employee Attendance Tool,Unmarked Attendance,Neobilježeno prisustvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +657,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/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Prodajna linija
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +617,Already completed,Već završen
-DocType: Production Plan Item,Ordered Qty,Poručena kol
-DocType: Item,Sales Details,Detalji prodaje
-apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigacija
-apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,Vaši artikli ili usluge
-DocType: Contract,CRM,CRM
-apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,Brend
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Quotation {0} is cancelled,Ponuda {0} je otkazana
-DocType: Pricing Rule,Item Code,Šifra artikla
-DocType: Purchase Order,Customer Mobile No,Broj telefona kupca
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Kol. za dopunu
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,Premještanje artikala
-DocType: Buying Settings,Buying Settings,Podešavanja nabavke
-DocType: Asset Movement,From Employee,Od Zaposlenog
-DocType: Driver,Fleet Manager,Menadžer transporta
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +51,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 +278,Closing (Cr),Saldo (Po)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +622,Product Bundle,Sastavnica
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Prodaja i povraćaji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +801,Sync Master Data,Sinhronizuj podatke iz centrale
-DocType: Sales Person,Sales Person Name,Ime prodajnog agenta
-DocType: Landed Cost Voucher,Purchase Receipts,Prijemi robe
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje formi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,Prisustvo zaposlenog {0} je već označeno
-DocType: Project,% Complete Method,% metod vrednovanja završetka projekta
-DocType: Purchase Invoice,Overdue,Istekao
-DocType: Purchase Invoice,Posting Time,Vrijeme izrade računa
-DocType: Stock Entry,Purchase Receipt No,Broj prijema robe
-DocType: Project,Expected End Date,Očekivani datum završetka
-apps/erpnext/erpnext/projects/doctype/project/project.py +84,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog dana početka
-DocType: Customer,Customer Primary Contact,Primarni kontakt kupca
-DocType: Project,Expected Start Date,Očekivani datum početka
-DocType: Supplier,Credit Limit,Kreditni limit
-DocType: Item,Item Tax,Porez
-DocType: Pricing Rule,Selling,Prodaja
-DocType: Purchase Order,Customer Contact,Kontakt kupca
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item {0} does not exist,Artikal {0} ne postoji
-apps/erpnext/erpnext/utilities/user_progress.py +247,Add Users,Dodaj korisnike
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +81,Select Serial Numbers,Izaberite serijske brojeve
-DocType: Bank Reconciliation Detail,Payment Entry,Uplate
-DocType: Purchase Invoice,In Words,Riječima
-DocType: HR Settings,Employee record is created using selected field. ,Izvještaj o Zaposlenom se kreira korišćenjem izabranog polja.
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski broj {0} ne pripada otpremnici {1}
-DocType: Issue,Support,Podrška
-DocType: Production Plan,Get Sales Orders,Pregledaj prodajne naloge
-DocType: Stock Ledger Entry,Stock Ledger Entry,Unos zalihe robe
-apps/erpnext/erpnext/config/projects.py +36,Gantt chart of all tasks.,Gantov grafikon svih zadataka
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cijena (Valuta preduzeća)
-DocType: Delivery Stop,Address Name,Naziv adrese
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +54,Another Sales Person {0} exists with the same Employee id,Postoji još jedan Prodavac {0} sa istim ID zaposlenog
-DocType: Item Group,Item Group Name,Naziv vrste artikala
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +175,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Isto ime grupe kupca već postoji. Promijenite ime kupca ili izmijenite grupu kupca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +586,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još jedan {0} # {1} postoji u vezanom Unosu zaliha {2}
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Dobavljač
-DocType: Item,Has Serial No,Ima serijski broj
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Zaposleni {0} na pola radnog vremena {1}
-DocType: Payment Entry,Difference Amount (Company Currency),Razlika u iznosu (Valuta)
-apps/erpnext/erpnext/public/js/utils.js +56,Add Serial No,Dodaj serijski broj
-apps/erpnext/erpnext/config/accounts.py +35,Company and Accounts,Preduzeće i računi
-DocType: Employee,Current Address Is,Trenutna adresa je
-DocType: Payment Entry,Unallocated Amount,Nepovezani iznos
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +58,Show zero values,Prikaži vrijednosti sa nulom
-DocType: Bank Account,Address and Contact,Adresa i kontakt
-,Supplier-Wise Sales Analytics,Analiza Dobavljačeve pametne prodaje
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,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
-apps/erpnext/erpnext/stock/doctype/item/item.py +840,Item {0} is cancelled,Stavka {0} je otkazana
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +89,Balance Value,Stanje vrijed.
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},Prodajni nalog je obavezan za artikal {0}
-DocType: Clinical Procedure,Patient,Pacijent
-DocType: Stock Entry,Default Target Warehouse,Prijemno skladište
-DocType: GL Entry,Voucher No,Br. dokumenta
-apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,Prisustvo je uspješno obilježeno.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +398,Serial No {0} created,Serijski broj {0} kreiran
-DocType: Account,Asset,Osnovna sredstva
-DocType: Payment Entry,Received Amount,Iznos uplate
-apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Не можете уређивати коренски чвор.
-,Sales Funnel,Prodajni lijevak
-DocType: Sales Invoice,Payment Due Date,Datum dospijeća fakture
-apps/erpnext/erpnext/config/healthcare.py +8,Consultation,Pregled
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Povezan
-DocType: Warehouse,Warehouse Name,Naziv skladišta
-DocType: Authorization Rule,Customer / Item Name,Kupac / Naziv proizvoda
-DocType: Timesheet,Total Billed Amount,Ukupno fakturisano
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +85,In Value,Prijem vrije.
-DocType: Expense Claim,Employees Email Id,ID email Zaposlenih
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +54,Tree Type,Tip stabla
-DocType: Stock Entry,Update Rate and Availability,Izmijenite cijenu i dostupnost
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1156,Supplier Quotation,Ponuda dobavljača
-DocType: Material Request Item,Quantity and Warehouse,Količina i skladište
-DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade dodate
-DocType: Work Order,Warehouses,Skladišta
-DocType: SMS Center,All Customer Contact,Svi kontakti kupca
-apps/erpnext/erpnext/accounts/doctype/account/account.js +78,Ledger,Skladišni karton
-DocType: Quotation,Quotation Lost Reason,Razlog gubitka ponude
-DocType: Purchase Invoice,Return Against Purchase Invoice,Povraćaj u vezi sa Fakturom nabavke
-DocType: Sales Invoice Item,Brand Name,Naziv brenda
-DocType: Account,Stock,Zalihe
-DocType: Customer Group,Customer Group Name,Naziv grupe kupca
-DocType: Item,Is Sales Item,Da li je prodajni artikal
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +119,Invoiced Amount,Fakturisano
-DocType: Purchase Invoice,Edit Posting Date and Time,Izmijeni datum i vrijeme dokumenta
-,Inactive Customers,Neaktivni kupci
-DocType: Stock Entry Detail,Stock Entry Detail,Detalji unosa zaliha
-DocType: Sales Invoice,Accounting Details,Računovodstveni detalji
-DocType: Asset Movement,Stock Manager,Menadžer zaliha
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +22,As on Date,Na datum
-DocType: Serial No,Is Cancelled,Je otkazan
-DocType: Naming Series,Setup Series,Podešavanje tipa dokumenta
-,Point of Sale,Kasa
-DocType: C-Form Invoice Detail,Invoice No,Broj fakture
-DocType: Landed Cost Item,Purchase Receipt Item,Stavka Prijema robe
-DocType: Bank Statement Transaction Payment Item,Invoices,Fakture
-DocType: Project,Task Progress,% završenosti zadataka
-DocType: Employee Attendance Tool,Employee Attendance Tool,Alat za prisustvo Zaposlenih
-DocType: Salary Slip,Payment Days,Dana za plaćanje
-apps/erpnext/erpnext/config/hr.py +231,Recruitment,Zapošljavanje
-DocType: Purchase Invoice,Taxes and Charges Calculation,Izračun Poreza
-DocType: Appraisal,For Employee,Za Zaposlenog
-apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uslovi i odredbe šablon
-DocType: Vehicle Service,Change,Kusur
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,Unos zaliha {0} je kreiran
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1181,Search Item (Ctrl + i),Pretraga artikala (Ctrl + i)
-apps/erpnext/erpnext/templates/generators/item.html +101,View in Cart,Pogledajte u korpi
-apps/erpnext/erpnext/stock/get_item_details.py +405,Item Price updated for {0} in Price List {1},Cijena artikla je izmijenjena {0} u cjenovniku {1}
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +623,Discount,Popust
-DocType: Packing Slip,Net Weight UOM,Neto težina JM
-DocType: Bank Account,Party Type,Tip partije
-DocType: Selling Settings,Sales Order Required,Prodajni nalog je obavezan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Pretraži artikal
-,Delivered Items To Be Billed,Nefakturisana isporučena roba
-DocType: Account,Debit,Duguje
-DocType: Patient Appointment,Date TIme,Datum i vrijeme
-DocType: Bank Reconciliation Detail,Payment Document,Dokument za plaćanje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +184,You can not enter current voucher in 'Against Journal Entry' column,"Неможете унети тренутни ваучер у колону ""На основу ставке у журналу"""
-DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta kompanije)
-,Purchase Receipt Trends,Trendovi prijema robe
-DocType: Employee Leave Approver,Employee Leave Approver,Odobreno odsustvo Zaposlenog
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji
-DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
-DocType: Account,Income Account,Račun prihoda
-DocType: Journal Entry Account,Account Balance,Knjigovodstveno stanje
-apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Expected Start Date' can not be greater than 'Expected End Date',Očekivani datum početka ne može biti veći od očekivanog datuma završetka
-DocType: Training Event,Employee Emails,Elektronska pošta Zaposlenog
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Početna količina
-DocType: Item,Reorder level based on Warehouse,Nivo dopune u zavisnosti od skladišta
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +84,To Warehouse,U skladište
-DocType: Account,Is Group,Je grupa
-DocType: Purchase Invoice,Contact Person,Kontakt osoba
-DocType: Item,Item Code for Suppliers,Dobavljačeva šifra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +893,Return / Debit Note,Povraćaj / knjižno zaduženje
-DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
-,LeaderBoard,Tabla
-DocType: Lab Test Groups,Lab Test Groups,Labaratorijske grupe
-DocType: Training Result Employee,Training Result Employee,Rezultati obuke Zaposlenih
-DocType: Serial No,Invoice Details,Detalji fakture
-apps/erpnext/erpnext/config/accounts.py +130,Banking and Payments,Bakarstvo i plaćanja
-DocType: Additional Salary,Employee Name,Ime Zaposlenog
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Активни Леадс / Kupci
-DocType: POS Profile,Accounting,Računovodstvo
-DocType: Payment Entry,Party Name,Ime partije
-DocType: Item,Manufacture,Proizvodnja
-apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Novi zadatak
-DocType: Journal Entry,Accounts Payable,Obaveze prema dobavljačima
-DocType: Purchase Invoice,Shipping Address,Adresa isporuke
-DocType: Bank Statement Transaction Invoice Item,Outstanding Amount,Preostalo za uplatu
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Naziv novog skladišta
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturisani iznos
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Stanje zalihe
-,Item Shortage Report,Izvještaj o negativnim zalihama
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +383,Transaction reference no {0} dated {1},Broj izvoda {0} na datum {1}
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Kreiraj prodajni nalog
-DocType: Purchase Invoice,Items,Artikli
-,Employees working on a holiday,Zaposleni koji rade za vrijeme praznika
-DocType: Payment Entry,Allocate Payment Amount,Poveži uplaćeni iznos
-DocType: Patient,Patient ID,ID pacijenta
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +263,Printed On,Datum i vrijeme štampe
-DocType: Sales Invoice,Debit To,Zaduženje za
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalna podešavanja
-apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +18,Make Employee,Keriraj Zaposlenog
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +244,Atleast one warehouse is mandatory,Minimum jedno skladište je obavezno
-DocType: Price List,Price List Name,Naziv cjenovnika
-DocType: Asset,Journal Entry for Scrap,Knjiženje rastura i loma
-DocType: Item,Website Warehouse,Skladište web sajta
-DocType: Sales Invoice Item,Customer's Item Code,Šifra kupca
-DocType: Bank Guarantee,Supplier,Dobavljači
-DocType: Purchase Invoice,Additional Discount Amount,Iznos dodatnog popusta
-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/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Naziv dobavljača
-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 +68,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 +539,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Радите без интернета. Нећете моћи да учитате страницу док се не повежете.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +542,Form View,Prikaži kao formu
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +81,Shortage Qty,Manjak kol.
-DocType: Drug Prescription,Hour,Sat
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +55,Item Group Tree,Stablo vrste artikala
-DocType: POS Profile,Update Stock,Ažuriraj zalihu
-DocType: Crop,Target Warehouse,Ciljno skladište
-,Delivery Note Trends,Trendovi Otpremnica
-DocType: Stock Entry,Default Source Warehouse,Izdajno skladište
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Email zaposlenog nije pronađena, stoga email nije poslat"
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Sva skladišta
-DocType: Asset Value Adjustment,Difference Amount,Razlika u iznosu
-DocType: Journal Entry,User Remark,Korisnička napomena
-DocType: Notification Control,Quotation Message,Ponuda - poruka
-DocType: Purchase Order,% Received,% Primljeno
-DocType: Journal Entry,Stock Entry,Unos zaliha
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Sales Price List,Prodajni cjenovnik
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,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
-DocType: Bank Account,Party,Partija
-,Total Stock Summary,Ukupan pregled zalihe
-DocType: Purchase Invoice,Net Total (Company Currency),Ukupno bez PDV-a (Valuta preduzeća)
-DocType: Healthcare Settings,Patient Name,Ime pacijenta
-apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
-DocType: Notification Control,Delivery Note Message,Poruka na otpremnici
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"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 +660,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
-apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,Novi Zaposleni
-apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,Kupci na čekanju
-DocType: Purchase Invoice,Price List Currency,Valuta Cjenovnika
-DocType: Authorization Rule,Applicable To (Employee),Primjenljivo na (zaposlene)
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +96,Project Manager,Projektni menadzer
-DocType: Journal Entry,Accounts Receivable,Potraživanja od kupaca
-DocType: Purchase Invoice Item,Rate,Cijena sa popustom
-DocType: Project Task,View Task,Pogledaj zadatak
-DocType: Employee Education,Employee Education,Obrazovanje Zaposlenih
-DocType: Account,Expense,Rashod
-apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter-i
-DocType: Purchase Invoice,Select Supplier Address,Izaberite adresu dobavljača
-apps/erpnext/erpnext/stock/get_item_details.py +521,Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji
-DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
-DocType: Restaurant Order Entry,Add Item,Dodaj stavku
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,All Customer Groups,Sve grupe kupca
-,Employee Birthday,Rođendan Zaposlenih
-DocType: Project,Total Billed Amount (via Sales Invoices),Ukupno fakturisano (putem fakture prodaje)
-DocType: Purchase Invoice Item,Weight UOM,JM Težina
-DocType: Purchase Invoice Item,Stock Qty,Zaliha
-DocType: Delivery Note,Return Against Delivery Note,Povraćaj u vezi sa otpremnicom
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +28,Ageing Range 1,Opseg dospijeća 1
-DocType: Serial No,Incoming Rate,Nabavna cijena
-DocType: Projects Settings,Timesheets,Potrošnja vremena
-DocType: Upload Attendance,Attendance From Date,Datum početka prisustva
-apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,Artikli na zalihama
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2227,New Cart,Nova korpa
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +83,Opening Value,Početna vrijednost
-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}","Podešavanje stanja na {0}, pošto Zaposleni koji se priključio Prodavcima nema koririsnički ID {1}"
-DocType: Upload Attendance,Import Attendance,Uvoz prisustva
-apps/erpnext/erpnext/config/selling.py +184,Analytics,Analitika
-DocType: Email Digest,Bank Balance,Stanje na računu
-DocType: Education Settings,Employee Number,Broj Zaposlenog
-DocType: Purchase Receipt Item,Rate and Amount,Cijena i vrijednost sa popustom
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +237,'Total','Ukupno bez PDV-a'
-DocType: Purchase Invoice,Total Taxes and Charges,Porez
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,No active or default Salary Structure found for employee {0} for the given dates,Nisu pronađene aktivne ili podrazumjevane strukture plate za Zaposlenog {0} za dati period
-DocType: Purchase Order Item,Supplier Part Number,Dobavljačeva šifra
-DocType: Project Task,Project Task,Projektni zadatak
-DocType: Item Group,Parent Item Group,Nadređena Vrsta artikala
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendance,Označi prisustvo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,Kreirao je korisnik {0}
-DocType: Purchase Order,Advance Paid,Avansno plačanje
-apps/erpnext/erpnext/stock/doctype/item/item.js +41,Projected,Projektovana količina na zalihama
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivo dopune
-DocType: Opportunity,Customer / Lead Address,Kupac / Adresa lead-a
-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 +1659,Write Off Amount,Zaokruženi iznos
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +139,Total Outstanding Amount,Preostalo za plaćanje
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +359,Not Paid and Not Delivered,Nije plaćeno i nije isporučeno
-DocType: Asset Maintenance Log,Planned,Planirano
-DocType: Bank Reconciliation,Total Amount,Ukupan iznos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +177,Please select Price List,Izaberite cjenovnik
-DocType: Quality Inspection,Item Serial No,Seriski broj artikla
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +388,Customer Service,Usluga kupca
-DocType: Project Task,Working,U toku
-DocType: Cost Center,Stock User,Korisnik zaliha
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,Glavna knjiga
-DocType: C-Form,Received Date,Datum prijema
-apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektni master
-DocType: Item Price,Valid From,Važi od
-,Purchase Order Trends,Trendovi kupovina
-DocType: Quotation,In Words will be visible once you save the Quotation.,Sačuvajte Predračun da bi Ispis slovima bio vidljiv
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektovana količina
-apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,Kontakt i adresa kupca
-DocType: Healthcare Settings,Employee name and designation in print,Ime i pozicija Zaposlenog
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1161,For Warehouse,Za skladište
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Nabavni cjenovnik
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +83,Accounts Payable Summary,Pregled obaveze prema dobavljačima
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnice {0} moraju biti otkazane prije otkazivanja prodajnog naloga
-DocType: Loan,Total Payment,Ukupno plaćeno
-DocType: POS Settings,POS Settings,POS podešavanja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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: Purchase Invoice,Invoice Copy,Kopija Fakture
-apps/erpnext/erpnext/projects/doctype/project/project.py +279,You have been invited to collaborate on the project: {0},Позвани сте да сарађујете на пројекту: {0}
-DocType: Journal Entry Account,Purchase Order,Porudžbenica
-DocType: Sales Invoice Item,Rate With Margin,Cijena sa popustom
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1182,"Search by item code, serial number, batch no or barcode","Pretraga po šifri, serijskom br. ili bar kodu"
-DocType: GL Entry,Voucher Type,Vrsta dokumenta
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,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
-apps/erpnext/erpnext/controllers/accounts_controller.py +617,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
-DocType: Material Request,% Ordered,% Poručenog
-apps/erpnext/erpnext/stock/get_item_details.py +523,Price List not selected,Cjenovnik nije odabran
-DocType: POS Profile,Apply Discount On,Primijeni popust na
-DocType: Item,Total Projected Qty,Ukupna projektovana količina
-DocType: Shipping Rule Condition,Shipping Rule Condition,Uslovi pravila nabavke
-apps/erpnext/erpnext/config/stock.py +317,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: Subscription,Net Total,Ukupno bez PDV-a
-DocType: Sales Invoice,Total Qty,Ukupna kol.
-DocType: Purchase Invoice,Return,Povraćaj
-DocType: Sales Order Item,Delivery Warehouse,Skladište dostave
-DocType: Purchase Invoice,Total (Company Currency),Ukupno bez PDV-a (Valuta)
-DocType: Sales Invoice,Change Amount,Kusur
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1083,Opportunity,Prilika
-DocType: Sales Order,Fully Delivered,Kompletno isporučeno
-DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako se podrazumijeva za sve tipove Zaposlenih
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +594,Disc,Popust
-DocType: Customer,Default Price List,Podrazumijevani cjenovnik
-DocType: Bank Statement Transaction Invoice Item,Journal Entry,Knjiženje
-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/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Већ сте оценили за критеријум оцењивања {}.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,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: Cashier Closing,Returns,Povraćaj
-DocType: Delivery Note,Delivery To,Isporuka za
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
-DocType: Warehouse,Parent Warehouse,Nadređeno skladište
-DocType: Payment Request,Make Sales Invoice,Kreiraj fakturu prodaje
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +594,Del,Obriši
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Warehouse...,Izaberite skladište...
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Detalji knjiženja
-,Projected Quantity as Source,Projektovana izvorna količina
-DocType: Asset Maintenance,Manufacturing User,Korisnik u proizvodnji
-apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Kreiraj korisnike
-apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +15,Price,Cijena
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Izdavanje Kol.
-DocType: Supplier Scorecard Scoring Standing,Employee,Zaposleni
-apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,Projektna aktivnost / zadatak
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervisano skladište u Prodajnom nalogu / Skladište gotovog proizvoda
-DocType: Appointment Type,Physician,Ljekar
-DocType: Opening Invoice Creation Tool Item,Quantity,Količina
-DocType: Buying Settings,Purchase Receipt Required,Prijem robe je obavezan
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta je obavezna za Cjenovnik {0}
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +87,Out Value,Izdavanje vrije.
-DocType: Loyalty Program,Customer Group,Grupa kupaca
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,You are not authorized to add or update entries before {0},Немате дозволу да додајете или ажурирате ставке пре {0}
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se jedino može promijeniti u dijelu Unos zaliha / Otpremnica / Prijem robe
-apps/erpnext/erpnext/hooks.py +148,Request for Quotations,Zahtjev za ponude
-apps/erpnext/erpnext/config/desktop.py +159,Learn,Naučite
-DocType: Timesheet,Employee Detail,Detalji o Zaposlenom
-DocType: POS Profile,Ignore Pricing Rule,Zanemari pravilnik o cijenama
-DocType: Purchase Invoice,Additional Discount,Dodatni popust
-DocType: Payment Entry,Cheque/Reference No,Broj izvoda
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Datum prisustva ne može biti raniji od datuma ulaska zaposlenog
-apps/erpnext/erpnext/utilities/user_progress.py +146,Box,Kutija
-DocType: Payment Entry,Total Allocated Amount,Ukupno povezani iznos
-apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese
-apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Početna stanja
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +68,"You can only plan for upto {0} vacancies and budget {1} \
+Yield UOM,Јединица мере приноса
+Default Supplier,Podrazumijevani dobavljač
+Select Patient,Izaberite pacijenta,
+Opening,Početno stanje,
+Customer Groups,Grupe kupaca,
+Item Manager,Menadžer artikala,
+Fiscal Year Company,Fiskalna godina preduzeća,
+Patient Appointment,Zakazivanje pacijenata,
+Show In Website,Prikaži na web sajtu,
+Paid Amount,Uplaćeno,
+Total Paid Amount,Ukupno plaćeno,
+Purchase Receipt {0} is not submitted,Prijem robe {0} nije potvrđen,
+Items and Pricing,Proizvodi i cijene,
+Account Paid From,Račun plaćen preko,
+Create customer quotes,Kreirajte bilješke kupca,
+Supplier Warehouse,Skladište dobavljača,
+Customer is required,Kupac je obavezan podatak,
+Manufacturer,Proizvođač
+Selling Amount,Prodajni iznos,
+Please set the Date Of Joining for employee {0},Molimo podesite datum zasnivanja radnog odnosa {0}
+Allow over delivery or receipt upto this percent,Dozvolite isporukuili prijem robe ukoliko ne premaši ovaj procenat,
+Orders,Porudžbine,
+Stock Transactions,Promjene na zalihama,
+You are not authorized to approve leaves on Block Dates,Немате дозволу да одобравате одсуства на Блок Датумима.
+Daily Timesheet Summary,Pregled dnevnog potrošenog vremena,
+View Timesheet,Pogledaj potrošeno vrijeme,
+Rounded Total (Company Currency),Zaokruženi ukupan iznos (valuta preduzeća)
+Salary Slip of employee {0} already created for this period,Isplatna lista Zaposlenog {0} kreirana je već za ovaj period,
+"If this item has variants, then it cannot be selected in sales orders etc.","Ako ovaj artikal ima varijante, onda ne može biti biran u prodajnom nalogu."
+You can only redeem max {0} points in this order.,Можете унети највише {0} поена у овој наруџбини.
+No leave record found for employee {0} for {1},Nije nađena evidancija o odsustvu Zaposlenog {0} za {1}
+Discount on Price List Rate (%),Popust na cijene iz cjenovnika (%)
+Groups,Grupe,
+Item Attribute,Atribut artikla,
+Amount in customer's currency,Iznos u valuti kupca,
+Warehouse is mandatory,Skladište je obavezan podatak,
+Stock Ageing,Starost zaliha,
+New Sales Orders,Novi prodajni nalozi,
+Invoice Created,Kreirana faktura,
+Employee Internal Work History,Interna radna istorija Zaposlenog,
+Cart is Empty,Korpa je prazna,
+Patient Details,Detalji o pacijentu,
+Stock Entry {0} is not submitted,Unos zaliha {0} nije potvrđen,
+Rest Of The World,Ostatak svijeta,
+Additional Operating Cost,Dodatni operativni troškovi,
+Rejected Warehouse,Odbijeno skladište,
+Manufacturing Manager,Menadžer proizvodnje,
+You are not present all day(s) between compensatory leave request days,Нисте присутни свих дана између захтева за компензацијски одмор.
+Is Fixed Asset,Artikal je osnovno sredstvo,
+POS,POS,
+Timesheet {0} is already completed or cancelled,Potrošeno vrijeme {0} je već potvrđeno ili otkazano,
+ (Half Day),(Pola dana)
+Net Weight,Neto težina,
+Attendance Record {0} exists against Student {1},Zapis o prisustvu {0} постоји kod studenata {1}
+Outstanding,Preostalo,
+Discount (%) on Price List Rate with Margin,Popust (%)
+Select Shipping Address,Odaberite adresu isporuke,
+Amount to Bill,Iznos za fakturisanje,
+Make Sales Orders to help you plan your work and deliver on-time,Kreiranje prodajnog naloga će vam pomoći da isplanirate svoje vrijeme i dostavite robu na vrijeme,
+Sync Offline Invoices,Sinhronizuj offline fakture,
+Manufacturing,Proizvodnja,
+{0}% Delivered,{0}% Isporučeno,
+Attendance,Prisustvo,
+Customer's Purchase Order No,Broj porudžbenice kupca,
+Please enter Sales Orders in the above table,U tabelu iznad unesite prodajni nalog,
+Report Date,Datum izvještaja,
+Item Groups,Vrste artikala,
+Discount Percentage,Procenat popusta,
+Gross Profit %,Bruto dobit%
+"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ","Овде можете дефинисати све задатке које је потребно извршити за ову жетву. Поље Дан говори дан на који је задатак потребно извршити, 1 је 1. дан, итд."
+Payment Request,Upit za plaćanje,
+Purchase Analytics,Analiza nabavke,
+Tree Details,Detalji stabla,
+Upload Attendance,Priloži evidenciju,
+Against,Povezano sa,
+Requested Amount,Traženi iznos,
+"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa email, telefon, poruke, posjete, itd."
+Customer Contact Email,Kontakt e-mail kupca,
+Primary Address Details,Detalji o primarnoj adresi,
+Above,Iznad,
+Variant Based On,Varijanta zasnovana na,
+Task Weight,Težina zadataka,
+Transaction ID,Transakcije,
+Allocated,Dodijeljeno,
+Add more items or open full form,Dodaj još stavki ili otvori kompletan prozor,
+Reserved for sale,Rezervisana za prodaju,
+Item Group,Vrste artikala,
+Age (Days),Starost (Dani)
+Opening (Dr),Početno stanje (Du)
+Total Outstanding Amt,Preostalo za plaćanje,
+Go to the Desktop and start using ERPNext,Idite na radnu površinu i krenite sa radom u programu,
+You can only have Plans with the same billing cycle in a Subscription,Сви Планови у Претплати морају имати исти циклус наплате
+Name and Employee ID,Ime i ID Zaposlenog,
+Invoice,Faktura,
+Invoice Date,Datum fakture,
+From Lead,Od Lead-a,
+Database of potential customers.,Baza potencijalnih kupaca,
+Project Status,Status Projekta,
+All Item Groups,Sve vrste artikala,
+Serial No {0} does not exist,Serijski broj {0} ne postoji,
+No contacts added yet.,Još uvijek nema dodatih kontakata,
+Ageing Range 3,Opseg dospijeća 3,
+Request for Quotation,Zahtjev za ponudu,
+Account Paid To,Račun plaćen u,
+Attendance can not be marked for future dates,Učesnik ne može biti označen za buduće datume,
+Sales Invoice No,Broj fakture prodaje,
+Timesheet,Potrošeno vrijeme,
+Don't send Employee Birthday Reminders,Nemojte slati podsjetnik o rođendanima Zaposlenih,
+Available Qty at Warehouse,Dostupna količina na skladištu,
+Foreign Trade Details,Spoljnotrgovinski detalji,
+Minimum Order Qty,Minimalna količina za poručivanje,
+No employees for the mentioned criteria,Za traženi kriterijum nema Zaposlenih,
+Fiscal Year,Fiskalna godina,
+Repack,Prepakovati,
+Please select a warehouse,Izaberite skladište,
+Received and Accepted,Primio i prihvatio,
+Project will be accessible on the website to these users,Projekat će biti dostupan na sajtu sledećim korisnicima,
+Upload HTML,Priloži HTML,
+Services,Usluge,
+Item Cart,Korpa sa artiklima,
+Total Paid Amt,Ukupno plaćeno,
+Warehouse Detail,Detalji o skldištu,
+Quotation Item,Stavka sa ponude,
+Employee Advance,Napredak Zaposlenog,
+Warehouse and Reference,Skladište i veza,
+{0} {1}: Account {2} is inactive,{0} {1}: Nalog {2} je neaktivan,
+Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena,
+No Remarks,Nema napomene,
+Purchase Receipt Message,Poruka u Prijemu robe,
+Taxes and Charges Deducted,Umanjeni porezi i naknade,
+Include Payment (POS),Uključi POS plaćanje,
+Customer PO Details,Pregled porudžbine kupca,
+Total Invoiced Amt,Ukupno fakturisano,
+Select Brand...,Izaberite brend,
+Default Unit of Measure,Podrazumijevana jedinica mjere,
+Serial No,Serijski broj,
+Supplier Type,Tip dobavljača,
+Actual Qty {0} / Waiting Qty {1},Trenutna kol. {0} / Na čekanju {1}
+Individual,Fizičko lice,
+Partially Ordered,Djelimično poručeno,
+Posting Date,Datum dokumenta,
+Date Settings,Podešavanje datuma,
+Total Allocated Amount (Company Currency),Ukupan povezani iznos (Valuta)
+Income,Prihod,
+Add Items,Dodaj stavke,
+Price List not found or disabled,Cjenovnik nije pronađen ili je zaključan,
+Weight (In Kilogram),Težina (u kg)
+New Sales Invoice,Nova faktura,
+New Company,Novo preduzeće,
+Support Team,Tim za podršku,
+Valuation Method,Način vrednovanja,
+Project Type,Tip Projekta,
+Returned Qty,Vraćena kol.
+Additional Discount Amount (Company Currency),Iznos dodatnog popusta (valuta preduzeća)
+Employee Information,Informacije o Zaposlenom,
+'Days Since Last Order' must be greater than or equal to zero,"""Dana od poslednje porudžbine"" mora biti veće ili jednako nuli"
+Maintenance,Održavanje,
+Multiple Item prices.,Više cijena artikala,
+Received From,je primljen od,
+Write Off Difference Amount,Otpis razlike u iznosu,
+Closing Date,Datum zatvaranja,
+Cheque/Reference Date,Datum izvoda,
+Planned Qty,Planirana količina,
+Payment Date,Datum plaćanja,
+Additional Details,Dodatni detalji,
+Create Chart Of Accounts Based On,Kreiraj kontni plan prema,
+You can not change rate if BOM mentioned agianst any item,Не можете променити цену ако постоји Саставница за било коју ставку.
+Open To Do,Otvori To Do,
+Average Discount,Prosječan popust,
+Material Issue,Reklamacija robe,
+Billed Amt,Fakturisani iznos,
+Supplier Quotation {0} created,Ponuda dobavljaču {0} је kreirana,
+Not allowed to update stock transactions older than {0},Nije dozvoljeno mijenjati Promjene na zalihama starije od {0}
+Add Employees,Dodaj Zaposlenog,
+Setting up Employees,Podešavanja Zaposlenih,
+Warehouse not found in the system,Skladište nije pronađeno u sistemu,
+Attendance for employee {0} is already marked for this day,Prisustvo zaposlenog {0} је već označeno za ovaj dan,
+Employee relieved on {0} must be set as 'Left',"Zaposleni smijenjen na {0} mora biti označen kao ""Napustio"""
+ Shipping Bill Number,Broj isporuke,
+Lab Test Report,Izvještaj labaratorijskog testa,
+You cannot credit and debit same account at the same time,Не можете кредитирати и дебитовати исти налог у исто време.
+Customer Name,Naziv kupca,
+Current Address,Trenutna adresa,
+Upcoming Calendar Events,Predstojeći događaji u kalendaru,
+Make Payment via Journal Entry,Kreiraj uplatu kroz knjiženje,
+Paid,Plaćeno,
+Buying,Nabavka,
+Default Item Group,Podrazumijevana vrsta artikala,
+In Stock Qty,Na zalihama,
+Taxes and Charges Deducted (Company Currency),Umanjeni porezi i naknade (valuta preduzeća)
+Additional Costs,Dodatni troškovi,
+Pending Review,Čeka provjeru,
+Default Selling Cost Center,Podrazumijevani centar troškova,
+No Customers yet!,Još uvijek nema kupaca!
+Sales Return,Povraćaj prodaje,
+No Items added to cart,Nema dodatih artikala na računu,
+This is based on transactions against this Customer. See timeline below for details,Ovo je zasnovano na transkcijama ovog klijenta. Pogledajte vremensku liniju ispod za dodatne informacije,
+Make Timesheet,Kreiraj potrošeno vrijeme,
+Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Upozorenje: Prodajni nalog {0}već postoji veza sa porudžbenicom kupca {1}
+Healthcare Settings,Podešavanje klinike,
+Accounting Ledger,Analitička kartica,
+Total Outgoing Value,Ukupna vrijednost isporuke,
+Sales Order {0} is {1},Prodajni nalog {0} је {1}
+Automatically Set Serial Nos based on FIFO,Podesi automatski serijski broj da koristi FIFO,
+New Customers,Novi kupci,
+Pre Sales,Prije prodaje,
+POS Customer Group,POS grupa kupaca,
+Shopping Cart,Korpa sa sajta,
+Reserved for manufacturing,Rezervisana za proizvodnju,
+Pricing Rule Help,Pravilnik za cijene pomoć
+Ageing Range 2,Opseg dospijeća 2,
+Employee Benefits,Primanja Zaposlenih,
+POS Item Group,POS Vrsta artikala,
+Lead,Lead,
+Employee Settings,Podešavanja zaposlenih,
+View All Products,Pogledajte sve proizvode,
+Patient Medical Record,Medicinski karton pacijenta,
+Batch,Serija,
+Purchase Receipt,Prijem robe,
+Warranty Period (in days),Garantni rok (u danima)
+Customer database.,Korisnička baza podataka,
+Attendance Date,Datum prisustva,
+Notify Employee,Obavijestiti Zaposlenog,
+User ID not set for Employee {0},Korisnički ID nije podešen za Zaposlenog {0}
+Stock Projected Qty,Projektovana količina na zalihama,
+Make Payment,Kreiraj plaćanje,
+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.
+{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..
+Item-wise Sales Register,Prodaja po artiklima,
+Tax Rate,Poreska stopa,
+Remarks,Napomena,
+Sales,Prodaja,
+Pricing Rule,Pravilnik za cijene,
+Products Settings,Podešavanje proizvoda,
+Mobile,Mobilni,
+Price List Rate,Cijena,
+Discount Amount,Vrijednost popusta,
+Sales Invoice Trends,Trendovi faktura prodaje,
+You don't have enought Loyalty Points to redeem,Немате довољно Бодова Лојалности.
+Tax Breakup,Porez po pozicijama,
+Task,Zadatak,
+Add / Edit Prices,Dodaj / Izmijeni cijene,
+Item Prices,Cijene artikala,
+Salary Component,Компонента плате
+Customer's Purchase Order Date,Datum porudžbenice kupca,
+Country of Origin,Zemlja porijekla,
+Please select Employee Record first.,Molimo izaberite registar Zaposlenih prvo,
+Order Type,Vrsta porudžbine,
+Rate & Amount,Cijena i iznos sa rabatom,
+For Price List,Za cjenovnik,
+Tax ID,Poreski broj,
+WIP Warehouse,Wip skladište,
+Itemwise Recommended Reorder Level,Pregled preporučenih nivoa dopune,
+{0} against Bill {1} dated {2},{0} veza sa računom {1} na datum {2}
+You are not authorized to set Frozen value,Немате дозволу да постављате замрзнуту вредност
+Requested Items To Be Ordered,Tražene stavke za isporuku,
+Unmarked Attendance,Neobilježeno prisustvo,
+Sales Order {0} is not submitted,Prodajni nalog {0} nije potvrđen,
+Default Material Request Type,Podrazumijevani zahtjev za tip materijala,
+Sales Pipeline,Prodajna linija,
+Already completed,Već završen,
+Ordered Qty,Poručena kol,
+Sales Details,Detalji prodaje,
+Navigating,Navigacija,
+Your Products or Services,Vaši artikli ili usluge,
+CRM,CRM,
+The Brand,Brend,
+Quotation {0} is cancelled,Ponuda {0} je otkazana,
+Item Code,Šifra artikla,
+Customer Mobile No,Broj telefona kupca,
+Reorder Qty,Kol. za dopunu,
+Move Item,Premještanje artikala,
+Buying Settings,Podešavanja nabavke,
+From Employee,Od Zaposlenog,
+Fleet Manager,Menadžer transporta,
+Stock Levels,Nivoi zalihe,
+Rate With Margin (Company Currency),Cijena sa popustom (Valuta preduzeća)
+Closing (Cr),Saldo (Po)
+Product Bundle,Sastavnica,
+Sales and Returns,Prodaja i povraćaji,
+Sync Master Data,Sinhronizuj podatke iz centrale,
+Sales Person Name,Ime prodajnog agenta,
+Purchase Receipts,Prijemi robe,
+Customizing Forms,Prilagođavanje formi,
+Attendance for employee {0} is already marked,Prisustvo zaposlenog {0} je već označeno,
+% Complete Method,% metod vrednovanja završetka projekta,
+Overdue,Istekao,
+Posting Time,Vrijeme izrade računa,
+Purchase Receipt No,Broj prijema robe,
+Expected End Date,Očekivani datum završetka,
+Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog dana početka,
+Customer Primary Contact,Primarni kontakt kupca,
+Expected Start Date,Očekivani datum početka,
+Credit Limit,Kreditni limit,
+Item Tax,Porez,
+Selling,Prodaja,
+Customer Contact,Kontakt kupca,
+Item {0} does not exist,Artikal {0} ne postoji,
+Add Users,Dodaj korisnike,
+Select Serial Numbers,Izaberite serijske brojeve,
+Payment Entry,Uplate,
+In Words,Riječima,
+Employee record is created using selected field. ,Izvještaj o Zaposlenom se kreira korišćenjem izabranog polja.
+Serial No {0} does not belong to Delivery Note {1},Serijski broj {0} ne pripada otpremnici {1}
+Support,Podrška,
+Get Sales Orders,Pregledaj prodajne naloge,
+Stock Ledger Entry,Unos zalihe robe,
+Gantt chart of all tasks.,Gantov grafikon svih zadataka,
+Price List Rate (Company Currency),Cijena (Valuta preduzeća)
+Address Name,Naziv adrese,
+Another Sales Person {0} exists with the same Employee id,Postoji još jedan Prodavac {0} sa istim ID zaposlenog,
+Item Group Name,Naziv vrste artikala,
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,Isto ime grupe kupca već postoji. Promijenite ime kupca ili izmijenite grupu kupca,
+Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još jedan {0} # {1} postoji u vezanom Unosu zaliha {2}
+Suplier,Dobavljač
+Has Serial No,Ima serijski broj,
+Employee {0} on Half day on {1},Zaposleni {0} na pola radnog vremena {1}
+Difference Amount (Company Currency),Razlika u iznosu (Valuta)
+Add Serial No,Dodaj serijski broj,
+Company and Accounts,Preduzeće i računi,
+Current Address Is,Trenutna adresa je,
+Unallocated Amount,Nepovezani iznos,
+Show zero values,Prikaži vrijednosti sa nulom,
+Address and Contact,Adresa i kontakt,
+Supplier-Wise Sales Analytics,Analiza Dobavljačeve pametne prodaje,
+Payment Entry is already created,Uplata je već kreirana,
+Item,Artikal,
+Unpaid,Neplaćen,
+Net Rate,Neto cijena sa rabatom,
+Project User,Projektni user,
+Customer Items,Proizvodi kupca,
+Item {0} is cancelled,Stavka {0} je otkazana,
+Balance Value,Stanje vrijed.
+Sales Order required for Item {0},Prodajni nalog je obavezan za artikal {0}
+Patient,Pacijent,
+Default Target Warehouse,Prijemno skladište,
+Voucher No,Br. dokumenta,
+Attendance has been marked successfully.,Prisustvo je uspješno obilježeno.
+Serial No {0} created,Serijski broj {0} kreiran,
+Asset,Osnovna sredstva,
+Received Amount,Iznos uplate,
+You cannot edit root node.,Не можете уређивати коренски чвор.
+Sales Funnel,Prodajni lijevak,
+Payment Due Date,Datum dospijeća fakture,
+Consultation,Pregled,
+Related,Povezan,
+Warehouse Name,Naziv skladišta,
+Customer / Item Name,Kupac / Naziv proizvoda,
+Total Billed Amount,Ukupno fakturisano,
+In Value,Prijem vrije.
+Employees Email Id,ID email Zaposlenih,
+Tree Type,Tip stabla,
+Update Rate and Availability,Izmijenite cijenu i dostupnost,
+Supplier Quotation,Ponuda dobavljača,
+Quantity and Warehouse,Količina i skladište,
+Taxes and Charges Added,Porezi i naknade dodate,
+Warehouses,Skladišta,
+All Customer Contact,Svi kontakti kupca,
+Ledger,Skladišni karton,
+Quotation Lost Reason,Razlog gubitka ponude,
+Return Against Purchase Invoice,Povraćaj u vezi sa Fakturom nabavke,
+Brand Name,Naziv brenda,
+Stock,Zalihe,
+Customer Group Name,Naziv grupe kupca,
+Is Sales Item,Da li je prodajni artikal,
+Invoiced Amount,Fakturisano,
+Edit Posting Date and Time,Izmijeni datum i vrijeme dokumenta,
+Inactive Customers,Neaktivni kupci,
+Stock Entry Detail,Detalji unosa zaliha,
+Accounting Details,Računovodstveni detalji,
+Stock Manager,Menadžer zaliha,
+As on Date,Na datum,
+Is Cancelled,Je otkazan,
+Setup Series,Podešavanje tipa dokumenta,
+Point of Sale,Kasa,
+Invoice No,Broj fakture,
+Purchase Receipt Item,Stavka Prijema robe,
+Invoices,Fakture,
+Task Progress,% završenosti zadataka,
+Employee Attendance Tool,Alat za prisustvo Zaposlenih,
+Payment Days,Dana za plaćanje,
+Recruitment,Zapošljavanje,
+Taxes and Charges Calculation,Izračun Poreza,
+For Employee,Za Zaposlenog,
+Terms and Conditions Template,Uslovi i odredbe šablon,
+Change,Kusur,
+Stock Entry {0} created,Unos zaliha {0} je kreiran,
+Search Item (Ctrl + i),Pretraga artikala (Ctrl + i)
+View in Cart,Pogledajte u korpi,
+Item Price updated for {0} in Price List {1},Cijena artikla je izmijenjena {0} u cjenovniku {1}
+Discount,Popust,
+Net Weight UOM,Neto težina JM,
+Party Type,Tip partije,
+Sales Order Required,Prodajni nalog je obavezan,
+Search Item,Pretraži artikal,
+Delivered Items To Be Billed,Nefakturisana isporučena roba,
+Debit,Duguje,
+Date TIme,Datum i vrijeme,
+Payment Document,Dokument za plaćanje,
+You can not enter current voucher in 'Against Journal Entry' column,"Неможете унети тренутни ваучер у колону ""На основу ставке у журналу"""
+In Words (Company Currency),Riječima (valuta kompanije)
+Purchase Receipt Trends,Trendovi prijema robe,
+Employee Leave Approver,Odobreno odsustvo Zaposlenog,
+Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji,
+Accepted Warehouse,Prihvaćeno skladište,
+Income Account,Račun prihoda,
+Account Balance,Knjigovodstveno stanje,
+'Expected Start Date' can not be greater than 'Expected End Date',Očekivani datum početka ne može biti veći od očekivanog datuma završetka,
+Employee Emails,Elektronska pošta Zaposlenog,
+Opening Qty,Početna količina,
+Reorder level based on Warehouse,Nivo dopune u zavisnosti od skladišta,
+To Warehouse,U skladište,
+Is Group,Je grupa,
+Contact Person,Kontakt osoba,
+Item Code for Suppliers,Dobavljačeva šifra,
+Return / Debit Note,Povraćaj / knjižno zaduženje,
+Request for Quotation Supplier,Zahtjev za ponudu dobavljača,
+LeaderBoard,Tabla,
+Lab Test Groups,Labaratorijske grupe,
+Training Result Employee,Rezultati obuke Zaposlenih,
+Invoice Details,Detalji fakture,
+Banking and Payments,Bakarstvo i plaćanja,
+Employee Name,Ime Zaposlenog,
+Active Leads / Customers,Активни Леадс / Kupci,
+Accounting,Računovodstvo,
+Party Name,Ime partije,
+Manufacture,Proizvodnja,
+New task,Novi zadatak,
+Accounts Payable,Obaveze prema dobavljačima,
+Shipping Address,Adresa isporuke,
+Outstanding Amount,Preostalo za uplatu,
+New Warehouse Name,Naziv novog skladišta,
+Billed Amount,Fakturisani iznos,
+Balance Qty,Stanje zalihe,
+Item Shortage Report,Izvještaj o negativnim zalihama,
+Transaction reference no {0} dated {1},Broj izvoda {0} na datum {1}
+Make Sales Order,Kreiraj prodajni nalog,
+Items,Artikli,
+Employees working on a holiday,Zaposleni koji rade za vrijeme praznika,
+Allocate Payment Amount,Poveži uplaćeni iznos,
+Patient ID,ID pacijenta,
+Printed On,Datum i vrijeme štampe,
+Debit To,Zaduženje za,
+Global Settings,Globalna podešavanja,
+Make Employee,Keriraj Zaposlenog,
+Atleast one warehouse is mandatory,Minimum jedno skladište je obavezno,
+Price List Name,Naziv cjenovnika,
+Journal Entry for Scrap,Knjiženje rastura i loma,
+Website Warehouse,Skladište web sajta,
+Customer's Item Code,Šifra kupca,
+Supplier,Dobavljači,
+Additional Discount Amount,Iznos dodatnog popusta,
+Project Start Date,Datum početka projekta,
+Student,Student,
+Suplier Name,Naziv dobavljača,
+In Qty,Prijem količine,
+Selling Rate,Prodajna cijena,
+Import Successful!,Uvoz uspješan!
+Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
+You are in offline mode. You will not be able to reload until you have network.,Радите без интернета. Нећете моћи да учитате страницу док се не повежете.
+Form View,Prikaži kao formu,
+Shortage Qty,Manjak kol.
+Hour,Sat,
+Item Group Tree,Stablo vrste artikala,
+Update Stock,Ažuriraj zalihu,
+Target Warehouse,Ciljno skladište,
+Delivery Note Trends,Trendovi Otpremnica,
+Default Source Warehouse,Izdajno skladište,
+"{0}: Employee email not found, hence email not sent","{0}: Email zaposlenog nije pronađena, stoga email nije poslat"
+All Warehouses,Sva skladišta,
+Difference Amount,Razlika u iznosu,
+User Remark,Korisnička napomena,
+Quotation Message,Ponuda - poruka,
+% Received,% Primljeno,
+Stock Entry,Unos zaliha,
+Sales Price List,Prodajni cjenovnik,
+Avg. Selling Rate,Prosječna prodajna cijena,
+End of Life,Kraj proizvodnje,
+Payment Type,Vrsta plaćanja,
+Default Customer Group,Podrazumijevana grupa kupaca,
+Party,Partija,
+Total Stock Summary,Ukupan pregled zalihe,
+Net Total (Company Currency),Ukupno bez PDV-a (Valuta preduzeća)
+Patient Name,Ime pacijenta,
+Write Off,Otpisati,
+Delivery Note Message,Poruka na otpremnici,
+"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"
+Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena,
+New Employee,Novi Zaposleni,
+Customers in Queue,Kupci na čekanju,
+Price List Currency,Valuta Cjenovnika,
+Applicable To (Employee),Primjenljivo na (zaposlene)
+Project Manager,Projektni menadzer,
+Accounts Receivable,Potraživanja od kupaca,
+Rate,Cijena sa popustom,
+View Task,Pogledaj zadatak,
+Employee Education,Obrazovanje Zaposlenih,
+Expense,Rashod,
+Newsletters,Newsletter-i,
+Select Supplier Address,Izaberite adresu dobavljača,
+Price List {0} is disabled or does not exist,Cjenovnik {0} je zaključan ili ne postoji,
+Billing Address Name,Naziv adrese za naplatu,
+Add Item,Dodaj stavku,
+All Customer Groups,Sve grupe kupca,
+Employee Birthday,Rođendan Zaposlenih,
+Total Billed Amount (via Sales Invoice),Ukupno fakturisano (putem fakture prodaje),
+Weight UOM,JM Težina,
+Stock Qty,Zaliha,
+Return Against Delivery Note,Povraćaj u vezi sa otpremnicom,
+Ageing Range 1,Opseg dospijeća 1,
+Incoming Rate,Nabavna cijena,
+Timesheets,Potrošnja vremena,
+Attendance From Date,Datum početka prisustva,
+Stock Items,Artikli na zalihama,
+New Cart,Nova korpa,
+Opening Value,Početna vrijednost,
+"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Podešavanje stanja na {0}, pošto Zaposleni koji se priključio Prodavcima nema koririsnički ID {1}"
+Import Attendance,Uvoz prisustva,
+Analytics,Analitika,
+Bank Balance,Stanje na računu,
+Employee Number,Broj Zaposlenog,
+Rate and Amount,Cijena i vrijednost sa popustom,
+'Total','Ukupno bez PDV-a'
+Total Taxes and Charges,Porez,
+No active or default Salary Structure found for employee {0} for the given dates,Nisu pronađene aktivne ili podrazumjevane strukture plate za Zaposlenog {0} za dati period,
+Supplier Part Number,Dobavljačeva šifra,
+Project Task,Projektni zadatak,
+Parent Item Group,Nadređena Vrsta artikala,
+Mark Attendance,Označi prisustvo,
+{0} created,Kreirao je korisnik {0}
+Advance Paid,Avansno plačanje,
+Projected,Projektovana količina na zalihama,
+Reorder Level,Nivo dopune,
+Customer / Lead Address,Kupac / Adresa lead-a,
+Default Buying Price List,Podrazumijevani Cjenovnik,
+Qty,Kol,
+General,Opšte,
+Default Payable Accounts,Podrazumijevani nalog za plaćanje,
+Rate: {0},Cijena: {0}
+Write Off Amount,Zaokruženi iznos,
+Total Outstanding Amount,Preostalo za plaćanje,
+Not Paid and Not Delivered,Nije plaćeno i nije isporučeno,
+Planned,Planirano,
+Total Amount,Ukupan iznos,
+Please select Price List,Izaberite cjenovnik,
+Item Serial No,Seriski broj artikla,
+Customer Service,Usluga kupca,
+Working,U toku,
+Stock User,Korisnik zaliha,
+General Ledger,Glavna knjiga,
+Received Date,Datum prijema,
+Project master.,Projektni master,
+Valid From,Važi od,
+Purchase Order Trends,Trendovi kupovina,
+In Words will be visible once you save the Quotation.,Sačuvajte Predračun da bi Ispis slovima bio vidljiv,
+Projected Qty,Projektovana količina,
+Customer Addresses And Contacts,Kontakt i adresa kupca,
+Employee name and designation in print,Ime i pozicija Zaposlenog,
+For Warehouse,Za skladište,
+Purchase Price List,Nabavni cjenovnik,
+Accounts Payable Summary,Pregled obaveze prema dobavljačima,
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnice {0} moraju biti otkazane prije otkazivanja prodajnog naloga,
+Total Payment,Ukupno plaćeno,
+POS Settings,POS podešavanja,
+Buying Amount,Iznos nabavke,
+Valuation Rate,Prosječna nab. cijena,
+Project Id,ID Projekta,
+Invoice Copy,Kopija Fakture,
+You have been invited to collaborate on the project: {0},Позвани сте да сарађујете на пројекту: {0}
+Purchase Order,Porudžbenica,
+Rate With Margin,Cijena sa popustom,
+"Search by item code, serial number, batch no or barcode","Pretraga po šifri, serijskom br. ili bar kodu"
+Voucher Type,Vrsta dokumenta,
+Serial No {0} has already been received,Serijski broj {0} je već primljen,
+Data Import and Export,Uvoz i izvoz podataka,
+Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
+% Ordered,% Poručenog,
+Price List not selected,Cjenovnik nije odabran,
+Apply Discount On,Primijeni popust na,
+Total Projected Qty,Ukupna projektovana količina,
+Shipping Rule Condition,Uslovi pravila nabavke,
+Opening Stock Balance,Početno stanje zalihe,
+Customer Credit Balance,Kreditni limit kupca,
+No address added yet.,Adresa još nije dodata.
+Net Total,Ukupno bez PDV-a,
+Total Qty,Ukupna kol.
+Return,Povraćaj,
+Delivery Warehouse,Skladište dostave,
+Total (Company Currency),Ukupno bez PDV-a (Valuta)
+Change Amount,Kusur,
+Opportunity,Prilika,
+Fully Delivered,Kompletno isporučeno,
+Leave blank if considered for all employee types,Ostavite prazno ako se podrazumijeva za sve tipove Zaposlenih,
+Disc,Popust,
+Default Price List,Podrazumijevani cjenovnik,
+Journal Entry,Knjiženje,
+Apply Additional Discount On,Primijeni dodatni popust na,
+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,
+90-Above,Iznad 90 dana,
+You have already assessed for the assessment criteria {}.,Већ сте оценили за критеријум оцењивања {}.
+Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom,
+New Contact,Novi kontakt,
+Returns,Povraćaj,
+Delivery To,Isporuka za,
+Project Value,Vrijednost Projekta,
+Parent Warehouse,Nadređeno skladište,
+Make Sales Invoice,Kreiraj fakturu prodaje,
+Del,Obriši,
+Select Warehouse...,Izaberite skladište...
+Invoice/Journal Entry Details,Faktura / Detalji knjiženja,
+Projected Quantity as Source,Projektovana izvorna količina,
+Manufacturing User,Korisnik u proizvodnji,
+Create Users,Kreiraj korisnike,
+Price,Cijena,
+Out Qty,Izdavanje Kol.
+Employee,Zaposleni,
+Project activity / task.,Projektna aktivnost / zadatak,
+Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervisano skladište u Prodajnom nalogu / Skladište gotovog proizvoda,
+Physician,Ljekar,
+Quantity,Količina,
+Purchase Receipt Required,Prijem robe je obavezan,
+Currency is required for Price List {0},Valuta je obavezna za Cjenovnik {0}
+Out Value,Izdavanje vrije.
+Customer Group,Grupa kupaca,
+You are not authorized to add or update entries before {0},Немате дозволу да додајете или ажурирате ставке пре {0}
+Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se jedino može promijeniti u dijelu Unos zaliha / Otpremnica / Prijem robe,
+Request for Quotations,Zahtjev za ponude,
+Learn,Naučite,
+Employee Detail,Detalji o Zaposlenom,
+Ignore Pricing Rule,Zanemari pravilnik o cijenama,
+Additional Discount,Dodatni popust,
+Cheque/Reference No,Broj izvoda,
+Attendance date can not be less than employee's joining date,Datum prisustva ne može biti raniji od datuma ulaska zaposlenog,
+Box,Kutija,
+Total Allocated Amount,Ukupno povezani iznos,
+All Addresses.,Sve adrese,
+Opening Balances,Početna stanja,
+Users and Permissions,Korisnici i dozvole,
+"You can only plan for upto {0} vacancies and budget {1} \
for {2} as per staffing plan {3} for parent company {4}.",Можете планирати до {0} слободна места и буџетирати {1} \ за {2} по плану особља {3} за матичну компанију {4}.
-apps/erpnext/erpnext/public/js/event.js +19,Add Customers,Dodaj kupce
-DocType: Employee External Work History,Employee External Work History,Istorijat o radu van preduzeća za Zaposlenog
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Otpremite robu prvo
-DocType: Lead,From Customer,Od kupca
-DocType: Item,Maintain Stock,Vođenje zalihe
-DocType: Sales Invoice Item,Sales Order Item,Pozicija prodajnog naloga
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Datum početka prisustva i prisustvo do danas su obavezni
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +73,Reserved Qty,Rezervisana kol.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1768,Not items found,Ništa nije pronađeno
-DocType: Item,Copy From Item Group,Kopiraj iz vrste artikala
-DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
-DocType: Purchase Taxes and Charges,On Net Total,Na ukupno bez PDV-a
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% završen
-apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} se ne nalazi u aktivnim poslovnim godinama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +533,Quick Journal Entry,Brzo knjiženje
-DocType: Sales Order,Partly Delivered,Djelimično isporučeno
-apps/erpnext/erpnext/stock/doctype/item/item.js +29,Balance,Pregled zalihe
-DocType: Purchase Invoice Item,Quality Inspection,Provjera kvaliteta
-apps/erpnext/erpnext/config/accounts.py +83,Accounting Statements,Računovodstveni iskazi
-apps/erpnext/erpnext/stock/get_item_details.py +416,Item Price added for {0} in Price List {1},Cijena je dodata na artiklu {0} iz cjenovnika {1}
-DocType: Project Type,Projects Manager,Projektni menadžer
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +102,Quotation {0} not of type {1},Ponuda {0} ne propada {1}
-apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi ili usluge.
-DocType: Purchase Invoice,Rounded Total,Zaokruženi ukupan iznos
-DocType: Request for Quotation Supplier,Download PDF,Preuzmi PDF
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +970,Quotation,Ponuda
-DocType: Lead,Mobile No.,Mobilni br.
-DocType: Item,Has Variants,Ima varijante
-DocType: Price List Country,Price List Country,Zemlja cjenovnika
-apps/erpnext/erpnext/controllers/accounts_controller.py +180,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/hr/doctype/attendance/attendance.py +52,Employee {0} is not active or does not exist,Zaposleni {0} nije aktivan ili ne postoji
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели сте дупликате. Молимо проверите и покушајте поново.
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +271,Closing (Dr),Saldo (Du)
-DocType: Sales Invoice,Product Bundle Help,Sastavnica Pomoć
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +401,Total {0} ({1}),Ukupno bez PDV-a {0} ({1})
-DocType: Sales Partner,Address & Contacts,Adresa i kontakti
-apps/erpnext/erpnext/controllers/accounts_controller.py +377, or ,ili
-apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahtjev za ponudu
-apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
-DocType: Department,Expense Approver,Odobravatalj troškova
-DocType: Purchase Invoice,Supplier Invoice Details,Detalji sa fakture dobavljača
-DocType: Purchase Order,To Bill,Za fakturisanje
-apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,Gant dijagram
-DocType: Bin,Requested Quantity,Tražena količina
-DocType: Company,Chart Of Accounts Template,Templejt za kontni plan
-DocType: Employee Attendance Tool,Marked Attendance,Označeno prisustvo
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +302,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite podrazumjevanu listu praznika za Zaposlenog {0} ili Preduzeće {1}
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
-DocType: Payment Entry Reference,Supplier Invoice No,Broj fakture dobavljača
-apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalna podešavanja za cjelokupan proces proizvodnje.
-DocType: Stock Entry,Material Transfer for Manufacture,Пренос robe za proizvodnju
-apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalji o primarnom kontaktu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,Vezni dokument
-DocType: Account,Accounts,Računi
-,Requested,Tražena
-apps/erpnext/erpnext/controllers/buying_controller.py +503,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
-DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za stavku sa ponude
-DocType: Homepage,Products,Proizvodi
-DocType: Patient Appointment,Check availability,Provjeri dostupnost
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Potrošeno vrijeme je kreirano:
-apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,Kreirati izvještaj o Zaposlenom
-apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","npr. ""Izrada alata za profesionalce"""
-apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js +7,Make Invoice,Kreiraj Fakturu
-DocType: Purchase Invoice,Is Paid,Je plaćeno
-DocType: Manufacturing Settings,Material Transferred for Manufacture,Prenešena roba za proizvodnju
-,Ordered Items To Be Billed,Poručeni artikli za fakturisanje
-apps/erpnext/erpnext/config/education.py +230,Other Reports,Ostali izvještaji
-DocType: Blanket Order,Purchasing,Kupovina
-apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',"Не можете обрисати ""Спољни"" тип пројекта."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +990,Delivery Note,Otpremnice
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječima će biti vidljivo tek kada sačuvate prodajni nalog.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +488,Show Salary Slip,Прикажи одсечак плате
-apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Troškovi aktivnosti po zaposlenom
-DocType: Journal Entry Account,Sales Order,Prodajni nalog
-DocType: Stock Entry,Customer or Supplier Details,Detalji kupca ili dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Prodaja
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Salary Slip of employee {0} already created for time sheet {1},Isplatna lista Zaposlenog {0} kreirana je već za raspored {1}
-DocType: Purchase Invoice,Additional Discount Percentage,Dodatni procenat popusta
-DocType: Additional Salary,HR User,Korisnik za ljudske resure
-apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Izvještaji zaliha robe
-DocType: Sales Invoice,Return Against Sales Invoice,Povraćaj u vezi sa Fakturom prodaje
-DocType: Asset,Naming Series,Vrste dokumenta
-,Monthly Attendance Sheet,Mjesečni list prisustva
-,Stock Ledger,Skladišni karton
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +235,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura {0} mora biti otkazana prije otkazivanja ovog prodajnog naloga
-DocType: Email Digest,New Quotations,Nove ponude
-apps/erpnext/erpnext/projects/doctype/project/project.js +98,Save the document first.,Prvo sačuvajte dokument
-DocType: Salary Slip,Employee Loan,Zajmovi Zaposlenih
-DocType: Item,Units of Measure,Jedinica mjere
-DocType: Antibiotic,Healthcare,Klinika
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,Trenutna količina na zalihama
-DocType: Material Request Plan Item,Actual Qty,Trenutna kol.
+Add Customers,Dodaj kupce,
+Employee External Work History,Istorijat o radu van preduzeća za Zaposlenog,
+Please Delivery Note first,Otpremite robu prvo,
+From Customer,Od kupca,
+Maintain Stock,Vođenje zalihe,
+Sales Order Item,Pozicija prodajnog naloga,
+Attendance From Date and Attendance To Date is mandatory,Datum početka prisustva i prisustvo do danas su obavezni,
+Reserved Qty,Rezervisana kol.
+Not items found,Ništa nije pronađeno,
+Copy From Item Group,Kopiraj iz vrste artikala,
+Total Amount in Words,Ukupan iznos riječima,
+On Net Total,Na ukupno bez PDV-a,
+{0}% Complete,{0}% završen,
+{0} {1} not in any active Fiscal Year.,{0} {1} se ne nalazi u aktivnim poslovnim godinama.
+Quick Journal Entry,Brzo knjiženje,
+Partly Delivered,Djelimično isporučeno,
+Balance,Pregled zalihe,
+Quality Inspection,Provjera kvaliteta,
+Accounting Statements,Računovodstveni iskazi,
+Item Price added for {0} in Price List {1},Cijena je dodata na artiklu {0} iz cjenovnika {1}
+Projects Manager,Projektni menadžer,
+Quotation {0} not of type {1},Ponuda {0} ne propada {1}
+All Products or Services.,Svi proizvodi ili usluge.
+Rounded Total,Zaokruženi ukupan iznos,
+Download PDF,Preuzmi PDF,
+Quotation,Ponuda,
+Mobile No.,Mobilni br.
+Has Variants,Ima varijante,
+Price List Country,Zemlja cjenovnika,
+Due Date is mandatory,Datum dospijeća je obavezan,
+Cart,Korpa,
+Stock transactions before {0} are frozen,Promjene na zalihama prije {0} su zamrznute,
+Employee {0} is not active or does not exist,Zaposleni {0} nije aktivan ili ne postoji,
+You have entered duplicate items. Please rectify and try again.,Унели сте дупликате. Молимо проверите и покушајте поново.
+Closing (Dr),Saldo (Du)
+Product Bundle Help,Sastavnica Pomoć
+Total {0} ({1}),Ukupno bez PDV-a {0} ({1})
+Address & Contacts,Adresa i kontakti,
+ or ,ili,
+Request for quotation.,Zahtjev za ponudu,
+Standard Selling,Standardna prodaja,
+Expense Approver,Odobravatalj troškova,
+Supplier Invoice Details,Detalji sa fakture dobavljača,
+To Bill,Za fakturisanje,
+Gantt Chart,Gant dijagram,
+Requested Quantity,Tražena količina,
+Chart Of Accounts Template,Templejt za kontni plan,
+Marked Attendance,Označeno prisustvo,
+Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite podrazumjevanu listu praznika za Zaposlenog {0} ili Preduzeće {1}
+Pending Amount,Iznos na čekanju,
+Supplier Invoice No,Broj fakture dobavljača,
+Global settings for all manufacturing processes.,Globalna podešavanja za cjelokupan proces proizvodnje.
+Material Transfer for Manufacture,Пренос robe za proizvodnju,
+Primary Contact Details,Detalji o primarnom kontaktu,
+Ref,Vezni dokument,
+Accounts,Računi,
+Requested,Tražena,
+{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren,
+Request for Quotation Item,Zahtjev za stavku sa ponude,
+Products,Proizvodi,
+Check availability,Provjeri dostupnost,
+Timesheet created:,Potrošeno vrijeme je kreirano:
+Create Employee Records,Kreirati izvještaj o Zaposlenom,
+"e.g. ""Build tools for builders""","npr. ""Izrada alata za profesionalce"""
+Make Invoice,Kreiraj Fakturu,
+Is Paid,Je plaćeno,
+Material Transferred for Manufacture,Prenešena roba za proizvodnju,
+Ordered Items To Be Billed,Poručeni artikli za fakturisanje,
+Other Reports,Ostali izvještaji,
+Purchasing,Kupovina,
+You cannot delete Project Type 'External',"Не можете обрисати ""Спољни"" тип пројекта."
+Delivery Note,Otpremnice,
+In Words will be visible once you save the Sales Order.,U riječima će biti vidljivo tek kada sačuvate prodajni nalog.
+Show Salary Slip,Прикажи одсечак плате
+Activity Cost per Employee,Troškovi aktivnosti po zaposlenom,
+Sales Order,Prodajni nalog,
+Customer or Supplier Details,Detalji kupca ili dobavljača,
+Sell,Prodaja,
+Salary Slip of employee {0} already created for time sheet {1},Isplatna lista Zaposlenog {0} kreirana je već za raspored {1}
+Additional Discount Percentage,Dodatni procenat popusta,
+HR User,Korisnik za ljudske resure,
+Stock Reports,Izvještaji zaliha robe,
+Return Against Sales Invoice,Povraćaj u vezi sa Fakturom prodaje,
+Naming Series,Vrste dokumenta,
+Monthly Attendance Sheet,Mjesečni list prisustva,
+Stock Ledger,Skladišni karton,
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura {0} mora biti otkazana prije otkazivanja ovog prodajnog naloga,
+New Quotations,Nove ponude,
+Save the document first.,Prvo sačuvajte dokument,
+Employee Loan,Zajmovi Zaposlenih,
+Units of Measure,Jedinica mjere,
+Healthcare,Klinika,
+Actual qty in stock,Trenutna količina na zalihama,
+Actual Qty,Trenutna kol.
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index f6cbb57..46b85c2 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Применљиво ако је компанија СпА, САпА или СРЛ",
Applicable if the company is a limited liability company,Применљиво ако је компанија са ограниченом одговорношћу,
Applicable if the company is an Individual or a Proprietorship,Применљиво ако је компанија физичка особа или власништво,
-Applicant,Подносилац захтева,
-Applicant Type,Тип подносиоца захтева,
Application of Funds (Assets),Применение средств ( активов ),
Application period cannot be across two allocation records,Период примене не може бити преко две евиденције алокације,
Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Списак доступних акционара са бројевима фолије,
Loading Payment System,Учитавање платног система,
Loan,Зајам,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0},
-Loan Application,Кредитног захтева,
-Loan Management,Управљање зајмовима,
-Loan Repayment,Отплата кредита,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Датум почетка и Период зајма су обавезни да бисте сачували попуст на фактури,
Loans (Liabilities),Кредиты ( обязательства),
Loans and Advances (Assets),Кредиты и авансы ( активы ),
@@ -1611,7 +1605,6 @@
Monday,Понедељак,
Monthly,Месечно,
Monthly Distribution,Месечни Дистрибуција,
-Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може бити већи од кредита Износ,
More,Више,
More Information,Више информација,
More than one selection for {0} not allowed,Више од једног избора за {0} није дозвољено,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Плаћајте {0} {1},
Payable,к оплате,
Payable Account,Плаћа се рачуна,
-Payable Amount,Износ који се плаћа,
Payment,Плаћање,
Payment Cancelled. Please check your GoCardless Account for more details,Плаћање је отказано. Проверите свој ГоЦардлесс рачун за више детаља,
Payment Confirmation,Потврда о уплати,
-Payment Date,Датум исплате,
Payment Days,Дана исплате,
Payment Document,dokument плаћање,
Payment Due Date,Плаћање Дуе Дате,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Молимо вас да унесете први оригинални рачун,
Please enter Receipt Document,Молимо унесите Документ о пријему,
Please enter Reference date,"Пожалуйста, введите дату Ссылка",
-Please enter Repayment Periods,Молимо Вас да унесете отплате Периоди,
Please enter Reqd by Date,Молимо унесите Рекд по датуму,
Please enter Woocommerce Server URL,Унесите УРЛ адресу Вооцоммерце Сервера,
Please enter Write Off Account,"Пожалуйста, введите списать счет",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Пожалуйста, введите МВЗ родительский",
Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}",
Please enter relieving date.,"Пожалуйста, введите даты снятия .",
-Please enter repayment Amount,Молимо Вас да унесете отплате Износ,
Please enter valid Financial Year Start and End Dates,Молимо Вас да унесете важи финансијске године датум почетка,
Please enter valid email address,Унесите исправну е-маил адресу,
Please enter {0} first,Молимо Вас да унесете {0} прво,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине.,
Primary Address Details,Примарни детаљи детаља,
Primary Contact Details,Примарне контактне информације,
-Principal Amount,Основицу,
Print Format,Принт Формат,
Print IRS 1099 Forms,Испиши обрасце ИРС 1099,
Print Report Card,Штампај извештај картицу,
@@ -2550,7 +2538,6 @@
Sample Collection,Сампле Цоллецтион,
Sample quantity {0} cannot be more than received quantity {1},Количина узорка {0} не може бити већа од примљене количине {1},
Sanctioned,санкционисан,
-Sanctioned Amount,Санкционисани износ,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.,
Sand,Песак,
Saturday,Субота,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} већ има родитељску процедуру {1}.,
API,АПИ,
Annual,годовой,
-Approved,Одобрено,
Change,Промена,
Contact Email,Контакт Емаил,
Export Type,Тип извоза,
@@ -3571,7 +3557,6 @@
Account Value,Вредност рачуна,
Account is mandatory to get payment entries,Рачун је обавезан за унос плаћања,
Account is not set for the dashboard chart {0},За графикон на контролној табли није подешен рачун {0},
-Account {0} does not belong to company {1},Счет {0} не принадлежит компании {1},
Account {0} does not exists in the dashboard chart {1},Налог {0} не постоји у табели командне табле {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Рачун: <b>{0}</b> је капитал Не ради се и не може га ажурирати унос у часопис,
Account: {0} is not permitted under Payment Entry,Рачун: {0} није дозвољен уносом плаћања,
@@ -3582,7 +3567,6 @@
Activity,Активност,
Add / Manage Email Accounts.,Додај / Манаге Емаил Аццоунтс.,
Add Child,Додај Цхилд,
-Add Loan Security,Додајте осигурање кредита,
Add Multiple,Додавање више,
Add Participants,Додајте учеснике,
Add to Featured Item,Додај у истакнути артикл,
@@ -3593,15 +3577,12 @@
Address Line 1,Аддресс Лине 1,
Addresses,Адресе,
Admission End Date should be greater than Admission Start Date.,Датум завршетка пријема требао би бити већи од датума почетка пријема.,
-Against Loan,Против зајма,
-Against Loan:,Против зајма:,
All,Све,
All bank transactions have been created,Све банкарске трансакције су креиране,
All the depreciations has been booked,Све амортизације су књижене,
Allocation Expired!,Расподјела је истекла!,
Allow Resetting Service Level Agreement from Support Settings.,Дозволите ресетирање споразума о нивоу услуге из поставки подршке.,
Amount of {0} is required for Loan closure,За затварање зајма потребан је износ {0},
-Amount paid cannot be zero,Плаћени износ не може бити нула,
Applied Coupon Code,Примењени код купона,
Apply Coupon Code,Примените код купона,
Appointment Booking,Резервација термина,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Не могу израчунати време доласка јер недостаје адреса возача.,
Cannot Optimize Route as Driver Address is Missing.,Рута не може да се оптимизира јер недостаје адреса возача.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Не могу извршити задатак {0} јер његов зависни задатак {1} није довршен / отказан.,
-Cannot create loan until application is approved,Није могуће креирање зајма док апликација не буде одобрена,
Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Не могу се преплатити за ставку {0} у реду {1} више од {2}. Да бисте омогућили прекомерно наплаћивање, молимо подесите додатак у Поставке рачуна",
"Capacity Planning Error, planned start time can not be same as end time","Погрешка планирања капацитета, планирано вријеме почетка не може бити исто колико и вријеме завршетка",
@@ -3812,20 +3792,9 @@
Less Than Amount,Мање од износа,
Liabilities,"Пасива, дугови",
Loading...,Учитавање ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Износ зајма премашује максимални износ зајма од {0} по предложеним хартијама од вредности,
Loan Applications from customers and employees.,Пријаве за зајмове од купаца и запослених.,
-Loan Disbursement,Исплата зајма,
Loan Processes,Процеси зајма,
-Loan Security,Гаранција на кредит,
-Loan Security Pledge,Зајам за зајам кредита,
-Loan Security Pledge Created : {0},Зајам за зајам креиран: {0},
-Loan Security Price,Цена гаранције зајма,
-Loan Security Price overlapping with {0},Цена зајамног осигурања која се преклапа са {0},
-Loan Security Unpledge,Безплатна позајмица,
-Loan Security Value,Вредност зајма кредита,
Loan Type for interest and penalty rates,Врста кредита за камату и затезне стопе,
-Loan amount cannot be greater than {0},Износ зајма не може бити већи од {0},
-Loan is mandatory,Зајам је обавезан,
Loans,Кредити,
Loans provided to customers and employees.,Кредити купцима и запосленима.,
Location,расположение,
@@ -3894,7 +3863,6 @@
Pay,Платити,
Payment Document Type,Врста документа плаћања,
Payment Name,Назив плаћања,
-Penalty Amount,Износ казне,
Pending,Нерешен,
Performance,Перформансе,
Period based On,Период заснован на,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Пријавите се као Корисник Маркетплаце-а да бисте уредили ову ставку.,
Please login as a Marketplace User to report this item.,Пријавите се као корисник Маркетплаце-а да бисте пријавили ову ставку.,
Please select <b>Template Type</b> to download template,Изаберите <b>Тип</b> предлошка за преузимање шаблона,
-Please select Applicant Type first,Прво одаберите врсту подносиоца захтева,
Please select Customer first,Прво одаберите купца,
Please select Item Code first,Прво одаберите шифру предмета,
-Please select Loan Type for company {0},Молимо одаберите врсту кредита за компанију {0},
Please select a Delivery Note,Изаберите напомену о достави,
Please select a Sales Person for item: {0},Изаберите продајно лице за артикал: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Молимо одаберите други начин плаћања. Трака не подржава трансакције у валути '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Подесите задани банковни рачун за компанију {0},
Please specify,Наведите,
Please specify a {0},Молимо наведите {0},lead
-Pledge Status,Статус залога,
-Pledge Time,Време залога,
Printing,Штампање,
Priority,Приоритет,
Priority has been changed to {0}.,Приоритет је промењен у {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Обрада КСМЛ датотека,
Profitability,Профитабилност,
Project,Пројекат,
-Proposed Pledges are mandatory for secured Loans,Предложене залоге су обавезне за осигуране зајмове,
Provide the academic year and set the starting and ending date.,Наведите академску годину и одредите датум почетка и завршетка.,
Public token is missing for this bank,Јавни токен недостаје за ову банку,
Publish,Објави,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Потврда о куповини нема ставку за коју је омогућен задржати узорак.,
Purchase Return,Куповина Ретурн,
Qty of Finished Goods Item,Количина производа готове робе,
-Qty or Amount is mandatroy for loan security,Количина или износ је мандатрои за осигурање кредита,
Quality Inspection required for Item {0} to submit,Инспекција квалитета потребна за подношење предмета {0},
Quantity to Manufacture,Количина за производњу,
Quantity to Manufacture can not be zero for the operation {0},Количина за производњу не може бити нула за операцију {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Датум ослобађања мора бити већи или једнак датуму придруживања,
Rename,Преименовање,
Rename Not Allowed,Преименовање није дозвољено,
-Repayment Method is mandatory for term loans,Начин отплате је обавезан за орочене кредите,
-Repayment Start Date is mandatory for term loans,Датум почетка отплате је обавезан за орочене кредите,
Report Item,Извештај,
Report this Item,Пријави ову ставку,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Количина резервисаног за подуговор: Количина сировина за израду предмета са подуговарањем.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Ред ({0}): {1} је већ снижен у {2},
Rows Added in {0},Редови су додани у {0},
Rows Removed in {0},Редови су уклоњени за {0},
-Sanctioned Amount limit crossed for {0} {1},Граница санкционисаног износа прешла за {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Износ санкционисаног зајма већ постоји за {0} против компаније {1},
Save,сачувати,
Save Item,Сачувај ставку,
Saved Items,Сачуване ставке,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Пользователь {0} отключена,
Users and Permissions,Корисници и дозволе,
Vacancies cannot be lower than the current openings,Слободна радна места не могу бити нижа од постојећих,
-Valid From Time must be lesser than Valid Upto Time.,Важи од времена мора бити краће од Важећег времена.,
Valuation Rate required for Item {0} at row {1},Стопа вредновања потребна за позицију {0} у реду {1},
Values Out Of Sync,Вредности ван синхронизације,
Vehicle Type is required if Mode of Transport is Road,Тип возила је потребан ако је начин превоза друмски,
@@ -4211,7 +4168,6 @@
Add to Cart,Добавить в корзину,
Days Since Last Order,Дани од последње наруџбе,
In Stock,На складишту,
-Loan Amount is mandatory,Износ зајма је обавезан,
Mode Of Payment,Начин плаћања,
No students Found,Није пронађен ниједан студент,
Not in Stock,Није у стању,
@@ -4240,7 +4196,6 @@
Group by,Група По,
In stock,На лагеру,
Item name,Назив,
-Loan amount is mandatory,Износ зајма је обавезан,
Minimum Qty,Минимални количина,
More details,Више детаља,
Nature of Supplies,Натуре оф Супплиес,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Укупно завршено Количина,
Qty to Manufacture,Кол Да Производња,
Repay From Salary can be selected only for term loans,Репаи Фром Салари може се одабрати само за орочене кредите,
-No valid Loan Security Price found for {0},Није пронађена важећа цена зајма за кредит за {0},
-Loan Account and Payment Account cannot be same,Рачун зајма и рачун за плаћање не могу бити исти,
-Loan Security Pledge can only be created for secured loans,Обезбеђење зајма може се створити само за обезбеђене зајмове,
Social Media Campaigns,Кампање на друштвеним мрежама,
From Date can not be greater than To Date,Од датума не може бити већи од датума,
Please set a Customer linked to the Patient,Поставите купца повезаног са пацијентом,
@@ -6437,7 +6389,6 @@
HR User,ХР Корисник,
Appointment Letter,Писмо о именовању,
Job Applicant,Посао захтева,
-Applicant Name,Подносилац захтева Име,
Appointment Date,Датум именовања,
Appointment Letter Template,Предложак писма о именовању,
Body,Тело,
@@ -7059,99 +7010,12 @@
Sync in Progress,Синхронизација у току,
Hub Seller Name,Продавац Име продавца,
Custom Data,Кориснички подаци,
-Member,Члан,
-Partially Disbursed,Делимично Додељено,
-Loan Closure Requested,Затражено затварање зајма,
Repay From Salary,Отплатити од плате,
-Loan Details,kredit Детаљи,
-Loan Type,Тип кредита,
-Loan Amount,Износ позајмице,
-Is Secured Loan,Обезбеђен зајам,
-Rate of Interest (%) / Year,Каматна стопа (%) / Иеар,
-Disbursement Date,isplata Датум,
-Disbursed Amount,Изплаћена сума,
-Is Term Loan,Терм зајам,
-Repayment Method,Начин отплате,
-Repay Fixed Amount per Period,Отплатити фиксан износ по периоду,
-Repay Over Number of Periods,Отплатити Овер број периода,
-Repayment Period in Months,Период отплате у месецима,
-Monthly Repayment Amount,Месечна отплата Износ,
-Repayment Start Date,Датум почетка отплате,
-Loan Security Details,Детаљи осигурања кредита,
-Maximum Loan Value,Максимална вредност зајма,
-Account Info,račun информације,
-Loan Account,Кредитни рачун,
-Interest Income Account,Приход од камата рачуна,
-Penalty Income Account,Рачун дохотка од казни,
-Repayment Schedule,отплате,
-Total Payable Amount,Укупно плаћају износ,
-Total Principal Paid,Укупна плаћена главница,
-Total Interest Payable,Укупно камати,
-Total Amount Paid,Укупан износ плаћен,
-Loan Manager,Менаџер кредита,
-Loan Info,kredit информације,
-Rate of Interest,Ниво интересовања,
-Proposed Pledges,Предложена обећања,
-Maximum Loan Amount,Максимални износ кредита,
-Repayment Info,otplata информације,
-Total Payable Interest,Укупно оплате камата,
-Against Loan ,Против зајма,
-Loan Interest Accrual,Обрачунате камате на зајмове,
-Amounts,Количине,
-Pending Principal Amount,На чекању главнице,
-Payable Principal Amount,Плативи главни износ,
-Paid Principal Amount,Плаћени износ главнице,
-Paid Interest Amount,Износ плаћене камате,
-Process Loan Interest Accrual,Обрачун камата на зајам,
-Repayment Schedule Name,Назив распореда отплате,
Regular Payment,Редовна уплата,
Loan Closure,Затварање зајма,
-Payment Details,Podaci o plaćanju,
-Interest Payable,Зарађена камата,
-Amount Paid,Износ Плаћени,
-Principal Amount Paid,Износ главнице,
-Repayment Details,Детаљи отплате,
-Loan Repayment Detail,Детаљи отплате зајма,
-Loan Security Name,Име зајма зајма,
-Unit Of Measure,Јединица мере,
-Loan Security Code,Код за сигурност кредита,
-Loan Security Type,Врста осигурања зајма,
-Haircut %,Фризура%,
-Loan Details,Детаљи о зајму,
-Unpledged,Непотпуњено,
-Pledged,Заложено,
-Partially Pledged,Делимично заложено,
-Securities,Хартије од вредности,
-Total Security Value,Укупна вредност безбедности,
-Loan Security Shortfall,Недостатак осигурања кредита,
-Loan ,Зајам,
-Shortfall Time,Време краћења,
-America/New_York,Америка / Нев_Иорк,
-Shortfall Amount,Износ мањка,
-Security Value ,Вредност сигурности,
-Process Loan Security Shortfall,Недостатак сигурности зајма у процесу,
-Loan To Value Ratio,Однос зајма до вредности,
-Unpledge Time,Време унпледге-а,
-Loan Name,kredit Име,
Rate of Interest (%) Yearly,Каматна стопа (%) Годишња,
-Penalty Interest Rate (%) Per Day,Каматна стопа (%) по дану,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Затезна камата се свакодневно обрачунава на виши износ камате у случају кашњења са отплатом,
-Grace Period in Days,Граце Период у данима,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Број дана од датума доспећа до којег се неће наплатити казна у случају кашњења у отплати кредита,
-Pledge,Залог,
-Post Haircut Amount,Износ пошиљања фризуре,
-Process Type,Тип процеса,
-Update Time,Време ажурирања,
-Proposed Pledge,Предложено заложно право,
-Total Payment,Укупан износ,
-Balance Loan Amount,Биланс Износ кредита,
-Is Accrued,Је обрачунато,
Salary Slip Loan,Зараду за плате,
Loan Repayment Entry,Отплата зајма,
-Sanctioned Loan Amount,Износ санкције зајма,
-Sanctioned Amount Limit,Лимитирани износ лимита,
-Unpledge,Унпледге,
-Haircut,Шишање,
MAT-MSH-.YYYY.-,МАТ-МСХ-ИИИИ.-,
Generate Schedule,Генериши Распоред,
Schedules,Распореди,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Пројекат ће бити доступни на сајту ових корисника,
Copied From,копиран из,
Start and End Dates,Почетни и завршни датуми,
-Actual Time (in Hours),Стварно време (у сатима),
+Actual Time in Hours (via Timesheet),Стварно време (у сатима),
Costing and Billing,Коштају и обрачуна,
-Total Costing Amount (via Timesheets),Укупни износ трошкова (преко Тимесхеета),
-Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања),
+Total Costing Amount (via Timesheet),Укупни износ трошкова (преко Тимесхеета),
+Total Expense Claim (via Expense Claim),Укупни расходи Цлаим (преко Расходи потраживања),
Total Purchase Cost (via Purchase Invoice),Укупно набавној вредности (преко фактури),
Total Sales Amount (via Sales Order),Укупан износ продаје (преко продајног налога),
-Total Billable Amount (via Timesheets),Укупан износ износа (преко Тимесхеета),
-Total Billed Amount (via Sales Invoices),Укупан фактурисани износ (преко фактура продаје),
-Total Consumed Material Cost (via Stock Entry),Укупни трошкови потрошње материјала (путем залиха залиха),
+Total Billable Amount (via Timesheet),Укупан износ износа (преко Тимесхеета),
+Total Billed Amount (via Sales Invoice),Укупан фактурисани износ (преко фактура продаје),
+Total Consumed Material Cost (via Stock Entry),Укупни трошкови потрошње материјала (путем залиха залиха),
Gross Margin,Бруто маржа,
Gross Margin %,Бруто маржа%,
Monitor Progress,Напредак монитора,
@@ -7521,12 +7385,10 @@
Dependencies,Зависности,
Dependent Tasks,Зависни задаци,
Depends on Tasks,Зависи од Задаци,
-Actual Start Date (via Time Sheet),Стварна Датум почетка (преко Тиме Схеет),
-Actual Time (in hours),Тренутно време (у сатима),
-Actual End Date (via Time Sheet),Стварна Датум завршетка (преко Тиме Схеет),
-Total Costing Amount (via Time Sheet),Укупно Обрачун трошкова Износ (преко Тиме Схеет),
+Actual Start Date (via Timesheet),Стварна Датум почетка (преко Тиме Схеет),
+Actual Time in Hours (via Timesheet),Тренутно време (у сатима),
+Actual End Date (via Timesheet),Стварна Датум завршетка (преко Тиме Схеет),
Total Expense Claim (via Expense Claim),Укупни расходи Цлаим (преко Екпенсе потраживања),
-Total Billing Amount (via Time Sheet),Укупно Износ обрачуна (преко Тиме Схеет),
Review Date,Прегледајте Дате,
Closing Date,Датум затварања,
Task Depends On,Задатак Дубоко У,
@@ -7887,7 +7749,6 @@
Update Series,Упдате,
Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.,
Prefix,Префикс,
-Current Value,Тренутна вредност,
This is the number of the last created transaction with this prefix,То је број последње створеног трансакције са овим префиксом,
Update Series Number,Упдате Број,
Quotation Lost Reason,Понуда Лост разлог,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер,
Lead Details,Олово Детаљи,
Lead Owner Efficiency,Олово Власник Ефикасност,
-Loan Repayment and Closure,Отплата и затварање зајма,
-Loan Security Status,Статус осигурања кредита,
Lost Opportunity,Изгубљена прилика,
Maintenance Schedules,Планове одржавања,
Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Број циљаних бројева: {0},
Payment Account is mandatory,Рачун за плаћање је обавезан,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ако се означи, пуни износ ће се одбити од опорезивог дохотка пре обрачуна пореза на доходак без икакве изјаве или подношења доказа.",
-Disbursement Details,Детаљи исплате,
Material Request Warehouse,Складиште захтева за материјал,
Select warehouse for material requests,Изаберите складиште за захтеве за материјалом,
Transfer Materials For Warehouse {0},Трансфер материјала за складиште {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Отплати неискоришћени износ из плате,
Deduction from salary,Одбитак од зараде,
Expired Leaves,Истекло лишће,
-Reference No,Референтни број,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Проценат шишања је процентуална разлика између тржишне вредности обезбеђења зајма и вредности која се приписује том обезбеђењу зајма када се користи као залог за тај зајам.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Однос зајма и вредности изражава однос износа зајма према вредности заложеног обезбеђења. Недостатак осигурања зајма покренуће се ако падне испод наведене вредности за било који зајам,
If this is not checked the loan by default will be considered as a Demand Loan,"Ако ово није потврђено, зајам ће се подразумевано сматрати зајмом на захтев",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Овај рачун се користи за резервирање отплате зајма од зајмопримца и за исплату зајмова зајмопримцу,
This account is capital account which is used to allocate capital for loan disbursal account ,Овај рачун је рачун капитала који се користи за алокацију капитала за рачун за издвајање кредита,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Операција {0} не припада радном налогу {1},
Print UOM after Quantity,Одштампај УОМ након количине,
Set default {0} account for perpetual inventory for non stock items,Поставите подразумевани {0} рачун за трајни инвентар за ставке које нису на залихама,
-Loan Security {0} added multiple times,Обезбеђење зајма {0} је додато више пута,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Гаранције за зајам са различитим односом ЛТВ не могу се заложити за један зајам,
-Qty or Amount is mandatory for loan security!,Количина или износ су обавезни за осигурање кредита!,
-Only submittted unpledge requests can be approved,Могу се одобрити само поднети захтеви за неупитништво,
-Interest Amount or Principal Amount is mandatory,Износ камате или износ главнице је обавезан,
-Disbursed Amount cannot be greater than {0},Исплаћени износ не може бити већи од {0},
-Row {0}: Loan Security {1} added multiple times,Ред {0}: Обезбеђење позајмице {1} додат је више пута,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Ред # {0}: Подређена ставка не би требало да буде пакет производа. Уклоните ставку {1} и сачувајте,
Credit limit reached for customer {0},Досегнуто кредитно ограничење за купца {0},
Could not auto create Customer due to the following missing mandatory field(s):,Није могуће аутоматски креирати купца због следећих обавезних поља која недостају:,
diff --git a/erpnext/translations/sr_sp.csv b/erpnext/translations/sr_sp.csv
index 5e7ae79..c121e6a 100644
--- a/erpnext/translations/sr_sp.csv
+++ b/erpnext/translations/sr_sp.csv
@@ -897,7 +897,7 @@
Task Progress,% završenosti zadataka,
% Completed,% završen,
Project will be accessible on the website to these users,Projekat će biti dostupan na sajtu sledećim korisnicima,
-Total Billed Amount (via Sales Invoices),Ukupno fakturisano (putem fakture prodaje),
+Total Billed Amount (via Sales Invoice),Ukupno fakturisano (putem fakture prodaje),
Projects Manager,Projektni menadžer,
Project User,Projektni user,
Weight,Težina,
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index ec443e9..89445c8 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Tillämpligt om företaget är SpA, SApA eller SRL",
Applicable if the company is a limited liability company,Tillämpligt om företaget är ett aktiebolag,
Applicable if the company is an Individual or a Proprietorship,Tillämpligt om företaget är en individ eller ett innehav,
-Applicant,Sökande,
-Applicant Type,Sökande Typ,
Application of Funds (Assets),Tillämpning av medel (tillgångar),
Application period cannot be across two allocation records,Ansökningsperioden kan inte över två fördelningsrekord,
Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Förteckning över tillgängliga aktieägare med folienummer,
Loading Payment System,Hämtar betalningssystemet,
Loan,Lån,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0},
-Loan Application,Låneansökan,
-Loan Management,Lånhantering,
-Loan Repayment,Låneåterbetalning,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Lånets startdatum och låneperiod är obligatoriskt för att spara fakturabatteringen,
Loans (Liabilities),Lån (Skulder),
Loans and Advances (Assets),Utlåning (tillgångar),
@@ -1611,7 +1605,6 @@
Monday,Måndag,
Monthly,Månadsvis,
Monthly Distribution,Månads Fördelning,
-Monthly Repayment Amount cannot be greater than Loan Amount,Månatliga återbetalningen belopp kan inte vara större än Lånebelopp,
More,Mer,
More Information,Mer information,
More than one selection for {0} not allowed,Mer än ett val för {0} är inte tillåtet,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Betala {0} {1},
Payable,Betalning sker,
Payable Account,Betalningskonto,
-Payable Amount,Betalningsbart belopp,
Payment,Betalning,
Payment Cancelled. Please check your GoCardless Account for more details,Betalning Avbruten. Kontrollera ditt GoCardless-konto för mer information,
Payment Confirmation,Betalningsbekräftelse,
-Payment Date,Betalningsdag,
Payment Days,Betalningsdagar,
Payment Document,betalning Dokument,
Payment Due Date,Förfallodag,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Ange inköpskvitto först,
Please enter Receipt Document,Ange Kvitto Dokument,
Please enter Reference date,Ange Referensdatum,
-Please enter Repayment Periods,Ange återbetalningstider,
Please enter Reqd by Date,Vänligen ange Reqd by Date,
Please enter Woocommerce Server URL,Vänligen ange webbadress för WoCommerce Server,
Please enter Write Off Account,Ange avskrivningskonto,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Ange huvud kostnadsställe,
Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0},
Please enter relieving date.,Ange avlösningsdatum.,
-Please enter repayment Amount,Ange återbetalningsbeloppet,
Please enter valid Financial Year Start and End Dates,Ange ett giltigt räkenskapsåret start- och slutdatum,
Please enter valid email address,Ange giltig e-postadress,
Please enter {0} first,Ange {0} först,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet.,
Primary Address Details,Primär adressuppgifter,
Primary Contact Details,Primär kontaktuppgifter,
-Principal Amount,Kapitalbelopp,
Print Format,Utskriftsformat,
Print IRS 1099 Forms,Skriv ut IRS 1099-formulär,
Print Report Card,Skriv ut rapportkort,
@@ -2550,7 +2538,6 @@
Sample Collection,Provsamling,
Sample quantity {0} cannot be more than received quantity {1},Provkvantitet {0} kan inte vara mer än mottagen kvantitet {1},
Sanctioned,sanktionerade,
-Sanctioned Amount,Sanktionerade Belopp,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.,
Sand,Sand,
Saturday,Lördag,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} har redan en överordnad procedur {1}.,
API,API,
Annual,Årlig,
-Approved,Godkänd,
Change,Byta,
Contact Email,Kontakt E-Post,
Export Type,Exportera typ,
@@ -3571,7 +3557,6 @@
Account Value,Kontovärde,
Account is mandatory to get payment entries,Kontot är obligatoriskt för att få inbetalningar,
Account is not set for the dashboard chart {0},Kontot är inte inställt för instrumentpanelen {0},
-Account {0} does not belong to company {1},Kontot {0} tillhör inte ett företag {1},
Account {0} does not exists in the dashboard chart {1},Kontot {0} finns inte i översiktsdiagrammet {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> är kapital Arbetet pågår och kan inte uppdateras av Journal Entry,
Account: {0} is not permitted under Payment Entry,Konto: {0} är inte tillåtet enligt betalningsinmatning,
@@ -3582,7 +3567,6 @@
Activity,Aktivitet,
Add / Manage Email Accounts.,Lägg till / Hantera e-postkonton.,
Add Child,Lägg till underval,
-Add Loan Security,Lägg till säkerhetslån,
Add Multiple,Lägg till flera,
Add Participants,Lägg till deltagare,
Add to Featured Item,Lägg till den utvalda artikeln,
@@ -3593,15 +3577,12 @@
Address Line 1,Adress Linje 1,
Addresses,Adresser,
Admission End Date should be greater than Admission Start Date.,Slutdatum för antagning bör vara större än startdatum för antagning.,
-Against Loan,Mot lån,
-Against Loan:,Mot lån:,
All,Allt,
All bank transactions have been created,Alla banktransaktioner har skapats,
All the depreciations has been booked,Alla avskrivningar har bokats,
Allocation Expired!,Tilldelningen har gått ut!,
Allow Resetting Service Level Agreement from Support Settings.,Tillåt återställning av servicenivåavtal från supportinställningar.,
Amount of {0} is required for Loan closure,Beloppet {0} krävs för lånets stängning,
-Amount paid cannot be zero,Betalt belopp kan inte vara noll,
Applied Coupon Code,Tillämpad kupongkod,
Apply Coupon Code,Tillämpa kupongkod,
Appointment Booking,Bokning av möten,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Det går inte att beräkna ankomsttiden eftersom förarens adress saknas.,
Cannot Optimize Route as Driver Address is Missing.,Kan inte optimera rutten eftersom förarens adress saknas.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Kan inte slutföra uppgift {0} eftersom dess beroende uppgift {1} inte är kompletterade / avbrutna.,
-Cannot create loan until application is approved,Kan inte skapa lån förrän ansökan har godkänts,
Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Det går inte att överbeställa för artikel {0} i rad {1} mer än {2}. För att tillåta överfakturering, ange tillåtelse i Kontoinställningar",
"Capacity Planning Error, planned start time can not be same as end time","Kapacitetsplaneringsfel, planerad starttid kan inte vara samma som sluttid",
@@ -3812,20 +3792,9 @@
Less Than Amount,Mindre än belopp,
Liabilities,Skulder,
Loading...,Laddar ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Lånebeloppet överstiger det maximala lånebeloppet på {0} enligt föreslagna värdepapper,
Loan Applications from customers and employees.,Låneansökningar från kunder och anställda.,
-Loan Disbursement,Lånutbetalning,
Loan Processes,Låneprocesser,
-Loan Security,Lånsäkerhet,
-Loan Security Pledge,Lånesäkerhetslöfte,
-Loan Security Pledge Created : {0},Lånesäkerhetslöfte skapad: {0},
-Loan Security Price,Lånesäkerhetspris,
-Loan Security Price overlapping with {0},Lånesäkerhetspris som överlappar med {0},
-Loan Security Unpledge,Lånesäkerhet unpledge,
-Loan Security Value,Lånesäkerhetsvärde,
Loan Type for interest and penalty rates,Låntyp för ränta och straff,
-Loan amount cannot be greater than {0},Lånebeloppet kan inte vara större än {0},
-Loan is mandatory,Lån är obligatoriskt,
Loans,lån,
Loans provided to customers and employees.,Lån till kunder och anställda.,
Location,Läge,
@@ -3894,7 +3863,6 @@
Pay,Betala,
Payment Document Type,Betalningsdokumenttyp,
Payment Name,Betalningsnamn,
-Penalty Amount,Straffbelopp,
Pending,Väntar,
Performance,Prestanda,
Period based On,Period baserat på,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Logga in som Marketplace-användare för att redigera den här artikeln.,
Please login as a Marketplace User to report this item.,Logga in som Marketplace-användare för att rapportera detta objekt.,
Please select <b>Template Type</b> to download template,Välj <b>malltyp för</b> att ladda ner mallen,
-Please select Applicant Type first,Välj först sökande,
Please select Customer first,Välj kund först,
Please select Item Code first,Välj först artikelkod,
-Please select Loan Type for company {0},Välj lånetyp för företag {0},
Please select a Delivery Note,Välj en leveransanteckning,
Please select a Sales Person for item: {0},Välj en säljare för artikeln: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Välj en annan betalningsmetod. Stripe stöder inte transaktioner i valuta "{0}",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Ställ in ett standardkonto för företag {0},
Please specify,Vänligen specificera,
Please specify a {0},Vänligen ange en {0},lead
-Pledge Status,Pantstatus,
-Pledge Time,Panttid,
Printing,Tryckning,
Priority,Prioritet,
Priority has been changed to {0}.,Prioritet har ändrats till {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Bearbetar XML-filer,
Profitability,lönsamhet,
Project,Projekt,
-Proposed Pledges are mandatory for secured Loans,Föreslagna pantsättningar är obligatoriska för säkrade lån,
Provide the academic year and set the starting and ending date.,Ange läsåret och ange start- och slutdatum.,
Public token is missing for this bank,Offentligt symbol saknas för denna bank,
Publish,Publicera,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Köpskvitto har inget objekt som behåller provet är aktiverat för.,
Purchase Return,bara Return,
Qty of Finished Goods Item,Antal färdigvaror,
-Qty or Amount is mandatroy for loan security,Antal eller belopp är obligatoriskt för lånets säkerhet,
Quality Inspection required for Item {0} to submit,Kvalitetskontroll krävs för att artikel {0} ska skickas in,
Quantity to Manufacture,Kvantitet att tillverka,
Quantity to Manufacture can not be zero for the operation {0},Antalet tillverkning kan inte vara noll för operationen {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Relief-datum måste vara större än eller lika med Datum för anslutning,
Rename,Byt namn,
Rename Not Allowed,Byt namn inte tillåtet,
-Repayment Method is mandatory for term loans,Återbetalningsmetod är obligatorisk för lån,
-Repayment Start Date is mandatory for term loans,Startdatum för återbetalning är obligatoriskt för lån,
Report Item,Rapportera objekt,
Report this Item,Rapportera det här objektet,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Reserverad antal för underleverantörer: Råvarukvantitet för att tillverka underleverantörer.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Rad ({0}): {1} är redan rabatterad i {2},
Rows Added in {0},Rader tillagda i {0},
Rows Removed in {0},Rader tas bort i {0},
-Sanctioned Amount limit crossed for {0} {1},Sanktionerad beloppgräns för {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Sanktionerat lånebelopp finns redan för {0} mot företag {1},
Save,Spara,
Save Item,Spara objekt,
Saved Items,Sparade objekt,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Användare {0} är inaktiverad,
Users and Permissions,Användare och behörigheter,
Vacancies cannot be lower than the current openings,Lediga platser kan inte vara lägre än nuvarande öppningar,
-Valid From Time must be lesser than Valid Upto Time.,Giltig från tid måste vara mindre än giltig fram till tid.,
Valuation Rate required for Item {0} at row {1},Värderingsgrad krävs för artikel {0} i rad {1},
Values Out Of Sync,Värden utan synk,
Vehicle Type is required if Mode of Transport is Road,Fordonstyp krävs om transportläget är väg,
@@ -4211,7 +4168,6 @@
Add to Cart,Lägg till i kundvagn,
Days Since Last Order,Dagar sedan förra beställningen,
In Stock,I lager,
-Loan Amount is mandatory,Lånebelopp är obligatoriskt,
Mode Of Payment,Betalningssätt,
No students Found,Inga studenter hittades,
Not in Stock,Inte i lager,
@@ -4240,7 +4196,6 @@
Group by,Gruppera efter,
In stock,I lager,
Item name,Produktnamn,
-Loan amount is mandatory,Lånebelopp är obligatoriskt,
Minimum Qty,Minsta antal,
More details,Fler detaljer,
Nature of Supplies,Typ av tillbehör,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Totalt slutfört antal,
Qty to Manufacture,Antal att tillverka,
Repay From Salary can be selected only for term loans,Återbetalning från lön kan endast väljas för långfristiga lån,
-No valid Loan Security Price found for {0},Inget giltigt lånesäkerhetspris hittades för {0},
-Loan Account and Payment Account cannot be same,Lånekontot och betalkontot kan inte vara desamma,
-Loan Security Pledge can only be created for secured loans,Lånsäkerhetspant kan endast skapas för säkrade lån,
Social Media Campaigns,Sociala mediekampanjer,
From Date can not be greater than To Date,Från datum kan inte vara större än till datum,
Please set a Customer linked to the Patient,Ange en kund som är länkad till patienten,
@@ -6437,7 +6389,6 @@
HR User,HR-Konto,
Appointment Letter,Mötesbrev,
Job Applicant,Arbetssökande,
-Applicant Name,Sökandes Namn,
Appointment Date,Utnämningsdagen,
Appointment Letter Template,Utnämningsbrevmall,
Body,Kropp,
@@ -7059,99 +7010,12 @@
Sync in Progress,Synkronisera pågår,
Hub Seller Name,Hubb Säljarens namn,
Custom Data,Anpassade data,
-Member,Medlem,
-Partially Disbursed,delvis Utbetalt,
-Loan Closure Requested,Lånestängning begärdes,
Repay From Salary,Repay från Lön,
-Loan Details,Loan Detaljer,
-Loan Type,lånetyp,
-Loan Amount,Lånebelopp,
-Is Secured Loan,Är säkrat lån,
-Rate of Interest (%) / Year,Hastighet av intresse (%) / år,
-Disbursement Date,utbetalning Datum,
-Disbursed Amount,Utbetalat belopp,
-Is Term Loan,Är terminlån,
-Repayment Method,återbetalning Metod,
-Repay Fixed Amount per Period,Återbetala fast belopp per period,
-Repay Over Number of Periods,Repay Över Antal perioder,
-Repayment Period in Months,Återbetalning i månader,
-Monthly Repayment Amount,Månatliga återbetalningen belopp,
-Repayment Start Date,Återbetalning Startdatum,
-Loan Security Details,Lånesäkerhetsdetaljer,
-Maximum Loan Value,Maximal lånevärde,
-Account Info,Kontoinformation,
-Loan Account,Lånekonto,
-Interest Income Account,Ränteintäkter Account,
-Penalty Income Account,Penninginkontokonto,
-Repayment Schedule,återbetalningsplan,
-Total Payable Amount,Total Betalbelopp,
-Total Principal Paid,Totalt huvudsakligt betalt,
-Total Interest Payable,Total ränta,
-Total Amount Paid,Summa Betald Betalning,
-Loan Manager,Lånchef,
-Loan Info,Loan info,
-Rate of Interest,RÄNTEFOT,
-Proposed Pledges,Föreslagna pantsättningar,
-Maximum Loan Amount,Maximala lånebeloppet,
-Repayment Info,återbetalning info,
-Total Payable Interest,Totalt betalas ränta,
-Against Loan ,Mot lån,
-Loan Interest Accrual,Låneränta,
-Amounts,Belopp,
-Pending Principal Amount,Väntande huvudbelopp,
-Payable Principal Amount,Betalningsbart huvudbelopp,
-Paid Principal Amount,Betalt huvudbelopp,
-Paid Interest Amount,Betalt räntebelopp,
-Process Loan Interest Accrual,Processlån Ränteöverföring,
-Repayment Schedule Name,Namn på återbetalningsschema,
Regular Payment,Regelbunden betalning,
Loan Closure,Lånestängning,
-Payment Details,Betalningsinformation,
-Interest Payable,Betalningsränta,
-Amount Paid,Betald Summa,
-Principal Amount Paid,Huvudbelopp som betalats,
-Repayment Details,Återbetalningsinformation,
-Loan Repayment Detail,Detalj för återbetalning av lån,
-Loan Security Name,Lånsäkerhetsnamn,
-Unit Of Measure,Måttenhet,
-Loan Security Code,Lånesäkerhetskod,
-Loan Security Type,Lånsäkerhetstyp,
-Haircut %,Frisyr %,
-Loan Details,Lånedetaljer,
-Unpledged,Unpledged,
-Pledged,Ställda,
-Partially Pledged,Delvis pantsatt,
-Securities,värdepapper,
-Total Security Value,Totalt säkerhetsvärde,
-Loan Security Shortfall,Lånsäkerhetsbrist,
-Loan ,Lån,
-Shortfall Time,Bristtid,
-America/New_York,America / New_York,
-Shortfall Amount,Bristbelopp,
-Security Value ,Säkerhetsvärde,
-Process Loan Security Shortfall,Process Säkerhetsbrist,
-Loan To Value Ratio,Lån till värde,
-Unpledge Time,Unpledge Time,
-Loan Name,Loan Namn,
Rate of Interest (%) Yearly,Hastighet av intresse (%) Årlig,
-Penalty Interest Rate (%) Per Day,Straffränta (%) per dag,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Straffräntan tas ut på det pågående räntebeloppet dagligen vid försenad återbetalning,
-Grace Period in Days,Nådeperiod i dagar,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Antal dagar från förfallodagen till dess att böter inte debiteras vid försenad återbetalning av lån,
-Pledge,Lova,
-Post Haircut Amount,Efter hårklippsmängd,
-Process Type,Process typ,
-Update Time,Uppdaterings tid,
-Proposed Pledge,Föreslagen pantsättning,
-Total Payment,Total betalning,
-Balance Loan Amount,Balans lånebelopp,
-Is Accrued,Är upplupna,
Salary Slip Loan,Lönebetalningslån,
Loan Repayment Entry,Lånet återbetalning post,
-Sanctioned Loan Amount,Sanktionerat lånebelopp,
-Sanctioned Amount Limit,Sanktionerad beloppgräns,
-Unpledge,Unpledge,
-Haircut,Frisyr,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Generera Schema,
Schedules,Scheman,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Projektet kommer att vara tillgänglig på webbplatsen till dessa användare,
Copied From,Kopierad från,
Start and End Dates,Start- och slutdatum,
-Actual Time (in Hours),Faktisk tid (i timmar),
+Actual Time in Hours (via Timesheet),Faktisk tid (i timmar),
Costing and Billing,Kostnadsberäkning och fakturering,
-Total Costing Amount (via Timesheets),Totalkostnadsbelopp (via tidskrifter),
-Total Expense Claim (via Expense Claims),Totalkostnadskrav (via räkningar),
+Total Costing Amount (via Timesheet),Totalkostnadsbelopp (via tidskrifter),
+Total Expense Claim (via Expense Claim),Totalkostnadskrav (via räkningar),
Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura),
Total Sales Amount (via Sales Order),Totala försäljningsbelopp (via försäljningsorder),
-Total Billable Amount (via Timesheets),Totala fakturabeloppet (via tidstabeller),
-Total Billed Amount (via Sales Invoices),Totalt fakturerat belopp (via försäljningsfakturor),
-Total Consumed Material Cost (via Stock Entry),Total förbrukad materialkostnad (via lagerinmatning),
+Total Billable Amount (via Timesheet),Totala fakturabeloppet (via tidstabeller),
+Total Billed Amount (via Sales Invoice),Totalt fakturerat belopp (via försäljningsfakturor),
+Total Consumed Material Cost (via Stock Entry),Total förbrukad materialkostnad (via lagerinmatning),
Gross Margin,Bruttomarginal,
Gross Margin %,Bruttomarginal%,
Monitor Progress,Monitor Progress,
@@ -7521,12 +7385,10 @@
Dependencies,beroenden,
Dependent Tasks,Beroende uppgifter,
Depends on Tasks,Beror på Uppgifter,
-Actual Start Date (via Time Sheet),Faktiska startdatum (via Tidrapportering),
-Actual Time (in hours),Faktisk tid (i timmar),
-Actual End Date (via Time Sheet),Faktisk Slutdatum (via Tidrapportering),
-Total Costing Amount (via Time Sheet),Totalt Costing Belopp (via Tidrapportering),
+Actual Start Date (via Timesheet),Faktiska startdatum (via Tidrapportering),
+Actual Time in Hours (via Timesheet),Faktisk tid (i timmar),
+Actual End Date (via Timesheet),Faktisk Slutdatum (via Tidrapportering),
Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning),
-Total Billing Amount (via Time Sheet),Totalt Billing Belopp (via Tidrapportering),
Review Date,Kontroll Datum,
Closing Date,Slutdatum,
Task Depends On,Uppgift Beror på,
@@ -7887,7 +7749,6 @@
Update Series,Uppdatera Serie,
Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.,
Prefix,Prefix,
-Current Value,Nuvarande Värde,
This is the number of the last created transaction with this prefix,Detta är numret på den senast skapade transaktionen med detta prefix,
Update Series Number,Uppdatera Serie Nummer,
Quotation Lost Reason,Anledning förlorad Offert,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå,
Lead Details,Prospekt Detaljer,
Lead Owner Efficiency,Effektivitet hos ledningsägaren,
-Loan Repayment and Closure,Lånåterbetalning och stängning,
-Loan Security Status,Lånsäkerhetsstatus,
Lost Opportunity,Förlorad möjlighet,
Maintenance Schedules,Underhålls scheman,
Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Räknade mål: {0},
Payment Account is mandatory,Betalningskonto är obligatoriskt,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",Om det är markerat kommer hela beloppet att dras av från beskattningsbar inkomst innan inkomstskatt beräknas utan någon förklaring eller bevis.,
-Disbursement Details,Utbetalningsdetaljer,
Material Request Warehouse,Materialförfrågningslager,
Select warehouse for material requests,Välj lager för materialförfrågningar,
Transfer Materials For Warehouse {0},Överför material för lager {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Återbetala obefogat belopp från lönen,
Deduction from salary,Avdrag från lön,
Expired Leaves,Utgångna löv,
-Reference No,referensnummer,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Hårklippningsprocent är den procentuella skillnaden mellan marknadsvärdet på lånets säkerhet och det värde som tillskrivs lånets säkerhet när det används som säkerhet för det lånet.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Loan To Value Ratio uttrycker förhållandet mellan lånebeloppet och värdet av den pantsatta säkerheten. Ett lånesäkerhetsbrist utlöses om detta faller under det angivna värdet för ett lån,
If this is not checked the loan by default will be considered as a Demand Loan,Om detta inte är markerat kommer lånet som standard att betraktas som ett efterfrågelån,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Detta konto används för bokning av återbetalningar av lån från låntagaren och för utbetalning av lån till låntagaren,
This account is capital account which is used to allocate capital for loan disbursal account ,Det här kontot är ett kapitalkonto som används för att fördela kapital för lånekonto,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Åtgärd {0} tillhör inte arbetsordern {1},
Print UOM after Quantity,Skriv UOM efter kvantitet,
Set default {0} account for perpetual inventory for non stock items,Ange standardkonto för {0} för bestående lager för icke-lagervaror,
-Loan Security {0} added multiple times,Lånesäkerhet {0} har lagts till flera gånger,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Lånepapper med olika belåningsgrad kan inte pantsättas mot ett lån,
-Qty or Amount is mandatory for loan security!,Antal eller belopp är obligatoriskt för lånesäkerhet!,
-Only submittted unpledge requests can be approved,Endast inlämnade begäranden om icke-pant kan godkännas,
-Interest Amount or Principal Amount is mandatory,Räntebelopp eller huvudbelopp är obligatoriskt,
-Disbursed Amount cannot be greater than {0},Utbetalt belopp får inte vara större än {0},
-Row {0}: Loan Security {1} added multiple times,Rad {0}: Lånesäkerhet {1} har lagts till flera gånger,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Rad # {0}: Underordnad artikel ska inte vara ett produktpaket. Ta bort objekt {1} och spara,
Credit limit reached for customer {0},Kreditgränsen har uppnåtts för kunden {0},
Could not auto create Customer due to the following missing mandatory field(s):,Kunde inte automatiskt skapa kund på grund av följande obligatoriska fält saknas:,
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index 989f8b0..d53492f 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Inatumika ikiwa kampuni ni SpA, SApA au SRL",
Applicable if the company is a limited liability company,Inatumika ikiwa kampuni ni kampuni ya dhima ndogo,
Applicable if the company is an Individual or a Proprietorship,Inatumika ikiwa kampuni ni ya Mtu binafsi au Proprietorship,
-Applicant,Mwombaji,
-Applicant Type,Aina ya Msaidizi,
Application of Funds (Assets),Matumizi ya Fedha (Mali),
Application period cannot be across two allocation records,Kipindi cha maombi haiwezi kuwa rekodi mbili za ugawaji,
Application period cannot be outside leave allocation period,Kipindi cha maombi hawezi kuwa nje ya kipindi cha ugawaji wa kuondoka,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Orodha ya Washiriki waliopatikana na namba za folio,
Loading Payment System,Inapakia Mfumo wa Malipo,
Loan,Mikopo,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Kiasi cha Mkopo hawezi kuzidi Kiwango cha Mikopo ya Upeo wa {0},
-Loan Application,Maombi ya Mikopo,
-Loan Management,Usimamizi wa Mikopo,
-Loan Repayment,Malipo ya kulipia,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Tarehe ya Kuanza mkopo na Kipindi cha Mkopo ni lazima ili kuokoa Upunguzaji wa ankara,
Loans (Liabilities),Mikopo (Madeni),
Loans and Advances (Assets),Mikopo na Maendeleo (Mali),
@@ -1611,7 +1605,6 @@
Monday,Jumatatu,
Monthly,Kila mwezi,
Monthly Distribution,Usambazaji wa kila mwezi,
-Monthly Repayment Amount cannot be greater than Loan Amount,Kiwango cha Ushuru wa kila mwezi hawezi kuwa kubwa kuliko Kiwango cha Mikopo,
More,Zaidi,
More Information,Taarifa zaidi,
More than one selection for {0} not allowed,Zaidi ya chaguo moja kwa {0} hairuhusiwi,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Kulipa {0} {1},
Payable,Inalipwa,
Payable Account,Akaunti ya kulipa,
-Payable Amount,Kiasi kinacholipwa,
Payment,Malipo,
Payment Cancelled. Please check your GoCardless Account for more details,Malipo Imepigwa. Tafadhali angalia Akaunti yako ya GoCardless kwa maelezo zaidi,
Payment Confirmation,Uthibitishaji wa Malipo,
-Payment Date,Tarehe ya Malipo,
Payment Days,Siku za Malipo,
Payment Document,Hati ya Malipo,
Payment Due Date,Tarehe ya Kutayarisha Malipo,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Tafadhali ingiza Receipt ya Ununuzi kwanza,
Please enter Receipt Document,Tafadhali ingiza Hati ya Receipt,
Please enter Reference date,Tafadhali ingiza tarehe ya Marejeo,
-Please enter Repayment Periods,Tafadhali ingiza Kipindi cha Malipo,
Please enter Reqd by Date,Tafadhali ingiza Reqd kwa Tarehe,
Please enter Woocommerce Server URL,Tafadhali ingiza URL ya Woocommerce Server,
Please enter Write Off Account,Tafadhali ingiza Akaunti ya Kuandika Akaunti,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Tafadhali ingiza kituo cha gharama ya wazazi,
Please enter quantity for Item {0},Tafadhali ingiza kiasi cha Bidhaa {0},
Please enter relieving date.,Tafadhali ingiza tarehe ya kufuta.,
-Please enter repayment Amount,Tafadhali ingiza Kiwango cha kulipa,
Please enter valid Financial Year Start and End Dates,Tafadhali ingiza Msaada wa Mwaka wa Fedha na Mwisho wa Tarehe,
Please enter valid email address,Tafadhali ingiza anwani ya barua pepe halali,
Please enter {0} first,Tafadhali ingiza {0} kwanza,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Kanuni za bei ni zilizochujwa zaidi kulingana na wingi.,
Primary Address Details,Maelezo ya Anwani ya Msingi,
Primary Contact Details,Maelezo ya Mawasiliano ya Msingi,
-Principal Amount,Kiasi kikubwa,
Print Format,Fomu ya Kuchapa,
Print IRS 1099 Forms,Chapisha Fomu za IRS 1099,
Print Report Card,Kadi ya Ripoti ya Kuchapa,
@@ -2550,7 +2538,6 @@
Sample Collection,Mkusanyiko wa Mfano,
Sample quantity {0} cannot be more than received quantity {1},Mfano wa wingi {0} hauwezi kuwa zaidi ya kupokea kiasi {1},
Sanctioned,Imeteuliwa,
-Sanctioned Amount,Kizuizi,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kizuizi cha Hesabu haiwezi kuwa kikubwa kuliko Kiasi cha Madai katika Row {0}.,
Sand,Mchanga,
Saturday,Jumamosi,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} tayari ina Utaratibu wa Mzazi {1}.,
API,API,
Annual,Kila mwaka,
-Approved,Imekubaliwa,
Change,Badilisha,
Contact Email,Mawasiliano ya barua pepe,
Export Type,Aina ya Nje,
@@ -3571,7 +3557,6 @@
Account Value,Thamani ya Akaunti,
Account is mandatory to get payment entries,Akaunti ni ya lazima kupata barua za malipo,
Account is not set for the dashboard chart {0},Akaunti haijawekwa kwa chati ya dashibodi {0},
-Account {0} does not belong to company {1},Akaunti {0} sio ya kampuni {1},
Account {0} does not exists in the dashboard chart {1},Akaunti {0} haipo kwenye chati ya dashibodi {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Akaunti: <b>{0}</b> ni mtaji wa Kazi unaendelea na hauwezi kusasishwa na Ingizo la Jarida,
Account: {0} is not permitted under Payment Entry,Akaunti: {0} hairuhusiwi chini ya malipo ya Malipo,
@@ -3582,7 +3567,6 @@
Activity,Shughuli,
Add / Manage Email Accounts.,Ongeza / Dhibiti Akaunti za Barua pepe.,
Add Child,Ongeza Mtoto,
-Add Loan Security,Ongeza Usalama wa Mkopo,
Add Multiple,Ongeza Multiple,
Add Participants,Ongeza Washiriki,
Add to Featured Item,Ongeza kwa Bidhaa Iliyoangaziwa,
@@ -3593,15 +3577,12 @@
Address Line 1,Anwani ya Anwani 1,
Addresses,Anwani,
Admission End Date should be greater than Admission Start Date.,Tarehe ya Mwisho ya Kuandikishwa inapaswa kuwa kubwa kuliko Tarehe ya Kuanza kuandikishwa.,
-Against Loan,Dhidi ya Mkopo,
-Against Loan:,Dhidi ya Mkopo:,
All,ZOTE,
All bank transactions have been created,Uuzaji wote wa benki umeundwa,
All the depreciations has been booked,Uchakavu wote umehifadhiwa,
Allocation Expired!,Ugawaji Umemalizika!,
Allow Resetting Service Level Agreement from Support Settings.,Ruhusu Kurudisha Mkataba wa Kiwango cha Huduma kutoka kwa Mipangilio ya Msaada.,
Amount of {0} is required for Loan closure,Kiasi cha {0} inahitajika kwa kufungwa kwa Mkopo,
-Amount paid cannot be zero,Kiasi kinacholipwa hakiwezi kuwa sifuri,
Applied Coupon Code,Nambari ya Coupon iliyotumiwa,
Apply Coupon Code,Tuma Nambari ya Coupon,
Appointment Booking,Uteuzi wa Uteuzi,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Huwezi kuhesabu Wakati wa Kufika kwani Anwani ya Dereva inakosekana.,
Cannot Optimize Route as Driver Address is Missing.,Haiwezi Kuboresha Njia kama Anwani ya Dereva inakosekana.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Haiwezi kukamilisha kazi {0} kama kazi yake tegemezi {1} haijakamilishwa / imefutwa.,
-Cannot create loan until application is approved,Haiwezi kuunda mkopo hadi programu itakapokubaliwa,
Cannot find a matching Item. Please select some other value for {0}.,Haiwezi kupata kitu kinachofanana. Tafadhali chagua thamani nyingine ya {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Haiwezi kulipiza zaidi ya Bidhaa {0} katika safu {1} zaidi ya {2}. Kuruhusu malipo ya juu, tafadhali weka posho katika Mipangilio ya Akaunti",
"Capacity Planning Error, planned start time can not be same as end time","Kosa la kupanga uwezo, wakati wa kuanza uliopangwa hauwezi kuwa sawa na wakati wa mwisho",
@@ -3812,20 +3792,9 @@
Less Than Amount,Chini ya Kiasi,
Liabilities,Madeni,
Loading...,Inapakia ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Kiasi cha mkopo kinazidi kiwango cha juu cha mkopo cha {0} kulingana na dhamana iliyopendekezwa,
Loan Applications from customers and employees.,Maombi ya mkopo kutoka kwa wateja na wafanyikazi.,
-Loan Disbursement,Utoaji wa mkopo,
Loan Processes,Michakato ya mkopo,
-Loan Security,Usalama wa Mkopo,
-Loan Security Pledge,Ahadi ya Usalama wa Mkopo,
-Loan Security Pledge Created : {0},Ahadi ya Usalama wa Mkopo Imeundwa: {0},
-Loan Security Price,Bei ya Usalama wa Mkopo,
-Loan Security Price overlapping with {0},Bei ya Mikopo ya Usalama inayoingiliana na {0},
-Loan Security Unpledge,Mkopo Usalama Ahadi,
-Loan Security Value,Thamani ya Usalama ya Mkopo,
Loan Type for interest and penalty rates,Aina ya mkopo kwa viwango vya riba na adhabu,
-Loan amount cannot be greater than {0},Kiasi cha mkopo hakiwezi kuwa kubwa kuliko {0},
-Loan is mandatory,Mkopo ni wa lazima,
Loans,Mikopo,
Loans provided to customers and employees.,Mikopo iliyopewa wateja na wafanyikazi.,
Location,Eneo,
@@ -3894,7 +3863,6 @@
Pay,Kulipa,
Payment Document Type,Aina ya Hati ya malipo,
Payment Name,Jina la malipo,
-Penalty Amount,Kiasi cha Adhabu,
Pending,Inasubiri,
Performance,Utendaji,
Period based On,Kipindi kinachozingatia,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Tafadhali ingia kama Mtumiaji wa Soko ili kuhariri kipengee hiki.,
Please login as a Marketplace User to report this item.,Tafadhali ingia kama Mtumiaji wa Soko ili kuripoti bidhaa hii.,
Please select <b>Template Type</b> to download template,Tafadhali chagua <b>Aina</b> ya Kiolezo kupakua templeti,
-Please select Applicant Type first,Tafadhali chagua aina ya Mwombaji kwanza,
Please select Customer first,Tafadhali chagua Mteja kwanza,
Please select Item Code first,Tafadhali chagua Nambari ya Bidhaa kwanza,
-Please select Loan Type for company {0},Tafadhali chagua Aina ya Mkopo kwa kampuni {0},
Please select a Delivery Note,Tafadhali chagua Ujumbe wa Uwasilishaji,
Please select a Sales Person for item: {0},Tafadhali chagua Mtu wa Uuzaji kwa bidhaa: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Tafadhali chagua njia nyingine ya malipo. Stripe haiunga mkono shughuli za fedha '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Tafadhali sasisha akaunti ya benki ya msingi ya kampuni {0},
Please specify,Tafadhali fafanua,
Please specify a {0},Tafadhali taja {0},lead
-Pledge Status,Hali ya Ahadi,
-Pledge Time,Wakati wa Ahadi,
Printing,Uchapishaji,
Priority,Kipaumbele,
Priority has been changed to {0}.,Kipaumbele kimebadilishwa kuwa {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Inasindika faili za XML,
Profitability,Faida,
Project,Mradi,
-Proposed Pledges are mandatory for secured Loans,Ahadi zilizopendekezwa ni za lazima kwa Mikopo iliyohifadhiwa,
Provide the academic year and set the starting and ending date.,Toa mwaka wa masomo na weka tarehe ya kuanza na kumalizia.,
Public token is missing for this bank,Baina ya umma haipo kwenye benki hii,
Publish,Kuchapisha,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Risiti ya Ununuzi haina Bidhaa yoyote ambayo Sampuli ya Uwezeshaji imewashwa.,
Purchase Return,Ununuzi wa Kurudisha,
Qty of Finished Goods Item,Qty ya Bidhaa iliyokamilishwa Bidhaa,
-Qty or Amount is mandatroy for loan security,Qty au Kiasi ni jukumu la usalama wa mkopo,
Quality Inspection required for Item {0} to submit,Ukaguzi wa Ubora unahitajika kwa Bidhaa {0} kuwasilisha,
Quantity to Manufacture,Kiasi cha kutengeneza,
Quantity to Manufacture can not be zero for the operation {0},Wingi wa utengenezaji hauwezi kuwa sifuri kwa operesheni {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Tarehe ya Kuachana lazima iwe kubwa kuliko au sawa na Tarehe ya Kujiunga,
Rename,Badilisha tena,
Rename Not Allowed,Badili jina Hairuhusiwi,
-Repayment Method is mandatory for term loans,Njia ya Kurudisha ni lazima kwa mikopo ya muda mrefu,
-Repayment Start Date is mandatory for term loans,Tarehe ya kuanza Kulipa ni lazima kwa mkopo wa muda mrefu,
Report Item,Ripoti Jambo,
Report this Item,Ripoti kipengee hiki,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty iliyohifadhiwa kwa Subcontract: Wingi wa vifaa vya malighafi kutengeneza vitu vilivyodhibitiwa.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Njia ({0}): {1} tayari imepunguzwa katika {2},
Rows Added in {0},Mizizi Zimeongezwa katika {0},
Rows Removed in {0},Safu zimeondolewa katika {0},
-Sanctioned Amount limit crossed for {0} {1},Kiwango cha Kuidhinishwa kimevuka kwa {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Kiwango cha Mkopo kilichoidhinishwa tayari kinapatikana kwa {0} dhidi ya kampuni {1},
Save,Hifadhi,
Save Item,Hifadhi kipengee,
Saved Items,Vitu vilivyohifadhiwa,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Mtumiaji {0} amezimwa,
Users and Permissions,Watumiaji na Ruhusa,
Vacancies cannot be lower than the current openings,Nafasi haziwezi kuwa chini kuliko fursa za sasa,
-Valid From Time must be lesser than Valid Upto Time.,Inayotumika Kutoka kwa wakati lazima iwe chini ya Wakati Unaofaa wa Upto.,
Valuation Rate required for Item {0} at row {1},Kiwango cha hesabu inahitajika kwa Bidhaa {0} katika safu {1},
Values Out Of Sync,Thamani Kati ya Usawazishaji,
Vehicle Type is required if Mode of Transport is Road,Aina ya Gari inahitajika ikiwa Njia ya Usafiri ni Barabara,
@@ -4211,7 +4168,6 @@
Add to Cart,Ongeza kwenye Cart,
Days Since Last Order,Siku Tangu Agizo la Mwisho,
In Stock,Katika Stock,
-Loan Amount is mandatory,Kiasi cha mkopo ni lazima,
Mode Of Payment,Mfumo wa Malipo,
No students Found,Hakuna wanafunzi aliyepatikana,
Not in Stock,Sio katika Hifadhi,
@@ -4240,7 +4196,6 @@
Group by,Kikundi Kwa,
In stock,Katika hisa,
Item name,Jina la Kipengee,
-Loan amount is mandatory,Kiasi cha mkopo ni lazima,
Minimum Qty,Uchina cha Chini,
More details,Maelezo zaidi,
Nature of Supplies,Hali ya Ugavi,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Jumla ya Qty iliyokamilishwa,
Qty to Manufacture,Uchina Ili Kufanya,
Repay From Salary can be selected only for term loans,Kulipa Kutoka kwa Mshahara kunaweza kuchaguliwa tu kwa mkopo wa muda,
-No valid Loan Security Price found for {0},Hakuna Bei halali ya Usalama ya Mkopo iliyopatikana kwa {0},
-Loan Account and Payment Account cannot be same,Akaunti ya Mkopo na Akaunti ya Malipo haziwezi kuwa sawa,
-Loan Security Pledge can only be created for secured loans,Ahadi ya Usalama wa Mkopo inaweza tu kuundwa kwa mikopo iliyopatikana,
Social Media Campaigns,Kampeni za Media Jamii,
From Date can not be greater than To Date,Kuanzia Tarehe haiwezi kuwa kubwa kuliko Kufikia Tarehe,
Please set a Customer linked to the Patient,Tafadhali weka Mteja aliyeunganishwa na Mgonjwa,
@@ -6437,7 +6389,6 @@
HR User,Mtumiaji wa HR,
Appointment Letter,Barua ya Uteuzi,
Job Applicant,Mwombaji wa Ayubu,
-Applicant Name,Jina la Msaidizi,
Appointment Date,Tarehe ya kuteuliwa,
Appointment Letter Template,Uteuzi wa Barua ya Kiolezo,
Body,Mwili,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sawazisha katika Maendeleo,
Hub Seller Name,Jina la Muuzaji wa Hub,
Custom Data,Takwimu za Desturi,
-Member,Mwanachama,
-Partially Disbursed,Kutengwa kwa sehemu,
-Loan Closure Requested,Kufungwa kwa Mkopo Kuhitajika,
Repay From Salary,Malipo kutoka kwa Mshahara,
-Loan Details,Maelezo ya Mikopo,
-Loan Type,Aina ya Mikopo,
-Loan Amount,Kiasi cha Mikopo,
-Is Secured Loan,Imehifadhiwa Mkopo,
-Rate of Interest (%) / Year,Kiwango cha Maslahi (%) / Mwaka,
-Disbursement Date,Tarehe ya Malipo,
-Disbursed Amount,Kiasi cha kutengwa,
-Is Term Loan,Mkopo wa Muda,
-Repayment Method,Njia ya kulipa,
-Repay Fixed Amount per Period,Rejesha Kiasi kilichopangwa kwa Kipindi,
-Repay Over Number of Periods,Rejesha Zaidi ya Kipindi cha Kipindi,
-Repayment Period in Months,Kipindi cha ulipaji kwa Miezi,
-Monthly Repayment Amount,Kiasi cha kulipa kila mwezi,
-Repayment Start Date,Tarehe ya Kuanza Kulipa,
-Loan Security Details,Maelezo ya Usalama wa Mkopo,
-Maximum Loan Value,Thamani ya Mkopo wa kiwango cha juu,
-Account Info,Maelezo ya Akaunti,
-Loan Account,Akaunti ya Mkopo,
-Interest Income Account,Akaunti ya Mapato ya riba,
-Penalty Income Account,Akaunti ya Mapato ya Adhabu,
-Repayment Schedule,Ratiba ya Ulipaji,
-Total Payable Amount,Kiasi Kilivyoteuliwa,
-Total Principal Paid,Jumla ya Jumla Imelipwa,
-Total Interest Payable,Jumla ya Maslahi ya Kulipa,
-Total Amount Paid,Jumla ya Malipo,
-Loan Manager,Meneja wa mkopo,
-Loan Info,Info Loan,
-Rate of Interest,Kiwango cha Maslahi,
-Proposed Pledges,Ahadi zilizopendekezwa,
-Maximum Loan Amount,Kiwango cha Mikopo Kikubwa,
-Repayment Info,Maelezo ya kulipa,
-Total Payable Interest,Jumla ya Maslahi ya kulipa,
-Against Loan ,Dhidi ya Mkopo,
-Loan Interest Accrual,Mkopo wa Riba ya Mkopo,
-Amounts,Viwango,
-Pending Principal Amount,Kiwango cha Kuu kinachosubiri,
-Payable Principal Amount,Kiwango cha kulipwa Kikuu,
-Paid Principal Amount,Kiasi Kikubwa cha Kulipwa,
-Paid Interest Amount,Kiasi cha Riba Inayolipwa,
-Process Loan Interest Accrual,Mchakato wa Kukopesha Riba ya Mkopo,
-Repayment Schedule Name,Jina la Ratiba ya Ulipaji,
Regular Payment,Malipo ya Mara kwa mara,
Loan Closure,Kufungwa kwa mkopo,
-Payment Details,Maelezo ya Malipo,
-Interest Payable,Riba Inalipwa,
-Amount Paid,Kiasi kilicholipwa,
-Principal Amount Paid,Kiasi kuu cha kulipwa,
-Repayment Details,Maelezo ya Malipo,
-Loan Repayment Detail,Maelezo ya Ulipaji wa Mkopo,
-Loan Security Name,Jina la Mkopo la Usalama,
-Unit Of Measure,Kitengo cha Upimaji,
-Loan Security Code,Nambari ya Usalama ya Mkopo,
-Loan Security Type,Aina ya Usalama wa Mkopo,
-Haircut %,Kukata nywele,
-Loan Details,Maelezo ya Mkopo,
-Unpledged,Iliyosahihishwa,
-Pledged,Iliyoahidiwa,
-Partially Pledged,Iliyoahidiwa kwa sehemu,
-Securities,Usalama,
-Total Security Value,Thamani ya Usalama Jumla,
-Loan Security Shortfall,Upungufu wa Usalama wa Mkopo,
-Loan ,Mikopo,
-Shortfall Time,Muda wa mapungufu,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Kiasi cha mapungufu,
-Security Value ,Thamani ya Usalama,
-Process Loan Security Shortfall,Mchakato wa Upungufu wa Usalama wa Mikopo,
-Loan To Value Ratio,Mkopo Ili Kuongeza Thamani,
-Unpledge Time,Kutahidi Wakati,
-Loan Name,Jina la Mikopo,
Rate of Interest (%) Yearly,Kiwango cha Maslahi (%) Kila mwaka,
-Penalty Interest Rate (%) Per Day,Kiwango cha Riba ya Adhabu (%) Kwa Siku,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Kiwango cha Riba ya Adhabu hutozwa kwa kiwango cha riba kinachosubiri kila siku ili malipo yachelewe,
-Grace Period in Days,Kipindi cha Neema katika Siku,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Idadi ya siku kutoka tarehe ya mwisho hadi ni adhabu gani ambayo haitatozwa ikiwa utachelewesha ulipaji wa mkopo,
-Pledge,Ahadi,
-Post Haircut Amount,Kiasi cha Kukata nywele,
-Process Type,Aina ya Mchakato,
-Update Time,Sasisha Wakati,
-Proposed Pledge,Ahadi Iliyopendekezwa,
-Total Payment,Malipo ya Jumla,
-Balance Loan Amount,Kiwango cha Mikopo,
-Is Accrued,Imeshikwa,
Salary Slip Loan,Mikopo ya Slip ya Mshahara,
Loan Repayment Entry,Kuingia kwa Malipo ya Mkopo,
-Sanctioned Loan Amount,Kiwango cha Mkopo ulioidhinishwa,
-Sanctioned Amount Limit,Kikomo cha Kiwango kilichoidhinishwa,
-Unpledge,Haikubali,
-Haircut,Kukata nywele,
MAT-MSH-.YYYY.-,MAT-MSH -YYYY.-,
Generate Schedule,Tengeneza Ratiba,
Schedules,Mipango,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Mradi utapatikana kwenye tovuti kwa watumiaji hawa,
Copied From,Ilikosa Kutoka,
Start and End Dates,Anza na Mwisho Dates,
-Actual Time (in Hours),Saa Halisi (kwa masaa),
+Actual Time in Hours (via Timesheet),Saa Halisi (kwa masaa),
Costing and Billing,Gharama na Ulipaji,
-Total Costing Amount (via Timesheets),Kiwango cha jumla cha gharama (kupitia Timesheets),
-Total Expense Claim (via Expense Claims),Madai ya jumla ya gharama (kupitia madai ya gharama),
+Total Costing Amount (via Timesheet),Kiwango cha jumla cha gharama (kupitia Timesheets),
+Total Expense Claim (via Expense Claim),Madai ya jumla ya gharama (kupitia madai ya gharama),
Total Purchase Cost (via Purchase Invoice),Gharama ya Jumla ya Ununuzi (kupitia Invoice ya Ununuzi),
Total Sales Amount (via Sales Order),Jumla ya Mauzo Kiasi (kupitia Mauzo ya Mauzo),
-Total Billable Amount (via Timesheets),Kiwango cha Jumla cha Billable (kupitia Timesheets),
-Total Billed Amount (via Sales Invoices),Kiasi kilicholipwa (kwa njia ya Mauzo ya Mauzo),
-Total Consumed Material Cost (via Stock Entry),Jumla ya Gharama za Nyenzo Zilizotumiwa (kupitia Uingiaji wa hisa),
+Total Billable Amount (via Timesheet),Kiwango cha Jumla cha Billable (kupitia Timesheets),
+Total Billed Amount (via Sales Invoice),Kiasi kilicholipwa (kwa njia ya Mauzo ya Mauzo),
+Total Consumed Material Cost (via Stock Entry),Jumla ya Gharama za Nyenzo Zilizotumiwa (kupitia Uingiaji wa hisa),
Gross Margin,Margin ya Pato,
Gross Margin %,Margin ya Pato%,
Monitor Progress,Kufuatilia Maendeleo,
@@ -7521,12 +7385,10 @@
Dependencies,Kuzingatia,
Dependent Tasks,Kazi za wategemezi,
Depends on Tasks,Inategemea Kazi,
-Actual Start Date (via Time Sheet),Tarehe ya Kuanza Kuanza (kupitia Karatasi ya Muda),
-Actual Time (in hours),Muda halisi (katika Masaa),
-Actual End Date (via Time Sheet),Tarehe ya mwisho ya mwisho (kupitia Karatasi ya Muda),
-Total Costing Amount (via Time Sheet),Kiwango cha jumla cha gharama (kupitia Karatasi ya Muda),
+Actual Start Date (via Timesheet),Tarehe ya Kuanza Kuanza (kupitia Karatasi ya Muda),
+Actual Time in Hours (via Timesheet),Muda halisi (katika Masaa),
+Actual End Date (via Timesheet),Tarehe ya mwisho ya mwisho (kupitia Karatasi ya Muda),
Total Expense Claim (via Expense Claim),Madai ya jumla ya gharama (kupitia madai ya gharama),
-Total Billing Amount (via Time Sheet),Kiasi cha kulipa jumla (kupitia Karatasi ya Muda),
Review Date,Tarehe ya Marekebisho,
Closing Date,Tarehe ya kufunga,
Task Depends On,Kazi inategemea,
@@ -7887,7 +7749,6 @@
Update Series,Sasisha Mfululizo,
Change the starting / current sequence number of an existing series.,Badilisha idadi ya mwanzo / ya sasa ya mlolongo wa mfululizo uliopo.,
Prefix,Kiambatisho,
-Current Value,Thamani ya sasa,
This is the number of the last created transaction with this prefix,Huu ndio idadi ya shughuli za mwisho zilizoundwa na kiambishi hiki,
Update Series Number,Sasisha Nambari ya Mfululizo,
Quotation Lost Reason,Sababu iliyopoteza Nukuu,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Inemwise Inapendekezwa Mpangilio wa Mpangilio,
Lead Details,Maelezo ya Kiongozi,
Lead Owner Efficiency,Ufanisi wa Mmiliki wa Uongozi,
-Loan Repayment and Closure,Ulipaji wa mkopo na kufungwa,
-Loan Security Status,Hali ya Usalama wa Mkopo,
Lost Opportunity,Fursa Iliyopotea,
Maintenance Schedules,Mipango ya Matengenezo,
Material Requests for which Supplier Quotations are not created,Maombi ya nyenzo ambayo Nukuu za Wasambazaji haziumbwa,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Hesabu Zilizolengwa: {0},
Payment Account is mandatory,Akaunti ya Malipo ni lazima,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Ikikaguliwa, kiwango kamili kitatolewa kutoka kwa mapato yanayopaswa kulipiwa kabla ya kuhesabu ushuru wa mapato bila tamko lolote au uwasilishaji wa ushahidi.",
-Disbursement Details,Maelezo ya Utoaji,
Material Request Warehouse,Ombi la Ghala la Vifaa,
Select warehouse for material requests,Chagua ghala kwa maombi ya nyenzo,
Transfer Materials For Warehouse {0},Vifaa vya Kuhamisha kwa Ghala {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Lipa kiasi ambacho hakijadai kutoka kwa mshahara,
Deduction from salary,Utoaji kutoka kwa mshahara,
Expired Leaves,Majani yaliyomalizika,
-Reference No,Rejea Na,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Asilimia ya kukata nywele ni tofauti ya asilimia kati ya thamani ya soko la Usalama wa Mkopo na thamani iliyopewa Usalama wa Mkopo wakati unatumiwa kama dhamana ya mkopo huo.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Mkopo Kwa Thamani Uwiano unaonyesha uwiano wa kiasi cha mkopo na thamani ya usalama ulioahidiwa. Upungufu wa usalama wa mkopo utasababishwa ikiwa hii iko chini ya thamani maalum ya mkopo wowote,
If this is not checked the loan by default will be considered as a Demand Loan,Ikiwa hii haijakaguliwa mkopo kwa chaguo-msingi utazingatiwa kama Mkopo wa Mahitaji,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Akaunti hii inatumika kwa uhifadhi wa mikopo kutoka kwa akopaye na pia kutoa mikopo kwa akopaye,
This account is capital account which is used to allocate capital for loan disbursal account ,Akaunti hii ni akaunti kuu ambayo hutumiwa kutenga mtaji kwa akaunti ya utoaji wa mkopo,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Operesheni {0} sio ya agizo la kazi {1},
Print UOM after Quantity,Chapisha UOM baada ya Wingi,
Set default {0} account for perpetual inventory for non stock items,Weka akaunti chaguomsingi ya {0} ya hesabu ya kila siku ya vitu visivyo vya hisa,
-Loan Security {0} added multiple times,Usalama wa Mkopo {0} uliongezwa mara kadhaa,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Dhamana za Mkopo zilizo na uwiano tofauti wa LTV haziwezi kuahidiwa dhidi ya mkopo mmoja,
-Qty or Amount is mandatory for loan security!,Bei au Kiasi ni lazima kwa usalama wa mkopo!,
-Only submittted unpledge requests can be approved,Maombi ya kujitolea yaliyowasilishwa tu yanaweza kupitishwa,
-Interest Amount or Principal Amount is mandatory,Kiasi cha Riba au Kiasi Kikubwa ni lazima,
-Disbursed Amount cannot be greater than {0},Kiasi kilichotolewa hakiwezi kuwa kubwa kuliko {0},
-Row {0}: Loan Security {1} added multiple times,Safu mlalo {0}: Usalama wa Mkopo {1} umeongezwa mara kadhaa,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Mstari # {0}: Kipengee cha Mtoto hakipaswi kuwa Kifungu cha Bidhaa. Tafadhali ondoa Bidhaa {1} na Uhifadhi,
Credit limit reached for customer {0},Kikomo cha mkopo kimefikiwa kwa mteja {0},
Could not auto create Customer due to the following missing mandatory field(s):,Haikuweza kuunda Wateja kiotomatiki kwa sababu ya uwanja (s) zifuatazo zinazokosekana:,
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 7314d4b..aa883b4 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","நிறுவனம் ஸ்பா, சாபா அல்லது எஸ்ஆர்எல் என்றால் பொருந்தும்",
Applicable if the company is a limited liability company,நிறுவனம் ஒரு வரையறுக்கப்பட்ட பொறுப்பு நிறுவனமாக இருந்தால் பொருந்தும்,
Applicable if the company is an Individual or a Proprietorship,நிறுவனம் ஒரு தனிநபர் அல்லது உரிமையாளராக இருந்தால் பொருந்தும்,
-Applicant,விண்ணப்பதாரர்,
-Applicant Type,விண்ணப்பதாரர் வகை,
Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் ),
Application period cannot be across two allocation records,விண்ணப்ப காலம் இரண்டு ஒதுக்கீடு பதிவுகள் முழுவதும் இருக்க முடியாது,
Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ஃபோலியோ எண்களுடன் கிடைக்கும் பங்குதாரர்களின் பட்டியல்,
Loading Payment System,கட்டணம் செலுத்தும் அமைப்பு ஏற்றுகிறது,
Loan,கடன்,
-Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0},
-Loan Application,கடன் விண்ணப்பம்,
-Loan Management,கடன் மேலாண்மை,
-Loan Repayment,கடனை திறம்பசெலுத்து,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,விலைப்பட்டியல் தள்ளுபடியைச் சேமிக்க கடன் தொடக்க தேதி மற்றும் கடன் காலம் கட்டாயமாகும்,
Loans (Liabilities),கடன்கள் ( கடன்),
Loans and Advances (Assets),கடன்கள் ( சொத்துக்கள் ),
@@ -1611,7 +1605,6 @@
Monday,திங்கட்கிழமை,
Monthly,மாதாந்தர,
Monthly Distribution,மாதாந்திர விநியோகம்,
-Monthly Repayment Amount cannot be greater than Loan Amount,மாதாந்திர கட்டுந்தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது முடியும்,
More,அதிக,
More Information,மேலும் தகவல்,
More than one selection for {0} not allowed,{0} க்கான ஒன்றுக்கு மேற்பட்ட தேர்வு அனுமதிக்கப்படவில்லை,
@@ -1884,11 +1877,9 @@
Pay {0} {1},செலுத்து {0} {1},
Payable,செலுத்த வேண்டிய,
Payable Account,செலுத்த வேண்டிய கணக்கு,
-Payable Amount,செலுத்த வேண்டிய தொகை,
Payment,கொடுப்பனவு,
Payment Cancelled. Please check your GoCardless Account for more details,கட்டணம் ரத்து செய்யப்பட்டது. மேலும் விவரங்களுக்கு உங்கள் GoCardless கணக்கைச் சரிபார்க்கவும்,
Payment Confirmation,கட்டணம் உறுதிப்படுத்தல்,
-Payment Date,கட்டணம் தேதி,
Payment Days,கட்டணம் நாட்கள்,
Payment Document,கொடுப்பனவு ஆவண,
Payment Due Date,கொடுப்பனவு காரணமாக தேதி,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,முதல் கொள்முதல் ரசீது உள்ளிடவும்,
Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய,
Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்,
-Please enter Repayment Periods,தயவு செய்து திரும்பச் செலுத்துதல் பீரியட்ஸ் நுழைய,
Please enter Reqd by Date,தயவுசெய்து தேதியின்படி தேதி சேர்க்கவும்,
Please enter Woocommerce Server URL,Woocommerce Server URL ஐ உள்ளிடுக,
Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,பெற்றோர் செலவு சென்டர் உள்ளிடவும்,
Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0},
Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.,
-Please enter repayment Amount,தயவு செய்து கடனைத் திரும்பச் செலுத்தும் தொகை நுழைய,
Please enter valid Financial Year Start and End Dates,செல்லுபடியாகும் நிதி ஆண்டின் தொடக்க மற்றும் முடிவு தேதிகளை உள்ளிடவும்,
Please enter valid email address,சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்,
Please enter {0} first,முதல் {0} உள்ளிடவும்,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு.,
Primary Address Details,முதன்மை முகவரி விவரம்,
Primary Contact Details,முதன்மை தொடர்பு விவரங்கள்,
-Principal Amount,அசல் தொகை,
Print Format,வடிவமைப்பு அச்சிட,
Print IRS 1099 Forms,ஐஆர்எஸ் 1099 படிவங்களை அச்சிடுங்கள்,
Print Report Card,அறிக்கை அறிக்கை அட்டை,
@@ -2550,7 +2538,6 @@
Sample Collection,மாதிரி சேகரிப்பு,
Sample quantity {0} cannot be more than received quantity {1},மாதிரி அளவு {0} பெறப்பட்ட அளவைவிட அதிகமாக இருக்க முடியாது {1},
Sanctioned,ஒப்புதல்,
-Sanctioned Amount,ஒப்புதல் தொகை,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.,
Sand,மணல்,
Saturday,சனிக்கிழமை,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ஏற்கனவே பெற்றோர் நடைமுறை {1 has ஐக் கொண்டுள்ளது.,
API,ஏபிஐ,
Annual,வருடாந்திர,
-Approved,ஏற்பளிக்கப்பட்ட,
Change,மாற்றம்,
Contact Email,மின்னஞ்சல் தொடர்பு,
Export Type,ஏற்றுமதி வகை,
@@ -3571,7 +3557,6 @@
Account Value,கணக்கு மதிப்பு,
Account is mandatory to get payment entries,கட்டண உள்ளீடுகளைப் பெற கணக்கு கட்டாயமாகும்,
Account is not set for the dashboard chart {0},டாஷ்போர்டு விளக்கப்படத்திற்கு கணக்கு அமைக்கப்படவில்லை {0},
-Account {0} does not belong to company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1},
Account {0} does not exists in the dashboard chart {1},கணக்கு {0 the டாஷ்போர்டு விளக்கப்படத்தில் இல்லை {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,கணக்கு: <b>{0</b> capital என்பது மூலதன வேலை செயலில் உள்ளது மற்றும் ஜர்னல் என்ட்ரி மூலம் புதுப்பிக்க முடியாது,
Account: {0} is not permitted under Payment Entry,கணக்கு: நுழைவு நுழைவு கீழ் {0 அனுமதிக்கப்படவில்லை,
@@ -3582,7 +3567,6 @@
Activity,நடவடிக்கை,
Add / Manage Email Accounts.,மின்னஞ்சல் கணக்குகள் சேர் / நிர்வகி.,
Add Child,குழந்தை சேர்,
-Add Loan Security,கடன் பாதுகாப்பைச் சேர்க்கவும்,
Add Multiple,பல சேர்,
Add Participants,பங்கேற்பாளர்களைச் சேர்க்கவும்,
Add to Featured Item,சிறப்பு உருப்படிக்குச் சேர்க்கவும்,
@@ -3593,15 +3577,12 @@
Address Line 1,முகவரி வரி 1,
Addresses,முகவரிகள்,
Admission End Date should be greater than Admission Start Date.,சேர்க்கை முடிவு தேதி சேர்க்கை தொடக்க தேதியை விட அதிகமாக இருக்க வேண்டும்.,
-Against Loan,கடனுக்கு எதிராக,
-Against Loan:,கடனுக்கு எதிராக:,
All,எல்லாம்,
All bank transactions have been created,அனைத்து வங்கி பரிவர்த்தனைகளும் உருவாக்கப்பட்டுள்ளன,
All the depreciations has been booked,அனைத்து தேய்மானங்களும் பதிவு செய்யப்பட்டுள்ளன,
Allocation Expired!,ஒதுக்கீடு காலாவதியானது!,
Allow Resetting Service Level Agreement from Support Settings.,ஆதரவு அமைப்புகளிலிருந்து சேவை நிலை ஒப்பந்தத்தை மீட்டமைக்க அனுமதிக்கவும்.,
Amount of {0} is required for Loan closure,கடன் மூடுவதற்கு {0 of அளவு தேவை,
-Amount paid cannot be zero,செலுத்தப்பட்ட தொகை பூஜ்ஜியமாக இருக்க முடியாது,
Applied Coupon Code,அப்ளைடு கூப்பன் குறியீடு,
Apply Coupon Code,கூப்பன் குறியீட்டைப் பயன்படுத்துக,
Appointment Booking,நியமனம் முன்பதிவு,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,டிரைவர் முகவரி இல்லாததால் வருகை நேரத்தை கணக்கிட முடியாது.,
Cannot Optimize Route as Driver Address is Missing.,டிரைவர் முகவரி இல்லாததால் வழியை மேம்படுத்த முடியாது.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"{1 its பணியைச் சார்ந்து இருக்க முடியாது, ஏனெனில் அதன் சார்பு பணி {1 c பூர்த்தி செய்யப்படவில்லை / ரத்து செய்யப்படவில்லை.",
-Cannot create loan until application is approved,விண்ணப்பம் அங்கீகரிக்கப்படும் வரை கடனை உருவாக்க முடியாது,
Cannot find a matching Item. Please select some other value for {0}.,ஒரு பொருத்தமான பொருள் கண்டுபிடிக்க முடியவில்லை. ஐந்து {0} வேறு சில மதிப்பு தேர்ந்தெடுக்கவும்.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{1 row வரிசையில் {0} உருப்படிக்கு over 2 over ஐ விட அதிகமாக பில் செய்ய முடியாது. அதிக பில்லிங்கை அனுமதிக்க, கணக்கு அமைப்புகளில் கொடுப்பனவை அமைக்கவும்",
"Capacity Planning Error, planned start time can not be same as end time","திறன் திட்டமிடல் பிழை, திட்டமிட்ட தொடக்க நேரம் இறுதி நேரத்திற்கு சமமாக இருக்க முடியாது",
@@ -3812,20 +3792,9 @@
Less Than Amount,தொகையை விட குறைவு,
Liabilities,பொறுப்புகள்,
Loading...,ஏற்றுகிறது ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,முன்மொழியப்பட்ட பத்திரங்களின்படி கடன் தொகை அதிகபட்ச கடன் தொகையான {0 ஐ விட அதிகமாக உள்ளது,
Loan Applications from customers and employees.,வாடிக்கையாளர்கள் மற்றும் பணியாளர்களிடமிருந்து கடன் விண்ணப்பங்கள்.,
-Loan Disbursement,கடன் வழங்கல்,
Loan Processes,கடன் செயல்முறைகள்,
-Loan Security,கடன் பாதுகாப்பு,
-Loan Security Pledge,கடன் பாதுகாப்பு உறுதிமொழி,
-Loan Security Pledge Created : {0},கடன் பாதுகாப்பு உறுதிமொழி உருவாக்கப்பட்டது: {0},
-Loan Security Price,கடன் பாதுகாப்பு விலை,
-Loan Security Price overlapping with {0},பாதுகாப்பு பாதுகாப்பு விலை {0 with உடன் ஒன்றுடன் ஒன்று,
-Loan Security Unpledge,கடன் பாதுகாப்பு நீக்குதல்,
-Loan Security Value,கடன் பாதுகாப்பு மதிப்பு,
Loan Type for interest and penalty rates,வட்டி மற்றும் அபராத விகிதங்களுக்கான கடன் வகை,
-Loan amount cannot be greater than {0},கடன் தொகை {0 than ஐ விட அதிகமாக இருக்கக்கூடாது,
-Loan is mandatory,கடன் கட்டாயமாகும்,
Loans,கடன்கள்,
Loans provided to customers and employees.,வாடிக்கையாளர்கள் மற்றும் பணியாளர்களுக்கு வழங்கப்படும் கடன்கள்.,
Location,இடம்,
@@ -3894,7 +3863,6 @@
Pay,செலுத்த,
Payment Document Type,கட்டண ஆவண வகை,
Payment Name,கட்டண பெயர்,
-Penalty Amount,அபராதத் தொகை,
Pending,முடிவுபெறாத,
Performance,செயல்திறன்,
Period based On,காலம் அடிப்படையில்,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,இந்த உருப்படியைத் திருத்த சந்தை பயனராக உள்நுழைக.,
Please login as a Marketplace User to report this item.,இந்த உருப்படியைப் புகாரளிக்க சந்தை பயனராக உள்நுழைக.,
Please select <b>Template Type</b> to download template,<b>வார்ப்புருவைப்</b> பதிவிறக்க வார்ப்புரு வகையைத் தேர்ந்தெடுக்கவும்,
-Please select Applicant Type first,முதலில் விண்ணப்பதாரர் வகையைத் தேர்ந்தெடுக்கவும்,
Please select Customer first,முதலில் வாடிக்கையாளரைத் தேர்ந்தெடுக்கவும்,
Please select Item Code first,முதலில் உருப்படி குறியீட்டைத் தேர்ந்தெடுக்கவும்,
-Please select Loan Type for company {0},தயவுசெய்து company 0 company நிறுவனத்திற்கான கடன் வகையைத் தேர்ந்தெடுக்கவும்,
Please select a Delivery Note,டெலிவரி குறிப்பைத் தேர்ந்தெடுக்கவும்,
Please select a Sales Person for item: {0},உருப்படிக்கு விற்பனையாளரைத் தேர்ந்தெடுக்கவும்: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',மற்றொரு கட்டண முறையை தேர்ந்தெடுக்கவும். கோடுகள் நாணய பரிவர்த்தனைகள் ஆதரிக்கவில்லை '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Company 0 company நிறுவனத்திற்கான இயல்புநிலை வங்கி கணக்கை அமைக்கவும்,
Please specify,குறிப்பிடவும்,
Please specify a {0},{0 if ஐ குறிப்பிடவும்,lead
-Pledge Status,உறுதிமொழி நிலை,
-Pledge Time,உறுதிமொழி நேரம்,
Printing,அச்சிடுதல்,
Priority,முதன்மை,
Priority has been changed to {0}.,முன்னுரிமை {0 to ஆக மாற்றப்பட்டுள்ளது.,
@@ -3944,7 +3908,6 @@
Processing XML Files,எக்ஸ்எம்எல் கோப்புகளை செயலாக்குகிறது,
Profitability,இலாபம்,
Project,திட்டம்,
-Proposed Pledges are mandatory for secured Loans,பாதுகாக்கப்பட்ட கடன்களுக்கு முன்மொழியப்பட்ட உறுதிமொழிகள் கட்டாயமாகும்,
Provide the academic year and set the starting and ending date.,கல்வி ஆண்டை வழங்கி தொடக்க மற்றும் இறுதி தேதியை அமைக்கவும்.,
Public token is missing for this bank,இந்த வங்கிக்கு பொது டோக்கன் இல்லை,
Publish,வெளியிடு,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,கொள்முதல் ரசீதில் தக்கவைப்பு மாதிரி இயக்கப்பட்ட எந்த உருப்படியும் இல்லை.,
Purchase Return,திரும்ப வாங்க,
Qty of Finished Goods Item,முடிக்கப்பட்ட பொருட்களின் அளவு,
-Qty or Amount is mandatroy for loan security,கடன் பாதுகாப்புக்கான அளவு அல்லது தொகை மாண்டட்ராய் ஆகும்,
Quality Inspection required for Item {0} to submit,சமர்ப்பிக்க பொருள் {0 for க்கு தர ஆய்வு தேவை,
Quantity to Manufacture,உற்பத்திக்கான அளவு,
Quantity to Manufacture can not be zero for the operation {0},To 0 the செயல்பாட்டிற்கான உற்பத்தி அளவு பூஜ்ஜியமாக இருக்க முடியாது,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,நிவாரண தேதி சேரும் தேதியை விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்,
Rename,மறுபெயரிடு,
Rename Not Allowed,மறுபெயரிட அனுமதிக்கப்படவில்லை,
-Repayment Method is mandatory for term loans,கால கடன்களுக்கு திருப்பிச் செலுத்தும் முறை கட்டாயமாகும்,
-Repayment Start Date is mandatory for term loans,கால கடன்களுக்கு திருப்பிச் செலுத்தும் தொடக்க தேதி கட்டாயமாகும்,
Report Item,உருப்படியைப் புகாரளி,
Report this Item,இந்த உருப்படியைப் புகாரளி,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,துணை ஒப்பந்தத்திற்கான ஒதுக்கப்பட்ட Qty: துணை ஒப்பந்த உருப்படிகளை உருவாக்க மூலப்பொருட்களின் அளவு.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},வரிசை ({0}): {1 already ஏற்கனவே {2 in இல் தள்ளுபடி செய்யப்பட்டுள்ளது,
Rows Added in {0},{0 in இல் சேர்க்கப்பட்ட வரிசைகள்,
Rows Removed in {0},{0 in இல் அகற்றப்பட்ட வரிசைகள்,
-Sanctioned Amount limit crossed for {0} {1},அனுமதிக்கப்பட்ட தொகை வரம்பு {0} {1 for க்கு தாண்டியது,
-Sanctioned Loan Amount already exists for {0} against company {1},அனுமதிக்கப்பட்ட கடன் தொகை ஏற்கனவே company 0 company நிறுவனத்திற்கு எதிராக {0 for க்கு உள்ளது,
Save,சேமிக்கவும்,
Save Item,பொருளைச் சேமிக்கவும்,
Saved Items,சேமித்த உருப்படிகள்,
@@ -4135,7 +4093,6 @@
User {0} is disabled,பயனர் {0} முடக்கப்பட்டுள்ளது,
Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள்,
Vacancies cannot be lower than the current openings,தற்போதைய திறப்புகளை விட காலியிடங்கள் குறைவாக இருக்க முடியாது,
-Valid From Time must be lesser than Valid Upto Time.,செல்லுபடியாகும் நேரம் செல்லுபடியாகும் நேரத்தை விட குறைவாக இருக்க வேண்டும்.,
Valuation Rate required for Item {0} at row {1},வரிசை {1 வரிசையில் உருப்படி {0 for க்கு மதிப்பீட்டு வீதம் தேவை,
Values Out Of Sync,ஒத்திசைவுக்கு வெளியே மதிப்புகள்,
Vehicle Type is required if Mode of Transport is Road,போக்குவரத்து முறை சாலை என்றால் வாகன வகை தேவை,
@@ -4211,7 +4168,6 @@
Add to Cart,வணிக வண்டியில் சேர்,
Days Since Last Order,கடைசி வரிசையில் இருந்து நாட்கள்,
In Stock,பங்கு,
-Loan Amount is mandatory,கடன் தொகை கட்டாயமாகும்,
Mode Of Payment,கட்டணம் செலுத்தும் முறை,
No students Found,மாணவர்கள் இல்லை,
Not in Stock,பங்கு இல்லை,
@@ -4240,7 +4196,6 @@
Group by,குழு மூலம்,
In stock,கையிருப்பில்,
Item name,பொருள் பெயர்,
-Loan amount is mandatory,கடன் தொகை கட்டாயமாகும்,
Minimum Qty,குறைந்தபட்ச மதிப்பு,
More details,மேலும் விபரங்கள்,
Nature of Supplies,இயற்கை வளங்கள்,
@@ -4409,9 +4364,6 @@
Total Completed Qty,மொத்தம் முடிக்கப்பட்டது,
Qty to Manufacture,உற்பத்தி அளவு,
Repay From Salary can be selected only for term loans,சம்பளத்திலிருந்து திருப்பிச் செலுத்துதல் கால கடன்களுக்கு மட்டுமே தேர்ந்தெடுக்க முடியும்,
-No valid Loan Security Price found for {0},Loan 0 for க்கு செல்லுபடியாகும் கடன் பாதுகாப்பு விலை எதுவும் கிடைக்கவில்லை,
-Loan Account and Payment Account cannot be same,கடன் கணக்கு மற்றும் கொடுப்பனவு கணக்கு ஒரே மாதிரியாக இருக்க முடியாது,
-Loan Security Pledge can only be created for secured loans,பாதுகாப்பான கடன்களுக்காக மட்டுமே கடன் பாதுகாப்பு உறுதிமொழியை உருவாக்க முடியும்,
Social Media Campaigns,சமூக ஊடக பிரச்சாரங்கள்,
From Date can not be greater than To Date,தேதி முதல் தேதி வரை அதிகமாக இருக்க முடியாது,
Please set a Customer linked to the Patient,நோயாளியுடன் இணைக்கப்பட்ட வாடிக்கையாளரை அமைக்கவும்,
@@ -6437,7 +6389,6 @@
HR User,அலுவலக பயனர்,
Appointment Letter,நியமனக் கடிதம்,
Job Applicant,வேலை விண்ணப்பதாரர்,
-Applicant Name,விண்ணப்பதாரர் பெயர்,
Appointment Date,நியமனம் தேதி,
Appointment Letter Template,நியமனம் கடிதம் வார்ப்புரு,
Body,உடல்,
@@ -7059,99 +7010,12 @@
Sync in Progress,ஒத்திசைவில் முன்னேற்றம்,
Hub Seller Name,ஹப்பி விற்பனையாளர் பெயர்,
Custom Data,தனிப்பயன் தரவு,
-Member,உறுப்பினர்,
-Partially Disbursed,பகுதியளவு செலவிட்டு,
-Loan Closure Requested,கடன் மூடல் கோரப்பட்டது,
Repay From Salary,சம்பளம் இருந்து திருப்பி,
-Loan Details,கடன் விவரங்கள்,
-Loan Type,கடன் வகை,
-Loan Amount,கடன்தொகை,
-Is Secured Loan,பாதுகாப்பான கடன்,
-Rate of Interest (%) / Year,வட்டி (%) / ஆண்டின் விகிதம்,
-Disbursement Date,இரு வாரங்கள் முடிவதற்குள் தேதி,
-Disbursed Amount,வழங்கப்பட்ட தொகை,
-Is Term Loan,கால கடன்,
-Repayment Method,திரும்பச் செலுத்துதல் முறை,
-Repay Fixed Amount per Period,காலம் ஒன்றுக்கு நிலையான தொகை திருப்பி,
-Repay Over Number of Periods,திருப்பி பாடவேளைகள் ஓவர் எண்,
-Repayment Period in Months,மாதங்களில் கடனை திருப்பி செலுத்தும் காலம்,
-Monthly Repayment Amount,மாதாந்திர கட்டுந்தொகை,
-Repayment Start Date,திரும்பத் திரும்பத் திரும்ப தேதி,
-Loan Security Details,கடன் பாதுகாப்பு விவரங்கள்,
-Maximum Loan Value,அதிகபட்ச கடன் மதிப்பு,
-Account Info,கணக்கு தகவல்,
-Loan Account,கடன் கணக்கு,
-Interest Income Account,வட்டி வருமான கணக்கு,
-Penalty Income Account,அபராதம் வருமான கணக்கு,
-Repayment Schedule,திரும்பச் செலுத்துதல் அட்டவணை,
-Total Payable Amount,மொத்த செலுத்த வேண்டிய தொகை,
-Total Principal Paid,மொத்த முதன்மை கட்டணம்,
-Total Interest Payable,மொத்த வட்டி செலுத்த வேண்டிய,
-Total Amount Paid,மொத்த தொகை பணம்,
-Loan Manager,கடன் மேலாளர்,
-Loan Info,கடன் தகவல்,
-Rate of Interest,வட்டி விகிதம்,
-Proposed Pledges,முன்மொழியப்பட்ட உறுதிமொழிகள்,
-Maximum Loan Amount,அதிகபட்ச கடன் தொகை,
-Repayment Info,திரும்பச் செலுத்துதல் தகவல்,
-Total Payable Interest,மொத்த செலுத்த வேண்டிய வட்டி,
-Against Loan ,கடனுக்கு எதிராக,
-Loan Interest Accrual,கடன் வட்டி திரட்டல்,
-Amounts,தொகைகளைக்,
-Pending Principal Amount,முதன்மை தொகை நிலுவையில் உள்ளது,
-Payable Principal Amount,செலுத்த வேண்டிய முதன்மை தொகை,
-Paid Principal Amount,கட்டண முதன்மை தொகை,
-Paid Interest Amount,கட்டண வட்டி தொகை,
-Process Loan Interest Accrual,செயல்முறை கடன் வட்டி திரட்டல்,
-Repayment Schedule Name,திருப்பிச் செலுத்தும் அட்டவணை பெயர்,
Regular Payment,வழக்கமான கட்டணம்,
Loan Closure,கடன் மூடல்,
-Payment Details,கட்டணம் விவரங்கள்,
-Interest Payable,செலுத்த வேண்டிய வட்டி,
-Amount Paid,கட்டண தொகை,
-Principal Amount Paid,செலுத்தப்பட்ட முதன்மை தொகை,
-Repayment Details,திருப்பிச் செலுத்தும் விவரங்கள்,
-Loan Repayment Detail,கடன் திருப்பிச் செலுத்தும் விவரம்,
-Loan Security Name,கடன் பாதுகாப்பு பெயர்,
-Unit Of Measure,அளவீட்டு அலகு,
-Loan Security Code,கடன் பாதுகாப்பு குறியீடு,
-Loan Security Type,கடன் பாதுகாப்பு வகை,
-Haircut %,ஹேர்கட்%,
-Loan Details,கடன் விவரங்கள்,
-Unpledged,Unpledged,
-Pledged,உறுதி,
-Partially Pledged,ஓரளவு உறுதிமொழி,
-Securities,பத்திரங்கள்,
-Total Security Value,மொத்த பாதுகாப்பு மதிப்பு,
-Loan Security Shortfall,கடன் பாதுகாப்பு பற்றாக்குறை,
-Loan ,கடன்,
-Shortfall Time,பற்றாக்குறை நேரம்,
-America/New_York,அமெரிக்கா / New_York,
-Shortfall Amount,பற்றாக்குறை தொகை,
-Security Value ,பாதுகாப்பு மதிப்பு,
-Process Loan Security Shortfall,செயல்முறை கடன் பாதுகாப்பு பற்றாக்குறை,
-Loan To Value Ratio,மதிப்பு விகிதத்திற்கான கடன்,
-Unpledge Time,திறக்கப்படாத நேரம்,
-Loan Name,கடன் பெயர்,
Rate of Interest (%) Yearly,வட்டி விகிதம் (%) வருடாந்திரம்,
-Penalty Interest Rate (%) Per Day,அபராதம் வட்டி விகிதம் (%) ஒரு நாளைக்கு,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,"திருப்பிச் செலுத்துவதில் தாமதமானால், நிலுவையில் உள்ள வட்டித் தொகையை தினசரி அடிப்படையில் அபராத வட்டி விகிதம் விதிக்கப்படுகிறது",
-Grace Period in Days,நாட்களில் கிரேஸ் காலம்,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,கடனைத் திருப்பிச் செலுத்துவதில் தாமதம் ஏற்பட்டால் அபராதம் வசூலிக்கப்படாத தேதி முதல் குறிப்பிட்ட நாட்கள் வரை,
-Pledge,உறுதிமொழி,
-Post Haircut Amount,ஹேர்கட் தொகையை இடுகையிடவும்,
-Process Type,செயல்முறை வகை,
-Update Time,புதுப்பிப்பு நேரம்,
-Proposed Pledge,முன்மொழியப்பட்ட உறுதிமொழி,
-Total Payment,மொத்த கொடுப்பனவு,
-Balance Loan Amount,இருப்பு கடன் தொகை,
-Is Accrued,திரட்டப்பட்டுள்ளது,
Salary Slip Loan,சம்பள சரிவு கடன்,
Loan Repayment Entry,கடன் திருப்பிச் செலுத்தும் நுழைவு,
-Sanctioned Loan Amount,அனுமதிக்கப்பட்ட கடன் தொகை,
-Sanctioned Amount Limit,அனுமதிக்கப்பட்ட தொகை வரம்பு,
-Unpledge,Unpledge,
-Haircut,ஹேர்கட்,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,அட்டவணை உருவாக்க,
Schedules,கால அட்டவணைகள்,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,திட்ட இந்த பயனர்களுக்கு வலைத்தளத்தில் அணுக வேண்டும்,
Copied From,இருந்து நகலெடுத்து,
Start and End Dates,தொடக்கம் மற்றும் தேதிகள் End,
-Actual Time (in Hours),உண்மையான நேரம் (மணிநேரத்தில்),
+Actual Time in Hours (via Timesheet),உண்மையான நேரம் (மணிநேரத்தில்),
Costing and Billing,செலவு மற்றும் பில்லிங்,
-Total Costing Amount (via Timesheets),மொத்த செலவு தொகை (Timesheets வழியாக),
-Total Expense Claim (via Expense Claims),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக),
+Total Costing Amount (via Timesheet),மொத்த செலவு தொகை (Timesheets வழியாக),
+Total Expense Claim (via Expense Claim),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக),
Total Purchase Cost (via Purchase Invoice),மொத்த கொள்முதல் விலை (கொள்முதல் விலைப்பட்டியல் வழியாக),
Total Sales Amount (via Sales Order),மொத்த விற்பனை தொகை (விற்பனை ஆணை வழியாக),
-Total Billable Amount (via Timesheets),மொத்த பில்கள் அளவு (டைம்ஸ் ஷீட்ஸ் வழியாக),
-Total Billed Amount (via Sales Invoices),மொத்த விற்பனையாகும் தொகை (விற்பனை பற்றுச்சீட்டுகள் வழியாக),
-Total Consumed Material Cost (via Stock Entry),மொத்த நுகர்வு பொருள் செலவு (பங்கு நுழைவு வழியாக),
+Total Billable Amount (via Timesheet),மொத்த பில்கள் அளவு (டைம்ஸ் ஷீட்ஸ் வழியாக),
+Total Billed Amount (via Sales Invoice),மொத்த விற்பனையாகும் தொகை (விற்பனை பற்றுச்சீட்டுகள் வழியாக),
+Total Consumed Material Cost (via Stock Entry),மொத்த நுகர்வு பொருள் செலவு (பங்கு நுழைவு வழியாக),
Gross Margin,மொத்த அளவு,
Gross Margin %,மொத்த அளவு%,
Monitor Progress,மானிட்டர் முன்னேற்றம்,
@@ -7521,12 +7385,10 @@
Dependencies,சார்ந்திருப்பவை,
Dependent Tasks,சார்பு பணிகள்,
Depends on Tasks,பணிகளைப் பொறுத்தது,
-Actual Start Date (via Time Sheet),உண்மையான தொடங்கும் தேதி (நேரம் தாள் வழியாக),
-Actual Time (in hours),(மணிகளில்) உண்மையான நேரம்,
-Actual End Date (via Time Sheet),உண்மையான முடிவு தேதி (நேரம் தாள் வழியாக),
-Total Costing Amount (via Time Sheet),மொத்த செலவுவகை தொகை (நேரம் தாள் வழியாக),
+Actual Start Date (via Timesheet),உண்மையான தொடங்கும் தேதி (நேரம் தாள் வழியாக),
+Actual Time in Hours (via Timesheet),(மணிகளில்) உண்மையான நேரம்,
+Actual End Date (via Timesheet),உண்மையான முடிவு தேதி (நேரம் தாள் வழியாக),
Total Expense Claim (via Expense Claim),(செலவு கூறுகின்றனர் வழியாக) மொத்த செலவு கூறுகின்றனர்,
-Total Billing Amount (via Time Sheet),மொத்த பில்லிங் அளவு (நேரம் தாள் வழியாக),
Review Date,தேதி,
Closing Date,தேதி மூடுவது,
Task Depends On,பணி பொறுத்தது,
@@ -7887,7 +7749,6 @@
Update Series,மேம்படுத்தல் தொடர்,
Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.,
Prefix,முற்சேர்க்கை,
-Current Value,தற்போதைய மதிப்பு,
This is the number of the last created transaction with this prefix,இந்த முன்னொட்டு கடந்த உருவாக்கப்பட்ட பரிவர்த்தனை எண்ணிக்கை,
Update Series Number,மேம்படுத்தல் தொடர் எண்,
Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,இனவாரியாக மறுவரிசைப்படுத்துக நிலை பரிந்துரைக்கப்படுகிறது,
Lead Details,முன்னணி விவரங்கள்,
Lead Owner Efficiency,முன்னணி உரிமையாளர் திறன்,
-Loan Repayment and Closure,கடன் திருப்பிச் செலுத்துதல் மற்றும் மூடல்,
-Loan Security Status,கடன் பாதுகாப்பு நிலை,
Lost Opportunity,வாய்ப்பு இழந்தது,
Maintenance Schedules,பராமரிப்பு அட்டவணை,
Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},இலக்கு எண்ணப்பட்டவை: {0},
Payment Account is mandatory,கட்டண கணக்கு கட்டாயமாகும்,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","சரிபார்க்கப்பட்டால், எந்தவொரு அறிவிப்பும் அல்லது ஆதார சமர்ப்பிப்பும் இல்லாமல் வருமான வரியைக் கணக்கிடுவதற்கு முன் முழுத் தொகையும் வரி விதிக்கக்கூடிய வருமானத்திலிருந்து கழிக்கப்படும்.",
-Disbursement Details,வழங்கல் விவரங்கள்,
Material Request Warehouse,பொருள் கோரிக்கை கிடங்கு,
Select warehouse for material requests,பொருள் கோரிக்கைகளுக்கு கிடங்கைத் தேர்ந்தெடுக்கவும்,
Transfer Materials For Warehouse {0},கிடங்கிற்கான பொருட்களை மாற்றவும் {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,கோரப்படாத தொகையை சம்பளத்திலிருந்து திருப்பிச் செலுத்துங்கள்,
Deduction from salary,சம்பளத்திலிருந்து கழித்தல்,
Expired Leaves,காலாவதியான இலைகள்,
-Reference No,குறிப்பு எண்,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,ஹேர்கட் சதவீதம் என்பது கடன் பாதுகாப்பின் சந்தை மதிப்புக்கும் அந்தக் கடனுக்கான பிணையமாகப் பயன்படுத்தும்போது அந்த கடன் பாதுகாப்புக்குக் கூறப்படும் மதிப்புக்கும் இடையிலான சதவீத வேறுபாடு ஆகும்.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,கடன் மதிப்பு மதிப்பு விகிதம் உறுதி அளிக்கப்பட்ட பாதுகாப்பின் மதிப்புக்கு கடன் தொகையின் விகிதத்தை வெளிப்படுத்துகிறது. எந்தவொரு கடனுக்கும் குறிப்பிட்ட மதிப்பை விட இது குறைந்துவிட்டால் கடன் பாதுகாப்பு பற்றாக்குறை தூண்டப்படும்,
If this is not checked the loan by default will be considered as a Demand Loan,"இது சரிபார்க்கப்படாவிட்டால், இயல்புநிலையாக கடன் தேவை கடனாக கருதப்படும்",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,கடன் வாங்கியவரிடமிருந்து கடன் திருப்பிச் செலுத்துவதற்கு முன்பதிவு செய்வதற்கும் கடன் வாங்கியவருக்கு கடன்களை வழங்குவதற்கும் இந்த கணக்கு பயன்படுத்தப்படுகிறது,
This account is capital account which is used to allocate capital for loan disbursal account ,"இந்த கணக்கு மூலதன கணக்கு ஆகும், இது கடன் வழங்கல் கணக்கிற்கு மூலதனத்தை ஒதுக்க பயன்படுகிறது",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},செயல்பாடு {0 the பணி ஒழுங்கு {1 to க்கு சொந்தமானது அல்ல,
Print UOM after Quantity,அளவுக்குப் பிறகு UOM ஐ அச்சிடுக,
Set default {0} account for perpetual inventory for non stock items,பங்கு அல்லாத பொருட்களுக்கான நிரந்தர சரக்குகளுக்கு இயல்புநிலை {0} கணக்கை அமைக்கவும்,
-Loan Security {0} added multiple times,கடன் பாதுகாப்பு {0 multiple பல முறை சேர்க்கப்பட்டது,
-Loan Securities with different LTV ratio cannot be pledged against one loan,வெவ்வேறு எல்.டி.வி விகிதத்துடன் கடன் பத்திரங்கள் ஒரு கடனுக்கு எதிராக அடகு வைக்க முடியாது,
-Qty or Amount is mandatory for loan security!,கடன் பாதுகாப்பிற்கு அளவு அல்லது தொகை கட்டாயமாகும்!,
-Only submittted unpledge requests can be approved,சமர்ப்பிக்கப்பட்ட unpledge கோரிக்கைகளை மட்டுமே அங்கீகரிக்க முடியும்,
-Interest Amount or Principal Amount is mandatory,வட்டி தொகை அல்லது முதன்மை தொகை கட்டாயமாகும்,
-Disbursed Amount cannot be greater than {0},வழங்கப்பட்ட தொகை {0 than ஐ விட அதிகமாக இருக்கக்கூடாது,
-Row {0}: Loan Security {1} added multiple times,வரிசை {0}: கடன் பாதுகாப்பு {1 multiple பல முறை சேர்க்கப்பட்டது,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,வரிசை # {0}: குழந்தை உருப்படி தயாரிப்பு மூட்டையாக இருக்கக்கூடாது. உருப்படி {1 remove ஐ நீக்கி சேமிக்கவும்,
Credit limit reached for customer {0},வாடிக்கையாளருக்கு கடன் வரம்பு அடைந்தது {0},
Could not auto create Customer due to the following missing mandatory field(s):,பின்வரும் கட்டாய புலம் (கள்) காணாமல் போனதால் வாடிக்கையாளரை தானாக உருவாக்க முடியவில்லை:,
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index 3fb32dc..4f67924 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","కంపెనీ స్పా, సాపా లేదా ఎస్ఆర్ఎల్ అయితే వర్తిస్తుంది",
Applicable if the company is a limited liability company,కంపెనీ పరిమిత బాధ్యత కలిగిన సంస్థ అయితే వర్తిస్తుంది,
Applicable if the company is an Individual or a Proprietorship,సంస్థ ఒక వ్యక్తి లేదా యజమాని అయితే వర్తిస్తుంది,
-Applicant,దరఖాస్తుదారు,
-Applicant Type,అభ్యర్థి రకం,
Application of Funds (Assets),ఫండ్స్ (ఆస్తులు) యొక్క అప్లికేషన్,
Application period cannot be across two allocation records,దరఖాస్తు కాలం రెండు కేటాయింపు రికార్డుల్లో ఉండరాదు,
Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,ఫోలియో సంఖ్యలతో అందుబాటులో ఉన్న వాటాదారుల జాబితా,
Loading Payment System,చెల్లింపు వ్యవస్థను లోడ్ చేస్తోంది,
Loan,ఋణం,
-Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0},
-Loan Application,లోన్ అప్లికేషన్,
-Loan Management,లోన్ మేనేజ్మెంట్,
-Loan Repayment,రుణాన్ని తిరిగి చెల్లించే,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,ఇన్వాయిస్ డిస్కౌంటింగ్ను సేవ్ చేయడానికి లోన్ ప్రారంభ తేదీ మరియు లోన్ పీరియడ్ తప్పనిసరి,
Loans (Liabilities),రుణాలు (లయబిలిటీస్),
Loans and Advances (Assets),రుణాలు మరియు అడ్వాన్సెస్ (ఆస్తులు),
@@ -1611,7 +1605,6 @@
Monday,సోమవారం,
Monthly,మంత్లీ,
Monthly Distribution,మంత్లీ పంపిణీ,
-Monthly Repayment Amount cannot be greater than Loan Amount,మంత్లీ నంతవరకు మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు,
More,మరిన్ని,
More Information,మరింత సమాచారం,
More than one selection for {0} not allowed,{0} కోసం ఒకటి కంటే ఎక్కువ ఎంపిక అనుమతించబడదు,
@@ -1884,11 +1877,9 @@
Pay {0} {1},చెల్లించు {0} {1},
Payable,చెల్లించవలసిన,
Payable Account,చెల్లించవలసిన ఖాతా,
-Payable Amount,చెల్లించవలసిన మొత్తం,
Payment,చెల్లింపు,
Payment Cancelled. Please check your GoCardless Account for more details,చెల్లింపు రద్దు చేయబడింది. దయచేసి మరిన్ని వివరాల కోసం మీ GoCardless ఖాతాను తనిఖీ చేయండి,
Payment Confirmation,చెల్లింపు నిర్ధారణ,
-Payment Date,చెల్లింపు తేదీ,
Payment Days,చెల్లింపు డేస్,
Payment Document,చెల్లింపు డాక్యుమెంట్,
Payment Due Date,చెల్లింపు గడువు తేదీ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,మొదటి కొనుగోలు రసీదులు నమోదు చేయండి,
Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి,
Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి,
-Please enter Repayment Periods,తిరిగి చెల్లించే కాలాలు నమోదు చేయండి,
Please enter Reqd by Date,దయచేసి తేదీ ద్వారా రిక్డ్ నమోదు చేయండి,
Please enter Woocommerce Server URL,దయచేసి Woocommerce Server URL ను నమోదు చేయండి,
Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,మాతృ ఖర్చు సెంటర్ నమోదు చేయండి,
Please enter quantity for Item {0},అంశం పరిమాణం నమోదు చేయండి {0},
Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.,
-Please enter repayment Amount,తిరిగి చెల్లించే మొత్తాన్ని నమోదు చేయండి,
Please enter valid Financial Year Start and End Dates,చెల్లుబాటు అయ్యే ఆర్థిక సంవత్సరం ప్రారంభ మరియు ముగింపు తేదీలను ఎంటర్ చేయండి,
Please enter valid email address,చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామాను నమోదు చేయండి,
Please enter {0} first,ముందుగా {0} నమోదు చేయండి,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,ధర నిబంధనలకు మరింత పరిమాణం ఆధారంగా ఫిల్టర్.,
Primary Address Details,ప్రాథమిక చిరునామా వివరాలు,
Primary Contact Details,ప్రాథమిక సంప్రదింపు వివరాలు,
-Principal Amount,ప్రధాన మొత్తం,
Print Format,ప్రింట్ ఫార్మాట్,
Print IRS 1099 Forms,IRS 1099 ఫారమ్లను ముద్రించండి,
Print Report Card,నివేదిక రిపోర్ట్ కార్డ్,
@@ -2550,7 +2538,6 @@
Sample Collection,నమూనా కలెక్షన్,
Sample quantity {0} cannot be more than received quantity {1},నమూనా పరిమాణం {0} పొందింది కంటే ఎక్కువ కాదు {1},
Sanctioned,మంజూరు,
-Sanctioned Amount,మంజూరు సొమ్ము,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,మంజూరు మొత్తం రో లో క్లెయిమ్ సొమ్ము కంటే ఎక్కువ ఉండకూడదు {0}.,
Sand,ఇసుక,
Saturday,శనివారం,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} ఇప్పటికే తల్లిదండ్రుల విధానం {1 has ను కలిగి ఉంది.,
API,API,
Annual,వార్షిక,
-Approved,ఆమోదించబడింది,
Change,మార్చు,
Contact Email,సంప్రదించండి ఇమెయిల్,
Export Type,ఎగుమతి రకం,
@@ -3571,7 +3557,6 @@
Account Value,ఖాతా విలువ,
Account is mandatory to get payment entries,చెల్లింపు ఎంట్రీలను పొందడానికి ఖాతా తప్పనిసరి,
Account is not set for the dashboard chart {0},డాష్బోర్డ్ చార్ట్ {0 for కోసం ఖాతా సెట్ చేయబడలేదు,
-Account {0} does not belong to company {1},ఖాతా {0} కంపెనీకి చెందినది కాదు {1},
Account {0} does not exists in the dashboard chart {1},ఖాతా {0 the డాష్బోర్డ్ చార్ట్ {1 in లో లేదు,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ఖాతా: <b>{0</b> capital మూలధన పని పురోగతిలో ఉంది మరియు జర్నల్ ఎంట్రీ ద్వారా నవీకరించబడదు,
Account: {0} is not permitted under Payment Entry,ఖాతా: చెల్లింపు ఎంట్రీ క్రింద {0 అనుమతించబడదు,
@@ -3582,7 +3567,6 @@
Activity,కార్యాచరణ,
Add / Manage Email Accounts.,ఇమెయిల్ అకౌంట్స్ / నిర్వహించు జోడించండి.,
Add Child,చైల్డ్ జోడించండి,
-Add Loan Security,రుణ భద్రతను జోడించండి,
Add Multiple,బహుళ జోడించండి,
Add Participants,పాల్గొనేవారిని జోడించండి,
Add to Featured Item,ఫీచర్ చేసిన అంశానికి జోడించండి,
@@ -3593,15 +3577,12 @@
Address Line 1,చిరునామా పంక్తి 1,
Addresses,చిరునామాలు,
Admission End Date should be greater than Admission Start Date.,ప్రవేశ ముగింపు తేదీ అడ్మిషన్ ప్రారంభ తేదీ కంటే ఎక్కువగా ఉండాలి.,
-Against Loan,రుణానికి వ్యతిరేకంగా,
-Against Loan:,రుణానికి వ్యతిరేకంగా:,
All,ALL,
All bank transactions have been created,అన్ని బ్యాంక్ లావాదేవీలు సృష్టించబడ్డాయి,
All the depreciations has been booked,అన్ని తరుగుదల బుక్ చేయబడింది,
Allocation Expired!,కేటాయింపు గడువు ముగిసింది!,
Allow Resetting Service Level Agreement from Support Settings.,మద్దతు సెట్టింగ్ల నుండి సేవా స్థాయి ఒప్పందాన్ని రీసెట్ చేయడానికి అనుమతించండి.,
Amount of {0} is required for Loan closure,రుణ మూసివేతకు {0 of అవసరం,
-Amount paid cannot be zero,చెల్లించిన మొత్తం సున్నా కాదు,
Applied Coupon Code,అప్లైడ్ కూపన్ కోడ్,
Apply Coupon Code,కూపన్ కోడ్ను వర్తించండి,
Appointment Booking,అపాయింట్మెంట్ బుకింగ్,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,డ్రైవర్ చిరునామా తప్పిపోయినందున రాక సమయాన్ని లెక్కించలేరు.,
Cannot Optimize Route as Driver Address is Missing.,డ్రైవర్ చిరునామా లేదు కాబట్టి మార్గాన్ని ఆప్టిమైజ్ చేయలేరు.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,{1 task పనిని పూర్తి చేయలేము ఎందుకంటే దాని ఆధారిత పని {1 c పూర్తి కాలేదు / రద్దు చేయబడదు.,
-Cannot create loan until application is approved,దరఖాస్తు ఆమోదించబడే వరకు రుణాన్ని సృష్టించలేరు,
Cannot find a matching Item. Please select some other value for {0}.,ఒక సరిపోలే అంశం దొరకదు. కోసం {0} కొన్ని ఇతర విలువ దయచేసి ఎంచుకోండి.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{1 row వరుసలో {2 item కంటే ఎక్కువ {0 item అంశం కోసం ఓవర్బిల్ చేయలేరు. ఓవర్ బిల్లింగ్ను అనుమతించడానికి, దయచేసి ఖాతాల సెట్టింగ్లలో భత్యం సెట్ చేయండి",
"Capacity Planning Error, planned start time can not be same as end time","సామర్థ్య ప్రణాళిక లోపం, ప్రణాళికాబద్ధమైన ప్రారంభ సమయం ముగింపు సమయానికి సమానంగా ఉండకూడదు",
@@ -3812,20 +3792,9 @@
Less Than Amount,మొత్తం కంటే తక్కువ,
Liabilities,బాధ్యతలు,
Loading...,లోడ్ అవుతోంది ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,ప్రతిపాదిత సెక్యూరిటీల ప్రకారం రుణ మొత్తం గరిష్ట రుణ మొత్తాన్ని {0 exceed మించిపోయింది,
Loan Applications from customers and employees.,కస్టమర్లు మరియు ఉద్యోగుల నుండి రుణ దరఖాస్తులు.,
-Loan Disbursement,రుణ పంపిణీ,
Loan Processes,రుణ ప్రక్రియలు,
-Loan Security,రుణ భద్రత,
-Loan Security Pledge,రుణ భద్రతా ప్రతిజ్ఞ,
-Loan Security Pledge Created : {0},రుణ భద్రతా ప్రతిజ్ఞ సృష్టించబడింది: {0},
-Loan Security Price,రుణ భద్రతా ధర,
-Loan Security Price overlapping with {0},రుణ భద్రతా ధర {0 with తో అతివ్యాప్తి చెందుతుంది,
-Loan Security Unpledge,లోన్ సెక్యూరిటీ అన్ప్లెడ్జ్,
-Loan Security Value,రుణ భద్రతా విలువ,
Loan Type for interest and penalty rates,వడ్డీ మరియు పెనాల్టీ రేట్ల కోసం రుణ రకం,
-Loan amount cannot be greater than {0},రుణ మొత్తం {0 than కంటే ఎక్కువ ఉండకూడదు,
-Loan is mandatory,రుణ తప్పనిసరి,
Loans,రుణాలు,
Loans provided to customers and employees.,వినియోగదారులకు మరియు ఉద్యోగులకు రుణాలు అందించబడతాయి.,
Location,నగర,
@@ -3894,7 +3863,6 @@
Pay,చెల్లించండి,
Payment Document Type,చెల్లింపు పత్రం రకం,
Payment Name,చెల్లింపు పేరు,
-Penalty Amount,జరిమానా మొత్తం,
Pending,పెండింగ్,
Performance,ప్రదర్శన,
Period based On,కాలం ఆధారంగా,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,ఈ అంశాన్ని సవరించడానికి దయచేసి మార్కెట్ ప్లేస్ యూజర్గా లాగిన్ అవ్వండి.,
Please login as a Marketplace User to report this item.,ఈ అంశాన్ని నివేదించడానికి దయచేసి మార్కెట్ ప్లేస్ యూజర్గా లాగిన్ అవ్వండి.,
Please select <b>Template Type</b> to download template,టెంప్లేట్ను డౌన్లోడ్ చేయడానికి <b>మూస రకాన్ని</b> ఎంచుకోండి,
-Please select Applicant Type first,దయచేసి మొదట దరఖాస్తుదారు రకాన్ని ఎంచుకోండి,
Please select Customer first,దయచేసి మొదట కస్టమర్ను ఎంచుకోండి,
Please select Item Code first,దయచేసి మొదట ఐటెమ్ కోడ్ను ఎంచుకోండి,
-Please select Loan Type for company {0},దయచేసి company 0 company కోసం లోన్ రకాన్ని ఎంచుకోండి,
Please select a Delivery Note,దయచేసి డెలివరీ గమనికను ఎంచుకోండి,
Please select a Sales Person for item: {0},దయచేసి అంశం కోసం అమ్మకందారుని ఎంచుకోండి: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',దయచేసి మరో చెల్లింపు పద్ధతిని ఎంచుకోండి. గీత ద్రవ్యంలో లావాదేవీలు మద్దతు లేదు '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},దయచేసి కంపెనీ for 0 for కోసం డిఫాల్ట్ బ్యాంక్ ఖాతాను సెటప్ చేయండి,
Please specify,పేర్కొనండి,
Please specify a {0},దయచేసి {0 పేర్కొనండి,lead
-Pledge Status,ప్రతిజ్ఞ స్థితి,
-Pledge Time,ప్రతిజ్ఞ సమయం,
Printing,ప్రింటింగ్,
Priority,ప్రాధాన్య,
Priority has been changed to {0}.,ప్రాధాన్యత {0 to కు మార్చబడింది.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML ఫైళ్ళను ప్రాసెస్ చేస్తోంది,
Profitability,లాభాల,
Project,ప్రాజెక్టు,
-Proposed Pledges are mandatory for secured Loans,సురక్షిత రుణాలకు ప్రతిపాదిత ప్రతిజ్ఞలు తప్పనిసరి,
Provide the academic year and set the starting and ending date.,విద్యా సంవత్సరాన్ని అందించండి మరియు ప్రారంభ మరియు ముగింపు తేదీని సెట్ చేయండి.,
Public token is missing for this bank,ఈ బ్యాంకుకు పబ్లిక్ టోకెన్ లేదు,
Publish,ప్రచురించు,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,కొనుగోలు రశీదులో నిలుపుదల నమూనా ప్రారంభించబడిన అంశం లేదు.,
Purchase Return,కొనుగోలు చూపించు,
Qty of Finished Goods Item,పూర్తయిన వస్తువుల అంశం,
-Qty or Amount is mandatroy for loan security,రుణ భద్రత కోసం క్యూటీ లేదా మొత్తం మాండట్రోయ్,
Quality Inspection required for Item {0} to submit,సమర్పించడానికి అంశం {0 for కోసం నాణ్యత తనిఖీ అవసరం,
Quantity to Manufacture,తయారీకి పరిమాణం,
Quantity to Manufacture can not be zero for the operation {0},To 0 operation ఆపరేషన్ కోసం తయారీ పరిమాణం సున్నా కాదు,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,ఉపశమన తేదీ చేరిన తేదీ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి,
Rename,పేరుమార్చు,
Rename Not Allowed,పేరు మార్చడం అనుమతించబడలేదు,
-Repayment Method is mandatory for term loans,టర్మ్ లోన్లకు తిరిగి చెల్లించే విధానం తప్పనిసరి,
-Repayment Start Date is mandatory for term loans,టర్మ్ లోన్లకు తిరిగి చెల్లించే ప్రారంభ తేదీ తప్పనిసరి,
Report Item,అంశాన్ని నివేదించండి,
Report this Item,ఈ అంశాన్ని నివేదించండి,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,సబ్ కాంట్రాక్ట్ కోసం రిజర్వు చేయబడిన Qty: ఉప కాంట్రాక్ట్ చేసిన వస్తువులను తయారు చేయడానికి ముడి పదార్థాల పరిమాణం.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},అడ్డు వరుస ({0}): {1 already ఇప్పటికే {2 in లో రాయితీ చేయబడింది,
Rows Added in {0},{0 in లో వరుసలు జోడించబడ్డాయి,
Rows Removed in {0},{0 in లో తొలగించబడిన వరుసలు,
-Sanctioned Amount limit crossed for {0} {1},మంజూరు చేసిన మొత్తం పరిమితి {0} {1 for కు దాటింది,
-Sanctioned Loan Amount already exists for {0} against company {1},కంపెనీ {1 against కు వ్యతిరేకంగా {0 for కోసం మంజూరు చేసిన రుణ మొత్తం ఇప్పటికే ఉంది,
Save,సేవ్,
Save Item,అంశాన్ని సేవ్ చేయండి,
Saved Items,సేవ్ చేసిన అంశాలు,
@@ -4135,7 +4093,6 @@
User {0} is disabled,వాడుకరి {0} నిలిపివేయబడింది,
Users and Permissions,వినియోగదారులు మరియు అనుమతులు,
Vacancies cannot be lower than the current openings,ప్రస్తుత ఓపెనింగ్ల కంటే ఖాళీలు తక్కువగా ఉండకూడదు,
-Valid From Time must be lesser than Valid Upto Time.,సమయం నుండి చెల్లుబాటు అయ్యే సమయం కంటే తక్కువ ఉండాలి.,
Valuation Rate required for Item {0} at row {1},{1 row వరుసలో అంశం {0 for కోసం మదింపు రేటు అవసరం,
Values Out Of Sync,విలువలు సమకాలీకరించబడలేదు,
Vehicle Type is required if Mode of Transport is Road,రవాణా విధానం రహదారి అయితే వాహన రకం అవసరం,
@@ -4211,7 +4168,6 @@
Add to Cart,కార్ట్ జోడించు,
Days Since Last Order,లాస్ట్ ఆర్డర్ నుండి రోజులు,
In Stock,అందుబాటులో ఉంది,
-Loan Amount is mandatory,రుణ మొత్తం తప్పనిసరి,
Mode Of Payment,చెల్లింపు విధానం,
No students Found,విద్యార్థులు లేరు,
Not in Stock,కాదు స్టాక్,
@@ -4240,7 +4196,6 @@
Group by,గ్రూప్ ద్వారా,
In stock,అందుబాటులో ఉంది,
Item name,అంశం పేరు,
-Loan amount is mandatory,రుణ మొత్తం తప్పనిసరి,
Minimum Qty,కనిష్ట విలువ,
More details,మరిన్ని వివరాలు,
Nature of Supplies,వస్తువుల ప్రకృతి,
@@ -4409,9 +4364,6 @@
Total Completed Qty,మొత్తం పూర్తయింది Qty,
Qty to Manufacture,తయారీకి అంశాల,
Repay From Salary can be selected only for term loans,టర్మ్ లోన్ల కోసం మాత్రమే జీతం నుండి తిరిగి చెల్లించవచ్చు,
-No valid Loan Security Price found for {0},Valid 0 for కోసం చెల్లుబాటు అయ్యే రుణ భద్రతా ధర కనుగొనబడలేదు,
-Loan Account and Payment Account cannot be same,లోన్ ఖాతా మరియు చెల్లింపు ఖాతా ఒకేలా ఉండకూడదు,
-Loan Security Pledge can only be created for secured loans,లోన్ సెక్యూరిటీ ప్రతిజ్ఞ సురక్షిత రుణాల కోసం మాత్రమే సృష్టించబడుతుంది,
Social Media Campaigns,సోషల్ మీడియా ప్రచారాలు,
From Date can not be greater than To Date,తేదీ నుండి తేదీ కంటే ఎక్కువ ఉండకూడదు,
Please set a Customer linked to the Patient,దయచేసి రోగికి లింక్ చేయబడిన కస్టమర్ను సెట్ చేయండి,
@@ -6437,7 +6389,6 @@
HR User,ఆర్ వాడుకరి,
Appointment Letter,నియామక పత్రం,
Job Applicant,ఉద్యోగం అభ్యర్థి,
-Applicant Name,దరఖాస్తుదారు పేరు,
Appointment Date,నియామక తేదీ,
Appointment Letter Template,నియామక లేఖ మూస,
Body,శరీర,
@@ -7059,99 +7010,12 @@
Sync in Progress,ప్రోగ్రెస్లో సమకాలీకరణ,
Hub Seller Name,హబ్ అమ్మకాల పేరు,
Custom Data,అనుకూల డేటా,
-Member,సభ్యుడు,
-Partially Disbursed,పాక్షికంగా పంపించబడతాయి,
-Loan Closure Requested,రుణ మూసివేత అభ్యర్థించబడింది,
Repay From Salary,జీతం నుండి తిరిగి,
-Loan Details,లోన్ వివరాలు,
-Loan Type,లోన్ టైప్,
-Loan Amount,అప్పు మొత్తం,
-Is Secured Loan,సెక్యూర్డ్ లోన్,
-Rate of Interest (%) / Year,ఆసక్తి రేటు (%) / ఆఫ్ ది ఇయర్,
-Disbursement Date,చెల్లించుట తేదీ,
-Disbursed Amount,పంపిణీ చేసిన మొత్తం,
-Is Term Loan,టర్మ్ లోన్,
-Repayment Method,తిరిగి చెల్లించే విధానం,
-Repay Fixed Amount per Period,ఒక్కో వ్యవధి స్థిర మొత్తం చెల్లింపులో,
-Repay Over Number of Periods,చెల్లింపులో కాలాల ఓవర్ సంఖ్య,
-Repayment Period in Months,నెలల్లో తిరిగి చెల్లించే కాలం,
-Monthly Repayment Amount,మంత్లీ నంతవరకు మొత్తం,
-Repayment Start Date,చెల్లింపు ప్రారంభ తేదీ,
-Loan Security Details,రుణ భద్రతా వివరాలు,
-Maximum Loan Value,గరిష్ట రుణ విలువ,
-Account Info,ఖాతా సమాచారం,
-Loan Account,రుణ ఖాతా,
-Interest Income Account,వడ్డీ ఆదాయం ఖాతా,
-Penalty Income Account,జరిమానా ఆదాయ ఖాతా,
-Repayment Schedule,తిరిగి చెల్లించే షెడ్యూల్,
-Total Payable Amount,మొత్తం చెల్లించవలసిన సొమ్ము,
-Total Principal Paid,మొత్తం ప్రిన్సిపాల్ చెల్లించారు,
-Total Interest Payable,చెల్లించవలసిన మొత్తం వడ్డీ,
-Total Amount Paid,మొత్తం చెల్లింపు మొత్తం,
-Loan Manager,లోన్ మేనేజర్,
-Loan Info,లోన్ సమాచారం,
-Rate of Interest,వడ్డీ రేటు,
-Proposed Pledges,ప్రతిపాదిత ప్రతిజ్ఞలు,
-Maximum Loan Amount,గరిష్ఠ రుణ మొత్తం,
-Repayment Info,తిరిగి చెల్లించే సమాచారం,
-Total Payable Interest,మొత్తం చెల్లించవలసిన వడ్డీ,
-Against Loan ,రుణానికి వ్యతిరేకంగా,
-Loan Interest Accrual,లోన్ ఇంట్రెస్ట్ అక్రూవల్,
-Amounts,మొత్తంలో,
-Pending Principal Amount,ప్రిన్సిపాల్ మొత్తం పెండింగ్లో ఉంది,
-Payable Principal Amount,చెల్లించవలసిన ప్రధాన మొత్తం,
-Paid Principal Amount,చెల్లించిన ప్రిన్సిపాల్ మొత్తం,
-Paid Interest Amount,చెల్లించిన వడ్డీ మొత్తం,
-Process Loan Interest Accrual,ప్రాసెస్ లోన్ వడ్డీ సముపార్జన,
-Repayment Schedule Name,తిరిగి చెల్లించే షెడ్యూల్ పేరు,
Regular Payment,రెగ్యులర్ చెల్లింపు,
Loan Closure,రుణ మూసివేత,
-Payment Details,చెల్లింపు వివరాలు,
-Interest Payable,కట్టవలసిన వడ్డీ,
-Amount Paid,కట్టిన డబ్బు,
-Principal Amount Paid,ప్రిన్సిపాల్ మొత్తం చెల్లించారు,
-Repayment Details,తిరిగి చెల్లించే వివరాలు,
-Loan Repayment Detail,రుణ తిరిగి చెల్లించే వివరాలు,
-Loan Security Name,రుణ భద్రతా పేరు,
-Unit Of Measure,కొలమానం,
-Loan Security Code,లోన్ సెక్యూరిటీ కోడ్,
-Loan Security Type,రుణ భద్రతా రకం,
-Haircut %,హ్యారీకట్%,
-Loan Details,రుణ వివరాలు,
-Unpledged,Unpledged,
-Pledged,ప్రతిజ్ఞ,
-Partially Pledged,పాక్షికంగా ప్రతిజ్ఞ,
-Securities,సెక్యూరిటీస్,
-Total Security Value,మొత్తం భద్రతా విలువ,
-Loan Security Shortfall,రుణ భద్రతా కొరత,
-Loan ,ఋణం,
-Shortfall Time,కొరత సమయం,
-America/New_York,అమెరికా / New_York,
-Shortfall Amount,కొరత మొత్తం,
-Security Value ,భద్రతా విలువ,
-Process Loan Security Shortfall,ప్రాసెస్ లోన్ సెక్యూరిటీ కొరత,
-Loan To Value Ratio,విలువ నిష్పత్తికి లోన్,
-Unpledge Time,అన్ప్లెడ్జ్ సమయం,
-Loan Name,లోన్ పేరు,
Rate of Interest (%) Yearly,ఆసక్తి రేటు (%) సుడి,
-Penalty Interest Rate (%) Per Day,రోజుకు జరిమానా వడ్డీ రేటు (%),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,తిరిగి చెల్లించడంలో ఆలస్యం జరిగితే ప్రతిరోజూ పెండింగ్లో ఉన్న వడ్డీ మొత్తంలో జరిమానా వడ్డీ రేటు విధించబడుతుంది,
-Grace Period in Days,రోజుల్లో గ్రేస్ పీరియడ్,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,రుణ తిరిగి చెల్లించడంలో ఆలస్యం జరిగితే జరిమానా వసూలు చేయబడని గడువు తేదీ నుండి రోజుల సంఖ్య,
-Pledge,ప్లెడ్జ్,
-Post Haircut Amount,హ్యారీకట్ మొత్తాన్ని పోస్ట్ చేయండి,
-Process Type,ప్రాసెస్ రకం,
-Update Time,నవీకరణ సమయం,
-Proposed Pledge,ప్రతిపాదిత ప్రతిజ్ఞ,
-Total Payment,మొత్తం చెల్లింపు,
-Balance Loan Amount,సంతులనం రుణ మొత్తం,
-Is Accrued,పెరిగింది,
Salary Slip Loan,జీతం స్లిప్ లోన్,
Loan Repayment Entry,రుణ తిరిగి చెల్లించే ఎంట్రీ,
-Sanctioned Loan Amount,మంజూరు చేసిన రుణ మొత్తం,
-Sanctioned Amount Limit,మంజూరు చేసిన మొత్తం పరిమితి,
-Unpledge,Unpledge,
-Haircut,హ్యారీకట్,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,షెడ్యూల్ రూపొందించండి,
Schedules,షెడ్యూల్స్,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,ప్రాజెక్టు ఈ వినియోగదారులకు వెబ్ సైట్ అందుబాటులో ఉంటుంది,
Copied From,నుండి కాపీ,
Start and End Dates,ప్రారంభం మరియు తేదీలు ఎండ్,
-Actual Time (in Hours),వాస్తవ సమయం (గంటల్లో),
+Actual Time in Hours (via Timesheet),వాస్తవ సమయం (గంటల్లో),
Costing and Billing,ఖర్చయ్యే బిల్లింగ్,
-Total Costing Amount (via Timesheets),మొత్తం ఖరీదు మొత్తం (టైమ్ షీట్లు ద్వారా),
-Total Expense Claim (via Expense Claims),మొత్తం ఖర్చుల దావా (ఖర్చు వాదనలు ద్వారా),
+Total Costing Amount (via Timesheet),మొత్తం ఖరీదు మొత్తం (టైమ్ షీట్లు ద్వారా),
+Total Expense Claim (via Expense Claim),మొత్తం ఖర్చుల దావా (ఖర్చు వాదనలు ద్వారా),
Total Purchase Cost (via Purchase Invoice),మొత్తం కొనుగోలు ఖర్చు (కొనుగోలు వాయిస్ ద్వారా),
Total Sales Amount (via Sales Order),మొత్తం సేల్స్ మొత్తం (సేల్స్ ఆర్డర్ ద్వారా),
-Total Billable Amount (via Timesheets),మొత్తం బిల్లబుల్ మొత్తం (టైమ్ షీట్లు ద్వారా),
-Total Billed Amount (via Sales Invoices),మొత్తం బిల్లు మొత్తం (సేల్స్ ఇన్వాయిస్లు ద్వారా),
-Total Consumed Material Cost (via Stock Entry),మొత్తం వినియోగ పదార్థాల వ్యయం (స్టాక్ ఎంట్రీ ద్వారా),
+Total Billable Amount (via Timesheet),మొత్తం బిల్లబుల్ మొత్తం (టైమ్ షీట్లు ద్వారా),
+Total Billed Amount (via Sales Invoice),మొత్తం బిల్లు మొత్తం (సేల్స్ ఇన్వాయిస్లు ద్వారా),
+Total Consumed Material Cost (via Stock Entry),మొత్తం వినియోగ పదార్థాల వ్యయం (స్టాక్ ఎంట్రీ ద్వారా),
Gross Margin,స్థూల సరిహద్దు,
Gross Margin %,స్థూల సరిహద్దు %,
Monitor Progress,మానిటర్ ప్రోగ్రెస్,
@@ -7521,12 +7385,10 @@
Dependencies,సమన్వయాలు,
Dependent Tasks,డిపెండెంట్ టాస్క్లు,
Depends on Tasks,విధులు ఆధారపడి,
-Actual Start Date (via Time Sheet),వాస్తవాధీన ప్రారంభ తేదీ (సమయం షీట్ ద్వారా),
-Actual Time (in hours),(గంటల్లో) వాస్తవ సమయం,
-Actual End Date (via Time Sheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా),
-Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా),
+Actual Start Date (via Timesheet),వాస్తవాధీన ప్రారంభ తేదీ (సమయం షీట్ ద్వారా),
+Actual Time in Hours (via Timesheet),(గంటల్లో) వాస్తవ సమయం,
+Actual End Date (via Timesheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా),
Total Expense Claim (via Expense Claim),(ఖర్చు చెప్పడం ద్వారా) మొత్తం ఖర్చు చెప్పడం,
-Total Billing Amount (via Time Sheet),మొత్తం బిల్లింగ్ మొత్తం (సమయం షీట్ ద్వారా),
Review Date,రివ్యూ తేదీ,
Closing Date,ముగింపు తేదీ,
Task Depends On,టాస్క్ ఆధారపడి,
@@ -7887,7 +7749,6 @@
Update Series,నవీకరణ సిరీస్,
Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.,
Prefix,ఆదిపదం,
-Current Value,కరెంట్ వేల్యూ,
This is the number of the last created transaction with this prefix,ఈ ఉపసర్గ గత రూపొందించినవారు లావాదేవీ సంఖ్య,
Update Series Number,నవీకరణ సిరీస్ సంఖ్య,
Quotation Lost Reason,కొటేషన్ లాస్ట్ కారణము,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise క్రమాన్ని స్థాయి సిఫార్సు,
Lead Details,లీడ్ వివరాలు,
Lead Owner Efficiency,జట్టు యజమాని సమర్థత,
-Loan Repayment and Closure,రుణ తిరిగి చెల్లించడం మరియు మూసివేయడం,
-Loan Security Status,రుణ భద్రతా స్థితి,
Lost Opportunity,అవకాశం కోల్పోయింది,
Maintenance Schedules,నిర్వహణ షెడ్యూల్స్,
Material Requests for which Supplier Quotations are not created,సరఫరాదారు కొటేషన్స్ రూపొందించినవారు లేని పదార్థం అభ్యర్థనలు,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},లక్ష్యంగా ఉన్న గణనలు: {0},
Payment Account is mandatory,చెల్లింపు ఖాతా తప్పనిసరి,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","తనిఖీ చేస్తే, ఎటువంటి ప్రకటన లేదా రుజువు సమర్పణ లేకుండా ఆదాయపు పన్నును లెక్కించే ముందు పూర్తి మొత్తాన్ని పన్ను పరిధిలోకి వచ్చే ఆదాయం నుండి తీసివేయబడుతుంది.",
-Disbursement Details,పంపిణీ వివరాలు,
Material Request Warehouse,మెటీరియల్ రిక్వెస్ట్ గిడ్డంగి,
Select warehouse for material requests,మెటీరియల్ అభ్యర్థనల కోసం గిడ్డంగిని ఎంచుకోండి,
Transfer Materials For Warehouse {0},గిడ్డంగి కోసం పదార్థాలను బదిలీ చేయండి {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,క్లెయిమ్ చేయని మొత్తాన్ని జీతం నుండి తిరిగి చెల్లించండి,
Deduction from salary,జీతం నుండి మినహాయింపు,
Expired Leaves,గడువు ముగిసిన ఆకులు,
-Reference No,సూచి సంఖ్య,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,హ్యారీకట్ శాతం అంటే రుణ భద్రత యొక్క మార్కెట్ విలువ మరియు ఆ రుణానికి అనుషంగికంగా ఉపయోగించినప్పుడు ఆ రుణ భద్రతకు సూచించిన విలువ మధ్య శాతం వ్యత్యాసం.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,లోన్ టు వాల్యూ రేషియో రుణ మొత్తం యొక్క నిష్పత్తిని ప్రతిజ్ఞ చేసిన భద్రత విలువకు తెలియజేస్తుంది. ఏదైనా for ణం కోసం పేర్కొన్న విలువ కంటే తక్కువగా ఉంటే రుణ భద్రతా కొరత ప్రేరేపించబడుతుంది,
If this is not checked the loan by default will be considered as a Demand Loan,ఇది తనిఖీ చేయకపోతే అప్పును అప్పుగా డిమాండ్ లోన్గా పరిగణిస్తారు,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,ఈ ఖాతా రుణగ్రహీత నుండి రుణ తిరిగి చెల్లించటానికి మరియు రుణగ్రహీతకు రుణాలు పంపిణీ చేయడానికి ఉపయోగించబడుతుంది,
This account is capital account which is used to allocate capital for loan disbursal account ,"ఈ ఖాతా మూలధన ఖాతా, ఇది రుణ పంపిణీ ఖాతాకు మూలధనాన్ని కేటాయించడానికి ఉపయోగించబడుతుంది",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},ఆపరేషన్ {0 the పని క్రమానికి చెందినది కాదు {1},
Print UOM after Quantity,పరిమాణం తర్వాత UOM ను ముద్రించండి,
Set default {0} account for perpetual inventory for non stock items,స్టాక్ కాని వస్తువుల కోసం శాశ్వత జాబితా కోసం డిఫాల్ట్ {0} ఖాతాను సెట్ చేయండి,
-Loan Security {0} added multiple times,లోన్ సెక్యూరిటీ {0 multiple అనేకసార్లు జోడించబడింది,
-Loan Securities with different LTV ratio cannot be pledged against one loan,వేర్వేరు ఎల్టివి నిష్పత్తి కలిగిన లోన్ సెక్యూరిటీలను ఒక రుణానికి వ్యతిరేకంగా ప్రతిజ్ఞ చేయలేము,
-Qty or Amount is mandatory for loan security!,రుణ భద్రత కోసం క్యూటీ లేదా మొత్తం తప్పనిసరి!,
-Only submittted unpledge requests can be approved,సమర్పించిన అన్ప్లెడ్జ్ అభ్యర్థనలను మాత్రమే ఆమోదించవచ్చు,
-Interest Amount or Principal Amount is mandatory,వడ్డీ మొత్తం లేదా ప్రిన్సిపాల్ మొత్తం తప్పనిసరి,
-Disbursed Amount cannot be greater than {0},పంపిణీ చేసిన మొత్తం {0 than కంటే ఎక్కువ ఉండకూడదు,
-Row {0}: Loan Security {1} added multiple times,అడ్డు వరుస {0}: రుణ భద్రత {1 multiple అనేకసార్లు జోడించబడింది,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,అడ్డు వరుస # {0}: పిల్లల అంశం ఉత్పత్తి బండిల్ కాకూడదు. దయచేసి అంశం {1 remove ను తీసివేసి సేవ్ చేయండి,
Credit limit reached for customer {0},కస్టమర్ {0 credit కోసం క్రెడిట్ పరిమితి చేరుకుంది,
Could not auto create Customer due to the following missing mandatory field(s):,కింది తప్పనిసరి ఫీల్డ్ (లు) లేనందున కస్టమర్ను ఆటో సృష్టించడం సాధ్యం కాలేదు:,
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index e371aed..5d3d27b 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","บังคับใช้หาก บริษัท คือ SpA, SApA หรือ SRL",
Applicable if the company is a limited liability company,บังคับใช้หาก บริษัท เป็น บริษัท รับผิด จำกัด,
Applicable if the company is an Individual or a Proprietorship,บังคับใช้หาก บริษัท เป็นบุคคลธรรมดาหรือเจ้าของกิจการ,
-Applicant,ผู้ขอ,
-Applicant Type,ประเภทผู้สมัคร,
Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์),
Application period cannot be across two allocation records,ระยะเวลาการสมัครต้องไม่เกินสองระเบียนการจัดสรร,
Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,รายชื่อผู้ถือหุ้นที่มีหมายเลข folio,
Loading Payment System,กำลังโหลดระบบการชำระเงิน,
Loan,เงินกู้,
-Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0},
-Loan Application,การขอสินเชื่อ,
-Loan Management,การจัดการสินเชื่อ,
-Loan Repayment,การชำระคืนเงินกู้,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,วันที่เริ่มต้นสินเชื่อและระยะเวลากู้มีผลบังคับใช้ในการบันทึกการลดใบแจ้งหนี้,
Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน ),
Loans and Advances (Assets),เงินให้กู้ยืม และ เงินทดรอง ( สินทรัพย์ ),
@@ -1611,7 +1605,6 @@
Monday,วันจันทร์,
Monthly,รายเดือน,
Monthly Distribution,การกระจายรายเดือน,
-Monthly Repayment Amount cannot be greater than Loan Amount,จำนวนเงินที่ชำระหนี้รายเดือนไม่สามารถจะสูงกว่าจำนวนเงินกู้,
More,เพิ่ม,
More Information,ข้อมูลมากกว่านี้,
More than one selection for {0} not allowed,ไม่อนุญาตให้เลือกมากกว่าหนึ่งรายการสำหรับ {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},ชำระเงิน {0} {1},
Payable,ที่ต้องชำระ,
Payable Account,เจ้าหนี้การค้า,
-Payable Amount,จำนวนเจ้าหนี้,
Payment,วิธีการชำระเงิน,
Payment Cancelled. Please check your GoCardless Account for more details,ยกเลิกการชำระเงินแล้ว โปรดตรวจสอบบัญชี GoCardless ของคุณเพื่อดูรายละเอียดเพิ่มเติม,
Payment Confirmation,การยืนยันการชำระเงิน,
-Payment Date,วันจ่าย,
Payment Days,วันชำระเงิน,
Payment Document,เอกสารการชำระเงิน,
Payment Due Date,วันที่ครบกำหนด ชำระเงิน,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,กรุณาใส่ใบเสร็จรับเงินครั้งแรก,
Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน,
Please enter Reference date,กรุณากรอก วันที่ อ้างอิง,
-Please enter Repayment Periods,กรุณากรอกระยะเวลาการชำระคืน,
Please enter Reqd by Date,โปรดป้อน Reqd by Date,
Please enter Woocommerce Server URL,โปรดป้อน URL เซิร์ฟเวอร์ Woocommerce,
Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,กรุณาใส่ ศูนย์ ค่าใช้จ่าย ของผู้ปกครอง,
Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0},
Please enter relieving date.,กรุณากรอก วันที่ บรรเทา,
-Please enter repayment Amount,กรุณากรอกจำนวนเงินการชำระหนี้,
Please enter valid Financial Year Start and End Dates,กรุณากรอกเริ่มต้นปีงบการเงินที่ถูกต้องและวันที่สิ้นสุด,
Please enter valid email address,โปรดป้อนที่อยู่อีเมลที่ถูกต้อง,
Please enter {0} first,กรุณากรอก {0} แรก,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ,
Primary Address Details,รายละเอียดที่อยู่หลัก,
Primary Contact Details,รายละเอียดการติดต่อหลัก,
-Principal Amount,เงินต้น,
Print Format,พิมพ์รูปแบบ,
Print IRS 1099 Forms,"พิมพ์ฟอร์ม IRS 1,099",
Print Report Card,พิมพ์บัตรรายงาน,
@@ -2550,7 +2538,6 @@
Sample Collection,การเก็บตัวอย่าง,
Sample quantity {0} cannot be more than received quantity {1},ปริมาณตัวอย่าง {0} ไม่สามารถมากกว่าปริมาณที่ได้รับ {1},
Sanctioned,ตามทำนองคลองธรรม,
-Sanctioned Amount,จำนวนตามทำนองคลองธรรม,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0},
Sand,ทราย,
Saturday,วันเสาร์,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} มี parent Parent {1} อยู่แล้ว,
API,API,
Annual,ประจำปี,
-Approved,ได้รับการอนุมัติ,
Change,เปลี่ยนแปลง,
Contact Email,ติดต่ออีเมล์,
Export Type,ประเภทการส่งออก,
@@ -3571,7 +3557,6 @@
Account Value,มูลค่าบัญชี,
Account is mandatory to get payment entries,บัญชีจำเป็นต้องมีเพื่อรับรายการชำระเงิน,
Account is not set for the dashboard chart {0},บัญชีไม่ถูกตั้งค่าสำหรับแผนภูมิแดชบอร์ด {0},
-Account {0} does not belong to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1},
Account {0} does not exists in the dashboard chart {1},บัญชี {0} ไม่มีอยู่ในแผนภูมิแดชบอร์ด {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,บัญชี: <b>{0}</b> เป็นงานที่อยู่ระหว่างดำเนินการและไม่สามารถอัพเดตได้โดยรายการบันทึก,
Account: {0} is not permitted under Payment Entry,บัญชี: {0} ไม่ได้รับอนุญาตภายใต้รายการชำระเงิน,
@@ -3582,7 +3567,6 @@
Activity,กิจกรรม,
Add / Manage Email Accounts.,เพิ่ม / จัดการอีเมล,
Add Child,เพิ่ม เด็ก,
-Add Loan Security,เพิ่มความปลอดภัยสินเชื่อ,
Add Multiple,เพิ่มหลายรายการ,
Add Participants,เพิ่มผู้เข้าร่วม,
Add to Featured Item,เพิ่มไปยังรายการแนะนำ,
@@ -3593,15 +3577,12 @@
Address Line 1,ที่อยู่บรรทัดที่ 1,
Addresses,ที่อยู่,
Admission End Date should be greater than Admission Start Date.,วันที่สิ้นสุดการรับสมัครควรมากกว่าวันที่เริ่มต้นการรับสมัคร,
-Against Loan,ต่อสินเชื่อ,
-Against Loan:,ต่อสินเชื่อ,
All,ทั้งหมด,
All bank transactions have been created,สร้างธุรกรรมธนาคารทั้งหมดแล้ว,
All the depreciations has been booked,การคิดค่าเสื่อมราคาทั้งหมดได้รับการจอง,
Allocation Expired!,การจัดสรรหมดอายุ!,
Allow Resetting Service Level Agreement from Support Settings.,อนุญาตการรีเซ็ตข้อตกลงระดับบริการจากการตั้งค่าการสนับสนุน,
Amount of {0} is required for Loan closure,ต้องมีจำนวน {0} สำหรับการปิดสินเชื่อ,
-Amount paid cannot be zero,จำนวนเงินที่ชำระต้องไม่เป็นศูนย์,
Applied Coupon Code,รหัสคูปองที่ใช้แล้ว,
Apply Coupon Code,ใช้รหัสคูปอง,
Appointment Booking,การจองการนัดหมาย,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,ไม่สามารถคำนวณเวลามาถึงได้เนื่องจากที่อยู่ของไดรเวอร์หายไป,
Cannot Optimize Route as Driver Address is Missing.,ไม่สามารถปรับเส้นทางให้เหมาะสมเนื่องจากที่อยู่ไดรเวอร์หายไป,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,ไม่สามารถดำเนินการงาน {0} ให้สมบูรณ์เนื่องจากงานที่ขึ้นต่อกัน {1} ไม่ได้ถูกคอมไพล์หรือยกเลิก,
-Cannot create loan until application is approved,ไม่สามารถสร้างเงินกู้จนกว่าใบสมัครจะได้รับการอนุมัติ,
Cannot find a matching Item. Please select some other value for {0}.,ไม่พบรายการที่ตรงกัน กรุณาเลือกบางค่าอื่น ๆ สำหรับ {0},
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",ไม่สามารถเรียกเก็บเงินเกินขนาดสำหรับรายการ {0} ในแถว {1} มากกว่า {2} หากต้องการอนุญาตการเรียกเก็บเงินมากเกินไปโปรดตั้งค่าเผื่อในการตั้งค่าบัญชี,
"Capacity Planning Error, planned start time can not be same as end time",ข้อผิดพลาดการวางแผนกำลังการผลิตเวลาเริ่มต้นตามแผนต้องไม่เหมือนกับเวลาสิ้นสุด,
@@ -3812,20 +3792,9 @@
Less Than Amount,น้อยกว่าจำนวนเงิน,
Liabilities,หนี้สิน,
Loading...,กำลังโหลด ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,จำนวนเงินกู้เกินจำนวนเงินกู้สูงสุด {0} ตามหลักทรัพย์ที่เสนอ,
Loan Applications from customers and employees.,การขอสินเชื่อจากลูกค้าและพนักงาน,
-Loan Disbursement,การเบิกจ่ายสินเชื่อ,
Loan Processes,กระบวนการสินเชื่อ,
-Loan Security,ความปลอดภัยของสินเชื่อ,
-Loan Security Pledge,จำนำหลักประกันสินเชื่อ,
-Loan Security Pledge Created : {0},สร้างหลักประกันความปลอดภัยสินเชื่อ: {0},
-Loan Security Price,ราคาหลักประกัน,
-Loan Security Price overlapping with {0},ราคาความปลอดภัยสินเชื่อทับซ้อนกับ {0},
-Loan Security Unpledge,Unpledge ความปลอดภัยสินเชื่อ,
-Loan Security Value,มูลค่าหลักประกัน,
Loan Type for interest and penalty rates,ประเภทสินเชื่อสำหรับอัตราดอกเบี้ยและค่าปรับ,
-Loan amount cannot be greater than {0},จำนวนเงินกู้ไม่สามารถมากกว่า {0},
-Loan is mandatory,สินเชื่อมีผลบังคับใช้,
Loans,เงินให้กู้ยืม,
Loans provided to customers and employees.,เงินให้กู้ยืมแก่ลูกค้าและพนักงาน,
Location,ตำแหน่ง,
@@ -3894,7 +3863,6 @@
Pay,จ่ายเงิน,
Payment Document Type,ประเภทเอกสารการชำระเงิน,
Payment Name,ชื่อการชำระเงิน,
-Penalty Amount,จำนวนโทษ,
Pending,คาราคาซัง,
Performance,ประสิทธิภาพ,
Period based On,ระยะเวลาขึ้นอยู่กับ,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,โปรดเข้าสู่ระบบในฐานะผู้ใช้ Marketplace เพื่อแก้ไขรายการนี้,
Please login as a Marketplace User to report this item.,โปรดเข้าสู่ระบบในฐานะผู้ใช้ Marketplace เพื่อรายงานรายการนี้,
Please select <b>Template Type</b> to download template,โปรดเลือก <b>ประเภทเทมเพลต</b> เพื่อดาวน์โหลดเทมเพลต,
-Please select Applicant Type first,โปรดเลือกประเภทผู้สมัครก่อน,
Please select Customer first,โปรดเลือกลูกค้าก่อน,
Please select Item Code first,กรุณาเลือกรหัสสินค้าก่อน,
-Please select Loan Type for company {0},โปรดเลือกประเภทสินเชื่อสำหรับ บริษัท {0},
Please select a Delivery Note,กรุณาเลือกใบส่งมอบ,
Please select a Sales Person for item: {0},โปรดเลือกพนักงานขายสำหรับรายการ: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',โปรดเลือกวิธีการชำระเงินอื่น แถบไม่รองรับธุรกรรมในสกุลเงิน '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},โปรดตั้งค่าบัญชีธนาคารเริ่มต้นสำหรับ บริษัท {0},
Please specify,โปรดระบุ,
Please specify a {0},โปรดระบุ {0},lead
-Pledge Status,สถานะการจำนำ,
-Pledge Time,เวลาจำนำ,
Printing,การพิมพ์,
Priority,บุริมสิทธิ์,
Priority has been changed to {0}.,ลำดับความสำคัญถูกเปลี่ยนเป็น {0},
@@ -3944,7 +3908,6 @@
Processing XML Files,กำลังประมวลผลไฟล์ XML,
Profitability,การทำกำไร,
Project,โครงการ,
-Proposed Pledges are mandatory for secured Loans,คำมั่นสัญญาที่เสนอมีผลบังคับใช้สำหรับสินเชื่อที่มีความปลอดภัย,
Provide the academic year and set the starting and ending date.,ระบุปีการศึกษาและกำหนดวันเริ่มต้นและสิ้นสุด,
Public token is missing for this bank,โทเค็นสาธารณะหายไปสำหรับธนาคารนี้,
Publish,ประกาศ,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,ใบเสร็จรับเงินซื้อไม่มีรายการใด ๆ ที่เปิดใช้งานเก็บตัวอย่างไว้,
Purchase Return,ซื้อกลับ,
Qty of Finished Goods Item,จำนวนสินค้าสำเร็จรูป,
-Qty or Amount is mandatroy for loan security,จำนวนหรือจำนวนเงินคือ mandatroy สำหรับการรักษาความปลอดภัยสินเชื่อ,
Quality Inspection required for Item {0} to submit,ต้องการการตรวจสอบคุณภาพสำหรับรายการ {0},
Quantity to Manufacture,ปริมาณการผลิต,
Quantity to Manufacture can not be zero for the operation {0},ปริมาณการผลิตไม่สามารถเป็นศูนย์สำหรับการดำเนินการ {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,วันที่บรรเทาจะต้องมากกว่าหรือเท่ากับวันที่เข้าร่วม,
Rename,ตั้งชื่อใหม่,
Rename Not Allowed,ไม่อนุญาตให้เปลี่ยนชื่อ,
-Repayment Method is mandatory for term loans,วิธีการชำระคืนมีผลบังคับใช้สำหรับสินเชื่อระยะยาว,
-Repayment Start Date is mandatory for term loans,วันที่เริ่มต้นชำระคืนมีผลบังคับใช้กับสินเชื่อระยะยาว,
Report Item,รายการรายงาน,
Report this Item,รายงานรายการนี้,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,ปริมาณที่สงวนไว้สำหรับการรับเหมาช่วง: ปริมาณวัตถุดิบเพื่อทำรายการรับเหมาช่วง,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},แถว ({0}): {1} ถูกลดราคาใน {2} แล้ว,
Rows Added in {0},เพิ่มแถวใน {0},
Rows Removed in {0},แถวถูกลบใน {0},
-Sanctioned Amount limit crossed for {0} {1},ข้ามขีด จำกัด ตามจำนวนที่อนุญาตสำหรับ {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},จำนวนเงินกู้ที่ถูกลงโทษมีอยู่แล้วสำหรับ {0} กับ บริษัท {1},
Save,บันทึก,
Save Item,บันทึกรายการ,
Saved Items,รายการที่บันทึกไว้,
@@ -4135,7 +4093,6 @@
User {0} is disabled,ผู้ใช้ {0} ถูกปิดใช้งาน,
Users and Permissions,ผู้ใช้และสิทธิ์,
Vacancies cannot be lower than the current openings,ตำแหน่งงานต้องไม่ต่ำกว่าช่องเปิดปัจจุบัน,
-Valid From Time must be lesser than Valid Upto Time.,ใช้งานได้จากเวลาจะต้องน้อยกว่าเวลาที่ใช้ได้ไม่เกิน,
Valuation Rate required for Item {0} at row {1},ต้องมีการประเมินค่าอัตราสำหรับรายการ {0} ที่แถว {1},
Values Out Of Sync,ค่าไม่ซิงค์กัน,
Vehicle Type is required if Mode of Transport is Road,ต้องระบุประเภทยานพาหนะหากโหมดการขนส่งเป็นถนน,
@@ -4211,7 +4168,6 @@
Add to Cart,ใส่ในรถเข็น,
Days Since Last Order,วันนับตั้งแต่คำสั่งซื้อล่าสุด,
In Stock,ในสต็อก,
-Loan Amount is mandatory,จำนวนเงินกู้เป็นสิ่งจำเป็น,
Mode Of Payment,โหมดของการชำระเงิน,
No students Found,ไม่พบนักเรียน,
Not in Stock,ไม่ได้อยู่ในสต็อก,
@@ -4240,7 +4196,6 @@
Group by,กลุ่มตาม,
In stock,มีสินค้าในสต๊อก,
Item name,ชื่อรายการ,
-Loan amount is mandatory,จำนวนเงินกู้เป็นสิ่งจำเป็น,
Minimum Qty,จำนวนขั้นต่ำ,
More details,รายละเอียดเพิ่มเติม,
Nature of Supplies,ธรรมชาติของวัสดุ,
@@ -4409,9 +4364,6 @@
Total Completed Qty,จำนวนที่เสร็จสมบูรณ์โดยรวม,
Qty to Manufacture,จำนวนการผลิต,
Repay From Salary can be selected only for term loans,การชำระคืนจากเงินเดือนสามารถเลือกได้เฉพาะสำหรับเงินกู้ระยะยาว,
-No valid Loan Security Price found for {0},ไม่พบราคาหลักประกันเงินกู้ที่ถูกต้องสำหรับ {0},
-Loan Account and Payment Account cannot be same,บัญชีเงินกู้และบัญชีการชำระเงินต้องไม่เหมือนกัน,
-Loan Security Pledge can only be created for secured loans,การจำนำความปลอดภัยของเงินกู้สามารถสร้างได้สำหรับเงินกู้ที่มีหลักประกันเท่านั้น,
Social Media Campaigns,แคมเปญโซเชียลมีเดีย,
From Date can not be greater than To Date,From Date ต้องไม่มากกว่าถึงวันที่,
Please set a Customer linked to the Patient,โปรดตั้งค่าลูกค้าที่เชื่อมโยงกับผู้ป่วย,
@@ -6437,7 +6389,6 @@
HR User,ผู้ใช้งานทรัพยากรบุคคล,
Appointment Letter,จดหมายนัด,
Job Applicant,ผู้สมัครงาน,
-Applicant Name,ชื่อผู้ยื่นคำขอ,
Appointment Date,วันที่นัดหมาย,
Appointment Letter Template,เทมเพลตจดหมายแต่งตั้ง,
Body,ร่างกาย,
@@ -7059,99 +7010,12 @@
Sync in Progress,ซิงค์อยู่ระหว่างดำเนินการ,
Hub Seller Name,ชื่อผู้ขาย Hub,
Custom Data,ข้อมูลที่กำหนดเอง,
-Member,สมาชิก,
-Partially Disbursed,การเบิกจ่ายบางส่วน,
-Loan Closure Requested,ขอปิดสินเชื่อ,
Repay From Salary,ชำระคืนจากเงินเดือน,
-Loan Details,รายละเอียดเงินกู้,
-Loan Type,ประเภทเงินกู้,
-Loan Amount,การกู้ยืมเงิน,
-Is Secured Loan,สินเชื่อที่มีหลักประกัน,
-Rate of Interest (%) / Year,อัตราดอกเบี้ย (%) / ปี,
-Disbursement Date,วันที่เบิกจ่าย,
-Disbursed Amount,จำนวนเงินที่เบิกจ่าย,
-Is Term Loan,เป็นเงินกู้ระยะยาว,
-Repayment Method,วิธีการชำระหนี้,
-Repay Fixed Amount per Period,ชำระคืนจำนวนคงที่ต่อปีระยะเวลา,
-Repay Over Number of Periods,ชำระคืนกว่าจำนวนงวด,
-Repayment Period in Months,ระยะเวลาชำระหนี้ในเดือน,
-Monthly Repayment Amount,จำนวนเงินที่ชำระหนี้รายเดือน,
-Repayment Start Date,วันที่เริ่มชำระคืน,
-Loan Security Details,รายละเอียดความปลอดภัยสินเชื่อ,
-Maximum Loan Value,มูลค่าสินเชื่อสูงสุด,
-Account Info,ข้อมูลบัญชี,
-Loan Account,บัญชีเงินกู้,
-Interest Income Account,บัญชีรายได้ดอกเบี้ย,
-Penalty Income Account,บัญชีรายรับค่าปรับ,
-Repayment Schedule,กำหนดชำระคืน,
-Total Payable Amount,รวมจำนวนเงินที่จ่าย,
-Total Principal Paid,เงินต้นรวมที่จ่าย,
-Total Interest Payable,ดอกเบี้ยรวมเจ้าหนี้,
-Total Amount Paid,จำนวนเงินที่จ่าย,
-Loan Manager,ผู้จัดการสินเชื่อ,
-Loan Info,ข้อมูลสินเชื่อ,
-Rate of Interest,อัตราดอกเบี้ย,
-Proposed Pledges,คำมั่นสัญญาที่เสนอ,
-Maximum Loan Amount,จำนวนเงินกู้สูงสุด,
-Repayment Info,ข้อมูลการชำระหนี้,
-Total Payable Interest,รวมดอกเบี้ยเจ้าหนี้,
-Against Loan ,ต่อต้านเงินกู้,
-Loan Interest Accrual,ดอกเบี้ยค้างรับ,
-Amounts,จํานวนเงิน,
-Pending Principal Amount,จำนวนเงินต้นที่รออนุมัติ,
-Payable Principal Amount,จำนวนเงินต้นเจ้าหนี้,
-Paid Principal Amount,จำนวนเงินต้นที่ชำระ,
-Paid Interest Amount,จำนวนดอกเบี้ยจ่าย,
-Process Loan Interest Accrual,ประมวลผลดอกเบี้ยค้างรับสินเชื่อ,
-Repayment Schedule Name,ชื่อกำหนดการชำระคืน,
Regular Payment,ชำระเงินปกติ,
Loan Closure,การปิดสินเชื่อ,
-Payment Details,รายละเอียดการชำระเงิน,
-Interest Payable,ดอกเบี้ยค้างจ่าย,
-Amount Paid,จำนวนเงินที่ชำระ,
-Principal Amount Paid,จำนวนเงินที่จ่าย,
-Repayment Details,รายละเอียดการชำระคืน,
-Loan Repayment Detail,รายละเอียดการชำระคืนเงินกู้,
-Loan Security Name,ชื่อหลักประกันสินเชื่อ,
-Unit Of Measure,หน่วยวัด,
-Loan Security Code,รหัสความปลอดภัยของสินเชื่อ,
-Loan Security Type,ประเภทหลักประกัน,
-Haircut %,ตัดผม%,
-Loan Details,รายละเอียดสินเชื่อ,
-Unpledged,Unpledged,
-Pledged,ให้คำมั่นสัญญา,
-Partially Pledged,จำนำบางส่วน,
-Securities,หลักทรัพย์,
-Total Security Value,มูลค่าความปลอดภัยทั้งหมด,
-Loan Security Shortfall,ความไม่มั่นคงของสินเชื่อ,
-Loan ,เงินกู้,
-Shortfall Time,เวลาที่สั้น,
-America/New_York,อเมริกา / New_York,
-Shortfall Amount,จำนวนเงินที่ขาด,
-Security Value ,ค่าความปลอดภัย,
-Process Loan Security Shortfall,ความล้มเหลวของความปลอดภัยสินเชื่อกระบวนการ,
-Loan To Value Ratio,อัตราส่วนสินเชื่อต่อมูลค่า,
-Unpledge Time,ปลดเวลา,
-Loan Name,ชื่อเงินกู้,
Rate of Interest (%) Yearly,อัตราดอกเบี้ย (%) ประจำปี,
-Penalty Interest Rate (%) Per Day,อัตราดอกเบี้ยค่าปรับ (%) ต่อวัน,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,อัตราดอกเบี้ยจะถูกเรียกเก็บจากจำนวนดอกเบี้ยที่ค้างอยู่ทุกวันในกรณีที่มีการชำระคืนล่าช้า,
-Grace Period in Days,ระยะเวลาปลอดหนี้เป็นวัน,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,จำนวนวันนับจากวันที่ครบกำหนดจนถึงที่จะไม่มีการเรียกเก็บค่าปรับในกรณีที่ชำระคืนเงินกู้ล่าช้า,
-Pledge,จำนำ,
-Post Haircut Amount,จำนวนเงินที่โพสต์ตัดผม,
-Process Type,ประเภทกระบวนการ,
-Update Time,อัปเดตเวลา,
-Proposed Pledge,จำนำเสนอ,
-Total Payment,การชำระเงินรวม,
-Balance Loan Amount,ยอดคงเหลือวงเงินกู้,
-Is Accrued,มีการค้างชำระ,
Salary Slip Loan,สินเชื่อลื่น,
Loan Repayment Entry,รายการชำระคืนเงินกู้,
-Sanctioned Loan Amount,จำนวนเงินกู้ตามทำนองคลองธรรม,
-Sanctioned Amount Limit,วงเงินจำนวนที่ถูกลงโทษ,
-Unpledge,Unpledge,
-Haircut,การตัดผม,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,สร้างแผนกำหนดการ,
Schedules,ตารางเวลา,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,โครงการจะสามารถเข้าถึงได้บนเว็บไซต์ของผู้ใช้เหล่านี้,
Copied From,คัดลอกจาก,
Start and End Dates,เริ่มต้นและสิ้นสุดวันที่,
-Actual Time (in Hours),เวลาจริง (เป็นชั่วโมง),
+Actual Time in Hours (via Timesheet),เวลาจริง (เป็นชั่วโมง),
Costing and Billing,ต้นทุนและการเรียกเก็บเงิน,
-Total Costing Amount (via Timesheets),ยอดรวมค่าใช้จ่าย (ผ่าน Timesheets),
-Total Expense Claim (via Expense Claims),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย),
+Total Costing Amount (via Timesheet),ยอดรวมค่าใช้จ่าย (ผ่าน Timesheets),
+Total Expense Claim (via Expense Claim),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย),
Total Purchase Cost (via Purchase Invoice),ค่าใช้จ่ายในการจัดซื้อรวม (ผ่านการซื้อใบแจ้งหนี้),
Total Sales Amount (via Sales Order),ยอดขายรวม (ผ่านใบสั่งขาย),
-Total Billable Amount (via Timesheets),ยอดรวม Billable Amount (ผ่าน Timesheets),
-Total Billed Amount (via Sales Invoices),จำนวนเงินที่เรียกเก็บเงินทั้งหมด (ผ่านใบกำกับการขาย),
-Total Consumed Material Cost (via Stock Entry),ค่าใช้จ่ายวัสดุสิ้นเปลืองทั้งหมด (ผ่านรายการสต็อค),
+Total Billable Amount (via Timesheet),ยอดรวม Billable Amount (ผ่าน Timesheets),
+Total Billed Amount (via Sales Invoice),จำนวนเงินที่เรียกเก็บเงินทั้งหมด (ผ่านใบกำกับการขาย),
+Total Consumed Material Cost (via Stock Entry),ค่าใช้จ่ายวัสดุสิ้นเปลืองทั้งหมด (ผ่านรายการสต็อค),
Gross Margin,กำไรขั้นต้น,
Gross Margin %,กำไรขั้นต้น %,
Monitor Progress,ติดตามความคืบหน้า,
@@ -7521,12 +7385,10 @@
Dependencies,การอ้างอิง,
Dependent Tasks,งานที่ต้องพึ่งพา,
Depends on Tasks,ขึ้นอยู่กับงาน,
-Actual Start Date (via Time Sheet),วันที่เริ่มต้นที่เกิดขึ้นจริง (ผ่านใบบันทึกเวลา),
-Actual Time (in hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง),
-Actual End Date (via Time Sheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา),
-Total Costing Amount (via Time Sheet),รวมคำนวณต้นทุนจำนวนเงิน (ผ่านใบบันทึกเวลา),
+Actual Start Date (via Timesheet),วันที่เริ่มต้นที่เกิดขึ้นจริง (ผ่านใบบันทึกเวลา),
+Actual Time in Hours (via Timesheet),เวลาที่เกิดขึ้นจริง (ในชั่วโมง),
+Actual End Date (via Timesheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา),
Total Expense Claim (via Expense Claim),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย),
-Total Billing Amount (via Time Sheet),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านใบบันทึกเวลา),
Review Date,ทบทวนวันที่,
Closing Date,ปิดวันที่,
Task Depends On,ขึ้นอยู่กับงาน,
@@ -7887,7 +7749,6 @@
Update Series,Series ปรับปรุง,
Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่,
Prefix,อุปสรรค,
-Current Value,ค่าปัจจุบัน,
This is the number of the last created transaction with this prefix,นี่คือหมายเลขของรายการที่สร้างขึ้นล่าสุดกับคำนำหน้านี้,
Update Series Number,จำนวน Series ปรับปรุง,
Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ,
Lead Details,รายละเอียดของช่องทาง,
Lead Owner Efficiency,ประสิทธิภาพของเจ้าของตะกั่ว,
-Loan Repayment and Closure,การชำระคืนเงินกู้และการปิดสินเชื่อ,
-Loan Security Status,สถานะความปลอดภัยสินเชื่อ,
Lost Opportunity,โอกาสที่หายไป,
Maintenance Schedules,กำหนดการบำรุงรักษา,
Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},จำนวนเป้าหมาย: {0},
Payment Account is mandatory,บัญชีการชำระเงินเป็นสิ่งจำเป็น,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",หากตรวจสอบแล้วเงินเต็มจำนวนจะถูกหักออกจากรายได้ที่ต้องเสียภาษีก่อนคำนวณภาษีเงินได้โดยไม่ต้องมีการสำแดงหรือส่งหลักฐานใด ๆ,
-Disbursement Details,รายละเอียดการเบิกจ่าย,
Material Request Warehouse,คลังสินค้าขอวัสดุ,
Select warehouse for material requests,เลือกคลังสินค้าสำหรับคำขอวัสดุ,
Transfer Materials For Warehouse {0},โอนวัสดุสำหรับคลังสินค้า {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,ชำระคืนจำนวนเงินที่ไม่มีการเรียกร้องจากเงินเดือน,
Deduction from salary,หักจากเงินเดือน,
Expired Leaves,ใบหมดอายุ,
-Reference No,เลขอ้างอิง,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,เปอร์เซ็นต์การตัดผมคือเปอร์เซ็นต์ความแตกต่างระหว่างมูลค่าตลาดของหลักประกันเงินกู้กับมูลค่าที่ระบุไว้กับหลักประกันเงินกู้นั้นเมื่อใช้เป็นหลักประกันสำหรับเงินกู้นั้น,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,อัตราส่วนเงินกู้ต่อมูลค่าเป็นการแสดงอัตราส่วนของจำนวนเงินกู้ต่อมูลค่าของหลักประกันที่จำนำ การขาดความปลอดภัยของเงินกู้จะเกิดขึ้นหากต่ำกว่ามูลค่าที่ระบุสำหรับเงินกู้ใด ๆ,
If this is not checked the loan by default will be considered as a Demand Loan,หากไม่ได้ตรวจสอบเงินกู้โดยค่าเริ่มต้นจะถือว่าเป็น Demand Loan,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,บัญชีนี้ใช้สำหรับจองการชำระคืนเงินกู้จากผู้กู้และการเบิกจ่ายเงินกู้ให้กับผู้กู้,
This account is capital account which is used to allocate capital for loan disbursal account ,บัญชีนี้เป็นบัญชีทุนที่ใช้ในการจัดสรรเงินทุนสำหรับบัญชีการเบิกจ่ายเงินกู้,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},การดำเนินการ {0} ไม่ได้อยู่ในใบสั่งงาน {1},
Print UOM after Quantity,พิมพ์ UOM หลังจำนวน,
Set default {0} account for perpetual inventory for non stock items,ตั้งค่าบัญชี {0} เริ่มต้นสำหรับสินค้าคงคลังถาวรสำหรับสินค้าที่ไม่มีในสต็อก,
-Loan Security {0} added multiple times,ความปลอดภัยของเงินกู้ {0} เพิ่มหลายครั้ง,
-Loan Securities with different LTV ratio cannot be pledged against one loan,หลักทรัพย์เงินกู้ที่มีอัตราส่วน LTV แตกต่างกันไม่สามารถนำไปจำนำกับเงินกู้เพียงก้อนเดียวได้,
-Qty or Amount is mandatory for loan security!,จำนวนหรือจำนวนเป็นสิ่งจำเป็นสำหรับการรักษาความปลอดภัยเงินกู้!,
-Only submittted unpledge requests can be approved,สามารถอนุมัติได้เฉพาะคำขอที่ไม่ได้ลงทะเบียนที่ส่งมาเท่านั้น,
-Interest Amount or Principal Amount is mandatory,จำนวนดอกเบี้ยหรือจำนวนเงินต้นเป็นข้อบังคับ,
-Disbursed Amount cannot be greater than {0},จำนวนเงินที่เบิกจ่ายต้องไม่เกิน {0},
-Row {0}: Loan Security {1} added multiple times,แถว {0}: Loan Security {1} เพิ่มหลายครั้ง,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,แถว # {0}: รายการย่อยไม่ควรเป็นกลุ่มผลิตภัณฑ์ โปรดลบรายการ {1} และบันทึก,
Credit limit reached for customer {0},ถึงวงเงินสินเชื่อสำหรับลูกค้าแล้ว {0},
Could not auto create Customer due to the following missing mandatory field(s):,ไม่สามารถสร้างลูกค้าโดยอัตโนมัติเนื่องจากไม่มีฟิลด์บังคับต่อไปนี้:,
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 69cdc2e..b9e301a 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Şirket SpA, SApA veya SRL ise uygulanabilir",
Applicable if the company is a limited liability company,Şirket limited şirketi ise uygulanabilir,
Applicable if the company is an Individual or a Proprietorship,Şirket Birey veya Mülkiyet ise uygulanabilir,
-Applicant,Başvuru Sahibi,
-Applicant Type,Başvuru Sahibi Türü,
Application of Funds (Assets),fon (varlık) çalışması,
Application period cannot be across two allocation records,Başvuru süresi iki ödenek boyunca kaydırılamaz,
Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz,
@@ -552,7 +550,7 @@
Closing (Cr),Kapanış (Alacak),
Closing (Dr),Kapanış (Borç),
Closing (Opening + Total),Kapanış (Açılış + Toplam),
-"Closing Account {0} must be of type Liability / Equity","Kapanış Hesabı {0}, Borç / Özkaynak türünde olmalıdır",
+Closing Account {0} must be of type Liability / Equity,"Kapanış Hesabı {0}, Borç / Özkaynak türünde olmalıdır",
Closing Balance,Kapanış bakiyesi,
Code,Kod,
Collapse All,Tümünü Daralt,
@@ -1449,11 +1447,11 @@
Leave application {0} already exists against the student {1},{1} öğrencine karşı {0} çalışanı zaten bırak,
"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Öncelik tahsis edememek izin {0}, izin özellikleri zaten devredilen gelecek izin tahsisi kayıtlarında olduğu gibi {1}",
"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","İzin yapısı zaten devredilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik etmek anlamsız bırakın {1}",
-"Leave of type {0} cannot be longer than {1}","{0} türündeki izin, {1}'den uzun olamaz",
+Leave of type {0} cannot be longer than {1},"{0} türündeki izin, {1}'den uzun olamaz",
Leaves,İzinler,
Leaves Allocated Successfully for {0},{0} için Başarıyla Tahsis Edilen İzinler,
Leaves has been granted sucessfully,İzinler başarıyla verildi,
-"Leaves must be allocated in multiples of 0.5","İzinler 0,5'in katları şeklinde tahsis edilmelidir",
+Leaves must be allocated in multiples of 0.5,"İzinler 0,5'in katları şeklinde tahsis edilmelidir",
Leaves per Year,Yıllık İzin,
Ledger,Defteri Kebir,
Legal,Yasal,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Folio numaraları ile mevcut Hissedarların listesi,
Loading Payment System,Ödeme Sistemi Yükleniyor,
Loan,Kredi,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0},
-Loan Application,Kredi Başvurusu,
-Loan Management,Kredi Yönetimi,
-Loan Repayment,Kredi Geri Ödemesi,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Fatura İndirimi’nin kaydedilmesi için Kredi Başlangıç Tarihi ve Kredi Süresi zorunludur,
Loans (Liabilities),Krediler (Yükümlülükler),
Loans and Advances (Assets),Krediler ve Avanslar (Varlıklar),
@@ -1611,7 +1605,6 @@
Monday,Pazartesi,
Monthly,Aylık,
Monthly Distribution,Aylık Dağılımı,
-Monthly Repayment Amount cannot be greater than Loan Amount,Aylık Geri Ödeme Tutarı Kredi Miktarı daha büyük olamaz,
More,Daha fazla,
More Information,Daha Fazla Bilgi,
More than one selection for {0} not allowed,{0} için birden fazla seçime izin verilmiyor,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} öde,
Payable,Ödenecek Borç,
Payable Account,Ödenecek Hesap,
-Payable Amount,Ödenecek Tutar,
Payment,Ödeme,
Payment Cancelled. Please check your GoCardless Account for more details,Ödeme iptal edildi. Daha fazla bilgi için lütfen GoCardless Hesabınızı kontrol edin,
Payment Confirmation,Ödeme Onaylama,
-Payment Date,Ödeme Tarihi,
Payment Days,Ödeme Günleri,
Payment Document,Ödeme Belgesi,
Payment Due Date,Son Ödeme Tarihi,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Lütfen İlk Alış Fişini giriniz,
Please enter Receipt Document,Lütfen Fiş Belgesini giriniz,
Please enter Reference date,Referans tarihini girin,
-Please enter Repayment Periods,Geri Ödeme Süreleri giriniz,
Please enter Reqd by Date,Lütfen Reqd'yi Tarihe Göre Girin,
Please enter Woocommerce Server URL,Lütfen Woocommerce Sunucusu URL'sini girin,
Please enter Write Off Account,Lütfen Şüpheli Alacak Hesabını Girin,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Lütfen ana maliyet merkezi giriniz,
Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz,
Please enter relieving date.,Lütfen hafifletme tarihini girin.,
-Please enter repayment Amount,Lütfen geri ödeme Tutarını giriniz,
Please enter valid Financial Year Start and End Dates,Geçerli Mali Yılı Başlangıç ve Bitiş Tarihleri girin,
Please enter valid email address,Lütfen geçerli e-posta adresini girin,
Please enter {0} first,İlk {0} giriniz,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir.,
Primary Address Details,Birincil Adres Ayrıntıları,
Primary Contact Details,Birincil İletişim Bilgileri,
-Principal Amount,anapara çiftleri,
Print Format,Yazdırma Formatı,
Print IRS 1099 Forms,IRS 1099 Formlarını Yazdır,
Print Report Card,Kartı Rapor Yazdır,
@@ -2550,7 +2538,6 @@
Sample Collection,Örnek Koleksiyon,
Sample quantity {0} cannot be more than received quantity {1},"Örnek miktarı {0}, alınan miktarn {1} fazla olamaz.",
Sanctioned,seçildi,
-Sanctioned Amount,tasdik edilmiş tutarlar,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.,
Sand,Kum,
Saturday,Cumartesi,
@@ -3472,7 +3459,6 @@
Conditions,Koşullar,
County,Kontluk,
Day of Week,Haftanın günü,
-"Dear System Manager,Sevgili Sistem Yöneticisi,",
Default Value,Varsayılan Değer,
Email Group,E-posta Grubu,
Email Settings,E-posta Ayarları,
@@ -3541,7 +3527,6 @@
{0} already has a Parent Procedure {1}.,{0} zaten bir {1} veli yapıya sahip.,
API,API,
Annual,Yıllık,
-Approved,Onaylandı,
Change,Değiştir,
Contact Email,İletişim E-Posta,
Export Type,Export Türü,
@@ -3571,7 +3556,6 @@
Account Value,hesap değeri,
Account is mandatory to get payment entries,Ödemeleri giriş almak için hesap yaptırımları,
Account is not set for the dashboard chart {0},{0} gösterge tablo grafiği için hesap ayarlanmadı,
-Account {0} does not belong to company {1},Hesap {0} Şirkete ait değil {1},
Account {0} does not exists in the dashboard chart {1},"{0} hesabı, {1} gösterge tablosunda yok",
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Hesap: <b>{0}</b> sermayedir Devam etmekte olan iş ve Yevmiye Kaydı tarafından güncellenemez,
Account: {0} is not permitted under Payment Entry,Hesap: İzin verilmiyor altında {0} Ödeme Girişi,
@@ -3582,7 +3566,6 @@
Activity,Aktivite,
Add / Manage Email Accounts.,E-posta Hesaplarını Ekle / Yönet.,
Add Child,Alt öğe ekle,
-Add Loan Security,Kredi Güvenliği Ekleme,
Add Multiple,Çoklu Ekle,
Add Participants,Katılımcı Ekle,
Add to Featured Item,Öne Çıkan Öğeye Ekle,
@@ -3593,15 +3576,12 @@
Address Line 1,Adres Satırı 1,
Addresses,Adresler,
Admission End Date should be greater than Admission Start Date.,"Giriş Bitiş Tarihi, Giriş Başlangıç Tarihinden büyük olmalıdır.",
-Against Loan,Krediye Karşı,
-Against Loan:,Krediye Karşı:,
All,Tümü,
All bank transactions have been created,Tüm banka işlemleri işletme,
All the depreciations has been booked,Tüm amortismanlar rezerve edildi,
Allocation Expired!,Tahsis Süresi Bitti!,
Allow Resetting Service Level Agreement from Support Settings.,Servis Seviyesi Sözleşmesini Destek Ayarlarından Sıfırlamaya İzin Ver.,
Amount of {0} is required for Loan closure,Kredi çıkışı için {0} barındırma gerekli,
-Amount paid cannot be zero,Ödenen tutarları sıfır olamaz,
Applied Coupon Code,Uygulamalı Kupon Kodu,
Apply Coupon Code,kupon üretme uygula,
Appointment Booking,Randevu Rezervasyonu,
@@ -3649,7 +3629,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Sürücü Adresi Eksiklerinden Varış Saati Hesaplanamıyor.,
Cannot Optimize Route as Driver Address is Missing.,Sürücü Adresi Eksik Olarak Rotayı Optimize Etme,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,{0} görevi tamamlanamıyor çünkü görevli görevi {1} tamamlanmadı / iptal edilmedi.,
-Cannot create loan until application is approved,Başvuru onaylanana kadar kredi oluşturulamaz,
Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. İçin {0} diğer bazı değer seçiniz.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","{1} bilgisindeki {0} öğe için {2} 'den fazla öğe fazla faturalandırılamıyor. Fazla faturalandırmaya izin vermek için, lütfen Hesap Yapılandırmalarında ödenenek ayarını yapınız.",
"Capacity Planning Error, planned start time can not be same as end time","Kapasite Planlama Hatası, patlama başlangıç zamanı bitiş zamanı ile aynı olamaz",
@@ -3812,20 +3791,9 @@
Less Than Amount,Tutardan Az,
Liabilities,Yükümlülükler,
Loading...,Yükleniyor...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,"Kredi Tutarı, çekilen menkul kıymetlere göre maksimum {0} kredi tutarını aşıyor",
Loan Applications from customers and employees.,Müşterilerden ve çalışanlardan kredi uygulamaları.,
-Loan Disbursement,Kredi Masrafı,
Loan Processes,Kredi Süreçleri,
-Loan Security,Kredi Güvenliği,
-Loan Security Pledge,Kredi Güvenliği Taahhüdü,
-Loan Security Pledge Created : {0},Kredi Güvenliği Rehin Oluşturuldu: {0},
-Loan Security Price,Kredi Güvenliği Fiyatı,
-Loan Security Price overlapping with {0},{0} ile örtüşen Kredi Güvenliği Fiyatı,
-Loan Security Unpledge,Kredi Güvenliği Bilgisizliği,
-Loan Security Value,Kredi Güvenliği Değeri,
Loan Type for interest and penalty rates,Faiz ve ceza oranları için Kredi Türü,
-Loan amount cannot be greater than {0},Kredi birimleri {0} 'dan fazla olamaz,
-Loan is mandatory,Kredi ağları,
Loans,Krediler,
Loans provided to customers and employees.,Müşterilere ve çalışanlara verilen krediler.,
Location,Konum,
@@ -3894,7 +3862,6 @@
Pay,Ödeme yap,
Payment Document Type,Ödeme Belgesi Türü,
Payment Name,Ödeme Adı,
-Penalty Amount,Ceza Tutarı,
Pending,Bekliyor,
Performance,Performans,
Period based On,Tarihine Göre Dönem,
@@ -3916,10 +3883,8 @@
Please login as a Marketplace User to edit this item.,Bu öğeyi düzenlemek için lütfen Marketplace Kullanıcısı olarak giriş yapın.,
Please login as a Marketplace User to report this item.,Bu öğeyi incelemek için lütfen bir Marketplace Kullanıcısı olarak giriş yapın.,
Please select <b>Template Type</b> to download template,<b>Şablonu</b> indirmek için lütfen <b>Şablon Türü'nü</b> seçin,
-Please select Applicant Type first,Lütfen önce Başvuru Türü'nü seçin,
Please select Customer first,Lütfen önce Müşteriyi Seçin,
Please select Item Code first,Lütfen önce Ürün Kodunu seçin,
-Please select Loan Type for company {0},Lütfen {0} şirketi için Kredi Türü'nü seçin,
Please select a Delivery Note,Lütfen bir İrsaliye seçin,
Please select a Sales Person for item: {0},Lütfen öğe için bir Satış Sorumlusu seçin: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',"Lütfen başka bir ödeme yöntemini seçin. şerit, '{0}' para birimini desteklemez",
@@ -3935,8 +3900,6 @@
Please setup a default bank account for company {0},Lütfen {0} şirketi için genel bir banka hesabı kurun,
Please specify,Lütfen belirtiniz,
Please specify a {0},Lütfen bir {0} kullanmak,
-Pledge Status,Rehin Durumu,
-Pledge Time,Rehin Zamanı,
Printing,Baskı,
Priority,Öncelik,
Priority has been changed to {0}.,Öncelik {0} olarak değiştirildi.,
@@ -3944,7 +3907,6 @@
Processing XML Files,XML Dosyalarını İşleme,
Profitability,Karlılık,
Project,Proje,
-Proposed Pledges are mandatory for secured Loans,Teminatlı Krediler için verilen rehinlerin dağıtımı hizmetleri,
Provide the academic year and set the starting and ending date.,Akademik yıl dönümü ve başlangıç ve bitiş tarihini ayarlayın.,
Public token is missing for this bank,Bu banka için genel belirteç eksik,
Publish,Yayınla,
@@ -3960,7 +3922,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Satınalma Fişinde, Örneği Tut'un etkinleştirildiği bir Öğe yoktur.",
Purchase Return,Satınalma İadesi,
Qty of Finished Goods Item,Mamul Mal Miktarı,
-Qty or Amount is mandatroy for loan security,Miktar veya Miktar kredi güvenliği için zorunlu,
Quality Inspection required for Item {0} to submit,{0} Ürününün gönderilmesi için Kalite Kontrol gerekli,
Quantity to Manufacture,Üretim Miktarı,
Quantity to Manufacture can not be zero for the operation {0},{0} işlemi için Üretim Miktarı sıfır olamaz,
@@ -3981,8 +3942,6 @@
Relieving Date must be greater than or equal to Date of Joining,"Rahatlama Tarihi, Katılım Tarihinden büyük veya ona eşit olmalıdır",
Rename,Yeniden adlandır,
Rename Not Allowed,Yeniden Adlandırmaya İzin Verilmiyor,
-Repayment Method is mandatory for term loans,Vadeli krediler için geri ödeme yöntemleri,
-Repayment Start Date is mandatory for term loans,Vadeli krediler için geri ödeme başlangıç tarihi,
Report Item,Öğeyi Bildir,
Report this Item,Bu öğeyi bildirin,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Fason Üretim için Ayrılmış Adet: Fason üretim yapmak için hammadde miktarı.,
@@ -4015,8 +3974,6 @@
Row({0}): {1} is already discounted in {2},"Satır ({0}): {1}, {2} için zaten indirimli",
Rows Added in {0},{0} içindeki satırlar,
Rows Removed in {0},{0} sonuçları Satırlar Kaldırıldı,
-Sanctioned Amount limit crossed for {0} {1},{0} {1} için Onaylanan Tutar sınırı aşıldı,
-Sanctioned Loan Amount already exists for {0} against company {1},{1} yerleştirme karşı {0} için Onaylanan Kredi Tutarı zaten var,
Save,Kaydet,
Save Item,Öğeyi Kaydet,
Saved Items,Kaydedilen Öğeler,
@@ -4135,7 +4092,6 @@
User {0} is disabled,Kullanıcı {0} devre dışı,
Users and Permissions,Kullanıcılar ve İzinler,
Vacancies cannot be lower than the current openings,Boş pozisyonlar mevcut patlamalardan daha düşük olamaz,
-Valid From Time must be lesser than Valid Upto Time.,"Geçerlilik Süresi, geçerlilik Süresi'nden daha az olmalıdır.",
Valuation Rate required for Item {0} at row {1},{1} bilgisindeki {0} Maddesi için Değerleme Oranı gerekli,
Values Out Of Sync,Senkronizasyon Dış Değerler,
Vehicle Type is required if Mode of Transport is Road,Ulaşım Şekli Karayolu ise Araç Tipi gereklidir,
@@ -4211,7 +4167,6 @@
Add to Cart,Sepete Ekle,
Days Since Last Order,Son Siparişten Beri Geçen Gün Sayısı,
In Stock,Stokta var,
-Loan Amount is mandatory,Kredi Tutarı cezaları,
Mode Of Payment,Ödeme Şekli,
No students Found,Öğrenci Bulunamadı,
Not in Stock,Stokta yok,
@@ -4240,7 +4195,6 @@
Group by,Gruplandır,
In stock,Stokta,
Item name,Ürün Adı,
-Loan amount is mandatory,Kredi tutarı zorunlu,
Minimum Qty,Minimum Mik,
More details,Daha fazla detay,
Nature of Supplies,Malzemelerin Doğası,
@@ -4409,9 +4363,6 @@
Total Completed Qty,Toplam Tamamlanan Miktar,
Qty to Manufacture,Üretilecek Miktar,
Repay From Salary can be selected only for term loans,Maaştan Geri Ödeme beklemek krediler için kullanmak,
-No valid Loan Security Price found for {0},{0} için geçerli bir Kredi Menkul Kıymet Fiyatı bulunamadı,
-Loan Account and Payment Account cannot be same,Kredi Hesabı ve Ödeme Hesabı aynı olamaz,
-Loan Security Pledge can only be created for secured loans,Kredi Teminat Rehni yalnızca garantili krediler için oluşturulabilir,
Social Media Campaigns,Sosyal Medya Kampanyaları,
From Date can not be greater than To Date,"Başlangıç Tarihi, Bitiş Tarihinden büyük olamaz",
Please set a Customer linked to the Patient,Lütfen Hastaya bağlı bir müşteri seçtiği,
@@ -6437,7 +6388,6 @@
HR User,İK Kullanıcısı,
Appointment Letter,Randevu mektubu,
Job Applicant,İş Başvuru Sahiibi,
-Applicant Name,başvuru sahibi adı,
Appointment Date,Randevu Tarihi,
Appointment Letter Template,Randevu Mektubu Şablonu,
Body,vücut,
@@ -7059,99 +7009,12 @@
Sync in Progress,Senkronizasyon Devam Ediyor,
Hub Seller Name,Hub Satıcı Adı,
Custom Data,özel veri,
-Member,Üye,
-Partially Disbursed,Kısmen Ödeme yapılmış,
-Loan Closure Requested,Kredi Kapanışı İstendi,
Repay From Salary,Maaşdan Öde,
-Loan Details,Kredi Detayları,
-Loan Type,Kredi Türü,
-Loan Amount,Kredi Tutarı,
-Is Secured Loan,Teminatlı Kredi,
-Rate of Interest (%) / Year,İlgi (%) / Yılın Oranı,
-Disbursement Date,Masraf Tarihi,
-Disbursed Amount,Masraf Harcama Tutarı,
-Is Term Loan,Vadeli Kredi,
-Repayment Method,Geri Ödeme Yöntemi,
-Repay Fixed Amount per Period,Dönem başına Sabit Tutar Geri Ödeme,
-Repay Over Number of Periods,Sürelerinin üzeri sayısı Geri Ödeme,
-Repayment Period in Months,Aylar Geri içinde Ödeme Süresi,
-Monthly Repayment Amount,Aylık Geri Ödeme Tutarı,
-Repayment Start Date,Geri Ödeme Başlangıç Tarihi,
-Loan Security Details,Kredi Güvenliği Detayları,
-Maximum Loan Value,Maksimum Kredi Değeri,
-Account Info,Hesap Bilgisi,
-Loan Account,Kredi Hesabı,
-Interest Income Account,Faiz Gelir Hesabı,
-Penalty Income Account,Ceza Geliri Hesabı,
-Repayment Schedule,Geri Ödeme Planı,
-Total Payable Amount,Toplam Ödenecek Tutar,
-Total Principal Paid,Toplam Ödenen Anapara,
-Total Interest Payable,Toplam Ödenecek Faiz,
-Total Amount Paid,Toplam Ödenen Tutar,
-Loan Manager,Kredi Yöneticisi,
-Loan Info,Kredi Bilgisi,
-Rate of Interest,Faiz Oranı,
-Proposed Pledges,Gelişmiş Rehinler,
-Maximum Loan Amount,Maksimum Kredi Tutarı,
-Repayment Info,Geri Ödeme Bilgisi,
-Total Payable Interest,Toplam Ödenecek Faiz,
-Against Loan ,Krediye Karşı,
-Loan Interest Accrual,Kredi Faiz Tahakkuku,
-Amounts,Tutarlar,
-Pending Principal Amount,Bekleyen Anapara Tutarı,
-Payable Principal Amount,Ödenecek Anapara Tutarı,
-Paid Principal Amount,Ödenen Anapara Tutarı,
-Paid Interest Amount,Ödenen Faiz Tutarı,
-Process Loan Interest Accrual,Kredi Faiz Tahakkuku Süreci,
-Repayment Schedule Name,Geri Ödeme Planı Adı,
Regular Payment,Düzenli Ödeme,
Loan Closure,Kredi Kapanışı,
-Payment Details,Ödeme Detayları,
-Interest Payable,Ödenecek Faiz,
-Amount Paid,Ödenen Tutar;,
-Principal Amount Paid,Ödenen Anapara Tutarı,
-Repayment Details,Geri Ödeme Ayrıntıları,
-Loan Repayment Detail,Kredi Geri Ödeme Detayı,
-Loan Security Name,Kredi Güvenlik Adı,
-Unit Of Measure,Ölçü Birimi,
-Loan Security Code,Kredi Güvenlik Kodu,
-Loan Security Type,Kredi Güvenlik Türü,
-Haircut %,Saç Kesimi %,
-Loan Details,Kredi Detayları,
-Unpledged,taahhütsüz,
-Pledged,Rehin,
-Partially Pledged,Kısmen Rehin Verildi,
-Securities,senetler,
-Total Security Value,Toplam Güvenlik Değeri,
-Loan Security Shortfall,Kredi Güvenliği Eksikliği,
-Loan ,Kredi ,
-Shortfall Time,Eksik Zaman,
-America/New_York,Amerika / New_York,
-Shortfall Amount,Eksiklik Tutarı,
-Security Value ,Güvenlik Değeri,
-Process Loan Security Shortfall,Kredi Güvenlik Açığı Süreci,
-Loan To Value Ratio,Kredi / Değer Oranı,
-Unpledge Time,Rehin Zamanı,
-Loan Name,Kredi Adı,
Rate of Interest (%) Yearly,Yıllık Faiz Oranı (%),
-Penalty Interest Rate (%) Per Day,Günlük Ceza Faiz Oranı (%),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,"Gecikmeli geri ödeme durumunda, günlük olarak alınan faiz oranı tahakkuk eden faiz oranı alınır.",
-Grace Period in Days,Gün olarak Ek Süre,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Kredi geri ödemesinde gecikme olması durumunda, vade kurallarından cezanın uygulanmayacağı gün sayısı",
-Pledge,Rehin,
-Post Haircut Amount,Post Saç Kesimi Miktarı,
-Process Type,İşlem türü,
-Update Time,Zamanı Güncelle,
-Proposed Pledge,Yetenekli Rehin,
-Total Payment,Toplam Ödeme,
-Balance Loan Amount,Bakiye Kredi Miktarı,
-Is Accrued,Tahakkuk Edildi,
Salary Slip Loan,Maaş Kaybı Kredisi,
Loan Repayment Entry,Kredi Geri Ödeme Girişi,
-Sanctioned Loan Amount,Onaylanan Kredi Tutarı,
-Sanctioned Amount Limit,Onaylanan Tutar Sınırı,
-Unpledge,Taahhüdü iptal et,
-Haircut,Saç Kesimi,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Program Oluşturmanın,
Schedules,programlı,
@@ -7479,15 +7342,15 @@
Project will be accessible on the website to these users,Proje internet siteleri şu kullanıcılar için erişilebilir olacak,
Copied From,Kopyalanacak,
Start and End Dates,Başlangıç ve Tarihler Sonu,
-Actual Time (in Hours),Gerçek Zaman (Saat olarak),
+Actual Time in Hours (via Timesheet),Gerçek Zaman (Saat olarak),
Costing and Billing,Maliyet ve Faturalandırma,
-Total Costing Amount (via Timesheets),Toplam Maliyetleme Tutarı (Çalışma Sayfası Tablosu Üzerinden),
-Total Expense Claim (via Expense Claims),Toplam Gider İddiası (Gider Talepleri yoluyla),
+Total Costing Amount (via Timesheet),Toplam Maliyetleme Tutarı (Çalışma Sayfası Tablosu Üzerinden),
+Total Expense Claim (via Expense Claim),Toplam Gider İddiası (Gider Talepleri yoluyla),
Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satınalma Fatura üzerinden),
Total Sales Amount (via Sales Order),Toplam Satış Tutarı (Satış Siparişi Yoluyla),
-Total Billable Amount (via Timesheets),Toplam Faturalandırılabilir Tutar (Çalışma Sayfası Tablosu ile),
-Total Billed Amount (via Sales Invoices),Toplam Faturalandırılan Tutar (Sat Faturaları ile),
-Total Consumed Material Cost (via Stock Entry),Toplam Tüketim Maliyeti Maliyeti (Stok Hareketi ile),
+Total Billable Amount (via Timesheet),Toplam Faturalandırılabilir Tutar (Çalışma Sayfası Tablosu ile),
+Total Billed Amount (via Sales Invoice),Toplam Faturalandırılan Tutar (Sat Faturaları ile),
+Total Consumed Material Cost (via Stock Entry),Toplam Tüketim Maliyeti Maliyeti (Stok Hareketi ile),
Gross Margin,Brut Marj,
Gross Margin %,Brüt Kar Marji%,
Monitor Progress,İlerlemeyi Görüntüle,
@@ -7521,12 +7384,10 @@
Dependencies,Bağımlılıklar,
Dependent Tasks,Bağımlı Görevler,
Depends on Tasks,Görevler bağlıdır,
-Actual Start Date (via Time Sheet),Gerçek başlangış tarihi (Zaman Tablosu'ndan),
-Actual Time (in hours),Gerçek Zaman (Saat olarak),
-Actual End Date (via Time Sheet),Gerçek bitiş tarihi (Zaman Tablosu'ndan),
-Total Costing Amount (via Time Sheet),(Zaman Formu maliyeti) Toplam Maliyet Tutarı,
+Actual Start Date (via Timesheet),Gerçek başlangış tarihi (Zaman Tablosu'ndan),
+Actual Time in Hours (via Timesheet),Gerçek Zaman (Saat olarak),
+Actual End Date (via Timesheet),Gerçek bitiş tarihi (Zaman Tablosu'ndan),
Total Expense Claim (via Expense Claim),(Gider İstem yoluyla) Toplam Gider İddiası,
-Total Billing Amount (via Time Sheet),Toplam Fatura Tutarı (Zaman Tablosu yoluyla),
Review Date,inceleme tarihi,
Closing Date,Kapanış Tarihi,
Task Depends On,Görev Bağlıdır,
@@ -7887,7 +7748,6 @@
Update Series,Seriyi Güncelle,
Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıcı / geçerli sıra numarası kuralları.,
Prefix,Önek,
-Current Value,Geçerli Değer,
This is the number of the last created transaction with this prefix,Bu ön ekle son genişleme miktarıdır,
Update Series Number,Seri Numaralarını Güncelle,
Quotation Lost Reason,Teklif Kayıp Nedeni,
@@ -8518,8 +8378,6 @@
Itemwise Recommended Reorder Level,Ürün için Önerilen Yeniden Sipariş Düzeyi,
Lead Details,Müşteri Adayı Detayı,
Lead Owner Efficiency,Aday Sahibi Verimliliği,
-Loan Repayment and Closure,Kredi Geri Ödeme ve Kapanışı,
-Loan Security Status,Kredi Güvenlik Durumu,
Lost Opportunity,Fırsat Kaybedildi,
Maintenance Schedules,Bakım Programları,
Material Requests for which Supplier Quotations are not created,Tedarikçi Tekliflerinin oluşturulmadığı Malzeme Talepleri,
@@ -8610,7 +8468,6 @@
Counts Targeted: {0},Hedeflenen Sayım: {0},
Payment Account is mandatory,Ödeme Hesabı verileri,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","İşaretliyse, tutarın tamamı, herhangi bir beyan veya kanıt sunmaktan gelir vergisi hesabından önce vergiye tabi gelirden düşülecektir.",
-Disbursement Details,Harcama Ayrıntıları,
Material Request Warehouse,Malzeme Talebi Deposu,
Select warehouse for material requests,Malzeme aksesuarları için depo seçin,
Transfer Materials For Warehouse {0},Depo İçin Transfer Malzemeleri {0},
@@ -8998,9 +8855,6 @@
Repay unclaimed amount from salary,Talep edilmeyen maaştan geri ödeyin,
Deduction from salary,Maaştan kesinti,
Expired Leaves,Süresi biten İzinler,
-Reference No,Referans Numarası,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Kesinti yüzdesi, Kredi Teminatının piyasa değeri ile o kredi için teminat olarak teminat olarak o Kredi Güvencesine atfedilen değer arasındaki yüzde farkıdır.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Kredi Değer Oranı, kredi borçlarının taahhüdünde bulunulan menkul değerin harcanması gerektiğini ifade eder. Herhangi bir kredi için belirtilen değerin altına düşerse bir kredi güvenlik açığı tetiklenir",
If this is not checked the loan by default will be considered as a Demand Loan,"Bu kontrol reddedilirse, varsayılan olarak kredi bir Talep Kredisi olarak kabul edilecektir.",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Bu hesap, borçludan kredi geri ödemelerini yapmak ve ayrıca borçluya kredi vermek için kullanılır.",
This account is capital account which is used to allocate capital for loan disbursal account ,"Bu hesap, kredi ödeme hesabına sermaye tahsis etmek için kullanılan sermaye hesabıdır.",
@@ -9464,13 +9318,6 @@
Operation {0} does not belong to the work order {1},"{0} işlemi, {1} iş emrine ait değil",
Print UOM after Quantity,Miktardan Sonra Birimi Yazdır,
Set default {0} account for perpetual inventory for non stock items,Stokta olmayan sunucular için kalıcı envanter için yerleşik {0} hesabını ayarladı,
-Loan Security {0} added multiple times,Kredi Güvenliği {0} birden çok kez eklendi,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Farklı LTV kredilerine sahip Kredi Menkul Kıymetleri tek bir krediye karşı rehin olamaz,
-Qty or Amount is mandatory for loan security!,Kredi kurtarma için Miktar veya Miktar müşterileri!,
-Only submittted unpledge requests can be approved,Yalnızca gönderilmiş makbuz işlemleri onaylanabilir,
-Interest Amount or Principal Amount is mandatory,Faiz Tutarı veya Anapara Tutarı yaptırımları,
-Disbursed Amount cannot be greater than {0},Ödenen Tutar en fazla {0} olabilir,
-Row {0}: Loan Security {1} added multiple times,Satır {0}: Kredi Teminatı {1} birden çok kez eklendi,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,"Satır # {0}: Alt Öğe, Ürün Paketi paketi. Lütfen {1} Öğesini yükleme ve Kaydedin",
Credit limit reached for customer {0},{0} müşterisi için kredi limitine ulaşıldı,
Could not auto create Customer due to the following missing mandatory field(s):,Aşağıdaki zorunlu grupları eksik olması müşteri nedeniyle otomatik olarak oluşturulamadı:,
@@ -9527,7 +9374,7 @@
Provide the invoice portion in percent,Fatura kısmı yüzde olarak yönlendirme,
Give number of days according to prior selection,Önceki seçime göre gün sayısını verin,
Email Details,E-posta Ayrıntıları,
-"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Alıcı için bir selamlama hitabı seçin. Örneğin Sayın vb.",
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",Alıcı için bir selamlama hitabı seçin. Örneğin Sayın vb.,
Preview Email,E-posta Önizlemesi,
Please select a Supplier,Lütfen bir Tedarikçi seçiniz,
Supplier Lead Time (days),Tedarikçi Teslimat Süresi (gün),
@@ -9824,7 +9671,7 @@
Cannot deliver Serial No {0} of item {1} as it is reserved to fullfill Sales Order {2},Satış Siparişini muhafaza etmek için yükümlülüklerinden {1} öğenin Seri Numarası {0} teslim edilemiyor {2},
"Sales Order {0} has reservation for the item {1}, you can only deliver reserved {1} against {0}.","Satış Siparişi {0}, {1} parça için rezervasyona sahip, yalnızca {0} oda {1} ayrılmış olarak teslim alabilir.",
{0} Serial No {1} cannot be delivered,{0} Seri No {1} teslim edilemiyor,
-Row {0}: Subcontracted Item is mandatory for the raw material {1},"Satır {0}: Taşeronluk Öğe {1} hammaddesi için zorunludur",
+Row {0}: Subcontracted Item is mandatory for the raw material {1},Satır {0}: Taşeronluk Öğe {1} hammaddesi için zorunludur,
"As there are sufficient raw materials, Material Request is not required for Warehouse {0}.","Yeterli hammadde olduğundan, Depo {0} için Malzeme Talebi gerekli değildir.",
" If you still want to proceed, please enable {0}.","Hala devam etmek istiyorsanız, lütfen {0} 'yi etkinleştirin.",
The item referenced by {0} - {1} is already invoiced,{0} - {1} tarafından referans verilen öğe zaten faturalanmış,
@@ -9904,13 +9751,13 @@
Naming Series and Price Defaults,Adlandırma Serisi ve Fiyat Varsayılanları,
Configure the action to stop the transaction or just warn if the same rate is not maintained.,İşlemi durdurmak için eylemi yapılandırın veya aynı oran korunmazsa sadece uyarı verin.,
Bill for Rejected Quantity in Purchase Invoice,Alış Faturasında Reddedilen Miktar Faturası,
-"If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt.","İşaretlenirse Satınalma İrsaliyesinden Satınalma Faturası yapılırken Reddedilen Miktar dahil edilecektir.",
+"If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt.",İşaretlenirse Satınalma İrsaliyesinden Satınalma Faturası yapılırken Reddedilen Miktar dahil edilecektir.,
Disable Last Purchase Rate,Son Satınalma Oranını Devre Dışı Bırak,
Role Allowed to Override Stop Action,Durdurma Eylemini Geçersiz kılma izni olan Rol,
"Review Stock Settings\n\nIn ERPNext, the Stock module\u2019s features are configurable as per your business needs. Stock Settings is the place where you can set your preferences for:\n- Default values for Item and Pricing\n- Default valuation method for inventory valuation\n- Set preference for serialization and batching of item\n- Set tolerance for over-receipt and delivery of items","# Stok Ayarlarını İnceleyin\n\nERPNext'te, Stok modülünün\u2019 özellikleri iş ihtiyaçlarınıza göre yapılandırılabilir. Stok Ayarları, şunlar için tercihlerinizi ayarlayabileceğiniz yerdir:\n- Öğe ve Fiyatlandırma için varsayılan değerler\n- Envanter değerlemesi için varsayılan değerleme yöntemi\n- Kalemlerin serileştirilmesi ve gruplandırılması için tercihi ayarlayın\n- Kalemlerin fazla girişi ve teslimatı için toleransı ayarlayın",
Auto close Opportunity Replied after the no. of days mentioned above,Yukarıda belirtilen gün sayısından sonra Yanıtlanan Fırsatı Otomatik Kapat,
Carry Forward Communication and Comments,İletişimi ve Yorumları Devret,
-"All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents.","Tüm Yorumlar ve E-postalar, CRM belgeleri boyunca bir belgeden yeni oluşturulan başka bir belgeye (Yol -> Fırsat -> Teklif) kopyalanacaktır.",
+All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents.,"Tüm Yorumlar ve E-postalar, CRM belgeleri boyunca bir belgeden yeni oluşturulan başka bir belgeye (Yol -> Fırsat -> Teklif) kopyalanacaktır.",
Allow Continuous Material Consumption,Sürekli Malzeme Tüketimi Sağlayın,
Allow material consumptions without immediately manufacturing finished goods against a Work Order,Bir İş Emrine göre bitmiş ürünleri hemen üretmeden malzeme tüketimine izin verin,
Allow material consumptions without immediately manufacturing finished goods against a Work Order,Bir İş Emrine göre bitmiş ürünleri hemen üretmeden malzeme tüketimine izin verin,
@@ -9935,16 +9782,14 @@
Customize Print Formats,Baskı Biçimlerini Özelleştirin,
Generate Custom Reports,Özel Raporlar Oluşturun,
Partly Paid,Kısmen Ödenmiş,
-Partly Paid and Discounted,Kısmen Ödenmiş ve İndirimli
+Partly Paid and Discounted,Kısmen Ödenmiş ve İndirimli,
Fixed Time,Sabit Süre,
-Loan Write Off,Kredi İptali,
Returns,İadeler,
Leads,Adaylar,
Forecasting,Tahmin,
In Location,Konumda,
Disposed,Elden Çıkarıldı,
Additional Info,Ek Bilgi,
-Loan Write Off,Kredi İptali,
Prospect,Potansiyel Müşteri,
Workstation Type,İş İstasyonu Türü,
Work Order Consumed Materials,İş Emri Sarf Malzemeleri,
@@ -9983,7 +9828,6 @@
"If mentioned, the system will allow only the users with this Role to create or modify any stock transaction earlier than the latest stock transaction for a specific item and warehouse. If set as blank, it allows all users to create/edit back-dated transactions.","Belirtilirse, sistem yalnızca bu Role sahip kullanıcıların belirli bir kalem ve depo için en son stok işleminden önceki herhangi bir stok işlemini oluşturmasına veya değiştirmesine izin verecektir. Boş olarak ayarlanırsa, tüm kullanıcıların geçmiş tarihli oluşturmasına/düzenlemesine izin verir. işlemler.",
Stock transactions that are older than the mentioned days cannot be modified.,Belirtilen günlerden daha eski olan hisse senedi işlemleri değiştirilemez.,
"The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units.","Sipariş edilen miktara göre daha fazla transfer etmenize izin verilen yüzde. Örneğin, 100 birim sipariş ettiyseniz ve Ödeneğiniz %10 ise, 110 birim transfer etmenize izin verilir.",
-Loan Write Off will be automatically created on loan closure request if pending amount is below this limit,"Kredi kapatma talebinde, bekleyen tutarın bu limitin altında olması durumunda, Kredi Kapatma talebi otomatik olarak oluşturulur",
"Link that is the website home page. Standard Links (home, login, products, blog, about, contact)","Web sitesi ana sayfası olan bağlantı. Standart Bağlantılar (ana sayfa, giriş, ürünler, blog, hakkında, iletişim)",
Show Language Picker,Dil Seçiciyi Göster,
Login Page,Login / Giriş Sayfası,
@@ -10021,7 +9865,7 @@
Is Scrap Item,Hurda Ögesi mi,
Is Rate Adjustment Entry (Debit Note),Kur Ayarlama Girişi (Borç Senedi),
Issue a debit note with 0 qty against an existing Sales Invoice,Mevcut bir Satış Faturasına karşı 0 adet borç dekontu düzenleyin,
-"To use Google Indexing, enable Google Settings.","Google Dizine Eklemeyi kullanmak için Google Ayarlarını etkinleştirin.",
+"To use Google Indexing, enable Google Settings.",Google Dizine Eklemeyi kullanmak için Google Ayarlarını etkinleştirin.,
Show Net Values in Party Account,Cari Hesabındaki Net Değerleri Göster,
Begin typing for results.,Sonuçlar için yazmaya başlayın.,
Invoice Portion (%),Fatura Porsiyonu (%),
@@ -10041,9 +9885,6 @@
Item Reference,Öğe Referansı,
Bank Reconciliation Tool,Banka Uzlaştırma Aracı,
Sales Order Reference,Satış Siparişi Referansı,
-Disbursement Account,Harcama Hesabı,
-Repayment Account,Geri Ödeme Hesabı,
-Auto Write Off Amount ,Otomatik Kapatma Tutarı,
Contact & Address,İletişim ve Adres,
Ref DocType,Ref Belge Türü,
FG Warehouse,Mamul Deposu,
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 83c8d41..0208544 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Застосовується, якщо компанія є SpA, SApA або SRL",
Applicable if the company is a limited liability company,"Застосовується, якщо компанія є товариством з обмеженою відповідальністю",
Applicable if the company is an Individual or a Proprietorship,"Застосовується, якщо компанія є фізичною особою або власником",
-Applicant,Заявник,
-Applicant Type,Тип заявника,
Application of Funds (Assets),Застосування засобів (активів),
Application period cannot be across two allocation records,Період заявки не може бути розподілений між двома записами про розподіл,
Application period cannot be outside leave allocation period,Термін подачі заяв не може бути за межами періоду призначених відпусток,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Список доступних акціонерів з номерами фоліо,
Loading Payment System,Завантаження платіжної системи,
Loan,Кредит,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0},
-Loan Application,Заявка на позику,
-Loan Management,Кредитний менеджмент,
-Loan Repayment,погашення позики,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Дата початку позики та період позики є обов'язковими для збереження дисконтування рахунків-фактур,
Loans (Liabilities),Кредити (зобов'язання),
Loans and Advances (Assets),Кредити та аванси (активи),
@@ -1611,7 +1605,6 @@
Monday,Понеділок,
Monthly,Щомісяця,
Monthly Distribution,Місячний розподіл,
-Monthly Repayment Amount cannot be greater than Loan Amount,"Щомісячне погашення Сума не може бути більше, ніж сума позики",
More,Більш,
More Information,Більше інформації,
More than one selection for {0} not allowed,Більше одного вибору для {0} не дозволено,
@@ -1884,11 +1877,9 @@
Pay {0} {1},Заплатити {0} {1},
Payable,До оплати,
Payable Account,Оплачується аккаунт,
-Payable Amount,Сума до сплати,
Payment,Оплата,
Payment Cancelled. Please check your GoCardless Account for more details,"Оплата скасована. Будь ласка, перевірте свій GoCardless рахунок для отримання додаткової інформації",
Payment Confirmation,Підтвердження платежу,
-Payment Date,Дата оплати,
Payment Days,Дні оплати,
Payment Document,Платіжний документ,
Payment Due Date,Дата платежу,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,"Будь ласка, введіть прихідну накладну спершу",
Please enter Receipt Document,"Будь ласка, введіть Квитанція документ",
Please enter Reference date,"Будь ласка, введіть дату Reference",
-Please enter Repayment Periods,"Будь ласка, введіть терміни погашення",
Please enter Reqd by Date,"Будь ласка, введіть Reqd за датою",
Please enter Woocommerce Server URL,"Будь ласка, введіть URL-адресу сервера Woocommerce",
Please enter Write Off Account,"Будь ласка, введіть рахунок списання",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Будь ласка, введіть батьківський центр витрат",
Please enter quantity for Item {0},"Будь ласка, введіть кількість для {0}",
Please enter relieving date.,"Будь ласка, введіть дату зняття.",
-Please enter repayment Amount,"Будь ласка, введіть Сума погашення",
Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсні дати початку та закінчення бюджетного періоду",
Please enter valid email address,"Будь ласка, введіть адресу електронної пошти",
Please enter {0} first,"Будь ласка, введіть {0} в першу чергу",
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості.,
Primary Address Details,Основна адреса інформації,
Primary Contact Details,Основна контактна інформація,
-Principal Amount,Основна сума,
Print Format,Формат друку,
Print IRS 1099 Forms,Друк форм IRS 1099,
Print Report Card,Друк звіту картки,
@@ -2550,7 +2538,6 @@
Sample Collection,Збірка зразків,
Sample quantity {0} cannot be more than received quantity {1},Обсяг вибірки {0} не може перевищувати отриману кількість {1},
Sanctioned,Санкціоновані,
-Sanctioned Amount,Санкціонована сума,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}.",
Sand,Пісок,
Saturday,Субота,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} вже має батьківську процедуру {1}.,
API,API,
Annual,Річний,
-Approved,Затверджений,
Change,Зміна,
Contact Email,Контактний Email,
Export Type,Тип експорту,
@@ -3571,7 +3557,6 @@
Account Value,Значення рахунку,
Account is mandatory to get payment entries,Рахунок обов'язковий для отримання платіжних записів,
Account is not set for the dashboard chart {0},Обліковий запис не встановлено для діаграми інформаційної панелі {0},
-Account {0} does not belong to company {1},Рахунок {0} не належать компанії {1},
Account {0} does not exists in the dashboard chart {1},Обліковий запис {0} не існує в діаграмі інформаційної панелі {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Рахунок: <b>{0}</b> - це капітал Незавершене виробництво, і його не можна оновлювати в журналі",
Account: {0} is not permitted under Payment Entry,Рахунок: {0} заборонено вводити платіж,
@@ -3582,7 +3567,6 @@
Activity,Діяльність,
Add / Manage Email Accounts.,Додати / Управління обліковими записами електронної пошти.,
Add Child,Додати підлеглий елемент,
-Add Loan Security,Додати гарантію позики,
Add Multiple,Додати кілька,
Add Participants,Додати учасників,
Add to Featured Item,Додати до обраного елемента,
@@ -3593,15 +3577,12 @@
Address Line 1,Адресний рядок 1,
Addresses,Адреси,
Admission End Date should be greater than Admission Start Date.,"Кінцева дата прийому повинна бути більшою, ніж дата початку прийому.",
-Against Loan,Проти позики,
-Against Loan:,Проти позики:,
All,ВСІ,
All bank transactions have been created,Усі банківські операції створені,
All the depreciations has been booked,Усі амортизації заброньовані,
Allocation Expired!,Виділення минуло!,
Allow Resetting Service Level Agreement from Support Settings.,Дозволити скидання Угоди про рівень обслуговування з налаштувань підтримки.,
Amount of {0} is required for Loan closure,Для закриття позики необхідна сума {0},
-Amount paid cannot be zero,Сума сплаченої суми не може дорівнювати нулю,
Applied Coupon Code,Прикладний купонний код,
Apply Coupon Code,Застосовуйте купонний код,
Appointment Booking,Призначення бронювання,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,"Неможливо обчислити час прибуття, оскільки адреса драйвера відсутня.",
Cannot Optimize Route as Driver Address is Missing.,"Не вдається оптимізувати маршрут, оскільки адреса драйвера відсутня.",
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Не вдається виконати завдання {0}, оскільки його залежне завдання {1} не завершено / скасовано.",
-Cannot create loan until application is approved,"Неможливо створити позику, поки заява не буде схвалена",
Cannot find a matching Item. Please select some other value for {0}.,"Не можете знайти відповідний пункт. Будь ласка, виберіть інше значення для {0}.",
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Неможливо перерахувати рахунок за пункт {0} у рядку {1} більше {2}. Щоб дозволити перевитрати, установіть надбавку у Налаштуваннях акаунтів",
"Capacity Planning Error, planned start time can not be same as end time","Помилка планування потенціалу, запланований час початку не може бути таким, як час закінчення",
@@ -3812,20 +3792,9 @@
Less Than Amount,Менша сума,
Liabilities,Зобов'язання,
Loading...,Завантаження ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Сума позики перевищує максимальну суму позики {0} відповідно до запропонованих цінних паперів,
Loan Applications from customers and employees.,Заявки на позику від клієнтів та співробітників.,
-Loan Disbursement,Виплата кредитів,
Loan Processes,Процеси позики,
-Loan Security,Гарантія позики,
-Loan Security Pledge,Позика під заставу,
-Loan Security Pledge Created : {0},Створено заставу під заставу: {0},
-Loan Security Price,Ціна позикової позики,
-Loan Security Price overlapping with {0},"Ціна забезпечення позики, що перекривається на {0}",
-Loan Security Unpledge,Поповнення застави,
-Loan Security Value,Значення безпеки позики,
Loan Type for interest and penalty rates,Тип позики під відсотки та штрафні ставки,
-Loan amount cannot be greater than {0},Сума позики не може перевищувати {0},
-Loan is mandatory,Позика є обов’язковою,
Loans,Кредити,
Loans provided to customers and employees.,"Кредити, надані клієнтам та працівникам.",
Location,Місцезнаходження,
@@ -3894,7 +3863,6 @@
Pay,Платити,
Payment Document Type,Тип платіжного документа,
Payment Name,Назва платежу,
-Penalty Amount,Сума штрафу,
Pending,До,
Performance,Продуктивність,
Period based On,"Період, заснований на",
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,"Будь ласка, увійдіть як користувач Marketplace, щоб редагувати цей елемент.",
Please login as a Marketplace User to report this item.,"Будь ласка, увійдіть як користувач Marketplace, щоб повідомити про цей товар.",
Please select <b>Template Type</b> to download template,Виберіть <b>Тип шаблону</b> для завантаження шаблону,
-Please select Applicant Type first,Виберіть спочатку Тип заявника,
Please select Customer first,Виберіть спочатку Клієнта,
Please select Item Code first,Виберіть спочатку Код товару,
-Please select Loan Type for company {0},Виберіть тип кредиту для компанії {0},
Please select a Delivery Note,Виберіть Примітку про доставку,
Please select a Sales Person for item: {0},Виберіть особу продавця для товару: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',"Будь ласка, виберіть інший спосіб оплати. Stripe не підтримує транзакції в валюті «{0}»",
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Установіть банківський рахунок за замовчуванням для компанії {0},
Please specify,Будь ласка уточніть,
Please specify a {0},Укажіть {0},lead
-Pledge Status,Статус застави,
-Pledge Time,Час застави,
Printing,Друк,
Priority,Пріоритет,
Priority has been changed to {0}.,Пріоритет змінено на {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Обробка XML-файлів,
Profitability,Рентабельність,
Project,Проект,
-Proposed Pledges are mandatory for secured Loans,Запропоновані застави є обов'язковими для забезпечених позик,
Provide the academic year and set the starting and ending date.,Укажіть навчальний рік та встановіть дату початку та закінчення.,
Public token is missing for this bank,Для цього банку немає публічного маркера,
Publish,Опублікувати,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"У квитанції про придбання немає жодного предмета, для якого увімкнено Затримати зразок.",
Purchase Return,Купівля Повернення,
Qty of Finished Goods Item,Кількість предмета готової продукції,
-Qty or Amount is mandatroy for loan security,Кількість або сума - мандатрой для забезпечення позики,
Quality Inspection required for Item {0} to submit,"Перевірка якості, необхідна для надсилання пункту {0}",
Quantity to Manufacture,Кількість у виробництві,
Quantity to Manufacture can not be zero for the operation {0},Кількість для виробництва не може бути нульовою для операції {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Дата звільнення повинна бути більшою або рівною даті приєднання,
Rename,Перейменувати,
Rename Not Allowed,Перейменування не дозволено,
-Repayment Method is mandatory for term loans,Метод погашення є обов'язковим для строкових позик,
-Repayment Start Date is mandatory for term loans,Дата початку погашення є обов'язковою для строкових позик,
Report Item,Елемент звіту,
Report this Item,Повідомити про цей елемент,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Кількість зарезервованих для субпідрядів: кількість сировини для виготовлення предметів субпідряду.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Рядок ({0}): {1} вже знижено в {2},
Rows Added in {0},Рядки додано в {0},
Rows Removed in {0},Рядки видалено через {0},
-Sanctioned Amount limit crossed for {0} {1},Межа санкціонованої суми перекреслена за {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Сума санкціонованої суми позики вже існує для {0} проти компанії {1},
Save,Зберегти,
Save Item,Зберегти елемент,
Saved Items,Збережені елементи,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Користувач {0} відключена,
Users and Permissions,Люди і дозволу,
Vacancies cannot be lower than the current openings,Вакансії не можуть бути нижчими від поточних,
-Valid From Time must be lesser than Valid Upto Time.,"Дійсний з часом повинен бути меншим, ніж Дійсний час оновлення.",
Valuation Rate required for Item {0} at row {1},"Коефіцієнт оцінювання, необхідний для позиції {0} у рядку {1}",
Values Out Of Sync,Значення не синхронізовані,
Vehicle Type is required if Mode of Transport is Road,"Тип транспортного засобу необхідний, якщо вид транспорту - дорожній",
@@ -4211,7 +4168,6 @@
Add to Cart,Додати в кошик,
Days Since Last Order,Дні з моменту останнього замовлення,
In Stock,В наявності,
-Loan Amount is mandatory,Сума позики є обов'язковою,
Mode Of Payment,Спосіб платежу,
No students Found,Не знайдено студентів,
Not in Stock,Немає на складі,
@@ -4240,7 +4196,6 @@
Group by,Групувати за,
In stock,В наявності,
Item name,Назва виробу,
-Loan amount is mandatory,Сума позики є обов'язковою,
Minimum Qty,Мінімальна кількість,
More details,Детальніше,
Nature of Supplies,Природа витратних матеріалів,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Всього виконано Кількість,
Qty to Manufacture,К-сть для виробництва,
Repay From Salary can be selected only for term loans,Погашення зарплати можна вибрати лише для строкових позик,
-No valid Loan Security Price found for {0},Для {0} не знайдено дійсних цін на забезпечення позики,
-Loan Account and Payment Account cannot be same,Позиковий рахунок і платіжний рахунок не можуть бути однаковими,
-Loan Security Pledge can only be created for secured loans,Заставу забезпечення позики можна створити лише під заставу,
Social Media Campaigns,Кампанії в соціальних мережах,
From Date can not be greater than To Date,"From Date не може бути більше, ніж To Date",
Please set a Customer linked to the Patient,"Будь ласка, встановіть Клієнта, пов’язаного з Пацієнтом",
@@ -6437,7 +6389,6 @@
HR User,HR Користувач,
Appointment Letter,Лист про призначення,
Job Applicant,Робота Заявник,
-Applicant Name,Заявник Ім'я,
Appointment Date,Дата призначення,
Appointment Letter Template,Шаблон листа про призначення,
Body,Тіло,
@@ -7059,99 +7010,12 @@
Sync in Progress,Синхронізація в процесі,
Hub Seller Name,Назва продавця концентратора,
Custom Data,Спеціальні дані,
-Member,Член,
-Partially Disbursed,частково Освоєно,
-Loan Closure Requested,Запитується закриття позики,
Repay From Salary,Погашати із заробітної плати,
-Loan Details,кредит Детальніше,
-Loan Type,Тип кредиту,
-Loan Amount,Розмір позики,
-Is Secured Loan,Позика під заставу,
-Rate of Interest (%) / Year,Процентна ставка (%) / рік,
-Disbursement Date,витрачання Дата,
-Disbursed Amount,Виплачена сума,
-Is Term Loan,Є строкова позика,
-Repayment Method,спосіб погашення,
-Repay Fixed Amount per Period,Погашати фіксовану суму за період,
-Repay Over Number of Periods,Погашати Over Кількість періодів,
-Repayment Period in Months,Період погашення в місцях,
-Monthly Repayment Amount,Щомісячна сума погашення,
-Repayment Start Date,Дата початку погашення,
-Loan Security Details,Деталі забезпечення позики,
-Maximum Loan Value,Максимальна вартість позики,
-Account Info,Інформація про акаунт,
-Loan Account,Рахунок позики,
-Interest Income Account,Рахунок Процентні доходи,
-Penalty Income Account,Рахунок пені,
-Repayment Schedule,погашення Розклад,
-Total Payable Amount,Загальна сума оплачується,
-Total Principal Paid,Загальна сума сплаченої основної суми,
-Total Interest Payable,Загальний відсоток кредиторів,
-Total Amount Paid,Загальна сума сплачена,
-Loan Manager,Кредитний менеджер,
-Loan Info,Позика інформація,
-Rate of Interest,відсоткова ставка,
-Proposed Pledges,Запропоновані обіцянки,
-Maximum Loan Amount,Максимальна сума кредиту,
-Repayment Info,погашення інформація,
-Total Payable Interest,Загальна заборгованість за відсотками,
-Against Loan ,Проти Позики,
-Loan Interest Accrual,Нарахування процентних позик,
-Amounts,Суми,
-Pending Principal Amount,"Основна сума, що очікує на розгляд",
-Payable Principal Amount,"Основна сума, що підлягає сплаті",
-Paid Principal Amount,Сплачена основна сума,
-Paid Interest Amount,Сума сплачених відсотків,
-Process Loan Interest Accrual,Нарахування відсотків за кредитом,
-Repayment Schedule Name,Назва графіка погашення,
Regular Payment,Регулярна оплата,
Loan Closure,Закриття позики,
-Payment Details,Платіжні реквізити,
-Interest Payable,Виплата відсотків,
-Amount Paid,Виплачувана сума,
-Principal Amount Paid,Основна сплачена сума,
-Repayment Details,Деталі погашення,
-Loan Repayment Detail,Деталь погашення позики,
-Loan Security Name,Ім'я безпеки позики,
-Unit Of Measure,Одиниця виміру,
-Loan Security Code,Кодекс забезпечення позики,
-Loan Security Type,Тип забезпечення позики,
-Haircut %,Стрижка%,
-Loan Details,Деталі позики,
-Unpledged,Незакріплений,
-Pledged,Закладений,
-Partially Pledged,Частково заставлений,
-Securities,Цінні папери,
-Total Security Value,Загальне значення безпеки,
-Loan Security Shortfall,Дефіцит забезпечення позики,
-Loan ,Кредит,
-Shortfall Time,Час нестачі,
-America/New_York,Америка / Нью-Йорк,
-Shortfall Amount,Сума нестачі,
-Security Value ,Значення безпеки,
-Process Loan Security Shortfall,Дефіцит безпеки кредитного процесу,
-Loan To Value Ratio,Співвідношення позики до вартості,
-Unpledge Time,Час зняття,
-Loan Name,кредит Ім'я,
Rate of Interest (%) Yearly,Процентна ставка (%) Річний,
-Penalty Interest Rate (%) Per Day,Процентна ставка пені (%) на день,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Процентна ставка пені щодня стягується із відкладеною сумою відсотків у разі затримки погашення,
-Grace Period in Days,Пільговий період у днях,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,"Кількість днів з дати настання строку, до якого штраф не стягуватиметься у разі затримки повернення позики",
-Pledge,Застава,
-Post Haircut Amount,Кількість стрижки після публікації,
-Process Type,Тип процесу,
-Update Time,Час оновлення,
-Proposed Pledge,Пропонована застава,
-Total Payment,Загальна оплата,
-Balance Loan Amount,Баланс Сума кредиту,
-Is Accrued,Нараховано,
Salary Slip Loan,Зарплата Скип Кредит,
Loan Repayment Entry,Повернення позики,
-Sanctioned Loan Amount,Сума санкціонованої позики,
-Sanctioned Amount Limit,Обмежений розмір санкціонованої суми,
-Unpledge,Знімати,
-Haircut,Стрижка,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Згенерувати розклад,
Schedules,Розклади,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Проект буде доступний на веб-сайті для цих користувачів,
Copied From,скопійовано з,
Start and End Dates,Дати початку і закінчення,
-Actual Time (in Hours),Фактичний час (у годинах),
+Actual Time in Hours (via Timesheet),Фактичний час (у годинах),
Costing and Billing,Калькуляція і білінг,
-Total Costing Amount (via Timesheets),Загальна сума витрат (за допомогою розсилок),
-Total Expense Claim (via Expense Claims),Всього витрат (за Авансовими звітами),
+Total Costing Amount (via Timesheet),Загальна сума витрат (за допомогою розсилок),
+Total Expense Claim (via Expense Claim),Всього витрат (за Авансовими звітами),
Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки),
Total Sales Amount (via Sales Order),Загальна сума продажів (через замовлення клієнта),
-Total Billable Amount (via Timesheets),"Загальна сума, що підлягає обігу (через розсилки)",
-Total Billed Amount (via Sales Invoices),Загальна сума виставлених рахунків (через рахунки-фактури),
-Total Consumed Material Cost (via Stock Entry),Загальна витрата матеріальної цінності (через вхід в акції),
+Total Billable Amount (via Timesheet),"Загальна сума, що підлягає обігу (через розсилки)",
+Total Billed Amount (via Sales Invoice),Загальна сума виставлених рахунків (через рахунки-фактури),
+Total Consumed Material Cost (via Stock Entry),Загальна витрата матеріальної цінності (через вхід в акції),
Gross Margin,Валовий дохід,
Gross Margin %,Валовий дохід %,
Monitor Progress,Прогрес монітора,
@@ -7521,12 +7385,10 @@
Dependencies,Залежності,
Dependent Tasks,Залежні завдання,
Depends on Tasks,Залежно від завдань,
-Actual Start Date (via Time Sheet),Фактична дата початку (за допомогою Time Sheet),
-Actual Time (in hours),Фактичний час (в годинах),
-Actual End Date (via Time Sheet),Фактична дата закінчення (за допомогою табеля робочого часу),
-Total Costing Amount (via Time Sheet),Загальна калькуляція Сума (за допомогою Time Sheet),
+Actual Start Date (via Timesheet),Фактична дата початку (за допомогою Time Sheet),
+Actual Time in Hours (via Timesheet),Фактичний час (в годинах),
+Actual End Date (via Timesheet),Фактична дата закінчення (за допомогою табеля робочого часу),
Total Expense Claim (via Expense Claim),Всього витрат (за Авансовим звітом),
-Total Billing Amount (via Time Sheet),Загальна сума оплат (через табель),
Review Date,Огляд Дата,
Closing Date,Дата закриття,
Task Depends On,Завдання залежить від,
@@ -7887,7 +7749,6 @@
Update Series,Серія Оновлення,
Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.,
Prefix,Префікс,
-Current Value,Поточна вартість,
This is the number of the last created transaction with this prefix,Це номер останнього створеного операції з цим префіксом,
Update Series Number,Оновлення Кількість Серія,
Quotation Lost Reason,Причина втрати пропозиції,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Рекомендовані рівні перезамовлення по товарах,
Lead Details,Деталі Lead-а,
Lead Owner Efficiency,Свинець Власник Ефективність,
-Loan Repayment and Closure,Погашення та закриття позики,
-Loan Security Status,Стан безпеки позики,
Lost Opportunity,Втрачена можливість,
Maintenance Schedules,Розклад запланованих обслуговувань,
Material Requests for which Supplier Quotations are not created,"Замовлення матеріалів, для яких не створено Пропозицій постачальника",
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Кількість цільових показників: {0},
Payment Account is mandatory,Платіжний рахунок є обов’язковим,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Якщо встановити цей прапорець, повна сума буде вирахувана з оподатковуваного доходу перед розрахунком податку на прибуток без подання декларації чи підтвердження.",
-Disbursement Details,Деталі виплат,
Material Request Warehouse,Склад матеріалів запиту,
Select warehouse for material requests,Виберіть склад для запитів матеріалів,
Transfer Materials For Warehouse {0},Передати матеріали на склад {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Повернути незатребувану суму із заробітної плати,
Deduction from salary,Відрахування із зарплати,
Expired Leaves,Листя закінчилися,
-Reference No,Довідковий номер,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Відсоток стрижки - це відсоткова різниця між ринковою вартістю застави позики та вартістю, що приписується цьому забезпеченню позики, коли використовується як забезпечення цієї позики.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Співвідношення позики та вартості виражає відношення суми позики до вартості застави. Дефіцит забезпечення позики буде ініційований, якщо він опуститься нижче зазначеного значення для будь-якого кредиту",
If this is not checked the loan by default will be considered as a Demand Loan,"Якщо це не позначено, позика за замовчуванням буде розглядатися як позика на вимогу",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,"Цей рахунок використовується для бронювання виплат позики у позичальника, а також для видачі позик позичальнику",
This account is capital account which is used to allocate capital for loan disbursal account ,"Цей рахунок є рахунком капіталу, який використовується для розподілу капіталу на рахунок виплати позики",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Операція {0} не належить до робочого замовлення {1},
Print UOM after Quantity,Друк UOM після кількості,
Set default {0} account for perpetual inventory for non stock items,"Встановіть обліковий запис {0} за умовчанням для безстрокових запасів для предметів, що не є в наявності",
-Loan Security {0} added multiple times,Захист позики {0} додано кілька разів,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Позикові цінні папери з різним коефіцієнтом LTV не можуть бути передані в заставу під одну позику,
-Qty or Amount is mandatory for loan security!,Кількість або сума є обов’язковою для забезпечення позики!,
-Only submittted unpledge requests can be approved,Можуть бути схвалені лише подані заявки на невикористання,
-Interest Amount or Principal Amount is mandatory,Сума відсотків або основна сума є обов’язковою,
-Disbursed Amount cannot be greater than {0},Виплачена сума не може перевищувати {0},
-Row {0}: Loan Security {1} added multiple times,Рядок {0}: Безпека позики {1} додано кілька разів,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Рядок № {0}: дочірній елемент не повинен бути набором продуктів. Вилучіть елемент {1} та збережіть,
Credit limit reached for customer {0},Досягнуто кредитного ліміту для клієнта {0},
Could not auto create Customer due to the following missing mandatory field(s):,Не вдалося автоматично створити Клієнта через такі відсутні обов’язкові поля:,
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 8cf0707..7ba0f48 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",اگر کمپنی SpA ، SAPA یا SRL ہے تو قابل اطلاق ہے۔,
Applicable if the company is a limited liability company,اگر کمپنی محدود ذمہ داری کی کمپنی ہے تو قابل اطلاق ہے۔,
Applicable if the company is an Individual or a Proprietorship,قابل اطلاق اگر کمپنی انفرادی یا ملکیت ہے۔,
-Applicant,درخواست دہندگان,
-Applicant Type,درخواست دہندگان کی قسم,
Application of Funds (Assets),فنڈز (اثاثے) کی درخواست,
Application period cannot be across two allocation records,درخواست کا دورہ دو مختص ریکارڈوں میں نہیں ہوسکتا ہے,
Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,فولیو نمبروں کے ساتھ دستیاب حصول داروں کی فہرست,
Loading Payment System,ادائیگی کے نظام کو لوڈ کر رہا ہے,
Loan,قرض,
-Loan Amount cannot exceed Maximum Loan Amount of {0},قرض کی رقم {0} کی زیادہ سے زیادہ قرض کی رقم سے زیادہ نہیں ہوسکتی,
-Loan Application,قرض کی درخواست,
-Loan Management,قرض مینجمنٹ,
-Loan Repayment,قرض کی واپسی,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,انوائس ڈسکاؤنٹنگ کو بچانے کے لئے لون اسٹارٹ ڈیٹ اور لون پیریڈ لازمی ہے۔,
Loans (Liabilities),قرضے (واجبات),
Loans and Advances (Assets),قرضوں اور ایڈوانسز (اثاثے),
@@ -1611,7 +1605,6 @@
Monday,پیر,
Monthly,ماہانہ,
Monthly Distribution,ماہانہ تقسیم,
-Monthly Repayment Amount cannot be greater than Loan Amount,ماہانہ واپسی کی رقم قرض کی رقم سے زیادہ نہیں ہو سکتا,
More,مزید,
More Information,مزید معلومات,
More than one selection for {0} not allowed,{0} کے لئے ایک سے زیادہ انتخاب کی اجازت نہیں,
@@ -1884,11 +1877,9 @@
Pay {0} {1},ادائیگی {0} {1},
Payable,قابل ادائیگی,
Payable Account,قابل ادائیگی اکاؤنٹ,
-Payable Amount,قابل ادائیگی,
Payment,ادائیگی,
Payment Cancelled. Please check your GoCardless Account for more details,ادائیگی منسوخ کردی گئی. مزید تفصیلات کے لئے براہ کرم اپنے گوشورڈ اکاؤنٹ چیک کریں,
Payment Confirmation,ادائیگی کی تصدیق,
-Payment Date,ادائیگی کی تاریخ,
Payment Days,ادائیگی دنوں,
Payment Document,ادائیگی دستاویز,
Payment Due Date,ادائیگی کی وجہ سے تاریخ,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,پہلی خریداری کی رسید درج کریں,
Please enter Receipt Document,رسید دستاویز درج کریں,
Please enter Reference date,حوالہ کوڈ داخل کریں.,
-Please enter Repayment Periods,واپسی کا دورانیہ درج کریں,
Please enter Reqd by Date,براہ مہربانی دوبارہ کوشش کریں,
Please enter Woocommerce Server URL,برائے مہربانی Woocommerce سرور URL,
Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,والدین لاگت مرکز درج کریں,
Please enter quantity for Item {0},شے کے لئے مقدار درج کریں {0},
Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.,
-Please enter repayment Amount,واپسی کی رقم درج کریں,
Please enter valid Financial Year Start and End Dates,درست مالی سال شروع کریں اور انتھاء داخل کریں,
Please enter valid email address,درست ای میل ایڈریس درج کریں,
Please enter {0} first,پہلے {0} درج کریں,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,قیمتوں کا تعین کے قواعد مزید مقدار کی بنیاد پر فلٹر کر رہے ہیں.,
Primary Address Details,ابتدائی ایڈریس کی تفصیلات,
Primary Contact Details,بنیادی رابطے کی تفصیلات,
-Principal Amount,اصل رقم,
Print Format,پرنٹ کی شکل,
Print IRS 1099 Forms,IRS 1099 فارم پرنٹ کریں۔,
Print Report Card,رپورٹ کارڈ پرنٹ کریں,
@@ -2550,7 +2538,6 @@
Sample Collection,نمونہ مجموعہ,
Sample quantity {0} cannot be more than received quantity {1},نمونہ مقدار {0} وصول شدہ مقدار سے زیادہ نہیں ہوسکتا ہے {1},
Sanctioned,منظور,
-Sanctioned Amount,منظور رقم,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,منظور رقم صف میں دعوے کی رقم سے زیادہ نہیں ہو سکتا {0}.,
Sand,ریت,
Saturday,ہفتہ,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} پہلے سے ہی والدین کا طریقہ کار {1} ہے.,
API,API,
Annual,سالانہ,
-Approved,منظور,
Change,پیج,
Contact Email,رابطہ ای میل,
Export Type,برآمد کی قسم,
@@ -3571,7 +3557,6 @@
Account Value,اکاؤنٹ کی قیمت,
Account is mandatory to get payment entries,ادائیگی اندراجات لینا اکاؤنٹ لازمی ہے,
Account is not set for the dashboard chart {0},ڈیش بورڈ چارٹ {0 for کے لئے اکاؤنٹ مرتب نہیں کیا گیا ہے,
-Account {0} does not belong to company {1},اکاؤنٹ {0} کمپنی سے تعلق نہیں ہے {1},
Account {0} does not exists in the dashboard chart {1},ڈیش بورڈ چارٹ Account 1 Account میں اکاؤنٹ {0 not موجود نہیں ہے,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,اکاؤنٹ: <b>{0</b> capital سرمائے کا کام جاری ہے اور جرنل انٹری کے ذریعہ اسے اپ ڈیٹ نہیں کیا جاسکتا ہے,
Account: {0} is not permitted under Payment Entry,اکاؤنٹ: ادائیگی کے اندراج کے تحت {0} کی اجازت نہیں ہے۔,
@@ -3582,7 +3567,6 @@
Activity,سرگرمی,
Add / Manage Email Accounts.,ای میل اکاؤنٹس کا انتظام / شامل کریں.,
Add Child,چائلڈ شامل,
-Add Loan Security,لون سیکیورٹی شامل کریں,
Add Multiple,ایک سے زیادہ شامل,
Add Participants,شرکاء شامل کریں,
Add to Featured Item,نمایاں آئٹم میں شامل کریں۔,
@@ -3593,15 +3577,12 @@
Address Line 1,پتہ لائن 1,
Addresses,پتے,
Admission End Date should be greater than Admission Start Date.,داخلہ اختتامی تاریخ داخلہ شروع ہونے کی تاریخ سے زیادہ ہونی چاہئے۔,
-Against Loan,قرض کے خلاف,
-Against Loan:,قرض کے خلاف:,
All,سب,
All bank transactions have been created,تمام بینک لین دین تشکیل دے دیئے گئے ہیں۔,
All the depreciations has been booked,تمام فرسودگی کو بک کیا گیا ہے۔,
Allocation Expired!,الاٹیکشن کی میعاد ختم ہوگئی!,
Allow Resetting Service Level Agreement from Support Settings.,سپورٹ کی ترتیبات سے خدمت کی سطح کے معاہدے کو دوبارہ ترتیب دینے کی اجازت دیں۔,
Amount of {0} is required for Loan closure,قرض کی بندش کے لئے {0} کی مقدار درکار ہے,
-Amount paid cannot be zero,ادا کی گئی رقم صفر نہیں ہوسکتی ہے,
Applied Coupon Code,لاگو کوپن کوڈ,
Apply Coupon Code,کوپن کوڈ کا اطلاق کریں,
Appointment Booking,تقرری کی بکنگ,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,آمد کے وقت کا حساب نہیں لگایا جاسکتا کیونکہ ڈرائیور کا پتہ گم ہو گیا ہے۔,
Cannot Optimize Route as Driver Address is Missing.,ڈرائیور کا پتہ گم ہونے کی وجہ سے روٹ کو بہتر نہیں بنایا جاسکتا۔,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,کام {0 complete کو مکمل نہیں کیا جاسکتا ہے کیونکہ اس کا منحصر کام {1} مکمل نہیں / منسوخ نہیں ہوتا ہے۔,
-Cannot create loan until application is approved,درخواست منظور ہونے تک قرض نہیں بن سکتا,
Cannot find a matching Item. Please select some other value for {0}.,ایک کے ملاپ شے نہیں مل سکتی. کے لئے {0} کسی دوسرے قدر منتخب کریں.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",آئٹم for 0 row کے لئے قطار میں {1 {2} سے زیادہ نہیں ہوسکتی ہے۔ اوور بلنگ کی اجازت دینے کیلئے ، براہ کرم اکاؤنٹس کی ترتیبات میں الاؤنس مقرر کریں,
"Capacity Planning Error, planned start time can not be same as end time",اہلیت کی منصوبہ بندی میں خرابی ، منصوبہ بندی کا آغاز وقت اختتامی وقت کے برابر نہیں ہوسکتا ہے,
@@ -3812,20 +3792,9 @@
Less Than Amount,رقم سے کم,
Liabilities,واجبات,
Loading...,لوڈ کر رہا ہے ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,مجوزہ سیکیورٹیز کے مطابق قرض کی رقم زیادہ سے زیادہ قرض {0 ex سے زیادہ ہے,
Loan Applications from customers and employees.,صارفین اور ملازمین سے قرض کی درخواستیں۔,
-Loan Disbursement,قرض کی فراہمی,
Loan Processes,قرض کے عمل,
-Loan Security,قرض کی حفاظت,
-Loan Security Pledge,قرض کی حفاظت کا عہد,
-Loan Security Pledge Created : {0},قرض کی حفاظت کا عہد کیا گیا: {0},
-Loan Security Price,قرض کی حفاظت کی قیمت,
-Loan Security Price overlapping with {0},قرض کی حفاظت کی قیمت {0 with کے ساتھ وورلیپنگ,
-Loan Security Unpledge,قرض سیکیورٹی Unpledge,
-Loan Security Value,قرض کی حفاظت کی قیمت,
Loan Type for interest and penalty rates,سود اور جرمانے کی شرح کے ل Lo قرض کی قسم,
-Loan amount cannot be greater than {0},قرض کی رقم {0 than سے زیادہ نہیں ہوسکتی ہے,
-Loan is mandatory,قرض لازمی ہے,
Loans,قرضے۔,
Loans provided to customers and employees.,صارفین اور ملازمین کو فراہم کردہ قرض,
Location,مقام,
@@ -3894,7 +3863,6 @@
Pay,ادائیگی,
Payment Document Type,ادائیگی دستاویز کی قسم۔,
Payment Name,ادائیگی کا نام,
-Penalty Amount,جرمانے کی رقم,
Pending,زیر غور,
Performance,کارکردگی,
Period based On,مدت پر مبنی,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,اس آئٹم میں ترمیم کرنے کے ل Please براہ کرم مارکیٹ کے صارف کے طور پر لاگ ان ہوں۔,
Please login as a Marketplace User to report this item.,براہ کرم اس آئٹم کی اطلاع دینے کے لئے کسی بازار کے صارف کے بطور لاگ ان ہوں۔,
Please select <b>Template Type</b> to download template,براہ کرم ٹیمپلیٹ ڈاؤن لوڈ کرنے کے لئے <b>ٹیمپلیٹ کی قسم</b> منتخب کریں,
-Please select Applicant Type first,براہ کرم پہلے درخواست دہندگان کی قسم منتخب کریں,
Please select Customer first,براہ کرم پہلے کسٹمر کو منتخب کریں۔,
Please select Item Code first,براہ کرم پہلے آئٹم کوڈ منتخب کریں,
-Please select Loan Type for company {0},براہ کرم کمپنی کے ل Lo قرض کی قسم منتخب کریں Type 0 select,
Please select a Delivery Note,براہ کرم ڈلیوری نوٹ منتخب کریں۔,
Please select a Sales Person for item: {0},براہ کرم آئٹم کے لئے سیلز شخص منتخب کریں: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',ایک اور طریقہ ادائیگی کا انتخاب کریں. پٹی کرنسی میں لین دین کی حمایت نہیں کرتا '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},براہ کرم کمپنی for 0 for کے لئے پہلے سے طے شدہ بینک اکاؤنٹ مرتب کریں,
Please specify,وضاحت براہ مہربانی,
Please specify a {0},براہ کرم ایک {0 specify کی وضاحت کریں,lead
-Pledge Status,عہد کی حیثیت,
-Pledge Time,عہد نامہ,
Printing,پرنٹنگ,
Priority,ترجیح,
Priority has been changed to {0}.,ترجیح کو {0} میں تبدیل کردیا گیا ہے۔,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML فائلوں پر کارروائی ہورہی ہے,
Profitability,منافع۔,
Project,پروجیکٹ,
-Proposed Pledges are mandatory for secured Loans,محفوظ قرضوں کے لئے مجوزہ وعدے لازمی ہیں,
Provide the academic year and set the starting and ending date.,تعلیمی سال فراہم کریں اور آغاز اور اختتامی تاریخ طے کریں۔,
Public token is missing for this bank,اس بینک کیلئے عوامی ٹوکن غائب ہے۔,
Publish,شائع کریں,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,خریداری کی رسید میں ایسا کوئی آئٹم نہیں ہے جس کے لئے دوبارہ برقرار رکھنے والا نمونہ فعال ہو۔,
Purchase Return,واپس خریداری,
Qty of Finished Goods Item,تیار سامان کی مقدار,
-Qty or Amount is mandatroy for loan security,قرض کی حفاظت کے لئے مقدار یا رقم کی مقدار مینڈٹروائی ہے,
Quality Inspection required for Item {0} to submit,آئٹم for 0 submit جمع کروانے کیلئے کوالٹی انسپیکشن درکار ہے,
Quantity to Manufacture,مقدار کی تیاری,
Quantity to Manufacture can not be zero for the operation {0},آپریشن کے لئے مقدار کی تیاری صفر نہیں ہوسکتی ہے {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,تاریخ چھٹکارا شامل ہونے کی تاریخ سے زیادہ یا اس کے برابر ہونا چاہئے,
Rename,نام تبدیل کریں,
Rename Not Allowed,نام تبدیل کرنے کی اجازت نہیں ہے۔,
-Repayment Method is mandatory for term loans,مدتی قرضوں کے لئے ادائیگی کا طریقہ لازمی ہے,
-Repayment Start Date is mandatory for term loans,مدتی قرضوں کے لئے ادائیگی شروع کرنے کی تاریخ لازمی ہے,
Report Item,آئٹم کی اطلاع دیں۔,
Report this Item,اس چیز کی اطلاع دیں,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,ذیلی معاہدے کے لئے محفوظ مقدار: ذیلی معاہدہ اشیاء بنانے کے لئے خام مال کی مقدار۔,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},قطار ({0}): {1 already پہلے ہی {2 in میں چھوٹ ہے,
Rows Added in {0},قطاریں {0 in میں شامل کی گئیں,
Rows Removed in {0},قطاریں {0 in میں ہٹا دی گئیں,
-Sanctioned Amount limit crossed for {0} {1},منظور شدہ رقم کی حد {0} {1 for کو عبور کر گئی,
-Sanctioned Loan Amount already exists for {0} against company {1},کمپنی} 1} کے خلاف منظور شدہ قرض کی رقم پہلے ہی {0 for میں موجود ہے,
Save,محفوظ کریں,
Save Item,آئٹم کو محفوظ کریں۔,
Saved Items,محفوظ کردہ اشیا,
@@ -4135,7 +4093,6 @@
User {0} is disabled,صارف {0} غیر فعال ہے,
Users and Permissions,صارفین اور اجازت,
Vacancies cannot be lower than the current openings,خالی جگہیں موجودہ خالی جگہوں سے کم نہیں ہوسکتی ہیں۔,
-Valid From Time must be lesser than Valid Upto Time.,درست وقت سے وقت تک درست سے کم ہونا چاہئے۔,
Valuation Rate required for Item {0} at row {1},قطار {1} پر آئٹم {0} کیلئے ویلیو ریٹ کی ضرورت ہے,
Values Out Of Sync,ہم آہنگی سے باہر کی اقدار,
Vehicle Type is required if Mode of Transport is Road,اگر موڈ آف ٹرانسپورٹ روڈ ہے تو گاڑی کی قسم کی ضرورت ہے۔,
@@ -4211,7 +4168,6 @@
Add to Cart,ٹوکری میں شامل کریں,
Days Since Last Order,آخری آرڈر کے بعد سے دن,
In Stock,اسٹاک میں,
-Loan Amount is mandatory,قرض کی رقم لازمی ہے,
Mode Of Payment,ادائیگی کا موڈ,
No students Found,کوئی طالب علم نہیں ملا,
Not in Stock,نہیں اسٹاک میں,
@@ -4240,7 +4196,6 @@
Group by,گروپ سے,
In stock,اسٹاک میں,
Item name,نام شے,
-Loan amount is mandatory,قرض کی رقم لازمی ہے,
Minimum Qty,کم از کم مقدار,
More details,مزید تفصیلات,
Nature of Supplies,سامان کی نوعیت,
@@ -4409,9 +4364,6 @@
Total Completed Qty,کل مکمل مقدار,
Qty to Manufacture,تیار کرنے کی مقدار,
Repay From Salary can be selected only for term loans,تنخواہ سے واپسی کا انتخاب صرف مدتی قرضوں کے لئے کیا جاسکتا ہے,
-No valid Loan Security Price found for {0},Security 0 for کے لئے کوئی مناسب قرض کی حفاظت کی قیمت نہیں ملی,
-Loan Account and Payment Account cannot be same,لون اکاؤنٹ اور ادائیگی اکاؤنٹ ایک جیسے نہیں ہوسکتے ہیں,
-Loan Security Pledge can only be created for secured loans,صرف سیکیورٹی والے قرضوں کے لئے قرض کی حفاظت کا عہد کیا جاسکتا ہے,
Social Media Campaigns,سوشل میڈیا مہمات,
From Date can not be greater than To Date,تاریخ سے تاریخ تک اس سے زیادہ نہیں ہوسکتی ہے,
Please set a Customer linked to the Patient,براہ کرم مریض سے منسلک ایک کسٹمر مقرر کریں,
@@ -6437,7 +6389,6 @@
HR User,HR صارف,
Appointment Letter,بھرتی کا حکم نامہ,
Job Applicant,ملازمت کی درخواست گزار,
-Applicant Name,درخواست گزار کا نام,
Appointment Date,تقرری کی تاریخ,
Appointment Letter Template,تقرری خط کا سانچہ,
Body,جسم,
@@ -7059,99 +7010,12 @@
Sync in Progress,ترقی میں مطابقت پذیری,
Hub Seller Name,حب بیچنے والے کا نام,
Custom Data,اپنی مرضی کے مطابق ڈیٹا,
-Member,رکن,
-Partially Disbursed,جزوی طور پر زرعی قرضوں کی فراہمی,
-Loan Closure Requested,قرض کی بندش کی درخواست کی گئی,
Repay From Salary,تنخواہ سے ادا,
-Loan Details,قرض کی تفصیلات,
-Loan Type,قرض کی قسم,
-Loan Amount,قرضے کی رقم,
-Is Secured Loan,محفوظ قرض ہے,
-Rate of Interest (%) / Year,سود (٪) / سال کی شرح,
-Disbursement Date,ادائیگی کی تاریخ,
-Disbursed Amount,تقسیم شدہ رقم,
-Is Term Loan,ٹرم لون ہے,
-Repayment Method,باز ادائیگی کا طریقہ,
-Repay Fixed Amount per Period,فی وقفہ مقررہ رقم ادا,
-Repay Over Number of Periods,دوران ادوار کی تعداد ادا,
-Repayment Period in Months,مہینے میں واپسی کی مدت,
-Monthly Repayment Amount,ماہانہ واپسی کی رقم,
-Repayment Start Date,واپسی کی تاریخ شروع,
-Loan Security Details,قرض کی حفاظت کی تفصیلات,
-Maximum Loan Value,زیادہ سے زیادہ قرض کی قیمت,
-Account Info,اکاونٹ کی معلومات,
-Loan Account,قرض اکاؤنٹ,
-Interest Income Account,سودی آمدنی اکاؤنٹ,
-Penalty Income Account,پنلٹی انکم اکاؤنٹ,
-Repayment Schedule,واپسی کے شیڈول,
-Total Payable Amount,کل قابل ادائیگی رقم,
-Total Principal Paid,کل پرنسپل ادا ہوا,
-Total Interest Payable,کل سود قابل ادائیگی,
-Total Amount Paid,ادا کردہ کل رقم,
-Loan Manager,لون منیجر,
-Loan Info,قرض کی معلومات,
-Rate of Interest,سود کی شرح,
-Proposed Pledges,مجوزہ وعدے,
-Maximum Loan Amount,زیادہ سے زیادہ قرض کی رقم,
-Repayment Info,باز ادائیگی کی معلومات,
-Total Payable Interest,کل قابل ادائیگی دلچسپی,
-Against Loan ,قرض کے خلاف,
-Loan Interest Accrual,قرضہ سود ایکوری,
-Amounts,رقم,
-Pending Principal Amount,زیر التواء پرنسپل رقم,
-Payable Principal Amount,قابل ادائیگی کی رقم,
-Paid Principal Amount,ادا شدہ پرنسپل رقم,
-Paid Interest Amount,ادا کردہ سود کی رقم,
-Process Loan Interest Accrual,پروسیس لون سود ایکوری,
-Repayment Schedule Name,ادائیگی کے نظام الاوقات کا نام,
Regular Payment,باقاعدہ ادائیگی,
Loan Closure,قرض کی بندش,
-Payment Details,ادائیگی کی تفصیلات,
-Interest Payable,قابل ادائیگی سود,
-Amount Paid,رقم ادا کر دی,
-Principal Amount Paid,پرنسپل رقم ادا کی گئی,
-Repayment Details,ادائیگی کی تفصیلات,
-Loan Repayment Detail,قرض کی واپسی کی تفصیل,
-Loan Security Name,لون سیکیورٹی نام,
-Unit Of Measure,پیمائش کی اکائی,
-Loan Security Code,لون سیکیورٹی کوڈ,
-Loan Security Type,قرض کی حفاظت کی قسم,
-Haircut %,بال کٹوانے,
-Loan Details,قرض کی تفصیلات,
-Unpledged,غیر وابستہ,
-Pledged,وعدہ کیا,
-Partially Pledged,جزوی طور پر وعدہ کیا,
-Securities,سیکیورٹیز,
-Total Security Value,سیکیورٹی کی کل قیمت,
-Loan Security Shortfall,قرض کی حفاظت میں کمی,
-Loan ,قرض,
-Shortfall Time,شارٹ فال ٹائم,
-America/New_York,امریکہ / نیو یارک,
-Shortfall Amount,کمی کی رقم,
-Security Value ,سیکیورٹی ویلیو,
-Process Loan Security Shortfall,عمل سے متعلق سیکیورٹی میں کمی,
-Loan To Value Ratio,قدر کے تناسب سے قرض,
-Unpledge Time,غیر تسلی بخش وقت,
-Loan Name,قرض نام,
Rate of Interest (%) Yearly,سود کی شرح (٪) سالانہ,
-Penalty Interest Rate (%) Per Day,پینلٹی سود کی شرح (٪) فی دن,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,ادائیگی میں تاخیر کی صورت میں روزانہ کی بنیاد پر زیر التوا سود کی رقم پر جرمانہ سود کی شرح عائد کی جاتی ہے,
-Grace Period in Days,دنوں میں فضل کا دورانیہ,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,مقررہ تاریخ سے لے کر اس دن تک جو قرض کی ادائیگی میں تاخیر کی صورت میں جرمانہ وصول نہیں کیا جائے گا,
-Pledge,عہد کرنا,
-Post Haircut Amount,بال کٹوانے کی رقم,
-Process Type,عمل کی قسم,
-Update Time,تازہ کاری کا وقت,
-Proposed Pledge,مجوزہ عہد,
-Total Payment,کل ادائیگی,
-Balance Loan Amount,بیلنس قرض کی رقم,
-Is Accrued,اکھٹا ہوا ہے,
Salary Slip Loan,تنخواہ سلپ قرض,
Loan Repayment Entry,قرض کی ادائیگی میں داخلہ,
-Sanctioned Loan Amount,منظور شدہ قرض کی رقم,
-Sanctioned Amount Limit,منظور شدہ رقم کی حد,
-Unpledge,عہد نہ کریں,
-Haircut,بال کٹوانے,
MAT-MSH-.YYYY.-,MAT-MSH -YYYY-,
Generate Schedule,شیڈول بنائیں,
Schedules,شیڈول,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,منصوبہ ان کے صارفین کو ویب سائٹ پر قابل رسائی ہو جائے گا,
Copied From,سے کاپی,
Start and End Dates,شروع کریں اور تواریخ اختتام,
-Actual Time (in Hours),اصل وقت (اوقات میں),
+Actual Time in Hours (via Timesheet),اصل وقت (اوقات میں),
Costing and Billing,لاگت اور بلنگ,
-Total Costing Amount (via Timesheets),مجموعی قیمت (ٹائم شیشے کے ذریعہ),
-Total Expense Claim (via Expense Claims),کل اخراجات کا دعوی (اخراجات کے دعووں کے ذریعے),
+Total Costing Amount (via Timesheet),مجموعی قیمت (ٹائم شیشے کے ذریعہ),
+Total Expense Claim (via Expense Claim),کل اخراجات کا دعوی (اخراجات کے دعووں کے ذریعے),
Total Purchase Cost (via Purchase Invoice),کل خریداری کی لاگت (انوائس خریداری کے ذریعے),
Total Sales Amount (via Sales Order),کل سیلز رقم (سیلز آرڈر کے ذریعے),
-Total Billable Amount (via Timesheets),کل بلبل رقم (ٹائم شیشے کے ذریعہ),
-Total Billed Amount (via Sales Invoices),کل بل رقم (سیلز انوائس کے ذریعہ),
-Total Consumed Material Cost (via Stock Entry),مجموعی سامان کی قیمت (اسٹاک انٹری کے ذریعے),
+Total Billable Amount (via Timesheet),کل بلبل رقم (ٹائم شیشے کے ذریعہ),
+Total Billed Amount (via Sales Invoice),کل بل رقم (سیلز انوائس کے ذریعہ),
+Total Consumed Material Cost (via Stock Entry),مجموعی سامان کی قیمت (اسٹاک انٹری کے ذریعے),
Gross Margin,مجموعی مارجن,
Gross Margin %,مجموعی مارجن٪,
Monitor Progress,نگرانی کی ترقی,
@@ -7521,12 +7385,10 @@
Dependencies,انحصار,
Dependent Tasks,منحصر کام,
Depends on Tasks,ٹاسکس پر انحصار کرتا ہے,
-Actual Start Date (via Time Sheet),اصل آغاز کی تاریخ (وقت شیٹ کے ذریعے),
-Actual Time (in hours),(گھنٹوں میں) اصل وقت,
-Actual End Date (via Time Sheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے),
-Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے),
+Actual Start Date (via Timesheet),اصل آغاز کی تاریخ (وقت شیٹ کے ذریعے),
+Actual Time in Hours (via Timesheet),(گھنٹوں میں) اصل وقت,
+Actual End Date (via Timesheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے),
Total Expense Claim (via Expense Claim),(خرچ دعوی ذریعے) کل اخراجات کا دعوی,
-Total Billing Amount (via Time Sheet),کل بلنگ کی رقم (وقت شیٹ کے ذریعے),
Review Date,جائزہ تاریخ,
Closing Date,آخری تاریخ,
Task Depends On,کام پر انحصار کرتا ہے,
@@ -7887,7 +7749,6 @@
Update Series,اپ ڈیٹ سیریز,
Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.,
Prefix,اپسرگ,
-Current Value,موجودہ قیمت,
This is the number of the last created transaction with this prefix,یہ اپسرگ کے ساتھ گزشتہ پیدا لین دین کی تعداد ہے,
Update Series Number,اپ ڈیٹ سلسلہ نمبر,
Quotation Lost Reason,کوٹیشن کھو وجہ,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Itemwise ترتیب لیول سفارش,
Lead Details,لیڈ تفصیلات,
Lead Owner Efficiency,لیڈ مالک مستعدی,
-Loan Repayment and Closure,قرض کی ادائیگی اور بندش,
-Loan Security Status,قرض کی حفاظت کی حیثیت,
Lost Opportunity,موقع کھو دیا۔,
Maintenance Schedules,بحالی شیڈول,
Material Requests for which Supplier Quotations are not created,پردایک کوٹیشن پیدا نہیں کر رہے ہیں جس کے لئے مواد کی درخواست,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},ھدف کردہ گنتی: {0},
Payment Account is mandatory,ادائیگی اکاؤنٹ لازمی ہے,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",اگر جانچ پڑتال کی گئی تو انکم ٹیکس کا حساب لگانے سے پہلے بغیر کسی اعلان یا ثبوت جمع کروانے سے قبل پوری رقم ٹیکس قابل آمدنی سے کٹوتی کی جائے گی۔,
-Disbursement Details,ادائیگی کی تفصیلات,
Material Request Warehouse,مٹیریل ریکوسٹ گودام,
Select warehouse for material requests,مادی درخواستوں کے لئے گودام کا انتخاب کریں,
Transfer Materials For Warehouse {0},گودام For 0 For کے لئے مواد کی منتقلی,
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,تنخواہ سے غیر دعویدار رقم واپس کریں,
Deduction from salary,تنخواہ سے کٹوتی,
Expired Leaves,ختم شدہ پتے,
-Reference No,حوالہ نمبر,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,بال کٹوانے کی شرح لون سیکیورٹی کی مارکیٹ ویلیو اور اس لون سیکیورٹی کے حساب سے اس قدر کے درمیان فیصد فرق ہے جب اس قرض کے لئے کولیٹرل کے طور پر استعمال ہوتا ہے۔,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,لین ٹو ویلیو تناسب ، قرض کی رقم کے تناسب کو سیکیورٹی کے وعدے کی قیمت سے ظاہر کرتا ہے۔ اگر یہ کسی بھی قرض کے لئے مخصوص قدر سے کم ہو تو قرض کی حفاظت میں شارٹ فال ہوسکے گا,
If this is not checked the loan by default will be considered as a Demand Loan,اگر اس کی جانچ نہیں کی گئی تو قرض کو بطور ڈیفانٹ لون سمجھا جائے گا,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,یہ اکاؤنٹ قرض لینے والے سے قرض کی واپسیوں کی بکنگ اور قرض لینے والے کو قرضوں کی تقسیم کے لئے استعمال ہوتا ہے,
This account is capital account which is used to allocate capital for loan disbursal account ,یہ کھاتہ دارالحکومت کا کھاتہ ہے جو قرض تقسیم کے اکاؤنٹ کے لئے سرمایہ مختص کرنے کے لئے استعمال ہوتا ہے,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},آپریشن {0 the کا تعلق ورک آرڈر to 1 not سے نہیں ہے۔,
Print UOM after Quantity,مقدار کے بعد UOM پرنٹ کریں,
Set default {0} account for perpetual inventory for non stock items,غیر اسٹاک آئٹمز کی مستقل انوینٹری کیلئے ڈیفالٹ {0} اکاؤنٹ مرتب کریں,
-Loan Security {0} added multiple times,لون سیکیورٹی {0 multiple نے متعدد بار شامل کیا,
-Loan Securities with different LTV ratio cannot be pledged against one loan,مختلف ایل ٹی وی تناسب والی لون سیکیورٹیز کو ایک لون کے مقابلے میں گروی نہیں رکھا جاسکتا,
-Qty or Amount is mandatory for loan security!,قرض کی حفاظت کے لئے مقدار یا رقم لازمی ہے!,
-Only submittted unpledge requests can be approved,صرف جمع کروائی گئی ناقابل قبول درخواستوں کو ہی منظور کیا جاسکتا ہے,
-Interest Amount or Principal Amount is mandatory,سود کی رقم یا پرنسپل رقم لازمی ہے,
-Disbursed Amount cannot be greater than {0},تقسیم شدہ رقم {0 than سے زیادہ نہیں ہوسکتی ہے,
-Row {0}: Loan Security {1} added multiple times,قطار {0}: قرض کی حفاظت {1 multiple میں متعدد بار شامل کیا گیا,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,قطار # {0}: چائلڈ آئٹم پروڈکٹ بنڈل نہیں ہونا چاہئے۔ براہ کرم آئٹم {1 remove کو ہٹا دیں اور محفوظ کریں,
Credit limit reached for customer {0},صارف کے لئے کریڈٹ کی حد limit 0 reached ہوگئی,
Could not auto create Customer due to the following missing mandatory field(s):,مندرجہ ذیل لاپتہ لازمی فیلڈز کی وجہ سے گاہک کو خود کار طریقے سے تشکیل نہیں دے سکا:,
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index 1e50376..40d4165 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Agar kompaniya SpA, SApA yoki SRL bo'lsa, tegishli",
Applicable if the company is a limited liability company,"Agar kompaniya ma'suliyati cheklangan jamiyat bo'lsa, tegishli",
Applicable if the company is an Individual or a Proprietorship,"Agar kompaniya jismoniy shaxs yoki mulkdor bo'lsa, tegishli",
-Applicant,Ariza beruvchi,
-Applicant Type,Ariza beruvchi turi,
Application of Funds (Assets),Jamg'armalar (aktivlar) ni qo'llash,
Application period cannot be across two allocation records,Ilova davri ikkita ajratma yozuvlari bo'yicha bo'lishi mumkin emas,
Application period cannot be outside leave allocation period,Ariza soatlari tashqaridan ajratilgan muddatning tashqarisida bo'lishi mumkin emas,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Folio raqamlari mavjud bo'lgan aktsiyadorlar ro'yxati,
Loading Payment System,To'lov tizimini o'rnatish,
Loan,Kredit,
-Loan Amount cannot exceed Maximum Loan Amount of {0},Kredit summasi {0} maksimum kredit summasidan oshib ketmasligi kerak.,
-Loan Application,Kreditlash uchun ariza,
-Loan Management,Kreditni boshqarish,
-Loan Repayment,Kreditni qaytarish,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Hisob-fakturani chegirishni saqlash uchun kreditning boshlanish sanasi va kredit muddati majburiy hisoblanadi,
Loans (Liabilities),Kreditlar (majburiyatlar),
Loans and Advances (Assets),Kreditlar va avanslar (aktivlar),
@@ -1611,7 +1605,6 @@
Monday,Dushanba,
Monthly,Oylik,
Monthly Distribution,Oylik tarqatish,
-Monthly Repayment Amount cannot be greater than Loan Amount,Oylik qaytarib beriladigan pul miqdori Kredit miqdoridan kattaroq bo'lishi mumkin emas,
More,Ko'proq,
More Information,Qo'shimcha ma'lumot,
More than one selection for {0} not allowed,{0} uchun bittadan ortiq tanlovga ruxsat berilmaydi,
@@ -1884,11 +1877,9 @@
Pay {0} {1},{0} {1} to'lash,
Payable,To'lanishi kerak,
Payable Account,To'lanadigan hisob,
-Payable Amount,To'lanadigan miqdor,
Payment,To'lov,
Payment Cancelled. Please check your GoCardless Account for more details,"To'lov bekor qilindi. Iltimos, batafsil ma'lumot uchun GoCardsiz hisobingizni tekshiring",
Payment Confirmation,To'lovlarni tasdiqlash,
-Payment Date,To'lov sanasi,
Payment Days,To'lov kunlari,
Payment Document,To'lov hujjati,
Payment Due Date,To'lov sanasi,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Avval Qabul Qabulnomasini kiriting,
Please enter Receipt Document,"Iltimos, hujjatning hujjatini kiriting",
Please enter Reference date,"Iltimos, arizani kiriting",
-Please enter Repayment Periods,To'lov muddatlarini kiriting,
Please enter Reqd by Date,Iltimos sanasi bo'yicha Reqd kiriting,
Please enter Woocommerce Server URL,"Iltimos, Woocommerce Server URL manzilini kiriting",
Please enter Write Off Account,"Iltimos, hisob raqamini kiriting",
@@ -1994,7 +1984,6 @@
Please enter parent cost center,"Iltimos, yuqori xarajat markazini kiriting",
Please enter quantity for Item {0},"Iltimos, {0} mahsulot uchun miqdorni kiriting",
Please enter relieving date.,"Iltimos, bo'sh vaqtni kiriting.",
-Please enter repayment Amount,To'lov miqdorini kiriting,
Please enter valid Financial Year Start and End Dates,"Iltimos, joriy moliyaviy yilni boshlash va tugatish sanasini kiriting",
Please enter valid email address,"Iltimos, to'g'ri elektron pochta manzilini kiriting",
Please enter {0} first,Avval {0} kiriting,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Raqobatchilar qoidalari miqdori bo'yicha qo'shimcha ravishda filtrlanadi.,
Primary Address Details,Birlamchi manzil ma'lumotlari,
Primary Contact Details,Birlamchi aloqa ma'lumotlari,
-Principal Amount,Asosiy miqdori,
Print Format,Bosib chiqarish formati,
Print IRS 1099 Forms,IRS 1099 shakllarini chop eting,
Print Report Card,Hisobot kartasini chop etish,
@@ -2550,7 +2538,6 @@
Sample Collection,Namunani yig'ish,
Sample quantity {0} cannot be more than received quantity {1},{0} o'rnak miqdori qabul qilingan miqdordan ortiq bo'lishi mumkin emas {1},
Sanctioned,Sanktsiya,
-Sanctioned Amount,Sanktsiya miqdori,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsiyalangan pul miqdori {0} qatorida da'vo miqdori qiymatidan katta bo'lmasligi kerak.,
Sand,Qum,
Saturday,Shanba,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} allaqachon Ota-ona tartibiga ega {1}.,
API,API,
Annual,Yillik,
-Approved,Tasdiqlandi,
Change,O'zgartirish,
Contact Email,E-pochtaga murojaat qiling,
Export Type,Eksport turi,
@@ -3571,7 +3557,6 @@
Account Value,Hisob qiymati,
Account is mandatory to get payment entries,To'lov yozuvlarini olish uchun hisob qaydnomasi majburiydir,
Account is not set for the dashboard chart {0},Hisoblash jadvali {0} jadvalida o'rnatilmagan,
-Account {0} does not belong to company {1},{0} hisobi {1} kompaniyasiga tegishli emas,
Account {0} does not exists in the dashboard chart {1},{1} boshqaruv panelida {0} hisobi mavjud emas.,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Hisob qaydnomasi: <b>{0}</b> asosiy ish bajarilmoqda va Journal Entry tomonidan yangilanmaydi,
Account: {0} is not permitted under Payment Entry,Hisob: {0} to'lovni kiritishda taqiqlangan,
@@ -3582,7 +3567,6 @@
Activity,Faoliyat,
Add / Manage Email Accounts.,E-pochta hisoblarini qo'shish / boshqarish.,
Add Child,Bola qo'shish,
-Add Loan Security,Kredit xavfsizligini qo'shing,
Add Multiple,Bir nechta qo'shish,
Add Participants,Ishtirokchilarni qo'shish,
Add to Featured Item,Tanlangan narsalarga qo'shish,
@@ -3593,15 +3577,12 @@
Address Line 1,Manzil uchun 1-chi qator,
Addresses,Manzillar,
Admission End Date should be greater than Admission Start Date.,Qabulni tugatish sanasi qabulning boshlanish sanasidan katta bo'lishi kerak.,
-Against Loan,Qarzga qarshi,
-Against Loan:,Qarzga qarshi:,
All,HAMMA,
All bank transactions have been created,Barcha bank operatsiyalari yaratildi,
All the depreciations has been booked,Barcha eskirgan narsalar bron qilingan,
Allocation Expired!,Ajratish muddati tugadi!,
Allow Resetting Service Level Agreement from Support Settings.,Xizmat ko'rsatish darajasi to'g'risidagi kelishuvni qo'llab-quvvatlash sozlamalaridan tiklashga ruxsat bering.,
Amount of {0} is required for Loan closure,Kreditni yopish uchun {0} miqdori talab qilinadi,
-Amount paid cannot be zero,To'langan miqdor nolga teng bo'lmaydi,
Applied Coupon Code,Amaliy Kupon kodi,
Apply Coupon Code,Kupon kodini qo'llang,
Appointment Booking,Uchrashuvni bron qilish,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Haydovchining manzili etishmayotganligi sababli yetib kelish vaqtini hisoblab bo'lmaydi.,
Cannot Optimize Route as Driver Address is Missing.,Haydovchining manzili mavjud emasligi sababli marshrutni optimallashtirib bo'lmaydi.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"{0} vazifasini bajarib bo'lmadi, chunki unga bog'liq bo'lgan {1} vazifasi tugallanmagan / bekor qilinmagan.",
-Cannot create loan until application is approved,Ilova ma'qullanmaguncha ssudani yaratib bo'lmaydi,
Cannot find a matching Item. Please select some other value for {0}.,Mos keladigan elementni topib bo'lmadi. {0} uchun boshqa qiymatni tanlang.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",{1} qatoridan {2} dan ortiq {0} elementi uchun ortiqcha buyurtma berish mumkin emas. Ortiqcha hisob-kitob qilishga ruxsat berish uchun hisob qaydnomasi sozlamalarida ruxsatnomani belgilang,
"Capacity Planning Error, planned start time can not be same as end time","Imkoniyatlarni rejalashtirishda xato, rejalashtirilgan boshlanish vaqti tugash vaqti bilan bir xil bo'lishi mumkin emas",
@@ -3812,20 +3792,9 @@
Less Than Amount,Miqdor kamroq,
Liabilities,Majburiyatlar,
Loading...,Yuklanmoqda ...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Kredit summasi taklif qilingan qimmatli qog'ozlarga ko'ra kreditning maksimal miqdoridan {0} dan ko'pdir,
Loan Applications from customers and employees.,Mijozlar va xodimlarning kredit buyurtmalari.,
-Loan Disbursement,Kreditni to'lash,
Loan Processes,Kredit jarayonlari,
-Loan Security,Kredit xavfsizligi,
-Loan Security Pledge,Kredit garovi,
-Loan Security Pledge Created : {0},Kredit xavfsizligi garovi yaratilgan: {0},
-Loan Security Price,Kredit kafolati narxi,
-Loan Security Price overlapping with {0},Kredit garovi narxi {0} bilan mos keladi,
-Loan Security Unpledge,Kredit xavfsizligini ta'minlash,
-Loan Security Value,Kredit kafolati qiymati,
Loan Type for interest and penalty rates,Foizlar va foizlar stavkalari uchun kredit turi,
-Loan amount cannot be greater than {0},Kredit summasi {0} dan ko'p bo'lmasligi kerak,
-Loan is mandatory,Qarz berish majburiydir,
Loans,Kreditlar,
Loans provided to customers and employees.,Mijozlar va xodimlarga berilgan kreditlar.,
Location,Manzil,
@@ -3894,7 +3863,6 @@
Pay,To'lash,
Payment Document Type,To'lov hujjati turi,
Payment Name,To'lov nomi,
-Penalty Amount,Jarima miqdori,
Pending,Kutilmoqda,
Performance,Ishlash,
Period based On,Davr asoslangan,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Ushbu mahsulotni tahrirlash uchun Marketplace foydalanuvchisi sifatida tizimga kiring.,
Please login as a Marketplace User to report this item.,Ushbu mahsulot haqida xabar berish uchun Marketplace foydalanuvchisi sifatida tizimga kiring.,
Please select <b>Template Type</b> to download template,"Iltimos, <b>shablonni</b> yuklab olish uchun <b>shablon turini</b> tanlang",
-Please select Applicant Type first,Avval Arizachi turini tanlang,
Please select Customer first,Avval mijozni tanlang,
Please select Item Code first,Avval mahsulot kodini tanlang,
-Please select Loan Type for company {0},Iltimos {0} uchun kredit turini tanlang.,
Please select a Delivery Note,"Iltimos, etkazib berish eslatmasini tanlang",
Please select a Sales Person for item: {0},"Iltimos, mahsulot sotuvchisini tanlang: {0}",
Please select another payment method. Stripe does not support transactions in currency '{0}',Boshqa to'lov usulini tanlang. Stripe '{0}' valyutasidagi operatsiyalarni qo'llab-quvvatlamaydi,
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Iltimos {0} kompaniyasi uchun odatiy bank hisobini o'rnating.,
Please specify,"Iltimos, ko'rsating",
Please specify a {0},"Iltimos, {0} kiriting",lead
-Pledge Status,Garov holati,
-Pledge Time,Garov muddati,
Printing,Bosib chiqarish,
Priority,Birinchi o'ringa,
Priority has been changed to {0}.,Ustuvorlik {0} ga o'zgartirildi.,
@@ -3944,7 +3908,6 @@
Processing XML Files,XML fayllarini qayta ishlash,
Profitability,Daromadlilik,
Project,Loyiha,
-Proposed Pledges are mandatory for secured Loans,Taklif etilayotgan garovlar kafolatlangan kreditlar uchun majburiydir,
Provide the academic year and set the starting and ending date.,O'quv yilini taqdim eting va boshlanish va tugash sanasini belgilang.,
Public token is missing for this bank,Ushbu bank uchun ommaviy token yo'q,
Publish,Nashr qiling,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Xarid kvitansiyasida "Qidiruv namunasini yoqish" bandi mavjud emas.,
Purchase Return,Xaridni qaytarish,
Qty of Finished Goods Item,Tayyor mahsulotning qirq qismi,
-Qty or Amount is mandatroy for loan security,Qty yoki Miqdor - bu kreditni ta'minlash uchun mandatroy,
Quality Inspection required for Item {0} to submit,{0} punktini topshirish uchun sifat nazorati talab qilinadi,
Quantity to Manufacture,Ishlab chiqarish miqdori,
Quantity to Manufacture can not be zero for the operation {0},Ishlab chiqarish miqdori {0} uchun nol bo'lishi mumkin emas.,
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Yengish sanasi qo'shilish sanasidan katta yoki unga teng bo'lishi kerak,
Rename,Nomni o'zgartiring,
Rename Not Allowed,Nomni o'zgartirishga ruxsat berilmagan,
-Repayment Method is mandatory for term loans,To'lash usuli muddatli kreditlar uchun majburiydir,
-Repayment Start Date is mandatory for term loans,To'lovni boshlash muddati muddatli kreditlar uchun majburiydir,
Report Item,Xabar berish,
Report this Item,Ushbu elementni xabar qiling,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Subtrudrat uchun ajratilgan Qty: pudrat shartnomalarini tuzish uchun xom ashyo miqdori.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Satr ({0}): {1} allaqachon {2} da chegirma qilingan,
Rows Added in {0},Qatorlar {0} da qo'shilgan,
Rows Removed in {0},Satrlar {0} da olib tashlandi,
-Sanctioned Amount limit crossed for {0} {1},Sanktsiyalangan miqdor cheklovi {0} {1} uchun o'tdi,
-Sanctioned Loan Amount already exists for {0} against company {1},Sanksiya qilingan kredit miqdori {1} kompaniyasiga qarshi {0} uchun allaqachon mavjud,
Save,Saqlash,
Save Item,Elementni saqlang,
Saved Items,Saqlangan narsalar,
@@ -4135,7 +4093,6 @@
User {0} is disabled,{0} foydalanuvchisi o'chirib qo'yilgan,
Users and Permissions,Foydalanuvchilar va ruxsatnomalar,
Vacancies cannot be lower than the current openings,Bo'sh ish o'rinlari joriy ochilishlardan past bo'lishi mumkin emas,
-Valid From Time must be lesser than Valid Upto Time.,Vaqtning amal qilishi Valid Upto vaqtidan kamroq bo'lishi kerak.,
Valuation Rate required for Item {0} at row {1},Baholash darajasi {0} qatorida {0} talab qilinadi.,
Values Out Of Sync,Sinxron bo'lmagan qiymatlar,
Vehicle Type is required if Mode of Transport is Road,"Transport turi Yo'l bo'lsa, transport vositasining turi talab qilinadi",
@@ -4211,7 +4168,6 @@
Add to Cart,savatchaga qo'shish,
Days Since Last Order,So'nggi buyurtmadan keyingi kunlar,
In Stock,Omborda mavjud; sotuvda mavjud,
-Loan Amount is mandatory,Qarz miqdori majburiydir,
Mode Of Payment,To'lov tartibi,
No students Found,Hech qanday talaba topilmadi,
Not in Stock,Stoktaki emas,
@@ -4240,7 +4196,6 @@
Group by,Guruh tomonidan,
In stock,Omborda mavjud; sotuvda mavjud,
Item name,Mavzu nomi,
-Loan amount is mandatory,Qarz miqdori majburiydir,
Minimum Qty,Minimal Miqdor,
More details,Batafsil ma'lumot,
Nature of Supplies,Ta'minot tabiati,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Jami bajarilgan Qty,
Qty to Manufacture,Ishlab chiqarish uchun miqdori,
Repay From Salary can be selected only for term loans,Ish haqidan to'lashni faqat muddatli kreditlar uchun tanlash mumkin,
-No valid Loan Security Price found for {0},{0} uchun haqiqiy kredit xavfsizligi narxi topilmadi,
-Loan Account and Payment Account cannot be same,Kredit hisobvarag'i va to'lov hisobi bir xil bo'lishi mumkin emas,
-Loan Security Pledge can only be created for secured loans,Kredit xavfsizligi garovi faqat ta'minlangan kreditlar uchun tuzilishi mumkin,
Social Media Campaigns,Ijtimoiy media aksiyalari,
From Date can not be greater than To Date,Sana sanasidan katta bo'lishi mumkin emas,
Please set a Customer linked to the Patient,"Iltimos, bemorga bog'langan mijozni o'rnating",
@@ -6437,7 +6389,6 @@
HR User,HR foydalanuvchisi,
Appointment Letter,Uchrashuv xati,
Job Applicant,Ish beruvchi,
-Applicant Name,Ariza beruvchi nomi,
Appointment Date,Uchrashuv sanasi,
Appointment Letter Template,Uchrashuv xatining shabloni,
Body,Tanasi,
@@ -7059,99 +7010,12 @@
Sync in Progress,Sinxronlash davom etmoqda,
Hub Seller Name,Hub sotuvchi nomi,
Custom Data,Maxsus ma'lumotlar,
-Member,Ro'yxatdan,
-Partially Disbursed,Qisman to'langan,
-Loan Closure Requested,Kreditni yopish so'raladi,
Repay From Salary,Ish haqidan to'lash,
-Loan Details,Kredit tafsilotlari,
-Loan Type,Kredit turi,
-Loan Amount,Kredit miqdori,
-Is Secured Loan,Kafolatlangan kredit,
-Rate of Interest (%) / Year,Foiz stavkasi (%) / yil,
-Disbursement Date,To'lov sanasi,
-Disbursed Amount,To'langan miqdor,
-Is Term Loan,Muddatli kredit,
-Repayment Method,Qaytarilish usuli,
-Repay Fixed Amount per Period,Davr uchun belgilangan miqdorni to'lash,
-Repay Over Number of Periods,Davr sonini qaytaring,
-Repayment Period in Months,Oylardagi qaytarish davri,
-Monthly Repayment Amount,Oylik to'lov miqdori,
-Repayment Start Date,To'lov boshlanish sanasi,
-Loan Security Details,Kredit xavfsizligi tafsilotlari,
-Maximum Loan Value,Kreditning maksimal qiymati,
-Account Info,Hisob ma'lumotlari,
-Loan Account,Kredit hisoboti,
-Interest Income Account,Foiz daromadi hisob,
-Penalty Income Account,Jazo daromadlari hisobi,
-Repayment Schedule,To'lov rejasi,
-Total Payable Amount,To'lanadigan qarz miqdori,
-Total Principal Paid,Asosiy to'langan pul,
-Total Interest Payable,To'lanadigan foizlar,
-Total Amount Paid,To'langan pul miqdori,
-Loan Manager,Kreditlar bo'yicha menejer,
-Loan Info,Kredit haqida ma'lumot,
-Rate of Interest,Foiz stavkasi,
-Proposed Pledges,Taklif qilingan garovlar,
-Maximum Loan Amount,Maksimal kredit summasi,
-Repayment Info,To'lov ma'lumoti,
-Total Payable Interest,To'lanadigan foiz,
-Against Loan ,Kreditga qarshi,
-Loan Interest Accrual,Kredit bo'yicha foizlarni hisoblash,
-Amounts,Miqdor,
-Pending Principal Amount,Asosiy miqdor kutilmoqda,
-Payable Principal Amount,To'lanadigan asosiy summa,
-Paid Principal Amount,To'langan asosiy summa,
-Paid Interest Amount,To'langan foizlar miqdori,
-Process Loan Interest Accrual,Kredit bo'yicha foizlarni hisoblash jarayoni,
-Repayment Schedule Name,To'lov jadvalining nomi,
Regular Payment,Doimiy to'lov,
Loan Closure,Kreditni yopish,
-Payment Details,To'lov ma'lumoti,
-Interest Payable,To'lanadigan foizlar,
-Amount Paid,To'lov miqdori,
-Principal Amount Paid,To'langan asosiy miqdor,
-Repayment Details,To'lov tafsilotlari,
-Loan Repayment Detail,Kreditni to'lash bo'yicha tafsilotlar,
-Loan Security Name,Kredit kafolati nomi,
-Unit Of Measure,O'lchov birligi,
-Loan Security Code,Kredit xavfsizligi kodi,
-Loan Security Type,Kredit xavfsizligi turi,
-Haircut %,Sartaroshlik%,
-Loan Details,Kredit haqida ma'lumot,
-Unpledged,Ishlov berilmagan,
-Pledged,Garovga qo'yilgan,
-Partially Pledged,Qisman garovga qo'yilgan,
-Securities,Qimmatli qog'ozlar,
-Total Security Value,Umumiy xavfsizlik qiymati,
-Loan Security Shortfall,Kredit ta'minotidagi kamchilik,
-Loan ,Kredit,
-Shortfall Time,Kamchilik vaqti,
-America/New_York,Amerika / Nyu_York,
-Shortfall Amount,Kamchilik miqdori,
-Security Value ,Xavfsizlik qiymati,
-Process Loan Security Shortfall,Kredit ssudasi garovi,
-Loan To Value Ratio,Qarz qiymatining nisbati,
-Unpledge Time,Bekor qilish vaqti,
-Loan Name,Kredit nomi,
Rate of Interest (%) Yearly,Foiz stavkasi (%) Yillik,
-Penalty Interest Rate (%) Per Day,Bir kun uchun foiz stavkasi (%),
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,"To'lov kechiktirilgan taqdirda, har kuni to'lanadigan foizlar miqdorida penyalar foiz stavkasi olinadi",
-Grace Period in Days,Kunlarda imtiyozli davr,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Kreditni to'lash muddati kechiktirilgan taqdirda jarima undirilmaydigan sanadan boshlab kunlar soni,
-Pledge,Garov,
-Post Haircut Amount,Soch turmagidan keyin miqdori,
-Process Type,Jarayon turi,
-Update Time,Yangilash vaqti,
-Proposed Pledge,Taklif qilingan garov,
-Total Payment,Jami to'lov,
-Balance Loan Amount,Kreditning qoldig'i,
-Is Accrued,Hisoblangan,
Salary Slip Loan,Ish haqi pul mablag'lari,
Loan Repayment Entry,Kreditni qaytarish uchun kirish,
-Sanctioned Loan Amount,Sanktsiyalangan kredit miqdori,
-Sanctioned Amount Limit,Sanktsiyalangan miqdor cheklovi,
-Unpledge,Olib tashlash,
-Haircut,Soch kesish,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Jadvalni yarating,
Schedules,Jadvallar,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Ushbu foydalanuvchilarning veb-saytida loyihaga kirish mumkin bo'ladi,
Copied From,Ko'chirildi,
Start and End Dates,Boshlanish va tugash sanalari,
-Actual Time (in Hours),Haqiqiy vaqt (soat bilan),
+Actual Time in Hours (via Timesheet),Haqiqiy vaqt (soat bilan),
Costing and Billing,Xarajatlar va billing,
-Total Costing Amount (via Timesheets),Jami xarajat summasi (vaqt jadvallari orqali),
-Total Expense Claim (via Expense Claims),Jami xarajat talabi (xarajatlar bo'yicha da'vo),
+Total Costing Amount (via Timesheet),Jami xarajat summasi (vaqt jadvallari orqali),
+Total Expense Claim (via Expense Claim),Jami xarajat talabi (xarajatlar bo'yicha da'vo),
Total Purchase Cost (via Purchase Invoice),Jami xarid qiymati (Xarid qilish byudjeti orqali),
Total Sales Amount (via Sales Order),Jami Sotuvdagi miqdori (Sotuvdagi Buyurtma orqali),
-Total Billable Amount (via Timesheets),Jami to'lov miqdori (vaqt jadvallari orqali),
-Total Billed Amount (via Sales Invoices),Jami to'lov miqdori (Savdo shkaflari orqali),
-Total Consumed Material Cost (via Stock Entry),Jami iste'mol qilinadigan materiallar qiymati (aktsiyalar orqali),
+Total Billable Amount (via Timesheet),Jami to'lov miqdori (vaqt jadvallari orqali),
+Total Billed Amount (via Sales Invoice),Jami to'lov miqdori (Savdo shkaflari orqali),
+Total Consumed Material Cost (via Stock Entry),Jami iste'mol qilinadigan materiallar qiymati (aktsiyalar orqali),
Gross Margin,Yalpi marj,
Gross Margin %,Yalpi marj%,
Monitor Progress,Monitoring jarayoni,
@@ -7521,12 +7385,10 @@
Dependencies,Bog'lanishlar,
Dependent Tasks,Bog'lanish vazifalari,
Depends on Tasks,Vazifalarga bog'liq,
-Actual Start Date (via Time Sheet),Haqiqiy boshlash sanasi (vaqt jadvalidan orqali),
-Actual Time (in hours),Haqiqiy vaqt (soati),
-Actual End Date (via Time Sheet),Haqiqiy tugash sanasi (vaqt jadvalidan orqali),
-Total Costing Amount (via Time Sheet),Jami xarajat summasi (vaqt jadvalidan),
+Actual Start Date (via Timesheet),Haqiqiy boshlash sanasi (vaqt jadvalidan orqali),
+Actual Time in Hours (via Timesheet),Haqiqiy vaqt (soati),
+Actual End Date (via Timesheet),Haqiqiy tugash sanasi (vaqt jadvalidan orqali),
Total Expense Claim (via Expense Claim),Jami xarajatlar bo'yicha da'vo (mablag 'to'lovi bo'yicha),
-Total Billing Amount (via Time Sheet),Jami to'lov miqdori (vaqt jadvalidan),
Review Date,Ko'rib chiqish sanasi,
Closing Date,Yakunlovchi sana,
Task Depends On,Vazifa bog'liq,
@@ -7887,7 +7749,6 @@
Update Series,Yangilash turkumi,
Change the starting / current sequence number of an existing series.,Mavjud ketma-ketlikning boshlang'ich / to`g`ri qatorini o`zgartirish.,
Prefix,Prefiks,
-Current Value,Joriy qiymat,
This is the number of the last created transaction with this prefix,"Bu, bu old qo'shimchadagi oxirgi yaratilgan bitimning sonidir",
Update Series Number,Series raqamini yangilash,
Quotation Lost Reason,Iqtibos yo'qolgan sabab,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Tavsiya etilgan buyurtmaning darajasi,
Lead Details,Qurilma detallari,
Lead Owner Efficiency,Qurilish egasining samaradorligi,
-Loan Repayment and Closure,Kreditni qaytarish va yopish,
-Loan Security Status,Qarz xavfsizligi holati,
Lost Opportunity,Yo'qotilgan imkoniyat,
Maintenance Schedules,Xizmat jadvali,
Material Requests for which Supplier Quotations are not created,Yetkazib beruvchi kotirovkalari yaratilmagan moddiy talablar,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Maqsadli hisoblar: {0},
Payment Account is mandatory,To'lov hisobi majburiydir,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Agar tekshirilgan bo'lsa, soliq deklaratsiyasini yoki dalillarni taqdim qilmasdan daromad solig'ini hisoblashdan oldin to'liq summa soliqqa tortiladigan daromaddan ushlab qolinadi.",
-Disbursement Details,To'lov tafsilotlari,
Material Request Warehouse,Materiallar so'rovi ombori,
Select warehouse for material requests,Moddiy talablar uchun omborni tanlang,
Transfer Materials For Warehouse {0},Ombor uchun materiallar uzatish {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Talab qilinmagan miqdorni ish haqidan qaytaring,
Deduction from salary,Ish haqidan ushlab qolish,
Expired Leaves,Muddati o'tgan barglar,
-Reference No,Yo'q ma'lumotnoma,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,"Sartaroshlik foizi - bu Kredit ta'minotining bozordagi qiymati va ushbu kredit uchun garov sifatida foydalanilganda, ushbu Kredit xavfsizligi bilan belgilanadigan qiymat o'rtasidagi foiz farqi.",
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,"Kreditning qiymat nisbati kredit miqdorining garovga qo'yilgan xavfsizlik qiymatiga nisbatini ifodalaydi. Agar bu har qanday kredit uchun belgilangan qiymatdan pastroq bo'lsa, qarz kafolatining etishmasligi boshlanadi",
If this is not checked the loan by default will be considered as a Demand Loan,"Agar bu tekshirilmasa, sukut bo'yicha qarz talabga javob beradigan kredit sifatida qabul qilinadi",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Ushbu hisob qarz oluvchidan kreditni to'lashni bron qilish va qarz oluvchiga qarz berish uchun ishlatiladi,
This account is capital account which is used to allocate capital for loan disbursal account ,"Ushbu hisob kapital hisobvarag'i bo'lib, u ssudani to'lash hisobiga kapital ajratish uchun ishlatiladi",
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},{0} operatsiyasi {1} buyrug'iga tegishli emas,
Print UOM after Quantity,Miqdordan keyin UOMni chop eting,
Set default {0} account for perpetual inventory for non stock items,Birjadan tashqari buyumlar uchun doimiy inventarizatsiya qilish uchun standart {0} hisobini o'rnating,
-Loan Security {0} added multiple times,Kredit xavfsizligi {0} bir necha bor qo'shildi,
-Loan Securities with different LTV ratio cannot be pledged against one loan,LTV koeffitsienti boshqacha bo'lgan kredit qimmatli qog'ozlarini bitta kredit bo'yicha garovga qo'yish mumkin emas,
-Qty or Amount is mandatory for loan security!,Miqdor yoki summa kreditni ta'minlash uchun majburiydir!,
-Only submittted unpledge requests can be approved,Faqat yuborilgan garov talablarini ma'qullash mumkin,
-Interest Amount or Principal Amount is mandatory,Foiz miqdori yoki asosiy summa majburiydir,
-Disbursed Amount cannot be greater than {0},Tugatilgan mablag 'miqdori {0} dan katta bo'lishi mumkin emas,
-Row {0}: Loan Security {1} added multiple times,{0} qatori: Kredit xavfsizligi {1} bir necha bor qo'shildi,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,"№ {0} qator: Asosiy mahsulot mahsulot to'plami bo'lmasligi kerak. Iltimos, {1} bandini olib tashlang va Saqlang",
Credit limit reached for customer {0},Mijoz uchun kredit limitiga erishildi {0},
Could not auto create Customer due to the following missing mandatory field(s):,Quyidagi majburiy bo'lmagan maydon (lar) tufayli mijozni avtomatik ravishda yaratib bo'lmadi:,
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 28fecb6..e376137 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -100,7 +100,7 @@
Activity Cost exists for Employee {0} against Activity Type - {1},Chi phí hoạt động tồn tại cho Nhân viên {0} đối với Kiểu công việc - {1},
Activity Cost per Employee,Chi phí hoạt động cho một nhân viên,
Activity Type,Loại hoạt động,
-Actual Cost,Gia thật,
+Actual Cost,Giá thật,
Actual Delivery Date,Ngày giao hàng thực tế,
Actual Qty,Số lượng thực tế,
Actual Qty is mandatory,Số lượng thực tế là bắt buộc,
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL","Áp dụng nếu công ty là SpA, SApA hoặc SRL",
Applicable if the company is a limited liability company,Áp dụng nếu công ty là công ty trách nhiệm hữu hạn,
Applicable if the company is an Individual or a Proprietorship,Áp dụng nếu công ty là Cá nhân hoặc Quyền sở hữu,
-Applicant,Người nộp đơn,
-Applicant Type,Loại người nộp đơn,
Application of Funds (Assets),Ứng dụng của Quỹ (tài sản),
Application period cannot be across two allocation records,Thời gian đăng ký không thể nằm trong hai bản ghi phân bổ,
Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài,
@@ -729,14 +727,14 @@
Current invoice {0} is missing,Hóa đơn hiện tại {0} bị thiếu,
Custom HTML,Tuỳ chỉnh HTML,
Custom?,Tùy chỉnh?,
-Customer,khách hàng,
+Customer,Khách Hàng,
Customer Addresses And Contacts,Địa chỉ Khách hàng Và Liên hệ,
Customer Contact,Liên hệ Khách hàng,
Customer Database.,Cơ sở dữ liệu khách hàng.,
Customer Group,Nhóm khách hàng,
Customer LPO,Khách hàng LPO,
Customer LPO No.,Số LPO của khách hàng,
-Customer Name,tên khách hàng,
+Customer Name,Tên khách hàng,
Customer POS Id,POS ID Khách hàng,
Customer Service,Dịch vụ chăm sóc khách hàng,
Customer and Supplier,Khách hàng và nhà cung cấp,
@@ -745,7 +743,7 @@
Customer required for 'Customerwise Discount',"Khách hàng phải có cho 'Giảm giá phù hợp KH """,
Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1},
Customer {0} is created.,Đã tạo {0} khách hàng.,
-Customers in Queue,Khách hàng ở Queue,
+Customers in Queue,Khách hàng trong hàng đợi,
Customize Homepage Sections,Tùy chỉnh phần Trang chủ,
Customizing Forms,Các hình thức tùy biến,
Daily Project Summary for {0},Tóm tắt dự án hàng ngày cho {0},
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,Danh sách cổ đông có số lượng folio,
Loading Payment System,Đang nạp hệ thống thanh toán,
Loan,Tiền vay,
-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},
-Loan Application,Đơn xin vay tiền,
-Loan Management,Quản lý khoản vay,
-Loan Repayment,Trả nợ,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,Ngày bắt đầu cho vay và Thời gian cho vay là bắt buộc để lưu Chiết khấu hóa đơn,
Loans (Liabilities),Các khoản vay (Nợ phải trả),
Loans and Advances (Assets),Các khoản cho vay và Tiền đặt trước (tài sản),
@@ -1611,7 +1605,6 @@
Monday,Thứ Hai,
Monthly,Hàng tháng,
Monthly Distribution,Phân phối hàng tháng,
-Monthly Repayment Amount cannot be greater than Loan Amount,SỐ tiền trả hàng tháng không thể lớn hơn Số tiền vay,
More,Nhiều Hơn,
More Information,Thêm thông tin,
More than one selection for {0} not allowed,Không cho phép nhiều lựa chọn cho {0},
@@ -1884,11 +1877,9 @@
Pay {0} {1},Thanh toán {0} {1},
Payable,Phải nộp,
Payable Account,Tài khoản phải trả,
-Payable Amount,Số tiền phải trả,
Payment,Thanh toán,
Payment Cancelled. Please check your GoCardless Account for more details,Thanh toán đã Hủy. Vui lòng kiểm tra Tài khoản GoCard của bạn để biết thêm chi tiết,
Payment Confirmation,Xác nhận thanh toán,
-Payment Date,Ngày thanh toán,
Payment Days,Ngày thanh toán,
Payment Document,Tài liệu Thanh toán,
Payment Due Date,Thanh toán đáo hạo,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,Vui lòng nhập biên lai nhận hàng trước,
Please enter Receipt Document,Vui lòng nhập Document Receipt,
Please enter Reference date,Vui lòng nhập ngày tham khảo,
-Please enter Repayment Periods,Vui lòng nhập kỳ hạn trả nợ,
Please enter Reqd by Date,Vui lòng nhập Reqd theo ngày,
Please enter Woocommerce Server URL,Vui lòng nhập URL của Máy chủ Woocommerce,
Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,Vui lòng nhập trung tâm chi phí gốc,
Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0},
Please enter relieving date.,Vui lòng nhập ngày giảm.,
-Please enter repayment Amount,Vui lòng nhập trả nợ Số tiền,
Please enter valid Financial Year Start and End Dates,Vui lòng nhập tài chính hợp lệ Năm Start và Ngày End,
Please enter valid email address,Vui lòng nhập địa chỉ email hợp lệ,
Please enter {0} first,Vui lòng nhập {0} đầu tiên,
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng.,
Primary Address Details,Chi tiết địa chỉ chính,
Primary Contact Details,Chi tiết liên hệ chính,
-Principal Amount,Số tiền chính,
Print Format,Định dạng in,
Print IRS 1099 Forms,In các mẫu IRS 1099,
Print Report Card,In Báo cáo Thẻ,
@@ -2550,7 +2538,6 @@
Sample Collection,Bộ sưu tập mẫu,
Sample quantity {0} cannot be more than received quantity {1},Số lượng mẫu {0} không được nhiều hơn số lượng nhận được {1},
Sanctioned,Xử phạt,
-Sanctioned Amount,Số tiền xử phạt,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.,
Sand,Cát,
Saturday,Thứ bảy,
@@ -3541,7 +3528,6 @@
{0} already has a Parent Procedure {1}.,{0} đã có Quy trình dành cho phụ huynh {1}.,
API,API,
Annual,Hàng năm,
-Approved,Đã được phê duyệt,
Change,Thay đổi,
Contact Email,Email Liên hệ,
Export Type,Loại xuất khẩu,
@@ -3571,7 +3557,6 @@
Account Value,Giá trị tài khoản,
Account is mandatory to get payment entries,Tài khoản là bắt buộc để có được các mục thanh toán,
Account is not set for the dashboard chart {0},Tài khoản không được đặt cho biểu đồ bảng điều khiển {0},
-Account {0} does not belong to company {1},Tài khoản {0} không thuộc về công ty {1},
Account {0} does not exists in the dashboard chart {1},Tài khoản {0} không tồn tại trong biểu đồ bảng điều khiển {1},
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Tài khoản: <b>{0}</b> là vốn Công việc đang được tiến hành và không thể cập nhật bằng Nhật ký,
Account: {0} is not permitted under Payment Entry,Tài khoản: {0} không được phép trong Mục thanh toán,
@@ -3582,7 +3567,6 @@
Activity,Hoạt động,
Add / Manage Email Accounts.,Thêm / Quản lý tài khoản Email.,
Add Child,Thêm mẫu con,
-Add Loan Security,Thêm bảo đảm tiền vay,
Add Multiple,Thêm Phức Hợp,
Add Participants,Thêm người tham gia,
Add to Featured Item,Thêm vào mục nổi bật,
@@ -3593,15 +3577,12 @@
Address Line 1,Địa chỉ Line 1,
Addresses,Địa chỉ,
Admission End Date should be greater than Admission Start Date.,Ngày kết thúc nhập học phải lớn hơn Ngày bắt đầu nhập học.,
-Against Loan,Chống cho vay,
-Against Loan:,Chống cho vay:,
All,Tất cả,
All bank transactions have been created,Tất cả các giao dịch ngân hàng đã được tạo,
All the depreciations has been booked,Tất cả các khấu hao đã được đặt,
Allocation Expired!,Phân bổ hết hạn!,
Allow Resetting Service Level Agreement from Support Settings.,Cho phép đặt lại Thỏa thuận cấp độ dịch vụ từ Cài đặt hỗ trợ.,
Amount of {0} is required for Loan closure,Số tiền {0} là bắt buộc để đóng khoản vay,
-Amount paid cannot be zero,Số tiền thanh toán không thể bằng không,
Applied Coupon Code,Mã giảm giá áp dụng,
Apply Coupon Code,Áp dụng mã phiếu thưởng,
Appointment Booking,Đặt hẹn,
@@ -3649,7 +3630,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,Không thể tính thời gian đến khi địa chỉ tài xế bị thiếu.,
Cannot Optimize Route as Driver Address is Missing.,Không thể tối ưu hóa tuyến đường vì địa chỉ tài xế bị thiếu.,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Không thể hoàn thành tác vụ {0} vì tác vụ phụ thuộc của nó {1} không được hoàn thành / hủy bỏ.,
-Cannot create loan until application is approved,Không thể tạo khoản vay cho đến khi đơn được chấp thuận,
Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Không thể ghi đè cho Mục {0} trong hàng {1} nhiều hơn {2}. Để cho phép thanh toán vượt mức, vui lòng đặt trợ cấp trong Cài đặt tài khoản",
"Capacity Planning Error, planned start time can not be same as end time","Lỗi lập kế hoạch năng lực, thời gian bắt đầu dự kiến không thể giống như thời gian kết thúc",
@@ -3661,7 +3641,7 @@
Close,Đóng,
Communication,Liên lạc,
Compact Item Print,Nhỏ gọn mục Print,
-Company,Giỏ hàng Giá liệt kê,
+Company,Công ty,
Company of asset {0} and purchase document {1} doesn't matches.,Công ty tài sản {0} và tài liệu mua hàng {1} không khớp.,
Compare BOMs for changes in Raw Materials and Operations,So sánh các BOM cho những thay đổi trong Nguyên liệu thô và Hoạt động,
Compare List function takes on list arguments,Chức năng So sánh Danh sách đảm nhận đối số danh sách,
@@ -3812,20 +3792,9 @@
Less Than Amount,Ít hơn số lượng,
Liabilities,Nợ phải trả,
Loading...,Đang tải...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,Số tiền cho vay vượt quá số tiền cho vay tối đa {0} theo chứng khoán được đề xuất,
Loan Applications from customers and employees.,Ứng dụng cho vay từ khách hàng và nhân viên.,
-Loan Disbursement,Giải ngân cho vay,
Loan Processes,Quy trình cho vay,
-Loan Security,Bảo đảm tiền vay,
-Loan Security Pledge,Cam kết bảo đảm tiền vay,
-Loan Security Pledge Created : {0},Cam kết bảo mật khoản vay được tạo: {0},
-Loan Security Price,Giá bảo đảm tiền vay,
-Loan Security Price overlapping with {0},Giá bảo đảm tiền vay chồng chéo với {0},
-Loan Security Unpledge,Bảo đảm cho vay,
-Loan Security Value,Giá trị bảo đảm tiền vay,
Loan Type for interest and penalty rates,Loại cho vay đối với lãi suất và lãi suất phạt,
-Loan amount cannot be greater than {0},Số tiền cho vay không thể lớn hơn {0},
-Loan is mandatory,Khoản vay là bắt buộc,
Loans,Cho vay,
Loans provided to customers and employees.,Các khoản vay cung cấp cho khách hàng và nhân viên.,
Location,Vị trí,
@@ -3894,7 +3863,6 @@
Pay,Trả,
Payment Document Type,Loại chứng từ thanh toán,
Payment Name,Tên thanh toán,
-Penalty Amount,Số tiền phạt,
Pending,Chờ,
Performance,Hiệu suất,
Period based On,Thời gian dựa trên,
@@ -3916,10 +3884,8 @@
Please login as a Marketplace User to edit this item.,Vui lòng đăng nhập với tư cách là Người dùng Marketplace để chỉnh sửa mục này.,
Please login as a Marketplace User to report this item.,Vui lòng đăng nhập với tư cách là Người dùng Marketplace để báo cáo mục này.,
Please select <b>Template Type</b> to download template,Vui lòng chọn <b>Loại mẫu</b> để tải xuống mẫu,
-Please select Applicant Type first,Vui lòng chọn Loại người đăng ký trước,
Please select Customer first,Vui lòng chọn Khách hàng trước,
Please select Item Code first,Vui lòng chọn Mã hàng trước,
-Please select Loan Type for company {0},Vui lòng chọn Loại cho vay đối với công ty {0},
Please select a Delivery Note,Vui lòng chọn một ghi chú giao hàng,
Please select a Sales Person for item: {0},Vui lòng chọn Nhân viên bán hàng cho mặt hàng: {0},
Please select another payment method. Stripe does not support transactions in currency '{0}',Vui lòng chọn một phương thức thanh toán khác. Sọc không hỗ trợ giao dịch bằng tiền tệ '{0}',
@@ -3935,8 +3901,6 @@
Please setup a default bank account for company {0},Vui lòng thiết lập tài khoản ngân hàng mặc định cho công ty {0},
Please specify,Vui lòng chỉ,
Please specify a {0},Vui lòng chỉ định {0},lead
-Pledge Status,Tình trạng cầm cố,
-Pledge Time,Thời gian cầm cố,
Printing,In ấn,
Priority,Ưu tiên,
Priority has been changed to {0}.,Ưu tiên đã được thay đổi thành {0}.,
@@ -3944,7 +3908,6 @@
Processing XML Files,Xử lý tệp XML,
Profitability,Khả năng sinh lời,
Project,Dự Án,
-Proposed Pledges are mandatory for secured Loans,Các cam kết được đề xuất là bắt buộc đối với các khoản vay có bảo đảm,
Provide the academic year and set the starting and ending date.,Cung cấp năm học và thiết lập ngày bắt đầu và ngày kết thúc.,
Public token is missing for this bank,Mã thông báo công khai bị thiếu cho ngân hàng này,
Publish,Công bố,
@@ -3960,7 +3923,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Biên lai mua hàng không có bất kỳ Mục nào cho phép Giữ lại mẫu được bật.,
Purchase Return,Mua Quay lại,
Qty of Finished Goods Item,Số lượng thành phẩm,
-Qty or Amount is mandatroy for loan security,Số lượng hoặc số tiền là mandatroy để bảo đảm tiền vay,
Quality Inspection required for Item {0} to submit,Kiểm tra chất lượng cần thiết cho Mục {0} để gửi,
Quantity to Manufacture,Số lượng sản xuất,
Quantity to Manufacture can not be zero for the operation {0},Số lượng sản xuất không thể bằng 0 cho hoạt động {0},
@@ -3981,8 +3943,6 @@
Relieving Date must be greater than or equal to Date of Joining,Ngày giải phóng phải lớn hơn hoặc bằng Ngày tham gia,
Rename,Đổi tên,
Rename Not Allowed,Đổi tên không được phép,
-Repayment Method is mandatory for term loans,Phương thức trả nợ là bắt buộc đối với các khoản vay có kỳ hạn,
-Repayment Start Date is mandatory for term loans,Ngày bắt đầu hoàn trả là bắt buộc đối với các khoản vay có kỳ hạn,
Report Item,Mục báo cáo,
Report this Item,Báo cáo mục này,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty dành riêng cho hợp đồng thầu phụ: Số lượng nguyên liệu thô để làm các mặt hàng được ký hợp đồng phụ.,
@@ -4015,8 +3975,6 @@
Row({0}): {1} is already discounted in {2},Hàng ({0}): {1} đã được giảm giá trong {2},
Rows Added in {0},Hàng được thêm vào {0},
Rows Removed in {0},Hàng bị xóa trong {0},
-Sanctioned Amount limit crossed for {0} {1},Giới hạn số tiền bị xử phạt được vượt qua cho {0} {1},
-Sanctioned Loan Amount already exists for {0} against company {1},Số tiền cho vay bị xử phạt đã tồn tại cho {0} đối với công ty {1},
Save,Lưu,
Save Item,Lưu mục,
Saved Items,Các mục đã lưu,
@@ -4135,7 +4093,6 @@
User {0} is disabled,Người sử dụng {0} bị vô hiệu hóa,
Users and Permissions,Người sử dụng và Quyền,
Vacancies cannot be lower than the current openings,Vị trí tuyển dụng không thể thấp hơn mức mở hiện tại,
-Valid From Time must be lesser than Valid Upto Time.,Thời gian hợp lệ phải nhỏ hơn thời gian tối đa hợp lệ.,
Valuation Rate required for Item {0} at row {1},Tỷ lệ định giá được yêu cầu cho Mục {0} tại hàng {1},
Values Out Of Sync,Giá trị không đồng bộ,
Vehicle Type is required if Mode of Transport is Road,Loại phương tiện được yêu cầu nếu Phương thức vận tải là Đường bộ,
@@ -4211,7 +4168,6 @@
Add to Cart,Thêm vào giỏ hàng,
Days Since Last Order,Ngày kể từ lần đặt hàng cuối cùng,
In Stock,Trong tồn kho,
-Loan Amount is mandatory,Số tiền cho vay là bắt buộc,
Mode Of Payment,Hình thức thanh toán,
No students Found,Không tìm thấy sinh viên,
Not in Stock,Không trong kho,
@@ -4240,7 +4196,6 @@
Group by,Nhóm theo,
In stock,Trong kho,
Item name,Tên hàng,
-Loan amount is mandatory,Số tiền cho vay là bắt buộc,
Minimum Qty,Số lượng tối thiểu,
More details,Xem chi tiết,
Nature of Supplies,Bản chất của nguồn cung cấp,
@@ -4409,9 +4364,6 @@
Total Completed Qty,Tổng số đã hoàn thành,
Qty to Manufacture,Số lượng Để sản xuất,
Repay From Salary can be selected only for term loans,Trả nợ theo lương chỉ có thể được chọn cho các khoản vay có kỳ hạn,
-No valid Loan Security Price found for {0},Không tìm thấy Giá Bảo đảm Khoản vay hợp lệ cho {0},
-Loan Account and Payment Account cannot be same,Tài khoản Khoản vay và Tài khoản Thanh toán không được giống nhau,
-Loan Security Pledge can only be created for secured loans,Cam kết Bảo đảm Khoản vay chỉ có thể được tạo cho các khoản vay có bảo đảm,
Social Media Campaigns,Chiến dịch truyền thông xã hội,
From Date can not be greater than To Date,Từ ngày không được lớn hơn Đến nay,
Please set a Customer linked to the Patient,Vui lòng đặt Khách hàng được liên kết với Bệnh nhân,
@@ -6437,7 +6389,6 @@
HR User,Người sử dụng nhân sự,
Appointment Letter,Thư hẹn,
Job Applicant,Nộp đơn công việc,
-Applicant Name,Tên đơn,
Appointment Date,Ngày hẹn,
Appointment Letter Template,Mẫu thư bổ nhiệm,
Body,Thân hình,
@@ -7059,99 +7010,12 @@
Sync in Progress,Đang đồng bộ hóa,
Hub Seller Name,Tên người bán trên Hub,
Custom Data,Dữ liệu Tuỳ chỉnh,
-Member,Hội viên,
-Partially Disbursed,phần giải ngân,
-Loan Closure Requested,Yêu cầu đóng khoản vay,
Repay From Salary,Trả nợ từ lương,
-Loan Details,Chi tiết vay,
-Loan Type,Loại cho vay,
-Loan Amount,Số tiền vay,
-Is Secured Loan,Khoản vay có bảo đảm,
-Rate of Interest (%) / Year,Lãi suất thị trường (%) / năm,
-Disbursement Date,ngày giải ngân,
-Disbursed Amount,Số tiền giải ngân,
-Is Term Loan,Vay có kỳ hạn,
-Repayment Method,Phương pháp trả nợ,
-Repay Fixed Amount per Period,Trả cố định Số tiền cho mỗi thời kỳ,
-Repay Over Number of Periods,Trả Trong số kỳ,
-Repayment Period in Months,Thời gian trả nợ trong tháng,
-Monthly Repayment Amount,Số tiền trả hàng tháng,
-Repayment Start Date,Ngày bắt đầu thanh toán,
-Loan Security Details,Chi tiết bảo mật khoản vay,
-Maximum Loan Value,Giá trị khoản vay tối đa,
-Account Info,Thông tin tài khoản,
-Loan Account,Tài khoản cho vay,
-Interest Income Account,Tài khoản thu nhập lãi,
-Penalty Income Account,Tài khoản thu nhập phạt,
-Repayment Schedule,Kế hoạch trả nợ,
-Total Payable Amount,Tổng số tiền phải nộp,
-Total Principal Paid,Tổng số tiền gốc,
-Total Interest Payable,Tổng số lãi phải trả,
-Total Amount Paid,Tổng số tiền thanh toán,
-Loan Manager,Quản lý khoản vay,
-Loan Info,Thông tin cho vay,
-Rate of Interest,lãi suất thị trường,
-Proposed Pledges,Dự kiến cam kết,
-Maximum Loan Amount,Số tiền cho vay tối đa,
-Repayment Info,Thông tin thanh toán,
-Total Payable Interest,Tổng số lãi phải trả,
-Against Loan ,Chống lại khoản vay,
-Loan Interest Accrual,Tiền lãi cộng dồn,
-Amounts,Lượng,
-Pending Principal Amount,Số tiền gốc đang chờ xử lý,
-Payable Principal Amount,Số tiền gốc phải trả,
-Paid Principal Amount,Số tiền gốc đã trả,
-Paid Interest Amount,Số tiền lãi phải trả,
-Process Loan Interest Accrual,Quá trình cho vay lãi tích lũy,
-Repayment Schedule Name,Tên lịch trình trả nợ,
Regular Payment,Thanh toán thường xuyên,
Loan Closure,Đóng khoản vay,
-Payment Details,Chi tiết Thanh toán,
-Interest Payable,Phải trả lãi,
-Amount Paid,Số tiền trả,
-Principal Amount Paid,Số tiền gốc phải trả,
-Repayment Details,Chi tiết Trả nợ,
-Loan Repayment Detail,Chi tiết Trả nợ Khoản vay,
-Loan Security Name,Tên bảo mật cho vay,
-Unit Of Measure,Đơn vị đo lường,
-Loan Security Code,Mã bảo đảm tiền vay,
-Loan Security Type,Loại bảo đảm tiền vay,
-Haircut %,Cắt tóc%,
-Loan Details,Chi tiết khoản vay,
-Unpledged,Không ghép,
-Pledged,Cầm cố,
-Partially Pledged,Cam kết một phần,
-Securities,Chứng khoán,
-Total Security Value,Tổng giá trị bảo mật,
-Loan Security Shortfall,Thiếu hụt an ninh cho vay,
-Loan ,Tiền vay,
-Shortfall Time,Thời gian thiếu,
-America/New_York,Mỹ / New_York,
-Shortfall Amount,Số tiền thiếu,
-Security Value ,Giá trị bảo mật,
-Process Loan Security Shortfall,Thiếu hụt bảo đảm tiền vay,
-Loan To Value Ratio,Tỷ lệ vay vốn,
-Unpledge Time,Thời gian mở,
-Loan Name,Tên vay,
Rate of Interest (%) Yearly,Lãi suất thị trường (%) hàng năm,
-Penalty Interest Rate (%) Per Day,Lãi suất phạt (%) mỗi ngày,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,Lãi suất phạt được tính trên số tiền lãi đang chờ xử lý hàng ngày trong trường hợp trả nợ chậm,
-Grace Period in Days,Thời gian ân sủng trong ngày,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,Số ngày kể từ ngày đến hạn cho đến khi khoản phạt sẽ không bị tính trong trường hợp chậm trả nợ,
-Pledge,Lời hứa,
-Post Haircut Amount,Số tiền cắt tóc,
-Process Type,Loại quy trình,
-Update Time,Cập nhật thời gian,
-Proposed Pledge,Cam kết đề xuất,
-Total Payment,Tổng tiền thanh toán,
-Balance Loan Amount,Số dư vay nợ,
-Is Accrued,Được tích lũy,
Salary Slip Loan,Khoản Vay Lương,
Loan Repayment Entry,Trả nợ vay,
-Sanctioned Loan Amount,Số tiền cho vay bị xử phạt,
-Sanctioned Amount Limit,Giới hạn số tiền bị xử phạt,
-Unpledge,Unpledge,
-Haircut,Cắt tóc,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,Tạo lịch trình,
Schedules,Lịch,
@@ -7479,15 +7343,15 @@
Project will be accessible on the website to these users,Dự án sẽ có thể truy cập vào các trang web tới những người sử dụng,
Copied From,Sao chép từ,
Start and End Dates,Ngày bắt đầu và kết thúc,
-Actual Time (in Hours),Thời gian thực tế (tính bằng giờ),
+Actual Time in Hours (via Timesheet),Thời gian thực tế (tính bằng giờ),
Costing and Billing,Chi phí và thanh toán,
-Total Costing Amount (via Timesheets),Tổng số tiền chi phí (thông qua Timesheets),
-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í),
+Total Costing Amount (via Timesheet),Tổng số tiền chi phí (thông qua Timesheets),
+Total Expense Claim (via Expense Claim),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í),
Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua danh đơn thu mua),
Total Sales Amount (via Sales Order),Tổng số tiền bán hàng (qua Lệnh bán hàng),
-Total Billable Amount (via Timesheets),Tổng số tiền Có thể Lập hoá đơn (thông qua Timesheets),
-Total Billed Amount (via Sales Invoices),Tổng số Khoản Thanh Toán (Thông qua Hóa Đơn Bán Hàng),
-Total Consumed Material Cost (via Stock Entry),Tổng chi phí nguyên vật liệu tiêu thụ (thông qua nhập hàng),
+Total Billable Amount (via Timesheet),Tổng số tiền Có thể Lập hoá đơn (thông qua Timesheets),
+Total Billed Amount (via Sales Invoice),Tổng số Khoản Thanh Toán (Thông qua Hóa Đơn Bán Hàng),
+Total Consumed Material Cost (via Stock Entry),Tổng chi phí nguyên vật liệu tiêu thụ (thông qua nhập hàng),
Gross Margin,Tổng lợi nhuận,
Gross Margin %,Tổng lợi nhuận %,
Monitor Progress,Theo dõi tiến độ,
@@ -7521,12 +7385,10 @@
Dependencies,Phụ thuộc,
Dependent Tasks,Nhiệm vụ phụ thuộc,
Depends on Tasks,Phụ thuộc vào nhiệm vụ,
-Actual Start Date (via Time Sheet),Ngày bắt đầu thực tế (thông qua thời gian biểu),
-Actual Time (in hours),Thời gian thực tế (tính bằng giờ),
-Actual End Date (via Time Sheet),Ngày kết thúc thực tế (thông qua thời gian biểu),
-Total Costing Amount (via Time Sheet),Tổng chi phí (thông qua thời gian biểu),
+Actual Start Date (via Timesheet),Ngày bắt đầu thực tế (thông qua thời gian biểu),
+Actual Time in Hours (via Timesheet),Thời gian thực tế (tính bằng giờ),
+Actual End Date (via Timesheet),Ngày kết thúc thực tế (thông qua thời gian biểu),
Total Expense Claim (via Expense Claim),Tổng số yêu cầu bồi thường chi phí (thông qua số yêu cầu bồi thường chi phí ),
-Total Billing Amount (via Time Sheet),Tổng số tiền thanh toán (thông qua Thời gian biểu),
Review Date,Ngày đánh giá,
Closing Date,Ngày Đóng cửa,
Task Depends On,Nhiệm vụ Phụ thuộc vào,
@@ -7727,7 +7589,7 @@
Contribution to Net Total,Đóng góp cho tổng số,
Selling Settings,thiết lập thông số bán hàng,
Settings for Selling Module,Thiết lập module bán hàng,
-Customer Naming By,đặt tên khách hàng theo,
+Customer Naming By,Đặt tên khách hàng theo,
Campaign Naming By,Đặt tên chiến dịch theo,
Default Customer Group,Nhóm khách hàng mặc định,
Default Territory,Địa bàn mặc định,
@@ -7755,7 +7617,7 @@
Customerwise Discount,Giảm giá 1 cách thông minh,
Itemwise Discount,Mẫu hàng thông minh giảm giá,
Customer or Item,Khách hàng hoặc mục,
-Customer / Item Name,Khách hàng / tên hàng hóa,
+Customer / Item Name,Khách hàng / Tên hàng hóa,
Authorized Value,Giá trị được ủy quyền,
Applicable To (Role),Để áp dụng (Role),
Applicable To (Employee),Để áp dụng (nhân viên),
@@ -7824,8 +7686,8 @@
To Currency,Tới tiền tệ,
For Buying,Để mua,
For Selling,Để bán,
-Customer Group Name,Tên Nhóm khách hàng,
-Parent Customer Group,Nhóm mẹ của nhóm khách hàng,
+Customer Group Name,Tên Nhóm Khách Hàng,
+Parent Customer Group,Nhóm cha của nhóm khách hàng,
Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch,
Mention if non-standard receivable account applicable,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn áp dụng,
Credit Limits,Hạn mức tín dụng,
@@ -7887,7 +7749,6 @@
Update Series,Cập nhật sê ri,
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ó.,
Prefix,Tiền tố,
-Current Value,Giá trị hiện tại,
This is the number of the last created transaction with this prefix,Đây là số lượng các giao dịch tạo ra cuối cùng với tiền tố này,
Update Series Number,Cập nhật số sê ri,
Quotation Lost Reason,lý do bảng báo giá mất,
@@ -8518,8 +8379,6 @@
Itemwise Recommended Reorder Level,Mẫu hàng thông minh được gợi ý sắp xếp lại theo cấp độ,
Lead Details,Chi tiết Tiềm năng,
Lead Owner Efficiency,Hiệu quả Chủ đầu tư,
-Loan Repayment and Closure,Trả nợ và đóng,
-Loan Security Status,Tình trạng bảo đảm tiền vay,
Lost Opportunity,Mất cơ hội,
Maintenance Schedules,Lịch bảo trì,
Material Requests for which Supplier Quotations are not created,Các yêu cầu vật chất mà Trích dẫn Nhà cung cấp không được tạo ra,
@@ -8610,7 +8469,6 @@
Counts Targeted: {0},Số lượng được Nhắm mục tiêu: {0},
Payment Account is mandatory,Tài khoản thanh toán là bắt buộc,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.","Nếu được kiểm tra, toàn bộ số tiền sẽ được khấu trừ vào thu nhập chịu thuế trước khi tính thuế thu nhập mà không cần kê khai hoặc nộp chứng từ nào.",
-Disbursement Details,Chi tiết giải ngân,
Material Request Warehouse,Kho yêu cầu nguyên liệu,
Select warehouse for material requests,Chọn kho cho các yêu cầu nguyên liệu,
Transfer Materials For Warehouse {0},Chuyển Vật liệu Cho Kho {0},
@@ -8998,9 +8856,6 @@
Repay unclaimed amount from salary,Hoàn trả số tiền chưa nhận được từ tiền lương,
Deduction from salary,Khấu trừ lương,
Expired Leaves,Lá hết hạn,
-Reference No,tài liệu tham khảo số,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,Tỷ lệ phần trăm cắt tóc là phần trăm chênh lệch giữa giá trị thị trường của Bảo đảm Khoản vay và giá trị được quy định cho Bảo đảm Khoản vay đó khi được sử dụng làm tài sản thế chấp cho khoản vay đó.,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,Tỷ lệ cho vay trên giá trị thể hiện tỷ lệ giữa số tiền cho vay với giá trị của tài sản đảm bảo được cầm cố. Sự thiếu hụt bảo đảm tiền vay sẽ được kích hoạt nếu điều này giảm xuống dưới giá trị được chỉ định cho bất kỳ khoản vay nào,
If this is not checked the loan by default will be considered as a Demand Loan,"Nếu điều này không được kiểm tra, khoản vay mặc định sẽ được coi là Khoản vay không kỳ hạn",
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,Tài khoản này được sử dụng để hoàn trả khoản vay từ người đi vay và cũng để giải ngân các khoản vay cho người vay,
This account is capital account which is used to allocate capital for loan disbursal account ,Tài khoản này là tài khoản vốn dùng để cấp vốn cho tài khoản giải ngân cho vay,
@@ -9210,7 +9065,7 @@
From Posting Date,Từ ngày đăng,
To Posting Date,Đến ngày đăng,
No records found,Không có dữ liệu được tìm thấy,
-Customer/Lead Name,Tên khách hàng / khách hàng tiềm năng,
+Customer/Lead Name,Tên khách hàng / Khách hàng tiềm năng,
Unmarked Days,Ngày không đánh dấu,
Jan,tháng một,
Feb,Tháng hai,
@@ -9464,13 +9319,6 @@
Operation {0} does not belong to the work order {1},Hoạt động {0} không thuộc về trình tự công việc {1},
Print UOM after Quantity,In UOM sau số lượng,
Set default {0} account for perpetual inventory for non stock items,Đặt tài khoản {0} mặc định cho khoảng không quảng cáo vĩnh viễn cho các mặt hàng không còn hàng,
-Loan Security {0} added multiple times,Bảo đảm Khoản vay {0} đã được thêm nhiều lần,
-Loan Securities with different LTV ratio cannot be pledged against one loan,Chứng khoán cho vay có tỷ lệ LTV khác nhau không được cầm cố cho một khoản vay,
-Qty or Amount is mandatory for loan security!,Số lượng hoặc Số tiền là bắt buộc để đảm bảo khoản vay!,
-Only submittted unpledge requests can be approved,Chỉ những yêu cầu hủy cam kết đã gửi mới có thể được chấp thuận,
-Interest Amount or Principal Amount is mandatory,Số tiền lãi hoặc Số tiền gốc là bắt buộc,
-Disbursed Amount cannot be greater than {0},Số tiền được giải ngân không được lớn hơn {0},
-Row {0}: Loan Security {1} added multiple times,Hàng {0}: Bảo đảm Khoản vay {1} được thêm nhiều lần,
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,Hàng # {0}: Mục Con không được là Gói sản phẩm. Vui lòng xóa Mục {1} và Lưu,
Credit limit reached for customer {0},Đã đạt đến giới hạn tín dụng cho khách hàng {0},
Could not auto create Customer due to the following missing mandatory field(s):,Không thể tự động tạo Khách hàng do thiếu (các) trường bắt buộc sau:,
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index c30dd72..e980327 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -1,1116 +1,1109 @@
-DocType: Accounting Period,Period Name,期間名稱
-DocType: Employee,Salary Mode,薪酬模式
-DocType: Patient,Divorced,離婚
-DocType: Support Settings,Post Route Key,郵政路線密鑰
-DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目在一個交易中被多次新增
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
-apps/erpnext/erpnext/config/education.py +118,Assessment Reports,評估報告
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,消費類產品
-DocType: Supplier Scorecard,Notify Supplier,通知供應商
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +52,Please select Party Type first,請選擇黨第一型
-DocType: Item,Customer Items,客戶項目
-DocType: Project,Costing and Billing,成本核算和計費
-apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company currency {0},預付科目貨幣應與公司貨幣{0}相同
-DocType: QuickBooks Migrator,Token Endpoint,令牌端點
-apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} can not be a ledger,科目{0}：上層科目{1}不能是總帳
-DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +270,Cannot find active Leave Period,找不到有效的休假期
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,評估
-DocType: Item,Default Unit of Measure,預設的計量單位
-DocType: SMS Center,All Sales Partner Contact,所有的銷售合作夥伴聯絡
-DocType: Department,Leave Approvers,休假審批人
-DocType: Employee,Bio / Cover Letter,自傳/求職信
-DocType: Patient Encounter,Investigations,調查
-DocType: Restaurant Order Entry,Click Enter To Add,點擊輸入要添加
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +29,"Missing value for Password, API Key or Shopify URL",缺少密碼，API密鑰或Shopify網址的值
-apps/erpnext/erpnext/public/js/setup_wizard.js +243,All Accounts,所有科目
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,無法轉移狀態為左的員工
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +216,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +338,Do you really want to scrap this asset?,難道你真的想放棄這項資產？
-DocType: Drug Prescription,Update Schedule,更新時間表
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,選擇默認供應商
-apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +26,Show Employee,顯示員工
-DocType: Exchange Rate Revaluation Account,New Exchange Rate,新匯率
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},價格表{0}需填入貨幣種類
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
-DocType: Purchase Order,Customer Contact,客戶聯絡
-DocType: Patient Appointment,Check availability,檢查可用性
-DocType: Retention Bonus,Bonus Payment Date,獎金支付日期
-DocType: Employee,Job Applicant,求職者
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,這是基於對這種供應商的交易。詳情請參閱以下時間表
-DocType: Manufacturing Settings,Overproduction Percentage For Work Order,工作訂單的生產率過高百分比
-DocType: Delivery Note,Transport Receipt Date,運輸收貨日期
-DocType: Shopify Settings,Sales Order Series,銷售訂單系列
-apps/erpnext/erpnext/hr/utils.py +222,"More than one selection for {0} not \
+Period Name,期間名稱
+Salary Mode,薪酬模式
+Divorced,離婚
+Post Route Key,郵政路線密鑰
+Allow Item to be added multiple times in a transaction,允許項目在一個交易中被多次新增
+Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
+Assessment Reports,評估報告
+Consumer Products,消費類產品
+Notify Supplier,通知供應商
+Please select Party Type first,請選擇黨第一型
+Customer Items,客戶項目
+Costing and Billing,成本核算和計費
+Advance account currency should be same as company currency {0},預付科目貨幣應與公司貨幣{0}相同
+Token Endpoint,令牌端點
+Account {0}: Parent account {1} can not be a ledger,科目{0}：上層科目{1}不能是總帳
+Publish Item to hub.erpnext.com,發布項目hub.erpnext.com,
+Cannot find active Leave Period,找不到有效的休假期
+Evaluation,評估
+Default Unit of Measure,預設的計量單位
+All Sales Partner Contact,所有的銷售合作夥伴聯絡
+Leave Approvers,休假審批人
+Bio / Cover Letter,自傳/求職信
+Investigations,調查
+Click Enter To Add,點擊輸入要添加
+"Missing value for Password, API Key or Shopify URL",缺少密碼，API密鑰或Shopify網址的值
+All Accounts,所有科目
+Cannot transfer Employee with status Left,無法轉移狀態為左的員工
+"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
+Do you really want to scrap this asset?,難道你真的想放棄這項資產？
+Update Schedule,更新時間表
+Select Default Supplier,選擇默認供應商
+Show Employee,顯示員工
+New Exchange Rate,新匯率
+Currency is required for Price List {0},價格表{0}需填入貨幣種類
+* Will be calculated in the transaction.,*將被計算在該交易。
+Customer Contact,客戶聯絡
+Check availability,檢查可用性
+Bonus Payment Date,獎金支付日期
+Job Applicant,求職者
+This is based on transactions against this Supplier. See timeline below for details,這是基於對這種供應商的交易。詳情請參閱以下時間表
+Overproduction Percentage For Work Order,工作訂單的生產率過高百分比
+Transport Receipt Date,運輸收貨日期
+Sales Order Series,銷售訂單系列
+"More than one selection for {0} not \
allowed",對{0}的多個選擇不是\允許的
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +204,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
-DocType: Allowed To Transact With,Allowed To Transact With,允許與
-DocType: Bank Guarantee,Customer,客戶
-DocType: Purchase Receipt Item,Required By,需求來自
-DocType: Delivery Note,Return Against Delivery Note,射向送貨單
-DocType: Asset Category,Finance Book Detail,財務帳簿細節
-DocType: Purchase Order,% Billed,％已開立帳單
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +41,Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
-DocType: Sales Invoice,Customer Name,客戶名稱
-DocType: Vehicle,Natural Gas,天然氣
-apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +63,Bank account cannot be named as {0},銀行科目不能命名為{0}
-DocType: Employee Tax Exemption Declaration,HRA as per Salary Structure,HRA根據薪資結構
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
-apps/erpnext/erpnext/public/js/controllers/transaction.js +882,Service Stop Date cannot be before Service Start Date,服務停止日期不能早於服務開始日期
-DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
-DocType: Leave Type,Leave Type Name,休假類型名稱
-apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,公開顯示
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,查看
-DocType: Asset Finance Book,Depreciation Start Date,折舊開始日期
-DocType: Pricing Rule,Apply On,適用於
-DocType: Item Price,Multiple Item prices.,多個項目的價格。
-,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 +84,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
-DocType: Amazon MWS Settings,Amazon MWS Settings,亞馬遜MWS設置
-apps/erpnext/erpnext/utilities/transaction_base.py +126,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
-,Batch Item Expiry Status,批處理項到期狀態
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Bank Draft,銀行匯票
-DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
-apps/erpnext/erpnext/config/healthcare.py +8,Consultation,會診
-DocType: Accounts Settings,Show Payment Schedule in Print,在打印中顯示付款時間表
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,銷售和退貨
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,顯示變體
-DocType: Academic Term,Academic Term,學期
-DocType: Employee Tax Exemption Sub Category,Employee Tax Exemption Sub Category,員工免稅子類別
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +61,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of benefit application pro-rata component\
+Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
+Allowed To Transact With,允許與
+Customer,客戶
+Required By,需求來自
+Return Against Delivery Note,射向送貨單
+Finance Book Detail,財務帳簿細節
+% Billed,％已開立帳單
+Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
+Customer Name,客戶名稱
+Natural Gas,天然氣
+Bank account cannot be named as {0},銀行科目不能命名為{0}
+HRA as per Salary Structure,HRA根據薪資結構
+Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
+Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
+Service Stop Date cannot be before Service Start Date,服務停止日期不能早於服務開始日期
+Default 10 mins,預設為10分鐘
+Leave Type Name,休假類型名稱
+Show open,公開顯示
+Checkout,查看
+Depreciation Start Date,折舊開始日期
+Apply On,適用於
+Multiple Item prices.,多個項目的價格。
+Purchase Order Items To Be Received,未到貨的採購訂單項目
+All Supplier Contact,所有供應商聯絡
+Support Settings,支持設置
+Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
+Amazon MWS Settings,亞馬遜MWS設置
+Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
+Batch Item Expiry Status,批處理項到期狀態
+Bank Draft,銀行匯票
+Mode of Payment Account,支付帳戶模式
+Consultation,會診
+Show Payment Schedule in Print,在打印中顯示付款時間表
+Sales and Returns,銷售和退貨
+Show Variants,顯示變體
+Academic Term,學期
+Employee Tax Exemption Sub Category,員工免稅子類別
+"Maximum benefit of employee {0} exceeds {1} by the sum {2} of benefit application pro-rata component\
amount and previous claimed amount",員工{0}的最高福利超過{1}，福利應用程序按比例分量\金額和上次索賠金額的總和{2}
-DocType: Opening Invoice Creation Tool Item,Quantity,數量
-,Customers Without Any Sales Transactions,沒有任何銷售交易的客戶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +590,Accounts table cannot be blank.,賬表不能為空。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Loans (Liabilities),借款（負債）
-DocType: Patient Encounter,Encounter Time,遇到時間
-DocType: Staffing Plan Detail,Total Estimated Cost,預計總成本
-DocType: Employee Education,Year of Passing,路過的一年
-DocType: Routing,Routing Name,路由名稱
-DocType: Item,Country of Origin,出生國家
-DocType: Soil Texture,Soil Texture Criteria,土壤質地標準
-apps/erpnext/erpnext/templates/includes/product_page.js +34,In Stock,庫存
-apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,主要聯繫方式
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,開放式問題
-DocType: Production Plan Item,Production Plan Item,生產計劃項目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +166,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,保健
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延遲支付（天）
-DocType: Payment Terms Template Detail,Payment Terms Template Detail,付款條款模板細節
-DocType: Delivery Note,Issue Credit Note,發行信用票據
-DocType: Lab Prescription,Lab Prescription,實驗室處方
-,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 +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
-DocType: Bank Statement Transaction Invoice Item,Invoice,發票
-DocType: Purchase Invoice Item,Item Weight Details,項目重量細節
-DocType: Asset Maintenance Log,Periodicity,週期性
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
-DocType: Crop Cycle,The minimum distance between rows of plants for optimum growth,植株之間的最小距離，以獲得最佳生長
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +21,Defense,防禦
-DocType: Salary Component,Abbr,縮寫
-DocType: Timesheet,Total Costing Amount,總成本計算金額
-DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +177,Please select Price List,請選擇價格表
-DocType: Accounts Settings,Currency Exchange Settings,貨幣兌換設置
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款單據才能完成trasaction
-DocType: Work Order Operation,Work In Progress,在製品
-apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,請選擇日期
-DocType: Item Price,Minimum Qty ,最低數量
-DocType: Finance Book,Finance Book,金融書
-DocType: Daily Work Summary Group,Holiday List,假日列表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +90,Accountant,會計人員
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,賣價格表
-DocType: Patient,Tobacco Current Use,煙草當前使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,賣出率
-DocType: Cost Center,Stock User,庫存用戶
-DocType: Soil Analysis,(Ca+Mg)/K,（鈣+鎂）/ K
-DocType: Delivery Stop,Contact Information,聯繫信息
-DocType: Company,Phone No,電話號碼
-DocType: Delivery Trip,Initial Email Notification Sent,初始電子郵件通知已發送
-DocType: Bank Statement Settings,Statement Header Mapping,聲明標題映射
-,Sales Partners Commission,銷售合作夥伴佣金
-DocType: Purchase Invoice,Rounding Adjustment,舍入調整
-apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +7,Payment Request,付錢請求
-apps/erpnext/erpnext/config/accounts.py +556,To view logs of Loyalty Points assigned to a Customer.,查看分配給客戶的忠誠度積分的日誌。
-DocType: Asset,Value After Depreciation,折舊後
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有關
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
-DocType: Grading Scale,Grading Scale Name,分級標準名稱
-apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,將用戶添加到市場
-apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,這是一個 root 科目，不能被編輯。
-DocType: BOM,Operations,操作
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
-DocType: Subscription,Subscription Start Date,訂閱開始日期
-DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Appointment charges.,如果未在患者中設置預約費用，則使用默認應收科目。
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列，一為舊名稱，一個用於新名稱
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +195,From Address 2,來自地址2
-apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} 不在任何有效的會計年度
-DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
-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/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +377,{0} {1} is not present in the parent company,在母公司中不存在{0} {1}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +215,Trial Period End Date Cannot be before Trial Period Start Date,試用期結束日期不能在試用期開始日期之前
-apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,公斤
-DocType: Tax Withholding Category,Tax Withholding Category,預扣稅類別
-apps/erpnext/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py +23,Cancel the journal entry {0} first,首先取消日記條目{0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +113,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 +74,Timespan,時間跨度
-apps/erpnext/erpnext/templates/pages/search_help.py +13,Help Results for,幫助結果
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Warehouse...,選擇倉庫...
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +6,Advertising,廣告
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
-apps/erpnext/erpnext/accounts/party.py +42,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Get items from,取得項目來源
-DocType: Price List,Price Not UOM Dependant,價格不依賴於UOM
-DocType: Purchase Invoice,Apply Tax Withholding Amount,申請預扣稅金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +539,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
-apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +124,Total Amount Credited,總金額
-apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
-apps/erpnext/erpnext/templates/generators/item_group.html +33,No items listed,沒有列出項目
-DocType: Asset Repair,Error Description,錯誤說明
-DocType: Payment Reconciliation,Reconcile,調和
-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,養老基金
-DocType: Exchange Rate Revaluation Account,Gain/Loss,收益/損失
-DocType: Accounts Settings,Use Custom Cash Flow Format,使用自定義現金流量格式
-DocType: SMS Center,All Sales Person,所有的銷售人員
-DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月，如果你在你的業務有季節性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1768,Not items found,未找到項目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +267,Salary Structure Missing,薪酬結構缺失
-DocType: Lead,Person Name,人姓名
-DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
-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,庫存報告
-DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
-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 +298,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
-DocType: Delivery Trip,Departure Time,出發時間
-DocType: Vehicle Service,Brake Oil,剎車油
-DocType: Tax Rule,Tax Type,稅收類型
-,Completed Work Orders,完成的工作訂單
-DocType: Support Settings,Forum Posts,論壇帖子
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +603,Taxable Amount,應稅金額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
-DocType: Leave Policy,Leave Policy Details,退出政策詳情
-DocType: BOM,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
-DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1136,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：參考文檔類型必須是費用索賠或日記帳分錄之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select BOM,選擇BOM
-DocType: SMS Log,SMS Log,短信日誌
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +39,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
-DocType: Inpatient Record,Admission Scheduled,入學時間表
-DocType: Student Log,Student Log,學生登錄
-apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,供應商榜單。
-DocType: Lead,Interested,有興趣
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Opening,開盤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +36,From {0} to {1},從{0} {1}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +51,Failed to setup taxes,無法設置稅收
-DocType: Item,Copy From Item Group,從項目群組複製
-DocType: Journal Entry,Opening Entry,開放報名
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,科目只需支付
-DocType: Loan,Repay Over Number of Periods,償還期的超過數
-DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +145,Account with existing transaction can not be converted to group.,科目與現有的交易不能被轉換到群組。
-DocType: Lead,Product Enquiry,產品查詢
-DocType: Education Settings,Validate Batch for Students in Student Group,驗證學生組學生的批次
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +38,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
-DocType: Company,Unrealized Exchange Gain/Loss Account,未實現的匯兌收益/損失科目
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,請先輸入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +626,Please select Company first,請首先選擇公司
-DocType: Employee Education,Under Graduate,根據研究生
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +290,Please set default template for Leave Status Notification in HR Settings.,請在人力資源設置中設置離職狀態通知的默認模板。
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標在
-DocType: BOM,Total Cost,總成本
-DocType: Soil Analysis,Ca/K,鈣/ K
-DocType: Salary Slip,Employee Loan,員工貸款
-DocType: Fee Schedule,Send Payment Request Email,發送付款請求電子郵件
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
-DocType: Supplier,Leave blank if the Supplier is blocked indefinitely,如果供應商被無限期封鎖，請留空
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,房地產
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,科目狀態
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +41,Pharmaceuticals,製藥
-DocType: Purchase Invoice Item,Is Fixed Asset,是固定的資產
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,"Available qty is {0}, you need {1}",可用數量是{0}，則需要{1}
-DocType: Expense Claim Detail,Claim Amount,索賠金額
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +646,Work Order has been {0},工單已{0}
-DocType: Budget,Applicable on Purchase Order,適用於採購訂單
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,在CUTOMER組表中找到重複的客戶群
-DocType: Location,Location Name,地點名稱
-apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html +7,Event Location,活動地點
-DocType: Asset Settings,Asset Settings,資產設置
-DocType: Assessment Result,Grade,年級
-DocType: Restaurant Table,No of Seats,座位數
-DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
-DocType: Asset Maintenance Task,Asset Maintenance Task,資產維護任務
-DocType: SMS Center,All Contact,所有聯絡
-DocType: Daily Work Summary,Daily Work Summary,每日工作總結
-DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
-apps/erpnext/erpnext/accounts/party.py +425,{0} {1} is frozen,{0} {1}被凍結
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Stock Expenses,庫存費用
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,選擇目標倉庫
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,選擇目標倉庫
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +87,Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
-DocType: Journal Entry,Contra Entry,魂斗羅進入
-DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
-DocType: Lab Test UOM,Lab Test UOM,實驗室測試UOM
-DocType: Delivery Note,Installation Status,安裝狀態
-DocType: BOM,Quality Inspection Template,質量檢驗模板
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
+Quantity,數量
+Customers Without Any Sales Transactions,沒有任何銷售交易的客戶
+Accounts table cannot be blank.,賬表不能為空。
+Loans (Liabilities),借款（負債）
+Encounter Time,遇到時間
+Total Estimated Cost,預計總成本
+Year of Passing,路過的一年
+Routing Name,路由名稱
+Country of Origin,出生國家
+Soil Texture Criteria,土壤質地標準
+In Stock,庫存
+Primary Contact Details,主要聯繫方式
+Open Issues,開放式問題
+Production Plan Item,生產計劃項目
+User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
+Health Care,保健
+Delay in payment (Days),延遲支付（天）
+Payment Terms Template Detail,付款條款模板細節
+Issue Credit Note,發行信用票據
+Lab Prescription,實驗室處方
+Delay Days,延遲天數
+Service Expense,服務費用
+Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+Invoice,發票
+Item Weight Details,項目重量細節
+Periodicity,週期性
+Fiscal Year {0} is required,會計年度{0}是必需的
+The minimum distance between rows of plants for optimum growth,植株之間的最小距離，以獲得最佳生長
+Defense,防禦
+Abbr,縮寫
+Total Costing Amount,總成本計算金額
+Vehicle No,車輛牌照號碼
+Please select Price List,請選擇價格表
+Currency Exchange Settings,貨幣兌換設置
+Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款單據才能完成trasaction,
+Work In Progress,在製品
+Please select date,請選擇日期
+Minimum Qty ,最低數量
+Finance Book,金融書
+Holiday List,假日列表
+Accountant,會計人員
+Selling Price List,賣價格表
+Tobacco Current Use,煙草當前使用
+Selling Rate,賣出率
+Stock User,庫存用戶
+(Ca+Mg)/K,（鈣+鎂）/ K,
+Contact Information,聯繫信息
+Phone No,電話號碼
+Initial Email Notification Sent,初始電子郵件通知已發送
+Statement Header Mapping,聲明標題映射
+Sales Partners Commission,銷售合作夥伴佣金
+Rounding Adjustment,舍入調整
+Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
+Payment Request,付錢請求
+To view logs of Loyalty Points assigned to a Customer.,查看分配給客戶的忠誠度積分的日誌。
+Value After Depreciation,折舊後
+Related,有關
+Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
+Grading Scale Name,分級標準名稱
+Add Users to Marketplace,將用戶添加到市場
+This is a root account and cannot be edited.,這是一個 root 科目，不能被編輯。
+Operations,操作
+Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
+Subscription Start Date,訂閱開始日期
+Default receivable accounts to be used if not set in Patient to book Appointment charges.,如果未在患者中設置預約費用，則使用默認應收科目。
+"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列，一為舊名稱，一個用於新名稱
+From Address 2,來自地址2,
+{0} {1} not in any active Fiscal Year.,{0} {1} 不在任何有效的會計年度
+Parent Detail docname,家長可採用DocName細節
+"Reference: {0}, Item Code: {1} and Customer: {2}",參考：{0}，商品編號：{1}和顧客：{2}
+{0} {1} is not present in the parent company,在母公司中不存在{0} {1}
+Trial Period End Date Cannot be before Trial Period Start Date,試用期結束日期不能在試用期開始日期之前
+Kg,公斤
+Tax Withholding Category,預扣稅類別
+Cancel the journal entry {0} first,首先取消日記條目{0}
+BOM is not specified for subcontracting item {0} at row {1},沒有為行{1}的轉包商品{0}指定BOM,
+{0} Result submittted,{0}結果提交
+Timespan,時間跨度
+Help Results for,幫助結果
+Select Warehouse...,選擇倉庫...
+Advertising,廣告
+Same Company is entered more than once,同一家公司進入不止一次
+Not permitted for {0},不允許{0}
+Get items from,取得項目來源
+Price Not UOM Dependant,價格不依賴於UOM,
+Apply Tax Withholding Amount,申請預扣稅金額
+Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+Total Amount Credited,總金額
+Product {0},產品{0}
+No items listed,沒有列出項目
+Error Description,錯誤說明
+Reconcile,調和
+Grocery,雜貨
+Reading 1,閱讀1,
+Pension Funds,養老基金
+Gain/Loss,收益/損失
+Use Custom Cash Flow Format,使用自定義現金流量格式
+All Sales Person,所有的銷售人員
+**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月，如果你在你的業務有季節性。
+Not items found,未找到項目
+Salary Structure Missing,薪酬結構缺失
+Person Name,人姓名
+Sales Invoice Item,銷售發票項目
+Credit,信用
+Write Off Cost Center,沖銷成本中心
+"e.g. ""Primary School"" or ""University""",如“小學”或“大學”
+Stock Reports,庫存報告
+Warehouse Detail,倉庫的詳細資訊
+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.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起（學年{}）。請更正日期，然後再試一次。
+"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
+Departure Time,出發時間
+Brake Oil,剎車油
+Tax Type,稅收類型
+Completed Work Orders,完成的工作訂單
+Forum Posts,論壇帖子
+Taxable Amount,應稅金額
+You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
+Leave Policy Details,退出政策詳情
+Item Image (if not slideshow),產品圖片（如果不是幻燈片）
+(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
+Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：參考文檔類型必須是費用索賠或日記帳分錄之一
+Select BOM,選擇BOM,
+SMS Log,短信日誌
+Cost of Delivered Items,交付項目成本
+The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
+Admission Scheduled,入學時間表
+Student Log,學生登錄
+Templates of supplier standings.,供應商榜單。
+Interested,有興趣
+Opening,開盤
+From {0} to {1},從{0} {1}
+Failed to setup taxes,無法設置稅收
+Copy From Item Group,從項目群組複製
+Opening Entry,開放報名
+Account Pay Only,科目只需支付
+Additional Costs,額外費用
+Account with existing transaction can not be converted to group.,科目與現有的交易不能被轉換到群組。
+Product Enquiry,產品查詢
+Validate Batch for Students in Student Group,驗證學生組學生的批次
+No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
+Unrealized Exchange Gain/Loss Account,未實現的匯兌收益/損失科目
+Please enter company first,請先輸入公司
+Please select Company first,請首先選擇公司
+Under Graduate,根據研究生
+Please set default template for Leave Status Notification in HR Settings.,請在人力資源設置中設置離職狀態通知的默認模板。
+Target On,目標在
+Total Cost,總成本
+Ca/K,鈣/ K,
+Employee Loan,員工貸款
+Send Payment Request Email,發送付款請求電子郵件
+Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+Leave blank if the Supplier is blocked indefinitely,如果供應商被無限期封鎖，請留空
+Real Estate,房地產
+Statement of Account,科目狀態
+Pharmaceuticals,製藥
+Is Fixed Asset,是固定的資產
+"Available qty is {0}, you need {1}",可用數量是{0}，則需要{1}
+Claim Amount,索賠金額
+Work Order has been {0},工單已{0}
+Applicable on Purchase Order,適用於採購訂單
+Duplicate customer group found in the cutomer group table,在CUTOMER組表中找到重複的客戶群
+Location Name,地點名稱
+Event Location,活動地點
+Asset Settings,資產設置
+Grade,年級
+No of Seats,座位數
+Delivered By Supplier,交付供應商
+Asset Maintenance Task,資產維護任務
+All Contact,所有聯絡
+Daily Work Summary,每日工作總結
+Closing Fiscal Year,截止會計年度
+{0} {1} is frozen,{0} {1}被凍結
+Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
+Stock Expenses,庫存費用
+Select Target Warehouse,選擇目標倉庫
+Select Target Warehouse,選擇目標倉庫
+Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
+Contra Entry,魂斗羅進入
+Credit in Company Currency,信用在公司貨幣
+Lab Test UOM,實驗室測試UOM,
+Installation Status,安裝狀態
+Quality Inspection Template,質量檢驗模板
+"Do you want to update attendance?<br>Present: {0}\
<br>Absent: {1}",你想更新考勤？ <br>現任：{0} \ <br>缺席：{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +433,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
-DocType: Item,Supply Raw Materials for Purchase,供應原料採購
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +441,"Cannot ensure delivery by Serial No as \
+Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
+Supply Raw Materials for Purchase,供應原料採購
+"Cannot ensure delivery by Serial No as \
Item {0} is added with and without Ensure Delivery by \
Serial No.",無法通過序列號確保交貨，因為\項目{0}是否添加了確保交貨\序列號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +203,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
-DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,銀行對賬單交易發票項目
-DocType: Products Settings,Show Products as a List,產品展示作為一個列表
-DocType: Salary Detail,Tax on flexible benefit,對靈活福利徵稅
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py +43,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
-DocType: Student Admission Program,Minimum Age,最低年齡
-apps/erpnext/erpnext/utilities/user_progress.py +190,Example: Basic Mathematics,例如：基礎數學
-apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差異數量
-DocType: Production Plan,Material Request Detail,材料請求詳情
-DocType: Selling Settings,Default Quotation Validity Days,默認報價有效天數
-apps/erpnext/erpnext/controllers/accounts_controller.py +886,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
-DocType: Payroll Entry,Validate Attendance,驗證出席
-DocType: Sales Invoice,Change Amount,變動金額
-DocType: Party Tax Withholding Config,Certificate Received,已收到證書
-DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,設置B2C的發票值。 B2CL和B2CS根據此發票值計算。
-DocType: BOM Update Tool,New BOM,新的物料清單
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +307,Prescribed Procedures,規定程序
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,只顯示POS
-DocType: Supplier Group,Supplier Group Name,供應商集團名稱
-DocType: Driver,Driving License Categories,駕駛執照類別
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +124,Please enter Delivery Date,請輸入交貨日期
-DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
-DocType: Closed Document,Closed Document,關閉文件
-DocType: HR Settings,Leave Settings,保留設置
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.js +76,Number of positions cannot be less then current count of employees,職位數量不能少於當前員工人數
-DocType: Lead,Request Type,請求類型
-DocType: Purpose of Travel,Purpose of Travel,旅行目的
-DocType: Payroll Period,Payroll Periods,工資期間
-apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +18,Make Employee,使員工
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/config/accounts.py +538,Setup mode of POS (Online / Offline),POS（在線/離線）的設置模式
-DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根據工作訂單創建時間日誌。不得根據工作指令跟踪操作
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Execution,執行
-apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,進行的作業細節。
-DocType: Asset Maintenance Log,Maintenance Status,維修狀態
-apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,會員資格
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要對供應商應付帳款{2}
-apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,項目和定價
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},總時間：{0}
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期＝{0}
-DocType: Drug Prescription,Interval,間隔
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +211,Preference,偏愛
-DocType: Supplier,Individual,個人
-DocType: Academic Term,Academics User,學術界用戶
-DocType: Cheque Print Template,Amount In Figure,量圖
-DocType: Loan Application,Loan Info,貸款信息
-apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,規劃維護訪問。
-DocType: Supplier Scorecard Period,Supplier Scorecard Period,供應商記分卡期
-DocType: Share Transfer,Share Transfer,股份轉讓
-,Expiring Memberships,即將到期的會員
-DocType: POS Profile,Customer Groups,客戶群
-apps/erpnext/erpnext/public/js/financial_statements.js +53,Financial Statements,財務報表
-DocType: Guardian,Students,學生們
-apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,規則適用的定價和折扣。
-DocType: Daily Work Summary,Daily Work Summary Group,日常工作總結小組
-DocType: Practitioner Schedule,Time Slots,時隙
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
-DocType: Shift Assignment,Shift Request,移位請求
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
-DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率（％）
-apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,項目模板
-DocType: Job Offer,Select Terms and Conditions,選擇條款和條件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +87,Out Value,輸出值
-DocType: Bank Statement Settings Item,Bank Statement Settings Item,銀行對賬單設置項目
-DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce設置
-DocType: Production Plan,Sales Orders,銷售訂單
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +203,Multiple Loyalty Program found for the Customer. Please select manually.,為客戶找到多個忠誠度計劃。請手動選擇。
-DocType: Purchase Taxes and Charges,Valuation,計價
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +436,Set as Default,設為預設
-,Purchase Order Trends,採購訂單趨勢
-apps/erpnext/erpnext/utilities/user_progress.py +78,Go to Customers,轉到客戶
-DocType: Hotel Room Reservation,Late Checkin,延遲入住
-apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,報價請求可以通過點擊以下鏈接進行訪問
-DocType: SG Creation Tool Course,SG Creation Tool Course,SG創建工具課程
-DocType: Bank Statement Transaction Invoice Item,Payment Description,付款說明
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Insufficient Stock,庫存不足
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用產能規劃和時間跟踪
-DocType: Email Digest,New Sales Orders,新的銷售訂單
-DocType: Bank Account,Bank Account,銀行帳戶
-DocType: Travel Itinerary,Check-out Date,離開日期
-DocType: Leave Type,Allow Negative Balance,允許負平衡
-apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',您不能刪除項目類型“外部”
-apps/erpnext/erpnext/public/js/utils.js +274,Select Alternate Item,選擇備用項目
-DocType: Employee,Create User,創建用戶
-DocType: Selling Settings,Default Territory,預設地域
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,電視
-DocType: Work Order Operation,Updated via 'Time Log',經由“時間日誌”更新
-apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,選擇客戶或供應商。
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +449,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +55,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",時隙滑動，時隙{0}到{1}與現有時隙{2}重疊到{3}
-DocType: Naming Series,Series List for this Transaction,本交易系列表
-DocType: Company,Enable Perpetual Inventory,啟用永久庫存
-DocType: Bank Guarantee,Charges Incurred,收費發生
-DocType: Company,Default Payroll Payable Account,默認情況下，應付職工薪酬帳戶
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,更新電子郵件組
-DocType: Sales Invoice,Is Opening Entry,是開放登錄
-DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ",如果取消選中，該項目不會出現在銷售發票中，但可用於創建組測試。
-DocType: Customer Group,Mention if non-standard receivable account applicable,何況，如果不規範應收帳款適用
-DocType: Course Schedule,Instructor Name,導師姓名
-DocType: Company,Arrear Component,欠費組件
-DocType: Supplier Scorecard,Criteria Setup,條件設置
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,For Warehouse is required before Submit,對於倉庫之前，需要提交
-DocType: Codification Table,Medical Code,醫療代號
-apps/erpnext/erpnext/config/integrations.py +37,Connect Amazon with ERPNext,將Amazon與ERPNext連接起來
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,請輸入公司名稱
-DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
-DocType: Agriculture Analysis Criteria,Linked Doctype,鏈接的文檔類型
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Cash from Financing,從融資淨現金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2389,"LocalStorage is full , did not save",localStorage的滿了，沒救
-DocType: Lead,Address & Contact,地址及聯絡方式
-DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
-DocType: Sales Partner,Partner website,合作夥伴網站
-DocType: Restaurant Order Entry,Add Item,新增項目
-DocType: Party Tax Withholding Config,Party Tax Withholding Config,黨的預扣稅配置
-DocType: Lab Test,Custom Result,自定義結果
-DocType: Delivery Stop,Contact Name,聯絡人姓名
-DocType: Course Assessment Criteria,Course Assessment Criteria,課程評價標準
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +21,Tax Id: ,稅號：
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,學生卡：
-DocType: POS Customer Group,POS Customer Group,POS客戶群
-DocType: Healthcare Practitioner,Practitioner Schedules,從業者時間表
-DocType: Vehicle,Additional Details,額外細節
-apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
-DocType: POS Closing Voucher Details,Collected Amount,收集金額
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
-,Open Work Orders,打開工作訂單
-DocType: Healthcare Practitioner,Out Patient Consulting Charge Item,出患者諮詢費用項目
-DocType: Payment Term,Credit Months,信貸月份
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +494,Net Pay cannot be less than 0,淨工資不能低於0
-DocType: Contract,Fulfilled,達到
-DocType: Inpatient Record,Discharge Scheduled,出院預定
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +138,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
-DocType: POS Closing Voucher,Cashier,出納員
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Leaves per Year,每年葉
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +162,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是進階'對科目{1}，如果這是一個進階條目。
-apps/erpnext/erpnext/stock/utils.py +243,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 +76,Please setup Students under Student Groups,請設置學生組的學生
-DocType: Item Website Specification,Item Website Specification,項目網站規格
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +543,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +818,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,銀行條目
-DocType: Customer,Is Internal Customer,是內部客戶
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +27,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",如果選中自動選擇，則客戶將自動與相關的忠誠度計劃鏈接（保存時）
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
-DocType: Stock Entry,Sales Invoice No,銷售發票號碼
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +145,Supply Type,供應類型
-DocType: Material Request Item,Min Order Qty,最小訂貨量
-DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,學生組創建工具課程
-DocType: Lead,Do Not Contact,不要聯絡
-apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,誰在您的組織教人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +98,Software Developer,軟件開發人員
-DocType: Item,Minimum Order Qty,最低起訂量
-DocType: Supplier,Supplier Type,供應商類型
-DocType: Course Scheduling Tool,Course Start Date,課程開始日期
-,Student Batch-Wise Attendance,學生分批出席
-DocType: POS Profile,Allow user to edit Rate,允許用戶編輯率
-DocType: Item,Publish in Hub,在發布中心
-DocType: Student Admission,Student Admission,學生入學
-,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +840,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,折舊行{0}：折舊開始日期作為過去的日期輸入
-DocType: Contract Template,Fulfilment Terms and Conditions,履行條款和條件
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1138,Material Request,物料需求
-DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供'表中的採購訂單{1}
-DocType: Salary Slip,Total Principal Amount,本金總額
-DocType: Student Guardian,Relation,關係
-DocType: Student Guardian,Mother,母親
-DocType: Restaurant Reservation,Reservation End Time,預訂結束時間
-DocType: Crop,Biennial,雙年展
-,BOM Variance Report,BOM差異報告
-apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,確認客戶的訂單。
-DocType: Purchase Receipt Item,Rejected Quantity,拒絕數量
-apps/erpnext/erpnext/education/doctype/fees/fees.py +80,Payment request {0} created,已創建付款請求{0}
-DocType: Inpatient Record,Admitted Datetime,承認日期時間
-DocType: Work Order,Backflush raw materials from work-in-progress warehouse,從在製品庫中反沖原料
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Open Orders,開放訂單
-apps/erpnext/erpnext/healthcare/setup.py +187,Low Sensitivity,低靈敏度
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.js +16,Order rescheduled for sync,訂單重新安排同步
-apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,完成培訓後請確認
-DocType: Lead,Suggestions,建議
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
-DocType: Payment Term,Payment Term Name,付款條款名稱
-DocType: Healthcare Settings,Create documents for sample collection,創建樣本收集文件
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
-apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py +16,All Healthcare Service Units,所有醫療服務單位
-DocType: Lead,Mobile No.,手機號碼
-DocType: Maintenance Schedule,Generate Schedule,生成時間表
-DocType: Purchase Invoice Item,Expense Head,總支出
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please select Charge Type first,請先選擇付款類別
-DocType: Crop,"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ",你可以在這裡定義所有需要進行的作業。日場是用來提及任務需要執行的日子，1日是第一天等。
-DocType: Student Group Student,Student Group Student,學生組學生
-DocType: Education Settings,Education Settings,教育設置
-DocType: Vehicle Service,Inspection,檢查
-DocType: Exchange Rate Revaluation Account,Balance In Base Currency,平衡基礎貨幣
-DocType: Supplier Scorecard Scoring Standing,Max Grade,最高等級
-DocType: Email Digest,New Quotations,新報價
-apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +60,Attendance not submitted for {0} as {1} on leave.,在{0}上沒有針對{1}上的考勤出席。
-DocType: Journal Entry,Payment Order,付款單
-DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
-DocType: Tax Rule,Shipping County,航運縣
-apps/erpnext/erpnext/config/desktop.py +159,Learn,學習
-DocType: Purchase Invoice Item,Enable Deferred Expense,啟用延期費用
-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,會計設定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
-apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理銷售人員樹。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +105,"Cannot process route, since Google Maps Settings is disabled.",由於禁用了Google地圖設置，因此無法處理路線。
-DocType: Job Applicant,Cover Letter,求職信
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
-DocType: Item,Synced With Hub,同步轂
-DocType: Driver,Fleet Manager,車隊經理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +573,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能為負值對項{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +129,Wrong Password,密碼錯誤
-DocType: Item,Variant Of,變種
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
-DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
-DocType: Employee,External Work History,外部工作經歷
-apps/erpnext/erpnext/projects/doctype/task/task.py +114,Circular Reference Error,循環引用錯誤
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,學生報告卡
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +207,From Pin Code,來自Pin Code
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1名稱
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
-DocType: Cheque Print Template,Distance from left edge,從左側邊緣的距離
-apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的單位（＃窗體/項目/ {1}）在[{2}]研究發現（＃窗體/倉儲/ {2}）
-DocType: Lead,Industry,行業
-DocType: BOM Item,Rate & Amount,價格和金額
-DocType: BOM,Transfer Material Against Job Card,轉移材料反對工作卡
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
-apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},請在{}上設置酒店房價
-DocType: Journal Entry,Multi Currency,多幣種
-DocType: Bank Statement Transaction Invoice Item,Invoice Type,發票類型
-DocType: Employee Benefit Claim,Expense Proof,費用證明
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +990,Delivery Note,送貨單
-apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立稅
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Cost of Sold Asset,出售資產的成本
-apps/erpnext/erpnext/accounts/utils.py +374,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-DocType: Program Enrollment Tool,New Student Batch,新學生批次
-apps/erpnext/erpnext/stock/doctype/item/item.py +510,{0} entered twice in Item Tax,{0}輸入兩次項目稅
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +121,Summary for this week and pending activities,本週和待活動總結
-DocType: Student Applicant,Admitted,錄取
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +116,Amount After Depreciation,折舊金額後
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,即將到來的日曆事件
-apps/erpnext/erpnext/public/js/templates/item_quick_entry.html +1,Variant Attributes,變量屬性
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +114,Please select month and year,請選擇年份和月份
-DocType: Employee,Company Email,企業郵箱
-DocType: GL Entry,Debit Amount in Account Currency,在科目幣種借記金額
-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,訂單價值
-DocType: Certified Consultant,Certified Consultant,認證顧問
-apps/erpnext/erpnext/config/accounts.py +29,Bank/Cash transactions against party or for internal transfer,銀行/現金對一方或內部轉讓交易
-DocType: Shipping Rule,Valid for Countries,有效的國家
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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,總訂貨考慮
-DocType: Certification Application,Not Certified,未認證
-DocType: Asset Value Adjustment,New Asset Value,新資產價值
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
-DocType: Course Scheduling Tool,Course Scheduling Tool,排課工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +698,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
-DocType: Crop Cycle,LInked Analysis,LInked分析
-DocType: POS Closing Voucher,POS Closing Voucher,POS關閉憑證
-DocType: Contract,Lapsed,失效
-DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +107,Application period cannot be across two allocation records,申請期限不能跨越兩個分配記錄
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +73,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
-DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,基於CRM的分包合同反向原材料
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +145,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
-DocType: Material Request Plan Item,Material Request Plan Item,材料申請計劃項目
-DocType: Leave Type,Allow Encashment,允許封裝
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +101,Convert to non-Group,轉換為非集團
-DocType: Project Update,Good/Steady,好/穩定
-DocType: Bank Statement Transaction Invoice Item,Invoice Date,發票日期
-DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +277,There can only be 1 Account per Company in {0} {1},只能有每公司1科目{0} {1}
-DocType: Support Search Source,Response Result Key Path,響應結果關鍵路徑
-DocType: Journal Entry,Inter Company Journal Entry,Inter公司日記帳分錄
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,For quantity {0} should not be grater than work order quantity {1},數量{0}不應超過工單數量{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +524,Please see attachment,請參閱附件
-DocType: Purchase Order,% Received,％ 已收
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
-DocType: Volunteer,Weekends,週末
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +138,Credit Note Amount,信用額度
-DocType: Setup Progress Action,Action Document,行動文件
-DocType: Chapter Member,Website URL,網站網址
-DocType: Delivery Note,Instructions,說明
-DocType: Quality Inspection,Inspected By,檢查
-DocType: Asset Maintenance Log,Maintenance Type,維護類型
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} 未在課程中註冊 {2}
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,學生姓名：
-DocType: POS Closing Voucher Details,Difference,區別
-DocType: Delivery Settings,Delay between Delivery Stops,交貨停止之間的延遲
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服務器的GoCardless配置似乎存在問題。別擔心，如果失敗，這筆款項將退還給您的帳戶。
-apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加項目
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
-DocType: Leave Application,Leave Approver Name,離開批准人姓名
-DocType: Depreciation Schedule,Schedule Date,排定日期
-DocType: Packed Item,Packed Item,盒裝產品
-DocType: Job Offer Term,Job Offer Term,招聘條件
-apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,採購交易的預設設定。
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},存在活動費用為員工{0}對活動類型 - {1}
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +20,Mandatory field - Get Students From,強制性領域 - 獲得學生
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +20,Mandatory field - Get Students From,強制性領域 - 獲得學生
-DocType: Program Enrollment,Enrolled courses,入學課程
-DocType: Program Enrollment,Enrolled courses,入學課程
-DocType: Currency Exchange,Currency Exchange,外幣兌換
-DocType: Opening Invoice Creation Tool Item,Item Name,項目名稱
-DocType: Authorization Rule,Approving User (above authorized value),批准的用戶（上述授權值）
-DocType: Email Digest,Credit Balance,貸方餘額
-DocType: Employee,Widowed,寡
-DocType: Request for Quotation,Request for Quotation,詢價
-DocType: Healthcare Settings,Require Lab Test Approval,需要實驗室測試批准
-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 +1548,Create a new Customer,創建一個新的客戶
-apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py +17,Expiring On,即將到期
-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: Purchase Receipt,Vehicle Date,車日期
-DocType: Student Log,Medical,醫療
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +186,Reason for losing,原因丟失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1757,Please select Drug,請選擇藥物
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,主導所有人不能等同於主導者
-apps/erpnext/erpnext/accounts/utils.py +380,Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
-DocType: Location,Area UOM,區域UOM
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +34,Opportunities,機會
-DocType: Lab Test Template,Single,單
-DocType: Compensatory Leave Request,Work From Date,從日期開始工作
-DocType: Salary Slip,Total Loan Repayment,總貸款還款
-DocType: Account,Cost of Goods Sold,銷貨成本
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +231,Please enter Cost Center,請輸入成本中心
-DocType: Drug Prescription,Dosage,劑量
-DocType: Journal Entry Account,Sales Order,銷售訂單
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,平均。賣出價
-DocType: Assessment Plan,Examiner Name,考官名稱
-DocType: Lab Test Template,No Result,沒有結果
-DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
-DocType: Delivery Note,% Installed,％已安裝
-apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,請先輸入公司名稱
-DocType: Travel Itinerary,Non-Vegetarian,非素食主義者
-DocType: Purchase Invoice,Supplier Name,供應商名稱
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
-DocType: HR Settings,Show Leaves Of All Department Members In Calendar,在日曆中顯示所有部門成員的葉子
-DocType: Purchase Invoice,01-Sales Return,01-銷售退貨
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Temporarily on Hold,暫時擱置
-DocType: Account,Is Group,是集團
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +327,Credit Note {0} has been created automatically,信用票據{0}已自動創建
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上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,換油
-DocType: Leave Encashment,Leave Balance,保持平衡
-DocType: Asset Maintenance Log,Asset Maintenance Log,資產維護日誌
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
-DocType: Certification Application,Non Profit,非營利
-DocType: Production Plan,Not Started,未啟動
-DocType: Lead,Channel Partner,渠道合作夥伴
-DocType: Account,Old Parent,舊上級
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +24,Mandatory field - Academic Year,必修課 - 學年
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +24,Mandatory field - Academic Year,必修課 - 學年
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +221,{0} {1} is not associated with {2} {3},{0} {1} 未與 {2} {3} 關聯
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +56,Row {0} : Operation is required against the raw material item {1},行{0}：對原材料項{1}需要操作
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Please set default payable account for the company {0},請為公司{0}設置預設應付帳款
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +608,Transaction not allowed against stopped Work Order {0},不允許對停止的工單{0}進行交易
-DocType: Setup Progress Action,Min Doc Count,最小文件計數
-apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
-DocType: Accounts Settings,Accounts Frozen Upto,科目被凍結到
-DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +778,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
-DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
-DocType: Sales Order,Not Applicable,不適用
-DocType: Amazon MWS Settings,UK,聯合王國
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +85,Opening Invoice Item,打開發票項目
-DocType: Request for Quotation Item,Required Date,所需時間
-DocType: Delivery Note,Billing Address,帳單地址
-DocType: Bank Statement Settings,Statement Headers,聲明標題
-DocType: Tax Rule,Billing County,開票縣
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
-DocType: Request for Quotation,Message for Supplier,消息供應商
-DocType: Job Card,Work Order,工作指示
-DocType: Sales Invoice,Total Qty,總數量
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2電子郵件ID
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2電子郵件ID
-DocType: Item,Show in Website (Variant),展網站（變體）
-DocType: Employee,Health Concerns,健康問題
-DocType: Payroll Entry,Select Payroll Period,選擇工資期
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,保留出售
-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 +30,Securities and Deposits,證券及存款
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +48,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法，因為有一些項目沒有自己的估值方法的交易
-DocType: Student Report Generation Tool,Attended by Parents,由父母出席
-apps/erpnext/erpnext/hr/doctype/shift_assignment/shift_assignment.py +39,Employee {0} has already applied for {1} on {2} : ,員工{0}已在{2}上申請{1}：
-DocType: Inpatient Record,AB Positive,AB積極
-DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +118,Pending activities for today,今天待定活動
-DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基於時間表工資。
-DocType: Driver,Applicable for external driver,適用於外部驅動器
-DocType: Sales Order Item,Used for Production Plan,用於生產計劃
-DocType: Loan,Total Payment,總付款
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +117,Cannot cancel transaction for Completed Work Order.,無法取消已完成工單的交易。
-DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間（以分鐘計）
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +837,PO already created for all sales order items,已為所有銷售訂單項創建採購訂單
-DocType: Healthcare Service Unit,Occupied,佔據
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +130,{0} {1} is cancelled so the action cannot be completed,{0} {1} 被取消，因此無法完成操作
-DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
-DocType: Journal Entry,Accounts Payable,應付帳款
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +55,The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,此付款申請中設置的{0}金額與所有付款計劃的計算金額不同：{1}。在提交文檔之前確保這是正確的。
-DocType: Patient,Allergies,過敏
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +43,The selected BOMs are not for the same item,所選的材料清單並不同樣項目
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +32,Change Item Code,更改物料代碼
-DocType: Vital Signs,Blood Pressure (systolic),血壓（收縮期）
-DocType: Item Price,Valid Upto,到...為止有效
-DocType: Training Event,Workshop,作坊
-DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告採購訂單
-apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
-DocType: Employee Tax Exemption Proof Submission,Rented From Date,從日期租用
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +25,Enough Parts to Build,足夠的配件組裝
-DocType: POS Profile User,POS Profile User,POS配置文件用戶
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,行{0}：折舊開始日期是必需的
-DocType: Purchase Invoice Item,Service Start Date,服務開始日期
-DocType: Subscription Invoice,Subscription Invoice,訂閱發票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接收入
-DocType: Patient Appointment,Date TIme,約會時間
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +53,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +93,Administrative Officer,政務主任
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Setting up company and taxes,建立公司和稅收
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
-DocType: Codification Table,Codification Table,編纂表
-DocType: Timesheet Detail,Hrs,小時
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +410,Please select Company,請選擇公司
-DocType: Stock Entry Detail,Difference Account,差異科目
-DocType: Purchase Invoice,Supplier GSTIN,供應商GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +50,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
-DocType: Work Order,Additional Operating Cost,額外的運營成本
-DocType: Lab Test Template,Lab Routine,實驗室常規
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妝品
-apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,請選擇已完成資產維護日誌的完成日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
-DocType: Supplier,Block Supplier,塊供應商
-DocType: Shipping Rule,Net Weight,淨重
-DocType: Job Opening,Planned number of Positions,計劃的職位數量
-DocType: Employee,Emergency Phone,緊急電話
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +82,{0} {1} does not exist.,{0} {1} 不存在。
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購買
-,Serial No Warranty Expiry,序列號保修到期
-DocType: Sales Invoice,Offline POS Name,離線POS名稱
-apps/erpnext/erpnext/utilities/user_progress.py +180,Student Application,學生申請
-DocType: Bank Statement Transaction Payment Item,Payment Reference,付款憑據
-DocType: Supplier,Hold Type,保持類型
-apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
-apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
-DocType: Bank Statement Transaction Payment Item,Bank Statement Transaction Payment Item,銀行對賬單交易付款項目
-DocType: Sales Order,To Deliver,為了提供
-DocType: Purchase Invoice Item,Item,項目
-apps/erpnext/erpnext/healthcare/setup.py +188,High Sensitivity,高靈敏度
-apps/erpnext/erpnext/config/non_profit.py +48,Volunteer Type information.,志願者類型信息。
-DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,現金流量映射模板
-DocType: Travel Request,Costing Details,成本計算詳情
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js +64,Show Return Entries,顯示返回條目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2569,Serial no item cannot be a fraction,序號項目不能是一個分數
-DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
-DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +99,"Not permitted, configure Lab Test Template as required",不允許，根據需要配置實驗室測試模板
-DocType: Patient,Risk Factors,風險因素
-DocType: Patient,Occupational Hazards and Environmental Factors,職業危害與環境因素
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Stock Entries already created for Work Order ,已為工單創建的庫存條目
-DocType: Vital Signs,Respiratory rate,呼吸頻率
-apps/erpnext/erpnext/config/stock.py +337,Managing Subcontracting,管理轉包
-DocType: Vital Signs,Body Temperature,體溫
-DocType: Project,Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Cannot cancel {0} {1} because Serial No {2} does not belong to the warehouse {3},無法取消{0} {1}，因為序列號{2}不屬於倉庫{3}
-DocType: Company,Default Deferred Expense Account,默認遞延費用科目
-apps/erpnext/erpnext/config/projects.py +29,Define Project type.,定義項目類型。
-DocType: Supplier Scorecard,Weighting Function,加權函數
-DocType: Healthcare Practitioner,OP Consulting Charge,OP諮詢費
-apps/erpnext/erpnext/utilities/user_progress.py +28,Setup your ,設置你的
-DocType: Student Report Generation Tool,Show Marks,顯示標記
-DocType: Support Settings,Get Latest Query,獲取最新查詢
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
-apps/erpnext/erpnext/setup/doctype/company/company.py +74,Account {0} does not belong to company: {1},科目{0}不屬於公司：{1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,另一家公司已使用此縮寫
-DocType: Selling Settings,Default Customer Group,預設客戶群組
-DocType: Employee,IFSC Code,IFSC代碼
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圓角總計”字段將不可見的任何交易
-DocType: BOM,Operating Cost,營業成本
-DocType: Crop,Produced Items,生產物品
-DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,將交易與發票匹配
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +872,Unblock Invoice,取消屏蔽發票
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能為0
-DocType: Company,Delete Company Transactions,刪除公司事務
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
-DocType: Payment Entry Reference,Supplier Invoice No,供應商發票號碼
-DocType: Territory,For reference,供參考
-DocType: Healthcare Settings,Appointment Confirmation,預約確認
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +278,Closing (Cr),關閉（Cr）
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,移動項目
-DocType: Employee Incentive,Incentive Amount,激勵金額
-DocType: Serial No,Warranty Period (Days),保修期限（天數）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Total Credit/ Debit Amount should be same as linked Journal Entry,總信用/借方金額應與鏈接的日記帳分錄相同
-DocType: Installation Note Item,Installation Note Item,安裝注意項
-DocType: Production Plan Item,Pending Qty,待定數量
-apps/erpnext/erpnext/accounts/party.py +429,{0} {1} is not active,{0} {1}是不活動
-DocType: Woocommerce Settings,Freight and Forwarding Account,貨運和轉運科目
-apps/erpnext/erpnext/config/accounts.py +240,Setup cheque dimensions for printing,設置檢查尺寸打印
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +33,Create Salary Slips,創建工資單
-DocType: Vital Signs,Bloated,脹
-DocType: Salary Slip,Salary Slip Timesheet,工資單時間表
-apps/erpnext/erpnext/controllers/buying_controller.py +200,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
-DocType: Sales Invoice,Total Commission,佣金總計
-DocType: Tax Withholding Account,Tax Withholding Account,扣繳稅款科目
-DocType: Pricing Rule,Sales Partner,銷售合作夥伴
-apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供應商記分卡。
-DocType: Buying Settings,Purchase Receipt Required,需要採購入庫單
-DocType: Delivery Note,Rail,軌
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +267,Target warehouse in row {0} must be same as Work Order,行{0}中的目標倉庫必須與工單相同
-apps/erpnext/erpnext/stock/doctype/item/item.py +183,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的，如果打開庫存進入
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,沒有在發票表中找到記錄
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +36,Please select Company and Party Type first,請選擇公司和黨的第一型
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已經在用戶{1}的pos配置文件{0}中設置了默認值，請禁用默認值
-apps/erpnext/erpnext/config/accounts.py +261,Financial / accounting year.,財務／會計年度。
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積值
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
-DocType: Shopify Settings,Customer Group will set to selected group while syncing customers from Shopify,客戶組將在同步Shopify客戶的同時設置為選定的組
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要領域
-DocType: Hub User,Hub User,中心用戶
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,製作銷售訂單
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},從{0}到{1}
-DocType: Project Task,Project Task,項目任務
-DocType: Loyalty Point Entry Redemption,Redeemed Points,兌換積分
-,Lead Id,潛在客戶標識
-DocType: C-Form Invoice Detail,Grand Total,累計
-DocType: Assessment Plan,Course,課程
-apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +105,Section Code,部分代碼
-DocType: Timesheet,Payslip,工資單
-apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +18,Half day date should be in between from date and to date,半天的日期應該在從日期到日期之間
-apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,項目車
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
-DocType: Issue,Resolution,決議
-DocType: Employee,Personal Bio,個人自傳
-apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py +15,Membership ID,會員ID
-apps/erpnext/erpnext/templates/pages/order.html +77,Delivered: {0},交貨：{0}
-DocType: QuickBooks Migrator,Connected to QuickBooks,連接到QuickBooks
-DocType: Bank Statement Transaction Entry,Payable Account,應付帳款
-DocType: Payment Entry,Type of Payment,付款類型
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +18,Half Day Date is mandatory,半天日期是強制性的
-DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
-DocType: Job Applicant,Resume Attachment,簡歷附
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
-apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +108,Create Variant,創建變體
-DocType: Sales Invoice,Shipping Bill Date,運費單日期
-DocType: Production Plan,Production Plan,生產計劃
-DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,打開發票創建工具
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +909,Sales Return,銷貨退回
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +110,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：總分配葉{0}應不低於已核定葉{1}期間
-DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根據序列號輸入設置交易數量
-,Total Stock Summary,總庫存總結
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +68,"You can only plan for upto {0} vacancies and budget {1} \
+At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
+Bank Statement Transaction Invoice Item,銀行對賬單交易發票項目
+Show Products as a List,產品展示作為一個列表
+Tax on flexible benefit,對靈活福利徵稅
+Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
+Minimum Age,最低年齡
+Example: Basic Mathematics,例如：基礎數學
+Diff Qty,差異數量
+Material Request Detail,材料請求詳情
+Default Quotation Validity Days,默認報價有效天數
+"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+Validate Attendance,驗證出席
+Change Amount,變動金額
+Certificate Received,已收到證書
+Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,設置B2C的發票值。 B2CL和B2CS根據此發票值計算。
+New BOM,新的物料清單
+Prescribed Procedures,規定程序
+Show only POS,只顯示POS,
+Supplier Group Name,供應商集團名稱
+Driving License Categories,駕駛執照類別
+Please enter Delivery Date,請輸入交貨日期
+Make Depreciation Entry,計提折舊進入
+Closed Document,關閉文件
+Leave Settings,保留設置
+Number of positions cannot be less then current count of employees,職位數量不能少於當前員工人數
+Request Type,請求類型
+Purpose of Travel,旅行目的
+Payroll Periods,工資期間
+Make Employee,使員工
+Broadcasting,廣播
+Setup mode of POS (Online / Offline),POS（在線/離線）的設置模式
+Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根據工作訂單創建時間日誌。不得根據工作指令跟踪操作
+Execution,執行
+Details of the operations carried out.,進行的作業細節。
+Maintenance Status,維修狀態
+Membership Details,會員資格
+{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要對供應商應付帳款{2}
+Items and Pricing,項目和定價
+Total hours: {0},總時間：{0}
+From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期＝{0}
+Interval,間隔
+Preference,偏愛
+Individual,個人
+Academics User,學術界用戶
+Amount In Figure,量圖
+Plan for maintenance visits.,規劃維護訪問。
+Supplier Scorecard Period,供應商記分卡期
+Share Transfer,股份轉讓
+Expiring Memberships,即將到期的會員
+Customer Groups,客戶群
+Financial Statements,財務報表
+Students,學生們
+Rules for applying pricing and discount.,規則適用的定價和折扣。
+Daily Work Summary Group,日常工作總結小組
+Time Slots,時隙
+Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
+Shift Request,移位請求
+Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
+Discount on Price List Rate (%),折扣價目表率（％）
+Item Template,項目模板
+Select Terms and Conditions,選擇條款和條件
+Out Value,輸出值
+Bank Statement Settings Item,銀行對賬單設置項目
+Woocommerce Settings,Woocommerce設置
+Sales Orders,銷售訂單
+Multiple Loyalty Program found for the Customer. Please select manually.,為客戶找到多個忠誠度計劃。請手動選擇。
+Valuation,計價
+Set as Default,設為預設
+Purchase Order Trends,採購訂單趨勢
+Go to Customers,轉到客戶
+Late Checkin,延遲入住
+The request for quotation can be accessed by clicking on the following link,報價請求可以通過點擊以下鏈接進行訪問
+SG Creation Tool Course,SG創建工具課程
+Payment Description,付款說明
+Insufficient Stock,庫存不足
+Disable Capacity Planning and Time Tracking,禁用產能規劃和時間跟踪
+New Sales Orders,新的銷售訂單
+Bank Account,銀行帳戶
+Check-out Date,離開日期
+Allow Negative Balance,允許負平衡
+You cannot delete Project Type 'External',您不能刪除項目類型“外部”
+Select Alternate Item,選擇備用項目
+Create User,創建用戶
+Default Territory,預設地域
+Television,電視
+Updated via 'Time Log',經由“時間日誌”更新
+Select the customer or supplier.,選擇客戶或供應商。
+Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",時隙滑動，時隙{0}到{1}與現有時隙{2}重疊到{3}
+Series List for this Transaction,本交易系列表
+Enable Perpetual Inventory,啟用永久庫存
+Charges Incurred,收費發生
+Default Payroll Payable Account,默認情況下，應付職工薪酬帳戶
+Update Email Group,更新電子郵件組
+Is Opening Entry,是開放登錄
+"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ",如果取消選中，該項目不會出現在銷售發票中，但可用於創建組測試。
+Mention if non-standard receivable account applicable,何況，如果不規範應收帳款適用
+Instructor Name,導師姓名
+Arrear Component,欠費組件
+Criteria Setup,條件設置
+For Warehouse is required before Submit,對於倉庫之前，需要提交
+Medical Code,醫療代號
+Connect Amazon with ERPNext,將Amazon與ERPNext連接起來
+Please enter Company,請輸入公司名稱
+Against Sales Invoice Item,對銷售發票項目
+Linked Doctype,鏈接的文檔類型
+Net Cash from Financing,從融資淨現金
+"LocalStorage is full , did not save",localStorage的滿了，沒救
+Address & Contact,地址及聯絡方式
+Add unused leaves from previous allocations,從以前的分配添加未使用的休假
+Partner website,合作夥伴網站
+Add Item,新增項目
+Party Tax Withholding Config,黨的預扣稅配置
+Custom Result,自定義結果
+Contact Name,聯絡人姓名
+Course Assessment Criteria,課程評價標準
+Tax Id: ,稅號：
+Student ID: ,學生卡：
+POS Customer Group,POS客戶群
+Practitioner Schedules,從業者時間表
+Additional Details,額外細節
+Request for purchase.,請求您的報價。
+Collected Amount,收集金額
+This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
+Open Work Orders,打開工作訂單
+Out Patient Consulting Charge Item,出患者諮詢費用項目
+Credit Months,信貸月份
+Net Pay cannot be less than 0,淨工資不能低於0,
+Fulfilled,達到
+Discharge Scheduled,出院預定
+Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
+Cashier,出納員
+Leaves per Year,每年葉
+Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是進階'對科目{1}，如果這是一個進階條目。
+Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
+Profit & Loss,收益與損失
+Please setup Students under Student Groups,請設置學生組的學生
+Item Website Specification,項目網站規格
+Leave Blocked,禁假的
+Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+Bank Entries,銀行條目
+Is Internal Customer,是內部客戶
+"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",如果選中自動選擇，則客戶將自動與相關的忠誠度計劃鏈接（保存時）
+Stock Reconciliation Item,庫存調整項目
+Sales Invoice No,銷售發票號碼
+Supply Type,供應類型
+Min Order Qty,最小訂貨量
+Student Group Creation Tool Course,學生組創建工具課程
+Do Not Contact,不要聯絡
+People who teach at your organisation,誰在您的組織教人
+Software Developer,軟件開發人員
+Minimum Order Qty,最低起訂量
+Supplier Type,供應商類型
+Course Start Date,課程開始日期
+Student Batch-Wise Attendance,學生分批出席
+Allow user to edit Rate,允許用戶編輯率
+Publish in Hub,在發布中心
+Student Admission,學生入學
+Terretory,Terretory,
+Item {0} is cancelled,項{0}將被取消
+Depreciation Row {0}: Depreciation Start Date is entered as past date,折舊行{0}：折舊開始日期作為過去的日期輸入
+Fulfilment Terms and Conditions,履行條款和條件
+Material Request,物料需求
+Update Clearance Date,更新日期間隙
+Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供'表中的採購訂單{1}
+Total Principal Amount,本金總額
+Relation,關係
+Mother,母親
+Reservation End Time,預訂結束時間
+Biennial,雙年展
+BOM Variance Report,BOM差異報告
+Confirmed orders from Customers.,確認客戶的訂單。
+Rejected Quantity,拒絕數量
+Payment request {0} created,已創建付款請求{0}
+Admitted Datetime,承認日期時間
+Backflush raw materials from work-in-progress warehouse,從在製品庫中反沖原料
+Open Orders,開放訂單
+Low Sensitivity,低靈敏度
+Order rescheduled for sync,訂單重新安排同步
+Please confirm once you have completed your training,完成培訓後請確認
+Suggestions,建議
+Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
+Payment Term Name,付款條款名稱
+Create documents for sample collection,創建樣本收集文件
+Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
+All Healthcare Service Units,所有醫療服務單位
+Mobile No.,手機號碼
+Generate Schedule,生成時間表
+Expense Head,總支出
+Please select Charge Type first,請先選擇付款類別
+"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ",你可以在這裡定義所有需要進行的作業。日場是用來提及任務需要執行的日子，1日是第一天等。
+Student Group Student,學生組學生
+Education Settings,教育設置
+Inspection,檢查
+Balance In Base Currency,平衡基礎貨幣
+Max Grade,最高等級
+New Quotations,新報價
+Attendance not submitted for {0} as {1} on leave.,在{0}上沒有針對{1}上的考勤出席。
+Payment Order,付款單
+Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
+Shipping County,航運縣
+Learn,學習
+Enable Deferred Expense,啟用延期費用
+Next Depreciation Date,接下來折舊日期
+Activity Cost per Employee,每個員工活動費用
+Settings for Accounts,會計設定
+Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
+Manage Sales Person Tree.,管理銷售人員樹。
+"Cannot process route, since Google Maps Settings is disabled.",由於禁用了Google地圖設置，因此無法處理路線。
+Cover Letter,求職信
+Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
+Synced With Hub,同步轂
+Fleet Manager,車隊經理
+Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能為負值對項{2}
+Wrong Password,密碼錯誤
+Variant Of,變種
+Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
+Closing Account Head,關閉帳戶頭
+External Work History,外部工作經歷
+Circular Reference Error,循環引用錯誤
+Student Report Card,學生報告卡
+From Pin Code,來自Pin Code,
+Guardian1 Name,Guardian1名稱
+In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
+Distance from left edge,從左側邊緣的距離
+{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的單位（＃窗體/項目/ {1}）在[{2}]研究發現（＃窗體/倉儲/ {2}）
+Industry,行業
+Rate & Amount,價格和金額
+Transfer Material Against Job Card,轉移材料反對工作卡
+Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
+Please set Hotel Room Rate on {},請在{}上設置酒店房價
+Multi Currency,多幣種
+Invoice Type,發票類型
+Expense Proof,費用證明
+Delivery Note,送貨單
+Setting up Taxes,建立稅
+Cost of Sold Asset,出售資產的成本
+Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
+New Student Batch,新學生批次
+{0} entered twice in Item Tax,{0}輸入兩次項目稅
+Summary for this week and pending activities,本週和待活動總結
+Admitted,錄取
+Amount After Depreciation,折舊金額後
+Upcoming Calendar Events,即將到來的日曆事件
+Variant Attributes,變量屬性
+Please select month and year,請選擇年份和月份
+Company Email,企業郵箱
+Debit Amount in Account Currency,在科目幣種借記金額
+Order Value,訂單價值
+Order Value,訂單價值
+Certified Consultant,認證顧問
+Bank/Cash transactions against party or for internal transfer,銀行/現金對一方或內部轉讓交易
+Valid for Countries,有效的國家
+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,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
+Grant Application,授予申請
+Total Order Considered,總訂貨考慮
+Not Certified,未認證
+New Asset Value,新資產價值
+Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
+Course Scheduling Tool,排課工具
+Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
+LInked Analysis,LInked分析
+POS Closing Voucher,POS關閉憑證
+Lapsed,失效
+Tax Rate,稅率
+Application period cannot be across two allocation records,申請期限不能跨越兩個分配記錄
+{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
+Backflush Raw Materials of Subcontract Based On,基於CRM的分包合同反向原材料
+Purchase Invoice {0} is already submitted,採購發票{0}已經提交
+Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
+Material Request Plan Item,材料申請計劃項目
+Allow Encashment,允許封裝
+Convert to non-Group,轉換為非集團
+Good/Steady,好/穩定
+Invoice Date,發票日期
+Debit Amount,借方金額
+There can only be 1 Account per Company in {0} {1},只能有每公司1科目{0} {1}
+Response Result Key Path,響應結果關鍵路徑
+Inter Company Journal Entry,Inter公司日記帳分錄
+For quantity {0} should not be grater than work order quantity {1},數量{0}不應超過工單數量{1}
+Please see attachment,請參閱附件
+% Received,％ 已收
+Create Student Groups,創建挺起胸
+Weekends,週末
+Credit Note Amount,信用額度
+Action Document,行動文件
+Website URL,網站網址
+Instructions,說明
+Inspected By,檢查
+Maintenance Type,維護類型
+{0} - {1} is not enrolled in the Course {2},{0} - {1} 未在課程中註冊 {2}
+Student Name: ,學生姓名：
+Difference,區別
+Delay between Delivery Stops,交貨停止之間的延遲
+Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
+"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服務器的GoCardless配置似乎存在問題。別擔心，如果失敗，這筆款項將退還給您的帳戶。
+Add Items,添加項目
+Item Quality Inspection Parameter,產品質量檢驗參數
+Leave Approver Name,離開批准人姓名
+Schedule Date,排定日期
+Packed Item,盒裝產品
+Job Offer Term,招聘條件
+Default settings for buying transactions.,採購交易的預設設定。
+Activity Cost exists for Employee {0} against Activity Type - {1},存在活動費用為員工{0}對活動類型 - {1}
+Mandatory field - Get Students From,強制性領域 - 獲得學生
+Mandatory field - Get Students From,強制性領域 - 獲得學生
+Enrolled courses,入學課程
+Enrolled courses,入學課程
+Currency Exchange,外幣兌換
+Item Name,項目名稱
+Approving User (above authorized value),批准的用戶（上述授權值）
+Credit Balance,貸方餘額
+Widowed,寡
+Request for Quotation,詢價
+Require Lab Test Approval,需要實驗室測試批准
+Working Hours,工作時間
+Total Outstanding,總計傑出
+Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
+Strength,強度
+Create a new Customer,創建一個新的客戶
+Expiring On,即將到期
+"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
+Create Purchase Orders,創建採購訂單
+Purchase Register,購買註冊
+Rechedule,Rechedule,
+Applicable Charges,相關費用
+Vehicle Date,車日期
+Medical,醫療
+Reason for losing,原因丟失
+Please select Drug,請選擇藥物
+Lead Owner cannot be same as the Lead,主導所有人不能等同於主導者
+Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
+Area UOM,區域UOM,
+Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
+Opportunities,機會
+Single,單
+Work From Date,從日期開始工作
+Total Loan Repayment,總貸款還款
+Cost of Goods Sold,銷貨成本
+Please enter Cost Center,請輸入成本中心
+Dosage,劑量
+Sales Order,銷售訂單
+Avg. Selling Rate,平均。賣出價
+Examiner Name,考官名稱
+No Result,沒有結果
+Quantity and Rate,數量和速率
+% Installed,％已安裝
+Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
+Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
+Please enter company name first,請先輸入公司名稱
+Non-Vegetarian,非素食主義者
+Supplier Name,供應商名稱
+Read the ERPNext Manual,閱讀ERPNext手冊
+Show Leaves Of All Department Members In Calendar,在日曆中顯示所有部門成員的葉子
+01-Sales Return,01-銷售退貨
+Temporarily on Hold,暫時擱置
+Is Group,是集團
+Credit Note {0} has been created automatically,信用票據{0}已自動創建
+Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO,
+Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
+Primary Address Details,主要地址詳情
+Oil Change,換油
+Leave Balance,保持平衡
+Asset Maintenance Log,資產維護日誌
+'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
+Non Profit,非營利
+Not Started,未啟動
+Channel Partner,渠道合作夥伴
+Old Parent,舊上級
+Mandatory field - Academic Year,必修課 - 學年
+Mandatory field - Academic Year,必修課 - 學年
+{0} {1} is not associated with {2} {3},{0} {1} 未與 {2} {3} 關聯
+Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
+Row {0} : Operation is required against the raw material item {1},行{0}：對原材料項{1}需要操作
+Please set default payable account for the company {0},請為公司{0}設置預設應付帳款
+Transaction not allowed against stopped Work Order {0},不允許對停止的工單{0}進行交易
+Min Doc Count,最小文件計數
+Global settings for all manufacturing processes.,所有製造過程中的全域設定。
+Accounts Frozen Upto,科目被凍結到
+Sent On,發送於
+Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+Employee record is created using selected field. ,使用所選欄位創建員工記錄。
+Not Applicable,不適用
+UK,聯合王國
+Opening Invoice Item,打開發票項目
+Required Date,所需時間
+Billing Address,帳單地址
+Statement Headers,聲明標題
+Billing County,開票縣
+"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
+Message for Supplier,消息供應商
+Work Order,工作指示
+Total Qty,總數量
+Guardian2 Email ID,Guardian2電子郵件ID,
+Guardian2 Email ID,Guardian2電子郵件ID,
+Show in Website (Variant),展網站（變體）
+Health Concerns,健康問題
+Select Payroll Period,選擇工資期
+Reserved for sale,保留出售
+From Package No.,從包裹編號
+To Range,為了範圍
+Securities and Deposits,證券及存款
+"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法，因為有一些項目沒有自己的估值方法的交易
+Attended by Parents,由父母出席
+Employee {0} has already applied for {1} on {2} : ,員工{0}已在{2}上申請{1}：
+AB Positive,AB積極
+Description of a Job Opening,一個空缺職位的說明
+Pending activities for today,今天待定活動
+Salary Component for timesheet based payroll.,薪酬部分基於時間表工資。
+Applicable for external driver,適用於外部驅動器
+Used for Production Plan,用於生產計劃
+Cannot cancel transaction for Completed Work Order.,無法取消已完成工單的交易。
+Time Between Operations (in mins),作業間隔時間（以分鐘計）
+PO already created for all sales order items,已為所有銷售訂單項創建採購訂單
+Occupied,佔據
+{0} {1} is cancelled so the action cannot be completed,{0} {1} 被取消，因此無法完成操作
+Buyer of Goods and Services.,買家商品和服務。
+Accounts Payable,應付帳款
+The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,此付款申請中設置的{0}金額與所有付款計劃的計算金額不同：{1}。在提交文檔之前確保這是正確的。
+Allergies,過敏
+The selected BOMs are not for the same item,所選的材料清單並不同樣項目
+Change Item Code,更改物料代碼
+Blood Pressure (systolic),血壓（收縮期）
+Valid Upto,到...為止有效
+Workshop,作坊
+Warn Purchase Orders,警告採購訂單
+List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+Rented From Date,從日期租用
+Enough Parts to Build,足夠的配件組裝
+POS Profile User,POS配置文件用戶
+Row {0}: Depreciation Start Date is required,行{0}：折舊開始日期是必需的
+Service Start Date,服務開始日期
+Subscription Invoice,訂閱發票
+Direct Income,直接收入
+Date TIme,約會時間
+"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
+Administrative Officer,政務主任
+Setting up company and taxes,建立公司和稅收
+Please select Course,請選擇課程
+Codification Table,編纂表
+Hrs,小時
+Please select Company,請選擇公司
+Difference Account,差異科目
+Supplier GSTIN,供應商GSTIN,
+Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
+Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+Additional Operating Cost,額外的運營成本
+Lab Routine,實驗室常規
+Cosmetics,化妝品
+Please select Completion Date for Completed Asset Maintenance Log,請選擇已完成資產維護日誌的完成日期
+"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+Block Supplier,塊供應商
+Net Weight,淨重
+Planned number of Positions,計劃的職位數量
+Emergency Phone,緊急電話
+{0} {1} does not exist.,{0} {1} 不存在。
+Buy,購買
+Serial No Warranty Expiry,序列號保修到期
+Offline POS Name,離線POS名稱
+Student Application,學生申請
+Payment Reference,付款憑據
+Hold Type,保持類型
+Please define grade for Threshold 0%,請定義等級為閾值0％
+Please define grade for Threshold 0%,請定義等級為閾值0％
+Bank Statement Transaction Payment Item,銀行對賬單交易付款項目
+To Deliver,為了提供
+Item,項目
+High Sensitivity,高靈敏度
+Volunteer Type information.,志願者類型信息。
+Cash Flow Mapping Template,現金流量映射模板
+Costing Details,成本計算詳情
+Show Return Entries,顯示返回條目
+Serial no item cannot be a fraction,序號項目不能是一個分數
+Difference (Dr - Cr),差異（Dr - Cr）
+Profit and Loss,損益
+"Not permitted, configure Lab Test Template as required",不允許，根據需要配置實驗室測試模板
+Risk Factors,風險因素
+Occupational Hazards and Environmental Factors,職業危害與環境因素
+Stock Entries already created for Work Order ,已為工單創建的庫存條目
+Respiratory rate,呼吸頻率
+Managing Subcontracting,管理轉包
+Body Temperature,體溫
+Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問
+Cannot cancel {0} {1} because Serial No {2} does not belong to the warehouse {3},無法取消{0} {1}，因為序列號{2}不屬於倉庫{3}
+Default Deferred Expense Account,默認遞延費用科目
+Define Project type.,定義項目類型。
+Weighting Function,加權函數
+OP Consulting Charge,OP諮詢費
+Setup your ,設置你的
+Show Marks,顯示標記
+Get Latest Query,獲取最新查詢
+Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
+Account {0} does not belong to company: {1},科目{0}不屬於公司：{1}
+Abbreviation already used for another company,另一家公司已使用此縮寫
+Default Customer Group,預設客戶群組
+IFSC Code,IFSC代碼
+"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圓角總計”字段將不可見的任何交易
+Operating Cost,營業成本
+Produced Items,生產物品
+Match Transaction to Invoices,將交易與發票匹配
+Unblock Invoice,取消屏蔽發票
+Increment cannot be 0,增量不能為0,
+Delete Company Transactions,刪除公司事務
+Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
+Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
+Supplier Invoice No,供應商發票號碼
+For reference,供參考
+Appointment Confirmation,預約確認
+"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
+Closing (Cr),關閉（Cr）
+Move Item,移動項目
+Incentive Amount,激勵金額
+Warranty Period (Days),保修期限（天數）
+Total Credit/ Debit Amount should be same as linked Journal Entry,總信用/借方金額應與鏈接的日記帳分錄相同
+Installation Note Item,安裝注意項
+Pending Qty,待定數量
+{0} {1} is not active,{0} {1}是不活動
+Freight and Forwarding Account,貨運和轉運科目
+Setup cheque dimensions for printing,設置檢查尺寸打印
+Create Salary Slips,創建工資單
+Bloated,脹
+Salary Slip Timesheet,工資單時間表
+Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
+Total Commission,佣金總計
+Tax Withholding Account,扣繳稅款科目
+Sales Partner,銷售合作夥伴
+All Supplier scorecards.,所有供應商記分卡。
+Purchase Receipt Required,需要採購入庫單
+Rail,軌
+Target warehouse in row {0} must be same as Work Order,行{0}中的目標倉庫必須與工單相同
+Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的，如果打開庫存進入
+No records found in the Invoice table,沒有在發票表中找到記錄
+Please select Company and Party Type first,請選擇公司和黨的第一型
+"Already set default in pos profile {0} for user {1}, kindly disabled default",已經在用戶{1}的pos配置文件{0}中設置了默認值，請禁用默認值
+Financial / accounting year.,財務／會計年度。
+Accumulated Values,累積值
+"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
+Customer Group will set to selected group while syncing customers from Shopify,客戶組將在同步Shopify客戶的同時設置為選定的組
+Territory is Required in POS Profile,POS Profile中需要領域
+Hub User,中心用戶
+Make Sales Order,製作銷售訂單
+Salary Slip submitted for period from {0} to {1},從{0}到{1}
+Project Task,項目任務
+Redeemed Points,兌換積分
+Lead Id,潛在客戶標識
+Grand Total,累計
+Course,課程
+Section Code,部分代碼
+Payslip,工資單
+Half day date should be in between from date and to date,半天的日期應該在從日期到日期之間
+Item Cart,項目車
+Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
+Resolution,決議
+Personal Bio,個人自傳
+Membership ID,會員ID,
+Delivered: {0},交貨：{0}
+Connected to QuickBooks,連接到QuickBooks,
+Payable Account,應付帳款
+Type of Payment,付款類型
+Half Day Date is mandatory,半天日期是強制性的
+Billing and Delivery Status,結算和交貨狀態
+Resume Attachment,簡歷附
+Repeat Customers,回頭客
+Create Variant,創建變體
+Shipping Bill Date,運費單日期
+Production Plan,生產計劃
+Opening Invoice Creation Tool,打開發票創建工具
+Sales Return,銷貨退回
+Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：總分配葉{0}應不低於已核定葉{1}期間
+Set Qty in Transactions based on Serial No Input,根據序列號輸入設置交易數量
+Total Stock Summary,總庫存總結
+"You can only plan for upto {0} vacancies and budget {1} \
for {2} as per staffing plan {3} for parent company {4}.",根據母公司{4}的人員配置計劃{3}，您只能針對{2}計劃最多{0}個職位空缺和預算{1} \。
-DocType: Announcement,Posted By,發布者
-DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
-DocType: Healthcare Settings,Confirmation Message,確認訊息
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
-DocType: Authorization Rule,Customer or Item,客戶或項目
-apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
-DocType: Quotation,Quotation To,報價到
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +250,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +950,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.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
-apps/erpnext/erpnext/accounts/utils.py +378,Allocated amount can not be negative,分配金額不能為負
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,請設定公司
-DocType: Share Balance,Share Balance,份額平衡
-DocType: Amazon MWS Settings,AWS Access Key ID,AWS訪問密鑰ID
-DocType: Purchase Order Item,Billed Amt,已結算額
-DocType: Training Result Employee,Training Result Employee,訓練結果員工
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
-DocType: Loan Application,Total Payable Interest,合計應付利息
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +58,Total Outstanding: {0},總計：{0}
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,銷售發票時間表
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
-DocType: Payroll Entry,Select Payment Account to make Bank Entry,選擇付款科目，使銀行進入
-DocType: Hotel Settings,Default Invoice Naming Series,默認發票命名系列
-apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉，報銷和工資
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +712,An error occurred during the update process,更新過程中發生錯誤
-DocType: Restaurant Reservation,Restaurant Reservation,餐廳預訂
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,Proposal Writing,提案寫作
-DocType: Payment Entry Deduction,Payment Entry Deduction,輸入付款扣除
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Wrapping up,包起來
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +45,Notify Customers via Email,通過電子郵件通知客戶
-DocType: Item,Batch Number Series,批號系列
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +54,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
-DocType: Employee Advance,Claimed Amount,聲明金額
-DocType: QuickBooks Migrator,Authorization Settings,授權設置
-DocType: Travel Itinerary,Departure Datetime,離開日期時間
-DocType: Travel Request Costing,Travel Request Costing,旅行請求成本計算
-apps/erpnext/erpnext/config/education.py +180,Masters,資料主檔
-DocType: Employee Onboarding,Employee Onboarding Template,員工入職模板
-DocType: Assessment Plan,Maximum Assessment Score,最大考核評分
-apps/erpnext/erpnext/config/accounts.py +134,Update Bank Transaction Dates,更新銀行交易日期
-apps/erpnext/erpnext/config/projects.py +41,Time Tracking,時間跟踪
-DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,輸送機重複
-apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +57,Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}＃付費金額不能大於請求的提前金額
-DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
-DocType: Packing Slip Item,DN Detail,DN詳細
-DocType: Training Event,Conference,會議
-DocType: Employee Grade,Default Salary Structure,默認工資結構
-DocType: Timesheet,Billed,計費
-DocType: Batch,Batch Description,批次說明
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
-apps/erpnext/erpnext/accounts/utils.py +763,"Payment Gateway Account not created, please create one manually.",支付閘道科目沒有創建，請手動創建一個。
-apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,按照DOB的規定，沒有資格參加本計劃
-DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
-DocType: Student,Sibling Details,兄弟姐妹詳情
-DocType: Vehicle Service,Vehicle Service,汽車服務
-apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,自動觸發基於條件的反饋請求。
-DocType: Employee,Reason for Resignation,辭退原因
-DocType: Sales Invoice,Credit Note Issued,信用票據發行
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,發票/日記帳分錄詳細資訊
-apps/erpnext/erpnext/accounts/utils.py +84,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
-DocType: Buying Settings,Settings for Buying Module,設置購買模塊
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +22,Asset {0} does not belong to company {1},資產{0}不屬於公司{1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,請先輸入採購入庫單
-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 +163,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶，客戶群組，領地，供應商，供應商類型，活動，銷售合作夥伴等。
-DocType: Employee Promotion,Employee Promotion Details,員工促銷詳情
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +83,Net Change in Inventory,在庫存淨變動
-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 +87,Manager,經理
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +8,From Fiscal Year,從財政年度開始
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +185,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 +453,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,銷售人員目標
-DocType: Work Order Operation,In minutes,在幾分鐘內
-DocType: Issue,Resolution Date,決議日期
-DocType: Lab Test Template,Compound,複合
-apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +11,Dispatch Notification,發貨通知
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +56,Select Property,選擇屬性
-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 +1213,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設置
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},貨幣應與價目表貨幣相同：{0}
-DocType: Selling Settings,Customer Naming By,客戶命名由
-DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,將顯示學生每月學生出勤記錄報告為存在
-DocType: Depreciation Schedule,Depreciation Amount,折舊額
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +105,Convert to Group,轉換為集團
-DocType: Activity Cost,Activity Type,活動類型
-DocType: Request for Quotation,For individual supplier,對於個別供應商
-DocType: BOM Operation,Base Hour Rate(Company Currency),基數小時率（公司貨幣）
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Delivered Amount,交付金額
-DocType: Loyalty Point Entry Redemption,Redemption Date,贖回日期
-DocType: Quotation Item,Item Balance,項目平衡
-DocType: Sales Invoice,Packing List,包裝清單
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,購買給供應商的訂單。
-DocType: Clinical Procedure Item,Transfer Qty,轉移數量
-DocType: Purchase Invoice Item,Asset Location,資產位置
-DocType: Tax Rule,Shipping Zipcode,運輸郵編
-DocType: Accounts Settings,Report Settings,報告設置
-DocType: Activity Cost,Projects User,項目用戶
-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 +158,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
-DocType: Asset,Asset Owner Company,資產所有者公司
-DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +257,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +14,Material Transfer,物料轉倉
-DocType: Cost Center,Cost Center Number,成本中心編號
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路徑
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +243,Opening (Dr),開啟（Dr）
-DocType: Compensatory Leave Request,Work End Date,工作結束日期
-DocType: Loan,Applicant,申請人
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +37,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
-apps/erpnext/erpnext/config/accounts.py +293,To make recurring documents,複製文件
-,GST Itemised Purchase Register,GST成品採購登記冊
-DocType: Loan,Total Interest Payable,合計應付利息
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
-DocType: Work Order Operation,Actual Start Time,實際開始時間
-DocType: Purchase Invoice Item,Deferred Expense Account,遞延費用科目
-DocType: BOM Operation,Operation Time,操作時間
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +466,Finish,完
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +441,Base,基礎
-DocType: Timesheet,Total Billed Hours,帳單總時間
-DocType: Travel Itinerary,Travel To,前往
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1659,Write Off Amount,核銷金額
-DocType: Leave Block List Allow,Allow User,允許用戶
-DocType: Journal Entry,Bill No,帳單號碼
-DocType: Company,Gain/Loss Account on Asset Disposal,在資產處置收益/損失科目
-DocType: Vehicle Log,Service Details,服務細節
-DocType: Vehicle Log,Service Details,服務細節
-DocType: Lab Test Template,Grouped,分組
-DocType: Selling Settings,Delivery Note Required,要求送貨單
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,提交工資單......
-DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
-DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
-DocType: Assessment Criteria,Assessment Criteria,評估標準
-DocType: BOM Item,Basic Rate (Company Currency),基礎匯率（公司貨幣）
-apps/erpnext/erpnext/support/doctype/issue/issue.js +38,Split Issue,拆分問題
-DocType: Student Attendance,Student Attendance,學生出勤
-DocType: Sales Invoice Timesheet,Time Sheet,時間表
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
-DocType: Sales Invoice,Port Code,港口代碼
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1031,Reserve Warehouse,儲備倉庫
-DocType: Lead,Lead is an Organization,領導是一個組織
-DocType: Instructor Log,Other Details,其他詳細資訊
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
-DocType: Lab Test,Test Template,測試模板
-apps/erpnext/erpnext/config/non_profit.py +13,Chapter information.,章節信息。
-DocType: Account,Accounts,會計
-DocType: Vehicle,Odometer Value (Last),里程表值（最後）
-apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,供應商計分卡標準模板。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +382,Marketing,市場營銷
-DocType: Sales Invoice,Redeem Loyalty Points,兌換忠誠度積分
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,已創建付款輸入
-DocType: Request for Quotation,Get Suppliers,獲取供應商
-DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/controllers/accounts_controller.py +681,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,預覽工資單
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,帳戶{0}已多次輸入
-DocType: Account,Expenses Included In Valuation,支出計入估值
-apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,如果您的會員資格在30天內到期，您只能續訂
-DocType: Shopping Cart Settings,Show Stock Availability,顯示庫存可用性
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},在資產類別{1}或公司{2}中設置{0}
-DocType: Location,Longitude,經度
-,Absent Student Report,缺席學生報告
-DocType: Crop,Crop Spacing UOM,裁剪間隔UOM
-DocType: Loyalty Program,Single Tier Program,單層計劃
-DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在設置了“現金流量映射器”文檔時才能選擇
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +189,From Address 1,來自地址1
-DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
-DocType: Supplier Scorecard,Per Week,每個星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +725,Item has variants.,項目已變種。
-apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,學生總數
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
-DocType: Bin,Stock Value,庫存價值
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +54,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: Sales Invoice,Commission Rate (%),佣金比率（％）
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
-DocType: Project,Estimated Cost,估計成本
-DocType: Request for Quotation,Link to material requests,鏈接到材料請求
-DocType: Journal Entry,Credit Card Entry,信用卡進入
-apps/erpnext/erpnext/config/accounts.py +35,Company and Accounts,公司與科目
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +85,In Value,在數值
-DocType: Asset Settings,Depreciation Options,折舊選項
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Either location or employee must be required,必須要求地點或員工
-apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,發佈時間無效
-DocType: Salary Component,Condition and Formula,條件和公式
-DocType: Lead,Campaign Name,活動名稱
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +61,There is no leave period in between {0} and {1},{0}和{1}之間沒有休假期限
-DocType: Fee Validity,Healthcare Practitioner,醫療從業者
-DocType: Travel Request Costing,Expense Type,費用類型
-DocType: Selling Settings,Close Opportunity After Days,關閉機會後日
-DocType: Driver,License Details,許可證詳情
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +86,The field From Shareholder cannot be blank,來自股東的字段不能為空
-DocType: Purchase Order,Supply Raw Materials,供應原料
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資產
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,{0} is not a stock Item,{0}不是庫存項目
-apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',請通過點擊“培訓反饋”，然後點擊“新建”
-DocType: Mode of Payment Account,Default Account,預設科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,Please select Sample Retention Warehouse in Stock Settings first,請先在庫存設置中選擇樣品保留倉庫
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +62,Please select the Multiple Tier Program type for more than one collection rules.,請為多個收集規則選擇多層程序類型。
-DocType: Payment Entry,Received Amount (Company Currency),收到的款項（公司幣種）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。請檢查您的GoCardless帳戶以了解更多詳情
-DocType: Delivery Settings,Send with Attachment,發送附件
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +30,Please select weekly off day,請選擇每週休息日
-DocType: Inpatient Record,O Negative,O負面
-DocType: Work Order Operation,Planned End Time,計劃結束時間
-,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
-apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
-apps/erpnext/erpnext/config/non_profit.py +33,Memebership Type Details,Memebership類型詳細信息
-DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
-DocType: Clinical Procedure,Consume Stock,消費庫存
-DocType: Budget,Budget Against,反對財政預算案
-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 +184,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
-DocType: Employee Benefit Application Detail,Max Benefit Amount,最大福利金額
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
-DocType: Opportunity,Opportunity From,機會從
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,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,細節
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：從{0}類型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +399,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +353,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
-DocType: Exchange Rate Revaluation,Exchange Rate Revaluation Account,匯率重估科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +539,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +106,Please select Company and Posting Date to getting entries,請選擇公司和發布日期以獲取條目
-DocType: Asset,Maintenance,維護
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Get from Patient Encounter,從患者遭遇中獲取
-DocType: Subscriber,Subscriber,訂戶
-DocType: Item Attribute Value,Item Attribute Value,項目屬性值
-apps/erpnext/erpnext/projects/doctype/project/project.py +455,Please Update your Project Status,請更新您的項目狀態
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +26,Currency Exchange must be applicable for Buying or for Selling.,貨幣兌換必須適用於買入或賣出。
-DocType: Item,Maximum sample quantity that can be retained,可以保留的最大樣品數量
-DocType: Project Update,How is the Project Progressing Right Now?,項目現在進展如何？
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +505,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},對於採購訂單{3}，行{0}＃項目{1}不能超過{2}
-apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,銷售活動。
-DocType: Project Task,Make Timesheet,製作時間表
-DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+Posted By,發布者
+Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
+Confirmation Message,確認訊息
+Database of potential customers.,數據庫的潛在客戶。
+Customer or Item,客戶或項目
+Customer database.,客戶數據庫。
+Quotation To,報價到
+Opening (Cr),開啟（Cr ）
+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.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
+Allocated amount can not be negative,分配金額不能為負
+Please set the Company,請設定公司
+Share Balance,份額平衡
+AWS Access Key ID,AWS訪問密鑰ID,
+Billed Amt,已結算額
+Training Result Employee,訓練結果員工
+A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
+Total Outstanding: {0},總計：{0}
+Sales Invoice Timesheet,銷售發票時間表
+Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
+Select Payment Account to make Bank Entry,選擇付款科目，使銀行進入
+Default Invoice Naming Series,默認發票命名系列
+"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉，報銷和工資
+An error occurred during the update process,更新過程中發生錯誤
+Restaurant Reservation,餐廳預訂
+Proposal Writing,提案寫作
+Payment Entry Deduction,輸入付款扣除
+Wrapping up,包起來
+Notify Customers via Email,通過電子郵件通知客戶
+Batch Number Series,批號系列
+Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID,
+Claimed Amount,聲明金額
+Authorization Settings,授權設置
+Departure Datetime,離開日期時間
+Travel Request Costing,旅行請求成本計算
+Masters,資料主檔
+Employee Onboarding Template,員工入職模板
+Maximum Assessment Score,最大考核評分
+Update Bank Transaction Dates,更新銀行交易日期
+Time Tracking,時間跟踪
+DUPLICATE FOR TRANSPORTER,輸送機重複
+Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}＃付費金額不能大於請求的提前金額
+Fiscal Year Company,會計年度公司
+DN Detail,DN詳細
+Conference,會議
+Default Salary Structure,默認工資結構
+Billed,計費
+Batch Description,批次說明
+Creating student groups,創建學生組
+Creating student groups,創建學生組
+"Payment Gateway Account not created, please create one manually.",支付閘道科目沒有創建，請手動創建一個。
+Not eligible for the admission in this program as per DOB,按照DOB的規定，沒有資格參加本計劃
+Sales Taxes and Charges,銷售稅金及費用
+Sibling Details,兄弟姐妹詳情
+Vehicle Service,汽車服務
+Automatically triggers the feedback request based on conditions.,自動觸發基於條件的反饋請求。
+Reason for Resignation,辭退原因
+Credit Note Issued,信用票據發行
+Invoice/Journal Entry Details,發票/日記帳分錄詳細資訊
+{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
+Settings for Buying Module,設置購買模塊
+Asset {0} does not belong to company {1},資產{0}不屬於公司{1}
+Please enter Purchase Receipt first,請先輸入採購入庫單
+Supplier Naming By,供應商命名
+Default Costing Rate,默認成本核算率
+Maintenance Schedule,維護計劃
+"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶，客戶群組，領地，供應商，供應商類型，活動，銷售合作夥伴等。
+Employee Promotion Details,員工促銷詳情
+Net Change in Inventory,在庫存淨變動
+Passport Number,護照號碼
+Relation with Guardian2,與關係Guardian2,
+Manager,經理
+From Fiscal Year,從財政年度開始
+New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
+Please set account in Warehouse {0},請在倉庫{0}中設置會計科目
+'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
+Sales Person Targets,銷售人員目標
+In minutes,在幾分鐘內
+Resolution Date,決議日期
+Compound,複合
+Dispatch Notification,發貨通知
+Select Property,選擇屬性
+Max number of visit,最大訪問次數
+Timesheet created:,創建時間表：
+Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+Enroll,註冊
+GST Settings,GST設置
+Currency should be same as Price List Currency: {0},貨幣應與價目表貨幣相同：{0}
+Customer Naming By,客戶命名由
+Will show the student as Present in Student Monthly Attendance Report,將顯示學生每月學生出勤記錄報告為存在
+Depreciation Amount,折舊額
+Convert to Group,轉換為集團
+Activity Type,活動類型
+For individual supplier,對於個別供應商
+Base Hour Rate(Company Currency),基數小時率（公司貨幣）
+Delivered Amount,交付金額
+Redemption Date,贖回日期
+Item Balance,項目平衡
+Packing List,包裝清單
+Purchase Orders given to Suppliers.,購買給供應商的訂單。
+Transfer Qty,轉移數量
+Asset Location,資產位置
+Shipping Zipcode,運輸郵編
+Report Settings,報告設置
+Projects User,項目用戶
+Consumed,消費
+{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
+Asset Owner Company,資產所有者公司
+Round Off Cost Center,四捨五入成本中心
+Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+Material Transfer,物料轉倉
+Cost Center Number,成本中心編號
+Could not find path for ,找不到路徑
+Opening (Dr),開啟（Dr）
+Work End Date,工作結束日期
+Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
+To make recurring documents,複製文件
+GST Itemised Purchase Register,GST成品採購登記冊
+Landed Cost Taxes and Charges,到岸成本稅費
+Actual Start Time,實際開始時間
+Deferred Expense Account,遞延費用科目
+Operation Time,操作時間
+Finish,完
+Base,基礎
+Total Billed Hours,帳單總時間
+Travel To,前往
+Write Off Amount,核銷金額
+Allow User,允許用戶
+Bill No,帳單號碼
+Gain/Loss Account on Asset Disposal,在資產處置收益/損失科目
+Service Details,服務細節
+Service Details,服務細節
+Grouped,分組
+Delivery Note Required,要求送貨單
+Submitting Salary Slips...,提交工資單......
+Bank Guarantee Number,銀行擔保編號
+Bank Guarantee Number,銀行擔保編號
+Assessment Criteria,評估標準
+Basic Rate (Company Currency),基礎匯率（公司貨幣）
+Split Issue,拆分問題
+Student Attendance,學生出勤
+Time Sheet,時間表
+Backflush Raw Materials Based On,倒沖原物料基於
+Port Code,港口代碼
+Reserve Warehouse,儲備倉庫
+Lead is an Organization,領導是一個組織
+Other Details,其他詳細資訊
+Suplier,Suplier,
+Test Template,測試模板
+Chapter information.,章節信息。
+Accounts,會計
+Odometer Value (Last),里程表值（最後）
+Templates of supplier scorecard criteria.,供應商計分卡標準模板。
+Marketing,市場營銷
+Redeem Loyalty Points,兌換忠誠度積分
+Payment Entry is already created,已創建付款輸入
+Get Suppliers,獲取供應商
+Current Stock,當前庫存
+Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
+Preview Salary Slip,預覽工資單
+Account {0} has been entered multiple times,帳戶{0}已多次輸入
+Expenses Included In Valuation,支出計入估值
+You can only renew if your membership expires within 30 days,如果您的會員資格在30天內到期，您只能續訂
+Show Stock Availability,顯示庫存可用性
+Set {0} in asset category {1} or company {2},在資產類別{1}或公司{2}中設置{0}
+Longitude,經度
+Absent Student Report,缺席學生報告
+Crop Spacing UOM,裁剪間隔UOM,
+Single Tier Program,單層計劃
+Only select if you have setup Cash Flow Mapper documents,只有在設置了“現金流量映射器”文檔時才能選擇
+From Address 1,來自地址1,
+Next email will be sent on:,接下來的電子郵件將被發送：
+Per Week,每個星期
+Item has variants.,項目已變種。
+Total Student,學生總數
+Item {0} not found,項{0}未找到
+Stock Value,庫存價值
+Tree Type,樹類型
+Qty Consumed Per Unit,數量消耗每單位
+IGST Account,IGST帳戶
+Warranty Expiry Date,保證期到期日
+Quantity and Warehouse,數量和倉庫
+Commission Rate (%),佣金比率（％）
+Please select Program,請選擇程序
+Please select Program,請選擇程序
+Estimated Cost,估計成本
+Link to material requests,鏈接到材料請求
+Credit Card Entry,信用卡進入
+Company and Accounts,公司與科目
+In Value,在數值
+Depreciation Options,折舊選項
+Either location or employee must be required,必須要求地點或員工
+Invalid Posting Time,發佈時間無效
+Condition and Formula,條件和公式
+Campaign Name,活動名稱
+There is no leave period in between {0} and {1},{0}和{1}之間沒有休假期限
+Healthcare Practitioner,醫療從業者
+Expense Type,費用類型
+Close Opportunity After Days,關閉機會後日
+License Details,許可證詳情
+The field From Shareholder cannot be blank,來自股東的字段不能為空
+Supply Raw Materials,供應原料
+Current Assets,流動資產
+{0} is not a stock Item,{0}不是庫存項目
+Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',請通過點擊“培訓反饋”，然後點擊“新建”
+Default Account,預設科目
+Please select Sample Retention Warehouse in Stock Settings first,請先在庫存設置中選擇樣品保留倉庫
+Please select the Multiple Tier Program type for more than one collection rules.,請為多個收集規則選擇多層程序類型。
+Received Amount (Company Currency),收到的款項（公司幣種）
+Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
+Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。請檢查您的GoCardless帳戶以了解更多詳情
+Send with Attachment,發送附件
+Please select weekly off day,請選擇每週休息日
+O Negative,O負面
+Planned End Time,計劃結束時間
+Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
+Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+Memebership Type Details,Memebership類型詳細信息
+Customer's Purchase Order No,客戶的採購訂單編號
+Consume Stock,消費庫存
+Budget Against,反對財政預算案
+Auto Material Requests Generated,汽車材料的要求生成
+Lost,丟失
+You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
+Max Benefit Amount,最大福利金額
+Reserved for manufacturing,預留製造
+Opportunity From,機會從
+Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
+Please select a table,請選擇一張桌子
+Website Specifications,網站規格
+Particulars,細節
+{0}: From {0} of type {1},{0}：從{0}類型{1}
+Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
+Exchange Rate Revaluation Account,匯率重估科目
+Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+Please select Company and Posting Date to getting entries,請選擇公司和發布日期以獲取條目
+Maintenance,維護
+Get from Patient Encounter,從患者遭遇中獲取
+Subscriber,訂戶
+Item Attribute Value,項目屬性值
+Please Update your Project Status,請更新您的項目狀態
+Currency Exchange must be applicable for Buying or for Selling.,貨幣兌換必須適用於買入或賣出。
+Maximum sample quantity that can be retained,可以保留的最大樣品數量
+How is the Project Progressing Right Now?,項目現在進展如何？
+Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},對於採購訂單{3}，行{0}＃項目{1}不能超過{2}
+Sales campaigns.,銷售活動。
+Make Timesheet,製作時間表
+"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
-#### Note
+#### Note,
The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
-#### Description of Columns
+#### Description of Columns,
1. Calculation Type:
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
-2. Account Head: The Account ledger under which this tax will be booked
+2. Account Head: The Account ledger under which this tax will be booked,
3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
4. Description: Description of the tax (that will be printed in invoices / quotes).
5. Rate: Tax rate.
@@ -1137,2190 +1130,2173 @@
7。總計：累積總數達到了這一點。
8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
9。這是含稅的基本速率？：如果你檢查這一點，就意味著這個稅不會顯示在項目表中，但在你的主項表將被納入基本速率。你想要給一個單位的價格（包括所有稅費）的價格為顧客這是非常有用的。"
-DocType: Employee,Bank A/C No.,銀行A/C No.
-DocType: Quality Inspection Reading,Reading 7,7閱讀
-DocType: Lab Test,Lab Test,實驗室測試
-DocType: Student Report Generation Tool,Student Report Generation Tool,學生報告生成工具
-DocType: Healthcare Schedule Time Slot,Healthcare Schedule Time Slot,醫療保健計劃時間槽
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +163,Doc Name,文件名稱
-DocType: Expense Claim Detail,Expense Claim Type,費用報銷型
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,對購物車的預設設定
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +27,Add Timeslots,添加時代
-apps/erpnext/erpnext/stock/__init__.py +57,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},請在倉庫{0}中設科目或在公司{1}中設置默認庫存科目
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +143,Asset scrapped via Journal Entry {0},通過資產日記帳分錄報廢{0}
-DocType: Loan,Interest Income Account,利息收入科目
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +61,Max benefits should be greater than zero to dispense benefits,最大的好處應該大於零來分配好處
-apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,審核邀請已發送
-DocType: Shift Assignment,Shift Assignment,班次分配
-DocType: Employee Transfer Property,Employee Transfer Property,員工轉移財產
-apps/erpnext/erpnext/accounts/doctype/cashier_closing/cashier_closing.py +36,From Time Should Be Less Than To Time,從時間應該少於時間
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,生物技術
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1121,"Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
+Bank A/C No.,銀行A/C No.
+Reading 7,7閱讀
+Lab Test,實驗室測試
+Student Report Generation Tool,學生報告生成工具
+Healthcare Schedule Time Slot,醫療保健計劃時間槽
+Doc Name,文件名稱
+Expense Claim Type,費用報銷型
+Default settings for Shopping Cart,對購物車的預設設定
+Add Timeslots,添加時代
+Please set Account in Warehouse {0} or Default Inventory Account in Company {1},請在倉庫{0}中設科目或在公司{1}中設置默認庫存科目
+Asset scrapped via Journal Entry {0},通過資產日記帳分錄報廢{0}
+Max benefits should be greater than zero to dispense benefits,最大的好處應該大於零來分配好處
+Review Invitation Sent,審核邀請已發送
+Shift Assignment,班次分配
+Employee Transfer Property,員工轉移財產
+From Time Should Be Less Than To Time,從時間應該少於時間
+Biotechnology,生物技術
+"Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
to fullfill Sales Order {2}.",無法將項目{0}（序列號：{1}）用作reserverd \以完成銷售訂單{2}。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Office Maintenance Expenses,Office維護費用
-apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,去
-DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,將Shopify更新到ERPNext價目表
-apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,設置電子郵件帳戶
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,請先輸入品項
-DocType: Asset Repair,Downtime,停機
-DocType: Account,Liability,責任
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +228,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +14,Academic Term: ,學術期限：
-DocType: Salary Component,Do not include in total,不包括在內
-DocType: Company,Default Cost of Goods Sold Account,銷貨成本科目
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1287,Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
-apps/erpnext/erpnext/stock/get_item_details.py +523,Price List not selected,未選擇價格列表
-DocType: Request for Quotation Supplier,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +257,Warning: Invalid Attachment {0},警告：無效的附件{0}
-DocType: Item,Max Sample Quantity,最大樣品量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +810,No Permission,無權限
-DocType: Contract Fulfilment Checklist,Contract Fulfilment Checklist,合同履行清單
-DocType: Vital Signs,Heart Rate / Pulse,心率/脈搏
-DocType: Company,Default Bank Account,預設銀行會計科目
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +76,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'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 +146,Nos,NOS
-DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
-apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,實驗室測試和重要標誌
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +685,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,無發現任何員工
-DocType: Item,If subcontracted to a vendor,如果分包給供應商
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
-apps/erpnext/erpnext/config/projects.py +18,Project Update.,項目更新。
-DocType: SMS Center,All Customer Contact,所有的客戶聯絡
-DocType: Location,Tree Details,樹詳細信息
-DocType: Marketplace Settings,Registered,註冊
-DocType: Training Event,Event Status,事件狀態
-DocType: Volunteer,Availability Timeslot,可用時間段
-,Support Analytics,支援分析
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +410,"If you have any questions, please get back to us.",如果您有任何疑問，請再次與我們聯繫。
-DocType: Cash Flow Mapper,Cash Flow Mapper,現金流量映射器
-DocType: Item,Website Warehouse,網站倉庫
-DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不屬於公司{3}
-apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),上傳你的信頭（保持網頁友好，900px乘100px）
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}科目{2}不能是一個群組科目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +367,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
-apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +81,Sales Invoice {0} created as paid,銷售發票{0}已創建為已付款
-DocType: Item Variant Settings,Copy Fields to Variant,將字段複製到變式
-DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +50,Score must be less than or equal to 5,得分必須小於或等於5
-DocType: Program Enrollment Tool,Program Enrollment Tool,計劃註冊工具
-apps/erpnext/erpnext/config/accounts.py +298,C-Form records,C-往績紀錄
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +74,The shares already exist,股份已經存在
-apps/erpnext/erpnext/config/selling.py +322,Customer and Supplier,客戶和供應商
-DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +412,Thank you for your business!,感謝您的業務！
-apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,客戶支持查詢。
-DocType: Employee Property History,Employee Property History,員工財產歷史
-DocType: Setup Progress Action,Action Doctype,行動Doctype
-DocType: HR Settings,Retirement Age,退休年齡
-DocType: Bin,Moving Average Rate,移動平均房價
-DocType: Production Plan,Select Items,選擇項目
-DocType: Share Transfer,To Shareholder,給股東
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +408,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +213,From State,來自州
-apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Institution,設置機構
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +73,Allocating leaves...,分配葉子......
-DocType: Program Enrollment,Vehicle/Bus Number,車輛/巴士號碼
-apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,課程表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +570,"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
+Office Maintenance Expenses,Office維護費用
+Go to ,去
+Update Price from Shopify To ERPNext Price List,將Shopify更新到ERPNext價目表
+Setting up Email Account,設置電子郵件帳戶
+Please enter Item first,請先輸入品項
+Downtime,停機
+Liability,責任
+Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
+Academic Term: ,學術期限：
+Do not include in total,不包括在內
+Default Cost of Goods Sold Account,銷貨成本科目
+Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
+Price List not selected,未選擇價格列表
+Send Email,發送電子郵件
+Warning: Invalid Attachment {0},警告：無效的附件{0}
+Max Sample Quantity,最大樣品量
+No Permission,無權限
+Contract Fulfilment Checklist,合同履行清單
+Heart Rate / Pulse,心率/脈搏
+Default Bank Account,預設銀行會計科目
+"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
+'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
+Acquisition Date,採集日期
+Nos,NOS,
+Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
+Lab Tests and Vital Signs,實驗室測試和重要標誌
+Bank Reconciliation Detail,銀行對帳詳細
+Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
+No employee found,無發現任何員工
+If subcontracted to a vendor,如果分包給供應商
+Student Group is already updated.,學生組已經更新。
+Student Group is already updated.,學生組已經更新。
+Project Update.,項目更新。
+All Customer Contact,所有的客戶聯絡
+Tree Details,樹詳細信息
+Registered,註冊
+Event Status,事件狀態
+Availability Timeslot,可用時間段
+Support Analytics,支援分析
+"If you have any questions, please get back to us.",如果您有任何疑問，請再次與我們聯繫。
+Cash Flow Mapper,現金流量映射器
+Website Warehouse,網站倉庫
+Minimum Invoice Amount,最小發票金額
+{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不屬於公司{3}
+Upload your letter head (Keep it web friendly as 900px by 100px),上傳你的信頭（保持網頁友好，900px乘100px）
+{0} {1}: Account {2} cannot be a Group,{0} {1}科目{2}不能是一個群組科目
+Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+No tasks,沒有任務
+Sales Invoice {0} created as paid,銷售發票{0}已創建為已付款
+Copy Fields to Variant,將字段複製到變式
+Opening Accumulated Depreciation,打開累計折舊
+Score must be less than or equal to 5,得分必須小於或等於5,
+Program Enrollment Tool,計劃註冊工具
+C-Form records,C-往績紀錄
+The shares already exist,股份已經存在
+Customer and Supplier,客戶和供應商
+Email Digest Settings,電子郵件摘要設定
+Thank you for your business!,感謝您的業務！
+Support queries from customers.,客戶支持查詢。
+Employee Property History,員工財產歷史
+Action Doctype,行動Doctype,
+Retirement Age,退休年齡
+Moving Average Rate,移動平均房價
+Select Items,選擇項目
+To Shareholder,給股東
+{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+From State,來自州
+Setup Institution,設置機構
+Allocating leaves...,分配葉子......
+Vehicle/Bus Number,車輛/巴士號碼
+Course Schedule,課程表
+"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
Employee Benefits in the last Salary Slip of Payroll Period",您必須在工資核算期的最後一個工資單上扣除未提交的免稅證明和無人認領的\員工福利稅
-DocType: Request for Quotation Supplier,Quote Status,報價狀態
-DocType: Maintenance Visit,Completion Status,完成狀態
-DocType: Daily Work Summary Group,Select Users,選擇用戶
-DocType: Hotel Room Pricing Item,Hotel Room Pricing Item,酒店房間定價項目
-DocType: Loyalty Program Collection,Tier Name,等級名稱
-DocType: HR Settings,Enter retirement age in years,在年內進入退休年齡
-DocType: Crop,Target Warehouse,目標倉庫
-DocType: Payroll Employee Detail,Payroll Employee Detail,薪資員工詳細信息
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,請選擇一個倉庫
-DocType: Cheque Print Template,Starting location from left edge,從左邊起始位置
-DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
-DocType: Upload Attendance,Import Attendance,進口出席
-apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,所有項目群組
-DocType: Work Order,Item To Manufacture,產品製造
-apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的狀態為{2}
-DocType: Water Analysis,Collection Temperature ,收集溫度
-DocType: Employee,Provide Email Address registered in company,提供公司註冊郵箱地址
-DocType: Shopping Cart Settings,Enable 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,預計數量
-DocType: Drug Prescription,Interval UOM,間隔UOM
-DocType: Customer,"Reselect, if the chosen address is edited after save",重新選擇，如果所選地址在保存後被編輯
-apps/erpnext/erpnext/stock/doctype/item/item.js +607,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
-DocType: Item,Hub Publishing Details,Hub發布細節
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +153,'Opening',“開放”
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
-DocType: Issue,Via Customer Portal,通過客戶門戶
-DocType: Notification Control,Delivery Note Message,送貨單留言
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +322,SGST Amount,SGST金額
-DocType: Lab Test Template,Result Format,結果格式
-DocType: Expense Claim,Expenses,開支
-DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
-,Purchase Receipt Trends,採購入庫趨勢
-DocType: Vehicle Service,Brake Pad,剎車片
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +392,Research & Development,研究與發展
-apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,帳單數額
-DocType: Company,Registration Details,註冊細節
-DocType: Timesheet,Total Billed Amount,總開單金額
-DocType: Item Reorder,Re-Order Qty,重新排序數量
-DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +101,BOM #{0}: Raw material cannot be same as main Item,物料清單＃{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,在外購入庫單項目表總的相關費用必須是相同的總稅費
-DocType: Sales Team,Incentives,獎勵
-DocType: SMS Log,Requested Numbers,請求號碼
-DocType: Volunteer,Evening,晚間
-DocType: Customer,Bypass credit limit check at Sales Order,在銷售訂單旁邊繞過信貸限額檢查
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +106,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
-DocType: Sales Invoice Item,Stock Details,庫存詳細訊息
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
-apps/erpnext/erpnext/config/selling.py +332,Point-of-Sale,銷售點
-DocType: Fee Schedule,Fee Creation Status,費用創建狀態
-DocType: Vehicle Log,Odometer Reading,里程表讀數
-apps/erpnext/erpnext/accounts/doctype/account/account.py +123,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",科目餘額已歸為貸方，不允許設為借方
-DocType: Account,Balance must be,餘額必須
-DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
-,Available Qty,可用數量
-DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,默認倉庫到創建銷售訂單和交貨單
-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: Amazon MWS Settings,Always synch your products from Amazon MWS before synching the Orders details,在同步訂單詳細信息之前，始終從亞馬遜MWS同步您的產品
-DocType: Delivery Trip,Delivery Stops,交貨停止
-apps/erpnext/erpnext/accounts/deferred_revenue.py +33,Cannot change Service Stop Date for item in row {0},無法更改行{0}中項目的服務停止日期
-DocType: Serial No,Incoming Rate,傳入速率
-DocType: Leave Type,Encashment Threshold Days,封存閾值天數
-,Final Assessment Grades,最終評估等級
-apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
-DocType: HR Settings,Include holidays in Total no. of Working Days,包括節假日的總數。工作日
-apps/erpnext/erpnext/setup/setup_wizard/operations/sample_data.py +107,Setup your Institute in ERPNext,在ERPNext中設置您的研究所
-DocType: Job Applicant,Hold,持有
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +101,Alternate Item,替代項目
-DocType: Project Update,Progress Details,進度細節
-DocType: Shopify Log,Request Data,請求數據
-DocType: Employee,Date of Joining,加入日期
-DocType: Supplier Quotation,Is Subcontracted,轉包
-DocType: Item Attribute,Item Attribute Values,項目屬性值
-DocType: Examination Result,Examination Result,考試成績
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +928,Purchase Receipt,採購入庫單
-,Received Items To Be Billed,待付款的收受品項
-apps/erpnext/erpnext/config/accounts.py +271,Currency exchange rate master.,貨幣匯率的主人。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +210,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
-apps/erpnext/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js +46,Filter Total Zero Qty,過濾器總計零數量
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +322,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
-DocType: Work 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 +628,BOM {0} must be active,BOM {0}必須是積極的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,沒有可用於傳輸的項目
-DocType: Employee Boarding Activity,Activity Name,活動名稱
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +867,Change Release Date,更改發布日期
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +218,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品數量<b>{0}</b>和數量<b>{1}</b>不能不同
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +256,Closing (Opening + Total),閉幕（開幕+總計）
-DocType: Delivery Settings,Dispatch Notification Attachment,發貨通知附件
-DocType: Payroll Entry,Number Of Employees,在職員工人數
-DocType: Journal Entry,Depreciation Entry,折舊分錄
-apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +31,Please select the document type first,請先選擇文檔類型
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
-DocType: Pricing Rule,Rate or Discount,價格或折扣
-DocType: Vital Signs,One Sided,單面
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
-DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
-DocType: Marketplace Settings,Custom Data,自定義數據
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
-apps/erpnext/erpnext/controllers/buying_controller.py +582,Serial no is mandatory for the item {0},序列號對於項目{0}是強制性的
-DocType: Bank Reconciliation,Total Amount,總金額
-apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +24,From Date and To Date lie in different Fiscal Year,從日期和到期日位於不同的財政年度
-apps/erpnext/erpnext/healthcare/utils.py +160,The Patient {0} do not have customer refrence to invoice,患者{0}沒有客戶參考發票
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,互聯網出版
-DocType: Prescription Duration,Number,數
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +25,Creating {0} Invoice,創建{0}發票
-DocType: Medical Code,Medical Code Standard,醫療代碼標準
-DocType: Item Group,Item Group Defaults,項目組默認值
-apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +102,Please save before assigning task.,在分配任務之前請保存。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +89,Balance Value,餘額
-DocType: Lab Test,Lab Technician,實驗室技術員
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Sales Price List,銷售價格表
-DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
+Quote Status,報價狀態
+Completion Status,完成狀態
+Select Users,選擇用戶
+Hotel Room Pricing Item,酒店房間定價項目
+Tier Name,等級名稱
+Enter retirement age in years,在年內進入退休年齡
+Target Warehouse,目標倉庫
+Payroll Employee Detail,薪資員工詳細信息
+Please select a warehouse,請選擇一個倉庫
+Starting location from left edge,從左邊起始位置
+Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
+Import Attendance,進口出席
+All Item Groups,所有項目群組
+Item To Manufacture,產品製造
+{0} {1} status is {2},{0} {1}的狀態為{2}
+Collection Temperature ,收集溫度
+Provide Email Address registered in company,提供公司註冊郵箱地址
+Enable Checkout,啟用結帳
+Purchase Order to Payment,採購訂單到付款
+Projected Qty,預計數量
+Interval UOM,間隔UOM,
+"Reselect, if the chosen address is edited after save",重新選擇，如果所選地址在保存後被編輯
+Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+Hub Publishing Details,Hub發布細節
+'Opening',“開放”
+Open To Do,開做
+Via Customer Portal,通過客戶門戶
+Delivery Note Message,送貨單留言
+SGST Amount,SGST金額
+Result Format,結果格式
+Expenses,開支
+Item Variant Attribute,產品規格屬性
+Purchase Receipt Trends,採購入庫趨勢
+Brake Pad,剎車片
+Research & Development,研究與發展
+Amount to Bill,帳單數額
+Registration Details,註冊細節
+Total Billed Amount,總開單金額
+Re-Order Qty,重新排序數量
+Leave Block List Date,休假區塊清單日期表
+BOM #{0}: Raw material cannot be same as main Item,物料清單＃{0}：原始材料與主要項目不能相同
+Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外購入庫單項目表總的相關費用必須是相同的總稅費
+Incentives,獎勵
+Requested Numbers,請求號碼
+Evening,晚間
+Bypass credit limit check at Sales Order,在銷售訂單旁邊繞過信貸限額檢查
+"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
+Stock Details,庫存詳細訊息
+Project Value,專案值
+Point-of-Sale,銷售點
+Fee Creation Status,費用創建狀態
+Odometer Reading,里程表讀數
+"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",科目餘額已歸為貸方，不允許設為借方
+Balance must be,餘額必須
+Expense Claim Rejected Message,報銷回絕訊息
+Available Qty,可用數量
+Default Warehouse to to create Sales Order and Delivery Note,默認倉庫到創建銷售訂單和交貨單
+On Previous Row Total,在上一行共
+Rejected Qty,被拒絕的數量
+Action Field,行動領域
+Manage Customer,管理客戶
+Always synch your products from Amazon MWS before synching the Orders details,在同步訂單詳細信息之前，始終從亞馬遜MWS同步您的產品
+Delivery Stops,交貨停止
+Cannot change Service Stop Date for item in row {0},無法更改行{0}中項目的服務停止日期
+Incoming Rate,傳入速率
+Encashment Threshold Days,封存閾值天數
+Final Assessment Grades,最終評估等級
+The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
+Include holidays in Total no. of Working Days,包括節假日的總數。工作日
+Setup your Institute in ERPNext,在ERPNext中設置您的研究所
+Hold,持有
+Alternate Item,替代項目
+Progress Details,進度細節
+Request Data,請求數據
+Date of Joining,加入日期
+Is Subcontracted,轉包
+Item Attribute Values,項目屬性值
+Examination Result,考試成績
+Purchase Receipt,採購入庫單
+Received Items To Be Billed,待付款的收受品項
+Currency exchange rate master.,貨幣匯率的主人。
+Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
+Filter Total Zero Qty,過濾器總計零數量
+Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
+Plan material for sub-assemblies,計劃材料為子組件
+Sales Partners and Territory,銷售合作夥伴和地區
+BOM {0} must be active,BOM {0}必須是積極的
+No Items available for transfer,沒有可用於傳輸的項目
+Activity Name,活動名稱
+Change Release Date,更改發布日期
+Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品數量<b>{0}</b>和數量<b>{1}</b>不能不同
+Closing (Opening + Total),閉幕（開幕+總計）
+Dispatch Notification Attachment,發貨通知附件
+Number Of Employees,在職員工人數
+Depreciation Entry,折舊分錄
+Please select the document type first,請先選擇文檔類型
+Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
+Rate or Discount,價格或折扣
+One Sided,單面
+Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
+Required Qty,所需數量
+Custom Data,自定義數據
+Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
+Serial no is mandatory for the item {0},序列號對於項目{0}是強制性的
+Total Amount,總金額
+From Date and To Date lie in different Fiscal Year,從日期和到期日位於不同的財政年度
+The Patient {0} do not have customer refrence to invoice,患者{0}沒有客戶參考發票
+Internet Publishing,互聯網出版
+Number,數
+Creating {0} Invoice,創建{0}發票
+Medical Code Standard,醫療代碼標準
+Item Group Defaults,項目組默認值
+Please save before assigning task.,在分配任務之前請保存。
+Balance Value,餘額
+Lab Technician,實驗室技術員
+Sales Price List,銷售價格表
+"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.",如果選中，將創建一個客戶，映射到患者。將針對該客戶創建病人發票。您也可以在創建患者時選擇現有客戶。
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +63,Customer isn't enrolled in any Loyalty Program,客戶未加入任何忠誠度計劃
-DocType: Bank Reconciliation,Account Currency,科目幣種
-DocType: Lab Test,Sample ID,樣品編號
-apps/erpnext/erpnext/accounts/general_ledger.py +178,Please mention Round Off Account in Company,請註明舍入科目的公司
-DocType: Purchase Receipt,Range,範圍
-DocType: Supplier,Default Payable Accounts,預設應付帳款
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +52,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
-DocType: Fee Structure,Components,組件
-DocType: Support Search Source,Search Term Param Name,搜索字詞Param Name
-DocType: Item Barcode,Item Barcode,商品條碼
-DocType: Woocommerce Settings,Endpoints,端點
-apps/erpnext/erpnext/stock/doctype/item/item.py +720,Item Variants {0} updated,項目變種{0}更新
-DocType: Quality Inspection Reading,Reading 6,6閱讀
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +994,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
-DocType: Share Transfer,From Folio No,來自Folio No
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +231,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
-apps/erpnext/erpnext/config/accounts.py +214,Define budget for a financial year.,定義預算財政年度。
-DocType: Shopify Tax Account,ERPNext Account,ERPNext帳戶
-apps/erpnext/erpnext/controllers/accounts_controller.py +58,{0} is blocked so this transaction cannot proceed,{0}被阻止，所以此事務無法繼續
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded on MR,如果累計每月預算超過MR，則採取行動
-DocType: Work Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +130,Healthcare Practitioner {0} not available on {1},{1}上沒有醫療從業者{0}
-DocType: Payment Terms Template,Payment Terms Template,付款條款模板
-apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,品牌
-DocType: Manufacturing Settings,Allow Multiple Material Consumption,允許多種材料消耗
-DocType: Employee,Exit Interview Details,退出面試細節
-DocType: Item,Is Purchase Item,是購買項目
-DocType: Bank Statement Transaction Invoice Item,Purchase Invoice,採購發票
-DocType: Manufacturing Settings,Allow multiple Material Consumption against a Work Order,針對工作單允許多種材料消耗
-DocType: GL Entry,Voucher Detail No,券詳細說明暫無
-apps/erpnext/erpnext/accounts/page/pos/pos.js +796,New Sales Invoice,新的銷售發票
-DocType: Stock Entry,Total Outgoing Value,出貨總計值
-DocType: Healthcare Practitioner,Appointments,約會
-apps/erpnext/erpnext/public/js/account_tree_grid.js +223,Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
-DocType: Lead,Request for Information,索取資料
-,LeaderBoard,排行榜
-DocType: Sales Invoice Item,Rate With Margin (Company Currency),利率保證金（公司貨幣）
-apps/erpnext/erpnext/accounts/page/pos/pos.js +809,Sync Offline Invoices,同步離線發票
-DocType: Payment Request,Paid,付費
-DocType: Program Fee,Program Fee,課程費用
-DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
+Customer isn't enrolled in any Loyalty Program,客戶未加入任何忠誠度計劃
+Account Currency,科目幣種
+Sample ID,樣品編號
+Please mention Round Off Account in Company,請註明舍入科目的公司
+Range,範圍
+Default Payable Accounts,預設應付帳款
+Employee {0} is not active or does not exist,員工{0}不活躍或不存在
+Components,組件
+Search Term Param Name,搜索字詞Param Name,
+Item Barcode,商品條碼
+Endpoints,端點
+Item Variants {0} updated,項目變種{0}更新
+Reading 6,6閱讀
+Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
+From Folio No,來自Folio No,
+Purchase Invoice Advance,購買發票提前
+Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+Define budget for a financial year.,定義預算財政年度。
+ERPNext Account,ERPNext帳戶
+{0} is blocked so this transaction cannot proceed,{0}被阻止，所以此事務無法繼續
+Action if Accumulated Monthly Budget Exceeded on MR,如果累計每月預算超過MR，則採取行動
+Operation completed for how many finished goods?,操作完成多少成品？
+Healthcare Practitioner {0} not available on {1},{1}上沒有醫療從業者{0}
+Payment Terms Template,付款條款模板
+The Brand,品牌
+Allow Multiple Material Consumption,允許多種材料消耗
+Exit Interview Details,退出面試細節
+Is Purchase Item,是購買項目
+Purchase Invoice,採購發票
+Allow multiple Material Consumption against a Work Order,針對工作單允許多種材料消耗
+Voucher Detail No,券詳細說明暫無
+New Sales Invoice,新的銷售發票
+Total Outgoing Value,出貨總計值
+Appointments,約會
+Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
+Request for Information,索取資料
+LeaderBoard,排行榜
+Rate With Margin (Company Currency),利率保證金（公司貨幣）
+Sync Offline Invoices,同步離線發票
+Paid,付費
+Program Fee,課程費用
+"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
It also updates latest price in all the BOMs.",替換使用所有其他BOM的特定BOM。它將替換舊的BOM鏈接，更新成本，並按照新的BOM重新生成“BOM爆炸項目”表。它還更新了所有BOM中的最新價格。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +483,The following Work Orders were created:,以下工作訂單已創建：
-DocType: Salary Slip,Total in words,總計大寫
-DocType: Inpatient Record,Discharged,出院
-DocType: Material Request Item,Lead Time Date,交貨時間日期
-,Employee Advance Summary,員工提前總結
-DocType: Guardian,Guardian Name,監護人姓名
-DocType: Cheque Print Template,Has Print Format,擁有打印格式
-DocType: Support Settings,Get Started Sections,入門部分
-DocType: Loan,Sanctioned,制裁
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +8,Total Contribution Amount: {0},總貢獻金額：{0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +179,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
-DocType: Payroll Entry,Salary Slips Submitted,提交工資單
-DocType: Crop Cycle,Crop Cycle,作物週期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +678,"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.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +201,From Place,從地方
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +460,Net Pay cannnot be negative,淨薪酬不能為負
-DocType: Student Admission,Publish on website,發布在網站上
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +778,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
-DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
-DocType: Agriculture Task,Agriculture Task,農業任務
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Indirect Income,間接收入
-DocType: Student Attendance Tool,Student Attendance Tool,學生考勤工具
-DocType: Restaurant Menu,Price List (Auto created),價目表（自動創建）
-DocType: Cheque Print Template,Date Settings,日期設定
-DocType: Employee Promotion,Employee Promotion Detail,員工促銷細節
-,Company Name,公司名稱
-DocType: SMS Center,Total Message(s),訊息總和（s ）
-DocType: Share Balance,Purchased,購買
-DocType: Item Variant Settings,Rename Attribute Value in Item Attribute.,在項目屬性中重命名屬性值。
-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.,選取支票存入該銀行帳戶的頭。
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
-DocType: Pricing Rule,Max Qty,最大數量
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js +25,Print Report Card,打印報告卡
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+The following Work Orders were created:,以下工作訂單已創建：
+Total in words,總計大寫
+Discharged,出院
+Lead Time Date,交貨時間日期
+Employee Advance Summary,員工提前總結
+Guardian Name,監護人姓名
+Has Print Format,擁有打印格式
+Get Started Sections,入門部分
+Sanctioned,制裁
+Total Contribution Amount: {0},總貢獻金額：{0}
+Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
+Salary Slips Submitted,提交工資單
+Crop Cycle,作物週期
+"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.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
+From Place,從地方
+Net Pay cannnot be negative,淨薪酬不能為負
+Publish on website,發布在網站上
+Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
+Purchase Order Item,採購訂單項目
+Agriculture Task,農業任務
+Indirect Income,間接收入
+Student Attendance Tool,學生考勤工具
+Price List (Auto created),價目表（自動創建）
+Date Settings,日期設定
+Employee Promotion Detail,員工促銷細節
+Company Name,公司名稱
+Total Message(s),訊息總和（s ）
+Purchased,購買
+Rename Attribute Value in Item Attribute.,在項目屬性中重命名屬性值。
+Additional Discount Percentage,額外折扣百分比
+View a list of all the help videos,查看所有幫助影片名單
+Soil Texture,土壤紋理
+Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
+Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
+Max Qty,最大數量
+Print Report Card,打印報告卡
+"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
Please enter a valid Invoice",行{0}：發票{1}是無效的，它可能會被取消/不存在。 \請輸入有效的發票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +16,Chemical,化學藥品
-DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默認銀行/現金帳戶時，會選擇此模式可以自動在工資日記條目更新。
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Total leaves allocated is mandatory for Leave Type {0},為假期類型{0}分配的總分配數是強制性的
-DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司貨幣）
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
-apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,儀表
-DocType: Workstation,Electricity Cost,電力成本
-apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py +15,Amount should be greater than zero.,金額應該大於零。
-apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +23,Lab testing datetime cannot be before collection datetime,實驗室測試日期時間不能在收集日期時間之前
-DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
-DocType: Expense Claim,Total Advance Amount,總預付金額
-DocType: Delivery Stop,Estimated Arrival,預計抵達時間
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +165,Walk In,走在
-DocType: Item,Inspection Criteria,檢驗標準
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,轉移
-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,法案
-DocType: SMS Center,All Lead (Open),所有鉛（開放）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
-apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,您只能從復選框列表中選擇最多一個選項。
-DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
-DocType: Item,Automatically Create New Batch,自動創建新批
-DocType: Item,Automatically Create New Batch,自動創建新批
-DocType: Student Admission,Admission Start Date,入學開始日期
-DocType: Journal Entry,Total Amount in Words,總金額大寫
-apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新員工
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
-apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的購物車
-apps/erpnext/erpnext/controllers/selling_controller.py +142,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,開放數量
-DocType: Healthcare Settings,Appointment Reminder,預約提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +550,Please enter Account for Change Amount,對於漲跌額請輸入帳號
-DocType: Program Enrollment Tool Student,Student Batch Name,學生批名
-DocType: Holiday List,Holiday List Name,假日列表名稱
-DocType: Repayment Schedule,Balance Loan Amount,平衡貸款額
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +132,Added to details,添加到細節
-apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,課程時間表
-DocType: Budget,Applicable on Material Request,適用於材料請求
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +194,Stock Options,庫存期權
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +628,No Items added to cart,沒有項目已添加到購物車
-DocType: Journal Entry Account,Expense Claim,報銷
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +352,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +530,Qty for {0},數量為{0}
-DocType: Leave Application,Leave Application,休假申請
-DocType: Patient,Patient Relation,患者關係
-DocType: Item,Hub Category to Publish,集線器類別發布
-DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +297,"Sales Order {0} has reservation for item {1}, you can
- only deliver reserved {1} against {0}. Serial No {2} cannot
+Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
+Chemical,化學藥品
+Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默認銀行/現金帳戶時，會選擇此模式可以自動在工資日記條目更新。
+Total leaves allocated is mandatory for Leave Type {0},為假期類型{0}分配的總分配數是強制性的
+Raw Material Cost(Company Currency),原料成本（公司貨幣）
+Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
+Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
+Meter,儀表
+Electricity Cost,電力成本
+Amount should be greater than zero.,金額應該大於零。
+Lab testing datetime cannot be before collection datetime,實驗室測試日期時間不能在收集日期時間之前
+Don't send Employee Birthday Reminders,不要送員工生日提醒
+Total Advance Amount,總預付金額
+Estimated Arrival,預計抵達時間
+Walk In,走在
+Inspection Criteria,檢驗標準
+Transfered,轉移
+BOM Website Item,BOM網站項目
+Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+Bill,法案
+All Lead (Open),所有鉛（開放）
+Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
+You can only select a maximum of one option from the list of check boxes.,您只能從復選框列表中選擇最多一個選項。
+Get Advances Paid,獲取有償進展
+Automatically Create New Batch,自動創建新批
+Automatically Create New Batch,自動創建新批
+Admission Start Date,入學開始日期
+Total Amount in Words,總金額大寫
+New Employee,新員工
+There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
+My Cart,我的購物車
+Order Type must be one of {0},訂單類型必須是一個{0}
+Next Contact Date,下次聯絡日期
+Opening Qty,開放數量
+Appointment Reminder,預約提醒
+Please enter Account for Change Amount,對於漲跌額請輸入帳號
+Student Batch Name,學生批名
+Holiday List Name,假日列表名稱
+Added to details,添加到細節
+Schedule Course,課程時間表
+Applicable on Material Request,適用於材料請求
+Stock Options,庫存期權
+No Items added to cart,沒有項目已添加到購物車
+Expense Claim,報銷
+Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
+Qty for {0},數量為{0}
+Leave Application,休假申請
+Patient Relation,患者關係
+Hub Category to Publish,集線器類別發布
+Leave Block List Dates,休假區塊清單日期表
+"Sales Order {0} has reservation for item {1}, you can,
+ only deliver reserved {1} against {0}. Serial No {2} cannot,
be delivered",銷售訂單{0}對項目{1}有預留，您只能對{0}提供保留的{1}。序列號{2}無法發送
-DocType: Sales Invoice,Billing Address GSTIN,帳單地址GSTIN
-DocType: Employee Tax Exemption Proof Submission,Total Eligible HRA Exemption,合格的HRA豁免總數
-DocType: Assessment Plan,Evaluate,評估
-DocType: Workstation,Net Hour Rate,淨小時率
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本採購入庫單
-DocType: Company,Default Terms,默認條款
-DocType: Supplier Scorecard Period,Criteria,標準
-DocType: Packing Slip Item,Packing Slip Item,包裝單項目
-DocType: Purchase Invoice,Cash/Bank Account,現金／銀行會計科目
-DocType: Travel Itinerary,Train,培養
-apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},請指定{0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
-DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.js +471,Variant creation has been queued.,變體創建已經排隊。
-DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一個請假批准者將被設置為默認的批准批准者。
-apps/erpnext/erpnext/stock/doctype/item/item.py +774,Attribute table is mandatory,屬性表是強制性的
-DocType: Production Plan,Get Sales Orders,獲取銷售訂單
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能為負數
-apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +37,Connect to Quickbooks,連接到Quickbooks
-DocType: Training Event,Self-Study,自習
-DocType: POS Closing Voucher,Period End Date,期末結束日期
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {0}: {1} is required to create the Opening {2} Invoices,行{0}：{1}是創建開始{2}發票所必需的
-DocType: Membership,Membership,籍
-DocType: Asset,Total Number of Depreciations,折舊總數
-DocType: Sales Invoice Item,Rate With Margin,利率保證金
-DocType: Sales Invoice Item,Rate With Margin,利率保證金
-DocType: Purchase Invoice,Is Return (Debit Note),是退貨（借記卡）
-DocType: Workstation,Wages,工資
-DocType: Asset Maintenance,Maintenance Manager Name,維護經理姓名
-DocType: Agriculture Task,Urgent,緊急
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +187,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,無法找到變量：
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +893,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
-apps/erpnext/erpnext/stock/doctype/item/item.py +293,Cannot be a fixed asset item as Stock Ledger is created.,不能成為庫存分類賬創建的固定資產項目。
-apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record.js +7,Admit,承認
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext
-apps/erpnext/erpnext/templates/pages/order.js +31,Pay Remaining,支付剩餘
-DocType: Item,Manufacturer,生產廠家
-DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
-DocType: Leave Allocation,Total Leaves Encashed,總葉子被掩飾
-DocType: POS Profile,Sales Invoice Payment,銷售發票付款
-DocType: Quality Inspection Template,Quality Inspection Template Name,質量檢驗模板名稱
-DocType: Project,First Email,第一郵件
-DocType: Company,Exception Budget Approver Role,例外預算審批人角色
-DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",一旦設置，該發票將被保留至設定的日期
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,銷售金額
-DocType: Repayment Schedule,Interest Amount,利息金額
-DocType: Sales Invoice,Loyalty Amount,忠誠金額
-DocType: Employee Transfer,Employee Transfer Detail,員工轉移詳情
-DocType: Serial No,Creation Document No,文檔創建編號
-DocType: Location,Location Details,位置詳情
-DocType: Share Transfer,Issue,問題
-apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,記錄
-DocType: Asset,Scrapped,報廢
-DocType: Item,Item Defaults,項目默認值
-DocType: Cashier Closing,Returns,返回
-DocType: Job Card,WIP Warehouse,WIP倉庫
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
-DocType: Lead,Organization Name,組織名稱
-DocType: Support Settings,Show Latest Forum Posts,顯示最新的論壇帖子
-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/delivery_note/delivery_note.js +914,Delivery Trip,送貨之旅
-DocType: Student,A-,一個-
-DocType: Share Transfer,Transfer Type,轉移類型
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,銷售費用
-DocType: Diagnosis,Diagnosis,診斷
-apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準採購
-DocType: Attendance Request,Explanation,說明
-DocType: GL Entry,Against,針對
-DocType: Item Default,Sales Defaults,銷售默認值
-DocType: Sales Order Item,Work Order Qty,工作訂單數量
-DocType: Item Default,Default Selling Cost Center,預設銷售成本中心
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +594,Disc,圓盤
-DocType: Buying Settings,Material Transferred for Subcontract,轉包材料轉讓
-DocType: Email Digest,Purchase Orders Items Overdue,採購訂單項目逾期
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,郵政編碼
-apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},銷售訂單{0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},選擇貸款{0}中的利息收入科目
-DocType: Opportunity,Contact Info,聯絡方式
-apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,製作Stock條目
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,無法提升狀態為Left的員工
-DocType: Packing Slip,Net Weight UOM,淨重計量單位
-DocType: Item Default,Default Supplier,預設的供應商
-DocType: Loan,Repayment Schedule,還款計劃
-DocType: Shipping Rule Condition,Shipping Rule Condition,送貨規則條件
-apps/erpnext/erpnext/hr/doctype/payroll_period/payroll_period.py +19,End Date can not be less than Start Date,結束日期不能小於開始日期
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +262,Invoice can't be made for zero billing hour,在零計費時間內無法開具發票
-DocType: Company,Date of Commencement,開始日期
-DocType: Sales Person,Select company name first.,先選擇公司名稱。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +380,Email sent to {0},電子郵件發送到{0}
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
-apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更換BOM並更新所有BOM中的最新價格
-apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +13,This is a root supplier group and cannot be edited.,這是一個根源供應商組，無法編輯。
-DocType: Delivery Note,Driver Name,司機姓名
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Average Age,平均年齡
-DocType: Education Settings,Attendance Freeze Date,出勤凍結日期
-DocType: Education Settings,Attendance Freeze Date,出勤凍結日期
-DocType: Payment Request,Inward,向內的
-apps/erpnext/erpnext/utilities/user_progress.py +110,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
-apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,查看所有產品
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,所有的材料明細表
-apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0}類型的酒店客房不適用於{1}
-DocType: Healthcare Practitioner,Default Currency,預設貨幣
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Maximum discount for Item {0} is {1}%,第{0}項的最大折扣為{1}％
-DocType: Asset Movement,From Employee,從員工
-DocType: Driver,Cellphone Number,手機號碼
-DocType: Project,Monitor Progress,監視進度
-apps/erpnext/erpnext/controllers/accounts_controller.py +545,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
-DocType: Journal Entry,Make Difference Entry,使不同入口
-DocType: Supplier Quotation,Auto Repeat Section,自動重複部分
-DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
-DocType: Program Enrollment,Transportation,運輸
-apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,無效屬性
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,{0} {1} must be submitted,{0} {1}必須提交
-DocType: Buying Settings,Default Supplier Group,默認供應商組
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},量必須小於或等於{0}
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +44,Maximum amount eligible for the component {0} exceeds {1},符合組件{0}的最高金額超過{1}
-DocType: Department Approver,Department Approver,部門批准人
-DocType: QuickBooks Migrator,Application Settings,應用程序設置
-DocType: SMS Center,Total Characters,總字元數
-DocType: Employee Advance,Claimed,聲稱
-DocType: Crop,Row Spacing,行間距
-apps/erpnext/erpnext/controllers/buying_controller.py +204,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +22,There isn't any item variant for the selected item,所選項目沒有任何項目變體
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
-apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +75,Contribution %,貢獻％
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +245,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根據購買設置，如果需要採購訂單=='是'，那麼為了創建採購發票，用戶需要首先為項目{0}創建採購訂單
-,HSN-wise-summary of outward supplies,HSN明智的向外供應摘要
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼，供大家參考。稅務號碼等
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +261,To State,國家
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +122,Distributor,經銷商
-DocType: Asset Finance Book,Asset Finance Book,資產融資書
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/public/js/controllers/transaction.js +72,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
-DocType: Party Tax Withholding Config,Applicable Percent,適用百分比
-,Ordered Items To Be Billed,預付款的訂購物品
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,從範圍必須小於要範圍
-DocType: Global Defaults,Global Defaults,全域預設值
-apps/erpnext/erpnext/projects/doctype/project/project.py +291,Project Collaboration Invitation,項目合作邀請
-DocType: Salary Slip,Deductions,扣除
-DocType: Setup Progress Action,Action Name,動作名稱
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +17,Start Year,開始年份
-apps/erpnext/erpnext/regional/india/utils.py +28,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位數字應與狀態號{0}匹配
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,PDC/LC,PDC / LC
-DocType: Purchase Invoice,Start date of current invoice's period,當前發票期間內的開始日期
-DocType: Salary Slip,Leave Without Pay,無薪假
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +366,Capacity Planning Error,產能規劃錯誤
-,Trial Balance for Party,試算表的派對
-DocType: Lead,Consultant,顧問
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +356,Parents Teacher Meeting Attendance,家長老師見面會
-DocType: Salary Slip,Earnings,收益
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +538,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
-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 +552,Nothing to request,無需求
-DocType: Stock Settings,Default Return Warehouse,默認退貨倉庫
-apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,選擇您的域名
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py +228,Shopify Supplier,Shopify供應商
-DocType: Bank Statement Transaction Entry,Payment Invoice Items,付款發票項目
-DocType: Payroll Entry,Employee Details,員工詳細信息
-DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段將僅在創建時復制。
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +390,Management,管理
-DocType: Cheque Print Template,Payer Settings,付款人設置
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +651,No pending Material Requests found to link for the given items.,找不到針對給定項目鏈接的待處理物料請求。
-apps/erpnext/erpnext/public/js/utils/party.js +193,Select company first,首先選擇公司
-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: Delivery Note,Is Return,退貨
-apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',開始日期大於任務“{0}”的結束日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +893,Return / Debit Note,返回/借記注
-DocType: Price List Country,Price List Country,價目表國家
-DocType: Item,UOMs,計量單位
-apps/erpnext/erpnext/stock/utils.py +236,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
-DocType: Purchase Invoice Item,UOM Conversion Factor,計量單位換算係數
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +9,Please enter Item Code to get Batch Number,請輸入產品代碼來獲得批號
-DocType: Loyalty Point Entry,Loyalty Point Entry,忠誠度積分
-DocType: Stock Settings,Default Item Group,預設項目群組
-DocType: Job Card,Time In Mins,分鐘時間
-apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
-DocType: Contract Template,Contract Terms and Conditions,合同條款和條件
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +425,You cannot restart a Subscription that is not cancelled.,您無法重新啟動未取消的訂閱。
-DocType: Account,Balance Sheet,資產負債表
-DocType: Leave Type,Is Earned Leave,獲得休假
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +797,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
-DocType: Student Report Generation Tool,Total Parents Teacher Meeting,總計家長教師會議
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2530,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
-apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
-DocType: Lead,Lead,潛在客戶
-DocType: Email Digest,Payables,應付帳款
-DocType: Course,Course Intro,課程介紹
-DocType: Amazon MWS Settings,MWS Auth Token,MWS Auth Token
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,庫存輸入{0}創建
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +110,You don't have enought Loyalty Points to redeem,您沒有獲得忠誠度積分兌換
-apps/erpnext/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +23,Please set associated account in Tax Withholding Category {0} against Company {1},請在針對公司{1}的預扣稅分類{0}中設置關聯帳戶
-apps/erpnext/erpnext/controllers/buying_controller.py +405,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
-apps/erpnext/erpnext/stock/doctype/item/item.js +203,Changing Customer Group for the selected Customer is not allowed.,不允許更改所選客戶的客戶組。
-,Purchase Order Items To Be Billed,欲付款的採購訂單品項
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,Updating estimated arrival times.,更新預計到達時間。
-DocType: Program Enrollment Tool,Enrollment Details,註冊詳情
-apps/erpnext/erpnext/stock/doctype/item/item.py +684,Cannot set multiple Item Defaults for a company.,無法為公司設置多個項目默認值。
-DocType: Purchase Invoice Item,Net Rate,淨費率
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +194,Please select a customer,請選擇一個客戶
-DocType: Leave Policy,Leave Allocations,離開分配
-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,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
-DocType: Student Report Generation Tool,Assessment Terms,評估條款
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,項目1
-DocType: Holiday,Holiday,節日
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,離開類型是瘋狂的
-DocType: Support Settings,Close Issue After Days,關閉問題天后
-apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能將用戶添加到Marketplace。
-DocType: Leave Control Panel,Leave blank if considered for all branches,保持空白如果考慮到全部分支機構
-DocType: Job Opening,Staffing Plan,人員配備計劃
-DocType: Bank Guarantee,Validity in Days,天數有效
-DocType: Bank Guarantee,Validity in Days,天數有效
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-形式不適用發票：{0}
-DocType: Certified Consultant,Name of Consultant,顧問的名字
-DocType: Payment Reconciliation,Unreconciled Payment Details,未核銷付款明細
-apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +6,Member Activity,會員活動
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,訂單數量
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,訂單數量
-DocType: Global Defaults,Current Fiscal Year,當前會計年度
-DocType: Purchase Invoice,Group same items,組相同的項目
-DocType: Purchase Invoice,Disable Rounded Total,禁用圓角總
-DocType: Marketplace Settings,Sync in Progress,同步進行中
-DocType: Department,Parent Department,家長部門
-DocType: Loan Application,Repayment Info,還款信息
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +486,'Entries' cannot be empty,“分錄”不能是空的
-DocType: Maintenance Team Member,Maintenance Role,維護角色
-apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},重複的行{0}同{1}
-DocType: Marketplace Settings,Disable Marketplace,禁用市場
-,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,會計年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,建立職工
-DocType: Hotel Room Reservation,Hotel Reservation User,酒店預訂用戶
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,請先選擇前綴稱號
-DocType: Subscription Settings,Subscription Settings,訂閱設置
-DocType: Purchase Invoice,Update Auto Repeat Reference,更新自動重複參考
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +273,Optional Holiday List not set for leave period {0},可選假期列表未設置為假期{0}
-DocType: Maintenance Visit Purpose,Work Done,工作完成
-apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
-DocType: Announcement,All Students,所有學生
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看總帳
-DocType: Grading Scale,Intervals,間隔
-DocType: Bank Statement Transaction Entry,Reconciled Transactions,協調的事務
-DocType: Crop Cycle,Linked Location,鏈接位置
-apps/erpnext/erpnext/stock/doctype/item/item.py +557,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
-apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,學生手機號碼
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Rest Of The World,世界其他地區
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
-DocType: Crop,Yield UOM,產量UOM
-,Budget Variance Report,預算差異報告
-DocType: Salary Slip,Gross Pay,工資總額
-DocType: Item,Is Item from Hub,是來自Hub的Item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1642,Get Items from Healthcare Services,從醫療保健服務獲取項目
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,會計總帳
-DocType: Asset Value Adjustment,Difference Amount,差額
-DocType: Purchase Invoice,Reverse Charge,反向充電
-DocType: Job Card,Timing Detail,時間細節
-DocType: Purchase Invoice,05-Change in POS,05-更改POS
-DocType: Vehicle Log,Service Detail,服務細節
-DocType: BOM,Item Description,項目說明
-DocType: Student Sibling,Student Sibling,學生兄弟
-DocType: Purchase Invoice,Supplied Items,提供的物品
-apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},請設置餐館{0}的有效菜單
-DocType: Work Order,Qty To Manufacture,製造數量
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整個採購週期價格保持一致
-DocType: Opportunity Item,Opportunity Item,項目的機會
-,Student and Guardian Contact Details,學生和監護人聯繫方式
-apps/erpnext/erpnext/accounts/doctype/account/account.js +51,Merge Account,合併科目
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,行{0}：對於供應商{0}的電郵地址發送電子郵件
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +76,Temporary Opening,臨時開通
-,Employee Leave Balance,員工休假餘額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},科目{0}的餘額必須始終為{1}
-DocType: Patient Appointment,More Info,更多訊息
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
-DocType: Supplier Scorecard,Scorecard Actions,記分卡操作
-apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,舉例：碩士計算機科學
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +67,Supplier {0} not found in {1},在{1}中找不到供應商{0}
-DocType: Purchase Invoice,Rejected Warehouse,拒絕倉庫
-DocType: GL Entry,Against Voucher,對傳票
-DocType: Item Default,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 教學，我們建議您花一些時間和觀看這些說明影片。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1046,For Default Supplier (optional),對於默認供應商（可選）
-DocType: Supplier Quotation Item,Lead Time in days,交貨天期
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +83,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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}無效
-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/healthcare/doctype/lab_test/lab_test.js +146,Lab Test Prescriptions,實驗室測試處方
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +164,"The total Issue / Transfer quantity {0} in Material Request {1} \
+Billing Address GSTIN,帳單地址GSTIN,
+Total Eligible HRA Exemption,合格的HRA豁免總數
+Evaluate,評估
+Net Hour Rate,淨小時率
+Landed Cost Purchase Receipt,到岸成本採購入庫單
+Default Terms,默認條款
+Criteria,標準
+Packing Slip Item,包裝單項目
+Cash/Bank Account,現金／銀行會計科目
+Train,培養
+Please specify a {0},請指定{0}
+Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
+Delivery To,交貨給
+Variant creation has been queued.,變體創建已經排隊。
+The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一個請假批准者將被設置為默認的批准批准者。
+Attribute table is mandatory,屬性表是強制性的
+Get Sales Orders,獲取銷售訂單
+{0} can not be negative,{0}不能為負數
+Connect to Quickbooks,連接到Quickbooks,
+Self-Study,自習
+Period End Date,期末結束日期
+Row {0}: {1} is required to create the Opening {2} Invoices,行{0}：{1}是創建開始{2}發票所必需的
+Membership,籍
+Total Number of Depreciations,折舊總數
+Rate With Margin,利率保證金
+Rate With Margin,利率保證金
+Is Return (Debit Note),是退貨（借記卡）
+Wages,工資
+Maintenance Manager Name,維護經理姓名
+Urgent,緊急
+Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
+Unable to find variable: ,無法找到變量：
+Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
+Cannot be a fixed asset item as Stock Ledger is created.,不能成為庫存分類賬創建的固定資產項目。
+Admit,承認
+Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext,
+Pay Remaining,支付剩餘
+Manufacturer,生產廠家
+Purchase Receipt Item,採購入庫項目
+Total Leaves Encashed,總葉子被掩飾
+Sales Invoice Payment,銷售發票付款
+Quality Inspection Template Name,質量檢驗模板名稱
+First Email,第一郵件
+Exception Budget Approver Role,例外預算審批人角色
+"Once set, this invoice will be on hold till the set date",一旦設置，該發票將被保留至設定的日期
+Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
+Selling Amount,銷售金額
+Interest Amount,利息金額
+Loyalty Amount,忠誠金額
+Employee Transfer Detail,員工轉移詳情
+Creation Document No,文檔創建編號
+Location Details,位置詳情
+Issue,問題
+Records,記錄
+Scrapped,報廢
+Item Defaults,項目默認值
+Returns,返回
+WIP Warehouse,WIP倉庫
+Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
+Organization Name,組織名稱
+Show Latest Forum Posts,顯示最新的論壇帖子
+Shipping State,運輸狀態
+Projected Quantity as Source,預計庫存量的來源
+Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
+Delivery Trip,送貨之旅
+A-,一個-
+Transfer Type,轉移類型
+Sales Expenses,銷售費用
+Diagnosis,診斷
+Standard Buying,標準採購
+Explanation,說明
+Against,針對
+Sales Defaults,銷售默認值
+Work Order Qty,工作訂單數量
+Default Selling Cost Center,預設銷售成本中心
+Disc,圓盤
+Material Transferred for Subcontract,轉包材料轉讓
+Purchase Orders Items Overdue,採購訂單項目逾期
+ZIP Code,郵政編碼
+Sales Order {0} is {1},銷售訂單{0} {1}
+Select interest income account in loan {0},選擇貸款{0}中的利息收入科目
+Contact Info,聯絡方式
+Making Stock Entries,製作Stock條目
+Cannot promote Employee with status Left,無法提升狀態為Left的員工
+Net Weight UOM,淨重計量單位
+Default Supplier,預設的供應商
+Shipping Rule Condition,送貨規則條件
+End Date can not be less than Start Date,結束日期不能小於開始日期
+Invoice can't be made for zero billing hour,在零計費時間內無法開具發票
+Date of Commencement,開始日期
+Select company name first.,先選擇公司名稱。
+Email sent to {0},電子郵件發送到{0}
+Quotations received from Suppliers.,從供應商收到的報價。
+Replace BOM and update latest price in all BOMs,更換BOM並更新所有BOM中的最新價格
+This is a root supplier group and cannot be edited.,這是一個根源供應商組，無法編輯。
+Driver Name,司機姓名
+Average Age,平均年齡
+Attendance Freeze Date,出勤凍結日期
+Attendance Freeze Date,出勤凍結日期
+Inward,向內的
+List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+View All Products,查看所有產品
+Minimum Lead Age (Days),最低鉛年齡（天）
+Minimum Lead Age (Days),最低鉛年齡（天）
+All BOMs,所有的材料明細表
+Hotel Rooms of type {0} are unavailable on {1},{0}類型的酒店客房不適用於{1}
+Default Currency,預設貨幣
+Maximum discount for Item {0} is {1}%,第{0}項的最大折扣為{1}％
+From Employee,從員工
+Cellphone Number,手機號碼
+Monitor Progress,監視進度
+Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+Make Difference Entry,使不同入口
+Auto Repeat Section,自動重複部分
+Key Performance Area,關鍵績效區
+Transportation,運輸
+Invalid Attribute,無效屬性
+{0} {1} must be submitted,{0} {1}必須提交
+Default Supplier Group,默認供應商組
+Quantity must be less than or equal to {0},量必須小於或等於{0}
+Maximum amount eligible for the component {0} exceeds {1},符合組件{0}的最高金額超過{1}
+Department Approver,部門批准人
+Application Settings,應用程序設置
+Total Characters,總字元數
+Claimed,聲稱
+Row Spacing,行間距
+Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
+There isn't any item variant for the selected item,所選項目沒有任何項目變體
+C-Form Invoice Detail,C-表 發票詳細資訊
+Payment Reconciliation Invoice,付款發票對帳
+Contribution %,貢獻％
+"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根據購買設置，如果需要採購訂單=='是'，那麼為了創建採購發票，用戶需要首先為項目{0}創建採購訂單
+HSN-wise-summary of outward supplies,HSN明智的向外供應摘要
+Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼，供大家參考。稅務號碼等
+To State,國家
+Distributor,經銷商
+Asset Finance Book,資產融資書
+Shopping Cart Shipping Rule,購物車運輸規則
+Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+Applicable Percent,適用百分比
+Ordered Items To Be Billed,預付款的訂購物品
+From Range has to be less than To Range,從範圍必須小於要範圍
+Global Defaults,全域預設值
+Project Collaboration Invitation,項目合作邀請
+Deductions,扣除
+Action Name,動作名稱
+Start Year,開始年份
+First 2 digits of GSTIN should match with State number {0},GSTIN的前2位數字應與狀態號{0}匹配
+PDC/LC,PDC / LC,
+Start date of current invoice's period,當前發票期間內的開始日期
+Leave Without Pay,無薪假
+Capacity Planning Error,產能規劃錯誤
+Trial Balance for Party,試算表的派對
+Consultant,顧問
+Parents Teacher Meeting Attendance,家長老師見面會
+Earnings,收益
+Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
+Opening Accounting Balance,打開會計平衡
+GST Sales Register,消費稅銷售登記冊
+Sales Invoice Advance,銷售發票提前
+Nothing to request,無需求
+Default Return Warehouse,默認退貨倉庫
+Select your Domains,選擇您的域名
+Shopify Supplier,Shopify供應商
+Payment Invoice Items,付款發票項目
+Employee Details,員工詳細信息
+Fields will be copied over only at time of creation.,字段將僅在創建時復制。
+'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
+Management,管理
+Payer Settings,付款人設置
+No pending Material Requests found to link for the given items.,找不到針對給定項目鏈接的待處理物料請求。
+Select company first,首先選擇公司
+"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”
+Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存，淨付款就會被顯示出來。
+Is Return,退貨
+Start day is greater than end day in task '{0}',開始日期大於任務“{0}”的結束日期
+Return / Debit Note,返回/借記注
+Price List Country,價目表國家
+UOMs,計量單位
+{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
+Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
+UOM Conversion Factor,計量單位換算係數
+Please enter Item Code to get Batch Number,請輸入產品代碼來獲得批號
+Loyalty Point Entry,忠誠度積分
+Default Item Group,預設項目群組
+Time In Mins,分鐘時間
+Supplier database.,供應商數據庫。
+Contract Terms and Conditions,合同條款和條件
+You cannot restart a Subscription that is not cancelled.,您無法重新啟動未取消的訂閱。
+Balance Sheet,資產負債表
+Is Earned Leave,獲得休假
+Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+Total Parents Teacher Meeting,總計家長教師會議
+"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
+Same item cannot be entered multiple times.,同一項目不能輸入多次。
+"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
+Lead,潛在客戶
+Payables,應付帳款
+Course Intro,課程介紹
+MWS Auth Token,MWS Auth Token,
+Stock Entry {0} created,庫存輸入{0}創建
+You don't have enought Loyalty Points to redeem,您沒有獲得忠誠度積分兌換
+Please set associated account in Tax Withholding Category {0} against Company {1},請在針對公司{1}的預扣稅分類{0}中設置關聯帳戶
+Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+Changing Customer Group for the selected Customer is not allowed.,不允許更改所選客戶的客戶組。
+Purchase Order Items To Be Billed,欲付款的採購訂單品項
+Updating estimated arrival times.,更新預計到達時間。
+Enrollment Details,註冊詳情
+Cannot set multiple Item Defaults for a company.,無法為公司設置多個項目默認值。
+Net Rate,淨費率
+Please select a customer,請選擇一個客戶
+Leave Allocations,離開分配
+Purchase Invoice Item,採購發票項目
+Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
+Assessment Terms,評估條款
+Item 1,項目1,
+Holiday,節日
+Leave Type is madatory,離開類型是瘋狂的
+Close Issue After Days,關閉問題天后
+You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能將用戶添加到Marketplace。
+Leave blank if considered for all branches,保持空白如果考慮到全部分支機構
+Staffing Plan,人員配備計劃
+Validity in Days,天數有效
+Validity in Days,天數有效
+C-form is not applicable for Invoice: {0},C-形式不適用發票：{0}
+Name of Consultant,顧問的名字
+Unreconciled Payment Details,未核銷付款明細
+Member Activity,會員活動
+Order Count,訂單數量
+Order Count,訂單數量
+Current Fiscal Year,當前會計年度
+Group same items,組相同的項目
+Disable Rounded Total,禁用圓角總
+Sync in Progress,同步進行中
+Parent Department,家長部門
+'Entries' cannot be empty,“分錄”不能是空的
+Maintenance Role,維護角色
+Duplicate row {0} with same {1},重複的行{0}同{1}
+Disable Marketplace,禁用市場
+Trial Balance,試算表
+Fiscal Year {0} not found,會計年度{0}未找到
+Setting up Employees,建立職工
+Hotel Reservation User,酒店預訂用戶
+Please select prefix first,請先選擇前綴稱號
+Subscription Settings,訂閱設置
+Update Auto Repeat Reference,更新自動重複參考
+Optional Holiday List not set for leave period {0},可選假期列表未設置為假期{0}
+Work Done,工作完成
+Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
+All Students,所有學生
+Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
+View Ledger,查看總帳
+Intervals,間隔
+Reconciled Transactions,協調的事務
+Linked Location,鏈接位置
+"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+Student Mobile No.,學生手機號碼
+Rest Of The World,世界其他地區
+The Item {0} cannot have Batch,該項目{0}不能有批
+Yield UOM,產量UOM,
+Budget Variance Report,預算差異報告
+Gross Pay,工資總額
+Is Item from Hub,是來自Hub的Item,
+Get Items from Healthcare Services,從醫療保健服務獲取項目
+Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
+Accounting Ledger,會計總帳
+Difference Amount,差額
+Reverse Charge,反向充電
+Timing Detail,時間細節
+05-Change in POS,05-更改POS,
+Service Detail,服務細節
+Item Description,項目說明
+Student Sibling,學生兄弟
+Supplied Items,提供的物品
+Please set an active menu for Restaurant {0},請設置餐館{0}的有效菜單
+Qty To Manufacture,製造數量
+Maintain same rate throughout purchase cycle,在整個採購週期價格保持一致
+Opportunity Item,項目的機會
+Student and Guardian Contact Details,學生和監護人聯繫方式
+Merge Account,合併科目
+Row {0}: For supplier {0} Email Address is required to send email,行{0}：對於供應商{0}的電郵地址發送電子郵件
+Temporary Opening,臨時開通
+Employee Leave Balance,員工休假餘額
+Balance for Account {0} must always be {1},科目{0}的餘額必須始終為{1}
+More Info,更多訊息
+Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
+Scorecard Actions,記分卡操作
+Example: Masters in Computer Science,舉例：碩士計算機科學
+Supplier {0} not found in {1},在{1}中找不到供應商{0}
+Rejected Warehouse,拒絕倉庫
+Against Voucher,對傳票
+Default Buying Cost Center,預設採購成本中心
+"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為得到最好的 ERPNext 教學，我們建議您花一些時間和觀看這些說明影片。
+For Default Supplier (optional),對於默認供應商（可選）
+Lead Time in days,交貨天期
+Accounts Payable Summary,應付帳款摘要
+Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
+Get Outstanding Invoices,獲取未付發票
+Sales Order {0} is not valid,銷售訂單{0}無效
+Warn for new Request for Quotations,警告新的報價請求
+Purchase orders help you plan and follow up on your purchases,採購訂單幫助您規劃和跟進您的購買
+Lab Test Prescriptions,實驗室測試處方
+"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
-DocType: Shopify Settings,"If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order",如果Shopify不包含訂單中的客戶，則在同步訂單時，系統會考慮默認客戶訂單
-DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,打開發票創建工具項目
-DocType: Cashier Closing Payments,Cashier Closing Payments,收銀員結算付款
-DocType: Education Settings,Employee Number,員工人數
-DocType: Subscription Settings,Cancel Invoice After Grace Period,在寬限期後取消發票
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
-DocType: Project,% Completed,％已完成
-,Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,項目2
-DocType: QuickBooks Migrator,Authorization Endpoint,授權端點
-DocType: Travel Request,International,國際
-DocType: Training Event,Training Event,培訓活動
-DocType: Item,Auto re-order,自動重新排序
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,實現總計
-DocType: Employee,Place of Issue,簽發地點
-DocType: Plant Analysis,Laboratory Testing Datetime,實驗室測試日期時間
-DocType: Email Digest,Add Quote,添加報價
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1246,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Indirect Expenses,間接費用
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +128,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
-DocType: Agriculture Analysis Criteria,Agriculture,農業
-apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +15,Create Sales Order,創建銷售訂單
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +516,Accounting Entry for Asset,資產會計分錄
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +878,Block Invoice,阻止發票
-apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js +16,Quantity to Make,數量
-apps/erpnext/erpnext/accounts/page/pos/pos.js +801,Sync Master Data,同步主數據
-DocType: Asset Repair,Repair Cost,修理費用
-apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,您的產品或服務
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +16,Failed to login,登錄失敗
-apps/erpnext/erpnext/controllers/buying_controller.py +629,Asset {0} created,資產{0}已創建
-DocType: Special Test Items,Special Test Items,特殊測試項目
-apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能在Marketplace上註冊。
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,根據您指定的薪資結構，您無法申請福利
-apps/erpnext/erpnext/stock/doctype/item/item.py +231,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +71,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
-apps/erpnext/erpnext/accounts/doctype/account/account.js +133,Merge,合併
-DocType: Journal Entry Account,Purchase Order,採購訂單
-DocType: Vehicle,Fuel UOM,燃油計量單位
-DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
-DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
-DocType: Volunteer,Volunteer Name,志願者姓名
-apps/erpnext/erpnext/controllers/accounts_controller.py +793,Rows with duplicate due dates in other rows were found: {0},發現其他行中具有重複截止日期的行：{0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
-apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},給定日期{1}的員工{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,外貿詳細
-,Assessment Plan Status,評估計劃狀態
-DocType: Serial No,Serial No Details,序列號詳細資訊
-DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +176,From Party Name,來自黨名
-DocType: Student Group Student,Group Roll Number,組卷編號
-DocType: Student Group Student,Group Roll Number,組卷編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +177,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方科目可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +660,Delivery Note {0} is not submitted,送貨單{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +167,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,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/manufacturing/doctype/work_order/work_order.js +372,Please set the Item Code first,請先設定商品代碼
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +157,Doc Type,文件類型
-apps/erpnext/erpnext/controllers/selling_controller.py +135,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
-DocType: Subscription Plan,Billing Interval Count,計費間隔計數
-apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py +10,Appointments and Patient Encounters,預約和患者遭遇
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +135,Value missing,價值缺失
-DocType: Employee,Department and Grade,部門和年級
-DocType: Sales Invoice Item,Edit Description,編輯說明
-,Team Updates,團隊更新
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +39,For Supplier,對供應商
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置會計科目類型有助於在交易中選擇該科目。
-DocType: Purchase Invoice,Grand Total (Company Currency),總計（公司貨幣）
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,創建打印格式
-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}
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.js +8,Items Filter,物品過濾
-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/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: Patient Appointment,Duration,持續時間
-apps/erpnext/erpnext/controllers/status_updater.py +160,"For an item {0}, quantity must be positive number",對於商品{0}，數量必須是正數
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +76,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：該成本中心是一個集團。不能讓反對團體的會計分錄。
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +44,Compensatory leave request days not in valid holidays,補休請求天不在有效假期
-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),總計（公司貨幣）
-DocType: Daily Work Summary Group,Reminder,提醒
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +304,Accessable Value,可訪問的價值
-apps/erpnext/erpnext/stock/utils.py +231,Serial number {0} entered more than once,序號{0}多次輸入
-DocType: Bank Statement Transaction Invoice Item,Journal Entry,日記帳分錄
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +183,From GSTIN,來自GSTIN
-DocType: Expense Claim Advance,Unclaimed amount,無人認領的金額
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +269,{0} items in progress,正在進行{0}項目
-DocType: Workstation,Workstation Name,工作站名稱
-DocType: Grading Scale Interval,Grade Code,等級代碼
-DocType: POS Item Group,POS Item Group,POS項目組
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,替代項目不能與項目代碼相同
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +644,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
-DocType: Sales Partner,Target Distribution,目標分佈
-DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-定期評估
-DocType: Salary Slip,Bank Account No.,銀行賬號
-DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
-DocType: Supplier Scorecard,"Scorecard variables can be used, as well as:
+"If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order",如果Shopify不包含訂單中的客戶，則在同步訂單時，系統會考慮默認客戶訂單
+Opening Invoice Creation Tool Item,打開發票創建工具項目
+Cashier Closing Payments,收銀員結算付款
+Employee Number,員工人數
+Cancel Invoice After Grace Period,在寬限期後取消發票
+Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
+% Completed,％已完成
+Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
+Item 2,項目2,
+Authorization Endpoint,授權端點
+International,國際
+Training Event,培訓活動
+Auto re-order,自動重新排序
+Total Achieved,實現總計
+Place of Issue,簽發地點
+Laboratory Testing Datetime,實驗室測試日期時間
+Add Quote,添加報價
+UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
+Indirect Expenses,間接費用
+Row {0}: Qty is mandatory,列#{0}：數量是強制性的
+Agriculture,農業
+Create Sales Order,創建銷售訂單
+Accounting Entry for Asset,資產會計分錄
+Block Invoice,阻止發票
+Quantity to Make,數量
+Sync Master Data,同步主數據
+Repair Cost,修理費用
+Your Products or Services,您的產品或服務
+Failed to login,登錄失敗
+Asset {0} created,資產{0}已創建
+Special Test Items,特殊測試項目
+You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能在Marketplace上註冊。
+As per your assigned Salary Structure you cannot apply for benefits,根據您指定的薪資結構，您無法申請福利
+Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
+Merge,合併
+Purchase Order,採購訂單
+Fuel UOM,燃油計量單位
+Warehouse Contact Info,倉庫聯絡方式
+Write Off Difference Amount,核銷金額差異
+Volunteer Name,志願者姓名
+Rows with duplicate due dates in other rows were found: {0},發現其他行中具有重複截止日期的行：{0}
+"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
+No Salary Structure assigned for Employee {0} on given date {1},給定日期{1}的員工{0}沒有分配薪金結構
+Shipping rule not applicable for country {0},運費規則不適用於國家/地區{0}
+Foreign Trade Details,外貿詳細
+Assessment Plan Status,評估計劃狀態
+Serial No Details,序列號詳細資訊
+Item Tax Rate,項目稅率
+From Party Name,來自黨名
+Group Roll Number,組卷編號
+Group Roll Number,組卷編號
+"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方科目可以連接另一個借方分錄
+Delivery Note {0} is not submitted,送貨單{0}未提交
+Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
+Capital Equipments,資本設備
+"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
+Please set the Item Code first,請先設定商品代碼
+Doc Type,文件類型
+Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100,
+Billing Interval Count,計費間隔計數
+Appointments and Patient Encounters,預約和患者遭遇
+Value missing,價值缺失
+Department and Grade,部門和年級
+Edit Description,編輯說明
+Team Updates,團隊更新
+For Supplier,對供應商
+Setting Account Type helps in selecting this Account in transactions.,設置會計科目類型有助於在交易中選擇該科目。
+Grand Total (Company Currency),總計（公司貨幣）
+Create Print Format,創建打印格式
+Fee Created,創建費用
+Did not find any item called {0},沒有找到所謂的任何項目{0}
+Items Filter,物品過濾
+Criteria Formula,標準配方
+Total Outgoing,出貨總計
+"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
+Duration,持續時間
+"For an item {0}, quantity must be positive number",對於商品{0}，數量必須是正數
+Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：該成本中心是一個集團。不能讓反對團體的會計分錄。
+Compensatory leave request days not in valid holidays,補休請求天不在有效假期
+Child warehouse exists for this warehouse. You can not delete this warehouse.,兒童倉庫存在這個倉庫。您不能刪除這個倉庫。
+Website Item Groups,網站項目群組
+Total (Company Currency),總計（公司貨幣）
+Reminder,提醒
+Accessable Value,可訪問的價值
+Serial number {0} entered more than once,序號{0}多次輸入
+Journal Entry,日記帳分錄
+From GSTIN,來自GSTIN,
+Unclaimed amount,無人認領的金額
+{0} items in progress,正在進行{0}項目
+Workstation Name,工作站名稱
+Grade Code,等級代碼
+POS Item Group,POS項目組
+Email Digest:,電子郵件摘要：
+Alternative item must not be same as item code,替代項目不能與項目代碼相同
+BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+Target Distribution,目標分佈
+06-Finalization of Provisional assessment,06-定期評估
+Bank Account No.,銀行賬號
+This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
+"Scorecard variables can be used, as well as:
{total_score} (the total score from that period),
{period_number} (the number of periods to present day)
",可以使用記分卡變量，以及：{total_score}（該期間的總分數），{period_number}（到當前時間段的數量）
-apps/erpnext/erpnext/public/js/setup_wizard.js +254,Collapse All,全部收縮
-apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +27,Create Purchase Order,創建採購訂單
-DocType: Quality Inspection Reading,Reading 8,閱讀8
-DocType: Inpatient Record,Discharge Note,卸貨說明
-DocType: Purchase Invoice,Taxes and Charges Calculation,稅費計算
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
-DocType: Request for Quotation Supplier,Request for Quotation Supplier,詢價供應商
-DocType: Healthcare Settings,Registration Message,註冊信息
-DocType: Prescription Dosage,Prescription Dosage,處方用量
-DocType: Contract,HR Manager,人力資源經理
-apps/erpnext/erpnext/accounts/party.py +196,Please select a Company,請選擇一個公司
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +70,Privilege Leave,特權休假
-DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
-DocType: Asset Settings,This value is used for pro-rata temporis calculation,該值用於按比例計算
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +91,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,評分標準
-DocType: Purchase Invoice,Party Account Currency,黨的科目幣種
-DocType: Delivery Trip,Total Estimated Distance,總估計距離
-,BOM Browser,BOM瀏覽器
-apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,請更新此培訓活動的狀態
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,存在重疊的條件：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,總訂單價值
-apps/erpnext/erpnext/demo/setup/setup_data.py +341,Food,食物
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +42,Ageing Range 3,老齡範圍3
-DocType: POS Closing Voucher Details,POS Closing Voucher Details,POS關閉憑證詳細信息
-DocType: Shopify Log,Shopify Log,Shopify日誌
-DocType: Inpatient Occupancy,Check In,報到
-DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},針對{1}存在維護計劃{0}
-apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +36,Enrolling student,招生學生
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},關閉科目的貨幣必須是{0}
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
-DocType: Project,Start and End Dates,開始和結束日期
-DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,合同模板履行條款
-,Delivered Items To Be Billed,交付項目要被收取
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},開放BOM {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +64,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
-DocType: Purchase Invoice Item,UOM,UOM
-DocType: Rename Tool,Utilities,公用事業
-DocType: POS Profile,Accounting,會計
-DocType: Asset,Purchase Receipt Amount,採購收據金額
-DocType: Employee Separation,Exit Interview Summary,退出面試摘要
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +140,Please select batches for batched item ,請為批量選擇批次
-DocType: Asset,Depreciation Schedules,折舊計劃
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +37,"Support for public app is deprecated. Please setup private app, for more details refer user manual",對公共應用程序的支持已被棄用。請設置私人應用程序，更多詳細信息請參閱用戶手冊
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +202,Following accounts might be selected in GST Settings:,以下帳戶可能在GST設置中選擇：
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
-DocType: Activity Cost,Projects,專案
-DocType: Payment Request,Transaction Currency,交易貨幣
-apps/erpnext/erpnext/controllers/buying_controller.py +34,From {0} | {1} {2},從{0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,有些電子郵件無效
-DocType: Work Order Operation,Operation Description,操作說明
-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,平均每日傳出
-DocType: POS Profile,Campaign,競賽
-DocType: Supplier,Name and Type,名稱和類型
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
-DocType: Healthcare Practitioner,Contacts and Address,聯繫人和地址
-DocType: Salary Structure,Max Benefits (Amount),最大收益（金額）
-DocType: Purchase Invoice,Contact Person,聯絡人
-apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +107,No data for this period,此期間沒有數據
-DocType: Course Scheduling Tool,Course End Date,課程結束日期
-DocType: Sales Order Item,Planned Quantity,計劃數量
-DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
-DocType: Water Analysis,Water Analysis Criteria,水分析標準
-DocType: Item,Maintain Stock,維護庫存資料
-DocType: Employee,Prefered Email,首選電子郵件
-DocType: Student Admission,Eligibility and Details,資格和細節
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,在固定資產淨變動
-apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要數量
-DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +892,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大數量：{0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
-DocType: Shopify Settings,For Company,對於公司
-apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"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 +70,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,創建課程表時出現錯誤
-DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一個費用審批人將被設置為默認的費用審批人。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的Administrator以外的用戶才能在Marketplace上註冊。
-apps/erpnext/erpnext/stock/doctype/item/item.py +830,Item {0} is not a stock Item,項{0}不是缺貨登記
-DocType: Maintenance Visit,Unscheduled,計劃外
-DocType: Employee,Owned,擁有的
-DocType: Salary Component,Depends on Leave Without Pay,依賴於無薪休假
-DocType: Pricing Rule,"Higher the number, higher the priority",數字越大，優先級越高
-,Purchase Invoice Trends,購買發票趨勢
-DocType: Travel Itinerary,Gluten Free,不含麩質
-DocType: Loyalty Program Collection,Minimum Total Spent,最低總支出
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +222,"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",行＃{0}：批次{1}只有{2}數量。請選擇具有{3}數量的其他批次，或將該行拆分成多個行，以便從多個批次中傳遞/發布
-DocType: Loyalty Program,Expiry Duration (in days),到期時間（天）
-DocType: Subscription Plan,Price Determination,價格確定
-apps/erpnext/erpnext/hr/doctype/department/department_tree.js +18,New Department,新部門
-DocType: Compensatory Leave Request,Worked On Holiday,在度假工作
-DocType: Appraisal,Goals,目標
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +399,Select POS Profile,選擇POS配置文件
-DocType: Warranty Claim,Warranty / AMC Status,保修/ AMC狀態
-,Accounts Browser,帳戶瀏覽器
-DocType: Procedure Prescription,Referral,推薦
-DocType: Payment Entry Reference,Payment Entry Reference,付款輸入參考
-DocType: GL Entry,GL Entry,GL報名
-DocType: Support Search Source,Response Options,響應選項
-DocType: HR Settings,Employee Settings,員工設置
-apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加載支付系統
-,Batch-Wise Balance History,間歇式平衡歷史
-apps/erpnext/erpnext/controllers/accounts_controller.py +1122,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金額大於項目{1}的開帳單金額，則無法設置費率。
-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 +83,Apprentice,學徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,負數量是不允許
-DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Collapse All,全部收縮
+Create Purchase Order,創建採購訂單
+Reading 8,閱讀8,
+Discharge Note,卸貨說明
+Taxes and Charges Calculation,稅費計算
+Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
+Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
+Request for Quotation Supplier,詢價供應商
+Registration Message,註冊信息
+Prescription Dosage,處方用量
+HR Manager,人力資源經理
+Please select a Company,請選擇一個公司
+Privilege Leave,特權休假
+Supplier Invoice Date,供應商發票日期
+This value is used for pro-rata temporis calculation,該值用於按比例計算
+You need to enable Shopping Cart,您需要啟用購物車
+Writeoff,註銷
+Naming Series Prefix,命名系列前綴
+Appraisal Template Goal,考核目標模板
+Earning,盈利
+Scoring Criteria,評分標準
+Party Account Currency,黨的科目幣種
+Total Estimated Distance,總估計距離
+BOM Browser,BOM瀏覽器
+Please update your status for this training event,請更新此培訓活動的狀態
+Overlapping conditions found between:,存在重疊的條件：
+Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
+Total Order Value,總訂單價值
+Food,食物
+Ageing Range 3,老齡範圍3,
+POS Closing Voucher Details,POS關閉憑證詳細信息
+Shopify Log,Shopify日誌
+Check In,報到
+No of Visits,沒有訪問量的
+Maintenance Schedule {0} exists against {1},針對{1}存在維護計劃{0}
+Enrolling student,招生學生
+Currency of the Closing Account must be {0},關閉科目的貨幣必須是{0}
+Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
+Start and End Dates,開始和結束日期
+Contract Template Fulfilment Terms,合同模板履行條款
+Delivered Items To Be Billed,交付項目要被收取
+Open BOM {0},開放BOM {0}
+Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
+UOM,UOM,
+Utilities,公用事業
+Accounting,會計
+Purchase Receipt Amount,採購收據金額
+Exit Interview Summary,退出面試摘要
+Please select batches for batched item ,請為批量選擇批次
+Depreciation Schedules,折舊計劃
+"Support for public app is deprecated. Please setup private app, for more details refer user manual",對公共應用程序的支持已被棄用。請設置私人應用程序，更多詳細信息請參閱用戶手冊
+Following accounts might be selected in GST Settings:,以下帳戶可能在GST設置中選擇：
+Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
+Projects,專案
+Transaction Currency,交易貨幣
+From {0} | {1} {2},從{0} | {1} {2}
+Some emails are invalid,有些電子郵件無效
+Operation Description,操作說明
+Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,不能更改財政年度開始日期和財政年度結束日期，一旦會計年度被保存。
+Shopping Cart,購物車
+Avg Daily Outgoing,平均每日傳出
+Campaign,競賽
+Name and Type,名稱和類型
+Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
+Contacts and Address,聯繫人和地址
+Max Benefits (Amount),最大收益（金額）
+Contact Person,聯絡人
+'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
+No data for this period,此期間沒有數據
+Course End Date,課程結束日期
+Planned Quantity,計劃數量
+Item Tax Amount,項目稅額
+Water Analysis Criteria,水分析標準
+Maintain Stock,維護庫存資料
+Prefered Email,首選電子郵件
+Eligibility and Details,資格和細節
+Net Change in Fixed Asset,在固定資產淨變動
+Reqd Qty,需要數量
+Leave blank if considered for all designations,離開，如果考慮所有指定空白
+Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+Max: {0},最大數量：{0}
+From Datetime,從日期時間
+For Company,對於公司
+Communication log.,通信日誌。
+"Request for Quotation is disabled to access from portal, for more check portal settings.",詢價被禁止訪問門脈，為更多的檢查門戶設置。
+Supplier Scorecard Scoring Variable,供應商記分卡評分變量
+Buying Amount,購買金額
+Shipping Address Name,送貨地址名稱
+Terms and Conditions Content,條款及細則內容
+There were errors creating Course Schedule,創建課程表時出現錯誤
+The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一個費用審批人將被設置為默認的費用審批人。
+cannot be greater than 100,不能大於100,
+You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的Administrator以外的用戶才能在Marketplace上註冊。
+Item {0} is not a stock Item,項{0}不是缺貨登記
+Unscheduled,計劃外
+Owned,擁有的
+Depends on Leave Without Pay,依賴於無薪休假
+"Higher the number, higher the priority",數字越大，優先級越高
+Purchase Invoice Trends,購買發票趨勢
+Gluten Free,不含麩質
+Minimum Total Spent,最低總支出
+"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",行＃{0}：批次{1}只有{2}數量。請選擇具有{3}數量的其他批次，或將該行拆分成多個行，以便從多個批次中傳遞/發布
+Expiry Duration (in days),到期時間（天）
+Price Determination,價格確定
+New Department,新部門
+Worked On Holiday,在度假工作
+Goals,目標
+Select POS Profile,選擇POS配置文件
+Warranty / AMC Status,保修/ AMC狀態
+Accounts Browser,帳戶瀏覽器
+Referral,推薦
+Payment Entry Reference,付款輸入參考
+GL Entry,GL報名
+Response Options,響應選項
+Employee Settings,員工設置
+Loading Payment System,加載支付系統
+Batch-Wise Balance History,間歇式平衡歷史
+Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金額大於項目{1}的開帳單金額，則無法設置費率。
+Print settings updated in respective print format,打印設置在相應的打印格式更新
+Package Code,封裝代碼
+Apprentice,學徒
+Negative Quantity is not allowed,負數量是不允許
+"Tax detail table fetched from item master as a string and stored in this field.
Used for Taxes and Charges",從項目主檔獲取的稅務詳細資訊表，成為字串並存儲在這欄位。用於稅賦及費用
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +171,Employee cannot report to himself.,員工不能報告自己。
-DocType: Leave Type,Max Leaves Allowed,允許最大葉子
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
-DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/accounts/party.py +269,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
-DocType: HR Settings,Leave Approver Mandatory In Leave Application,在離職申請中允許Approver為強制性
-DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況，學歷等。
-DocType: Journal Entry Account,Account Balance,帳戶餘額
-apps/erpnext/erpnext/config/accounts.py +179,Tax Rule for transactions.,稅收規則進行的交易。
-DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客戶對應收帳款{2}
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
-DocType: Weather,Weather Parameter,天氣參數
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +76,Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
-DocType: Item,Asset Naming Series,資產命名系列
-apps/erpnext/erpnext/regional/india/utils.py +179,House rented dates should be atleast 15 days apart,出租房屋的日期應至少相隔15天
-DocType: Clinical Procedure Template,Collection Details,收集細節
-DocType: POS Profile,Allow Print Before Pay,付款前允許打印
-DocType: Linked Soil Texture,Linked Soil Texture,連接的土壤紋理
-DocType: Shipping Rule,Shipping Account,送貨科目
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{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: Bank Statement Transaction Entry,Bank Transaction Entries,銀行交易分錄
-DocType: Quality Inspection,Readings,閱讀
-DocType: Stock Entry,Total Additional Costs,總額外費用
-apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +47,No of Interactions,沒有相互作用
-DocType: BOM,Scrap Material Cost(Company Currency),廢料成本（公司貨幣）
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +44,Sub Assemblies,子組件
-DocType: Asset,Asset Name,資產名稱
-DocType: Project,Task Weight,任務重
-DocType: Loyalty Program,Loyalty Program Type,忠誠度計劃類型
-DocType: Asset Movement,Stock Manager,庫存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +250,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
-apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付條款可能是重複的。
-apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),農業（測試版）
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +919,Packing Slip,包裝單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Office Rent,辦公室租金
-apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,設置短信閘道設置
-DocType: Disease,Common Name,通用名稱
-DocType: Employee Boarding Activity,Employee Boarding Activity,員工寄宿活動
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,導入失敗！
-apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,尚未新增地址。
-DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
-DocType: Vital Signs,Blood Pressure,血壓
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Analyst,分析人士
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +20,{0} is not in a valid Payroll Period,{0}不在有效的工資核算期間
-DocType: Item,Inventory,庫存
-DocType: Item,Sales Details,銷售詳細資訊
-DocType: Opportunity,With Items,隨著項目
-DocType: Asset Maintenance,Maintenance Team,維修隊
-DocType: Salary Component,Is Additional Component,是附加組件
-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,項目屬性
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,報銷{0}已經存在車輛日誌
-DocType: Asset Movement,Source Location,來源地點
-apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,學院名稱
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,請輸入還款金額
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +18,There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier.,根據總花費可以有多個分層收集因子。但兌換的兌換係數對於所有等級總是相同的。
-apps/erpnext/erpnext/config/stock.py +312,Item Variants,項目變體
-apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服務
-DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1098,Select Possible Supplier,選擇潛在供應商
-DocType: Customer,"Select, to make the customer searchable with these fields",選擇，使客戶可以使用這些字段進行搜索
-DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在發貨時從Shopify導入交貨單
-apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
-DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
-DocType: Fee Validity,Fee Validity,費用有效期
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,沒有在支付表中找到記錄
-apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
-DocType: Student Attendance Tool,Students HTML,學生HTML
-DocType: GST HSN Code,GST HSN Code,GST HSN代碼
-DocType: Employee External Work History,Total Experience,總經驗
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打開項目
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +300,Packing Slip(s) cancelled,包裝單（ S）已取消
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +90,Cash Flow from Investing,從投資現金流
-DocType: Program Course,Program Course,課程計劃
-DocType: Healthcare Service Unit,Allow Appointments,允許約會
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Freight and Forwarding Charges,貨運代理費
-DocType: Homepage,Company Tagline for website homepage,公司標語的網站主頁
-DocType: Item Group,Item Group Name,項目群組名稱
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Taken,拍攝
-DocType: Student,Date of Leaving,離開日期
-DocType: Pricing Rule,For Price List,對於價格表
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +27,Executive Search,獵頭
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +56,Setting defaults,設置默認值
-DocType: Loyalty Program,Auto Opt In (For all customers),自動選擇（適用於所有客戶）
-apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,建立潛在客戶
-DocType: Maintenance Schedule,Schedules,時間表
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +515,POS Profile is required to use Point-of-Sale,POS配置文件需要使用銷售點
-DocType: Cashier Closing,Net Amount,淨額
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} 尚未提交, 因此無法完成操作"
-DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
-DocType: Landed Cost Voucher,Additional Charges,附加費用
-DocType: Support Search Source,Result Route Field,結果路由字段
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
-DocType: Supplier Scorecard,Supplier Scorecard,供應商記分卡
-DocType: Plant Analysis,Result Datetime,結果日期時間
-,Support Hour Distribution,支持小時分配
-DocType: Maintenance Visit,Maintenance Visit,維護訪問
-DocType: Student,Leaving Certificate Number,畢業證書號碼
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +100,"Appointment cancelled, Please review and cancel the invoice {0}",預約已取消，請查看並取消發票{0}
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
-DocType: Bank Account,Is Company Account,是公司帳戶
-apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +58,Leave Type {0} is not encashable,離開類型{0}不可放置
-DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
-DocType: Purchase Invoice,Select Shipping Address,選擇送貨地址
-DocType: Timesheet Detail,Expected Hrs,預計的小時數
-apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership細節
-DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +194,Please input all required Result Value(s),請輸入所有必需的結果值（s）
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +142,Accounts Receivable Summary,應收帳款匯總
-DocType: POS Closing Voucher,Linked Invoices,鏈接的發票
-DocType: Loan,Monthly Repayment Amount,每月還款額
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,打開發票
-DocType: Contract,Contract Details,合同細節
-DocType: Employee,Leave Details,留下細節
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +218,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
-DocType: UOM,UOM Name,計量單位名稱
-DocType: GST HSN Code,HSN Code,HSN代碼
-apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +87,Contribution Amount,貢獻金額
-DocType: Purchase Invoice,Shipping Address,送貨地址
-DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存，就會顯示出來。
-apps/erpnext/erpnext/erpnext_integrations/utils.py +22,Unverified Webhook Data,未經驗證的Webhook數據
-apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},學生{0} - {1}出現連續中多次{2}和{3}
-DocType: Item Alternative,Two-way,雙向
-DocType: Project,Day to Send,發送日
-DocType: Healthcare Settings,Manage Sample Collection,管理樣品收集
-DocType: Production Plan,Ignore Existing Ordered Quantity,忽略現有的訂購數量
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +73,Please set the series to be used.,請設置要使用的系列。
-DocType: Patient,Tobacco Past Use,煙草過去使用
-DocType: Travel Itinerary,Mode of Travel,旅行模式
-DocType: Sales Invoice Item,Brand Name,商標名稱
-DocType: Purchase Receipt,Transporter Details,貨運公司細節
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2714,Default warehouse is required for selected item,默認倉庫需要選中的項目
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1095,Possible Supplier,可能的供應商
-DocType: Budget,Monthly Distribution,月度分佈
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +72,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
-apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),醫療保健（beta）
-DocType: Production Plan Sales Order,Production Plan Sales Order,生產計劃銷售訂單
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +433,"No active BOM found for item {0}. Delivery by \
+Employee cannot report to himself.,員工不能報告自己。
+Max Leaves Allowed,允許最大葉子
+"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
+Bank Balance,銀行結餘
+Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+Leave Approver Mandatory In Leave Application,在離職申請中允許Approver為強制性
+"Job profile, qualifications required etc.",所需的工作概況，學歷等。
+Account Balance,帳戶餘額
+Tax Rule for transactions.,稅收規則進行的交易。
+Type of document to rename.,的文件類型進行重命名。
+{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客戶對應收帳款{2}
+Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
+Weather Parameter,天氣參數
+Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
+Asset Naming Series,資產命名系列
+House rented dates should be atleast 15 days apart,出租房屋的日期應至少相隔15天
+Collection Details,收集細節
+Allow Print Before Pay,付款前允許打印
+Linked Soil Texture,連接的土壤紋理
+Shipping Account,送貨科目
+{0} {1}: Account {2} is inactive,{0} {1}科目{2}無效
+Make Sales Orders to help you plan your work and deliver on-time,製作銷售訂單，以幫助你計劃你的工作和按時交付
+Bank Transaction Entries,銀行交易分錄
+Readings,閱讀
+Total Additional Costs,總額外費用
+No of Interactions,沒有相互作用
+Scrap Material Cost(Company Currency),廢料成本（公司貨幣）
+Sub Assemblies,子組件
+Asset Name,資產名稱
+Task Weight,任務重
+Loyalty Program Type,忠誠度計劃類型
+Stock Manager,庫存管理
+Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
+The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付條款可能是重複的。
+Agriculture (beta),農業（測試版）
+Packing Slip,包裝單
+Office Rent,辦公室租金
+Setup SMS gateway settings,設置短信閘道設置
+Common Name,通用名稱
+Employee Boarding Activity,員工寄宿活動
+Import Failed!,導入失敗！
+No address added yet.,尚未新增地址。
+Workstation Working Hour,工作站工作時間
+Blood Pressure,血壓
+Analyst,分析人士
+{0} is not in a valid Payroll Period,{0}不在有效的工資核算期間
+Inventory,庫存
+Sales Details,銷售詳細資訊
+With Items,隨著項目
+Maintenance Team,維修隊
+Is Additional Component,是附加組件
+In Qty,在數量
+Validate Enrolled Course for Students in Student Group,驗證學生組學生入學課程
+Expense Claim Rejected,費用索賠被拒絕
+Item Attribute,項目屬性
+Expense Claim {0} already exists for the Vehicle Log,報銷{0}已經存在車輛日誌
+Source Location,來源地點
+Institute Name,學院名稱
+There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier.,根據總花費可以有多個分層收集因子。但兌換的兌換係數對於所有等級總是相同的。
+Item Variants,項目變體
+Services,服務
+Email Salary Slip to Employee,電子郵件工資單給員工
+Select Possible Supplier,選擇潛在供應商
+"Select, to make the customer searchable with these fields",選擇，使客戶可以使用這些字段進行搜索
+Import Delivery Notes from Shopify on Shipment,在發貨時從Shopify導入交貨單
+Show closed,顯示關閉
+Is Leave Without Pay,是無薪休假
+Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
+Fee Validity,費用有效期
+No records found in the Payment table,沒有在支付表中找到記錄
+This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
+Students HTML,學生HTML,
+GST HSN Code,GST HSN代碼
+Total Experience,總經驗
+Open Projects,打開項目
+Packing Slip(s) cancelled,包裝單（ S）已取消
+Cash Flow from Investing,從投資現金流
+Program Course,課程計劃
+Allow Appointments,允許約會
+Freight and Forwarding Charges,貨運代理費
+Company Tagline for website homepage,公司標語的網站主頁
+Item Group Name,項目群組名稱
+Taken,拍攝
+Date of Leaving,離開日期
+For Price List,對於價格表
+Executive Search,獵頭
+Setting defaults,設置默認值
+Auto Opt In (For all customers),自動選擇（適用於所有客戶）
+Create Leads,建立潛在客戶
+Schedules,時間表
+POS Profile is required to use Point-of-Sale,POS配置文件需要使用銷售點
+Net Amount,淨額
+{0} {1} has not been submitted so the action cannot be completed,"{0} {1} 尚未提交, 因此無法完成操作"
+BOM Detail No,BOM表詳細編號
+Additional Charges,附加費用
+Result Route Field,結果路由字段
+Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
+Supplier Scorecard,供應商記分卡
+Result Datetime,結果日期時間
+Support Hour Distribution,支持小時分配
+Maintenance Visit,維護訪問
+Leaving Certificate Number,畢業證書號碼
+"Appointment cancelled, Please review and cancel the invoice {0}",預約已取消，請查看並取消發票{0}
+Available Batch Qty at Warehouse,可用的批次數量在倉庫
+Is Company Account,是公司帳戶
+Leave Type {0} is not encashable,離開類型{0}不可放置
+Landed Cost Help,到岸成本幫助
+Select Shipping Address,選擇送貨地址
+Expected Hrs,預計的小時數
+Memebership Details,Memebership細節
+Block Holidays on important days.,重要的日子中封鎖假期。
+Please input all required Result Value(s),請輸入所有必需的結果值（s）
+Accounts Receivable Summary,應收帳款匯總
+Linked Invoices,鏈接的發票
+Opening Invoices,打開發票
+Contract Details,合同細節
+Leave Details,留下細節
+Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
+UOM Name,計量單位名稱
+HSN Code,HSN代碼
+Contribution Amount,貢獻金額
+Shipping Address,送貨地址
+This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
+In Words will be visible once you save the Delivery Note.,送貨單一被儲存，就會顯示出來。
+Unverified Webhook Data,未經驗證的Webhook數據
+Student {0} - {1} appears Multiple times in row {2} & {3},學生{0} - {1}出現連續中多次{2}和{3}
+Two-way,雙向
+Day to Send,發送日
+Manage Sample Collection,管理樣品收集
+Ignore Existing Ordered Quantity,忽略現有的訂購數量
+Please set the series to be used.,請設置要使用的系列。
+Tobacco Past Use,煙草過去使用
+Mode of Travel,旅行模式
+Brand Name,商標名稱
+Transporter Details,貨運公司細節
+Default warehouse is required for selected item,默認倉庫需要選中的項目
+Possible Supplier,可能的供應商
+Monthly Distribution,月度分佈
+Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
+Healthcare (beta),醫療保健（beta）
+Production Plan Sales Order,生產計劃銷售訂單
+"No active BOM found for item {0}. Delivery by \
Serial No cannot be ensured",未找到項{0}的有效BOM。無法確保交貨\串口號
-DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
-DocType: Loan Type,Maximum Loan Amount,最高貸款額度
-DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},學生{0}的重複卷號
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},學生{0}的重複卷號
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求採購訂單
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +79,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
-,Bank Reconciliation Statement,銀行對帳表
-DocType: Patient Encounter,Medical Coding,醫學編碼
-,Lead Name,主導者名稱
-,POS,POS
-apps/erpnext/erpnext/config/stock.py +317,Opening Stock Balance,期初存貨餘額
-DocType: Asset Category Account,Capital Work In Progress Account,資本工作進行中的帳戶
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +92,Asset Value Adjustment,資產價值調整
-DocType: Additional Salary,Payroll Date,工資日期
-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,無項目包裝
-DocType: Shipping Rule Condition,From Value,從價值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +717,Manufacturing Quantity is mandatory,生產數量是必填的
-DocType: Loan,Repayment Method,還款方式
-DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果選中，主頁將是網站的默認項目組
-DocType: Quality Inspection Reading,Reading 4,4閱讀
-apps/erpnext/erpnext/utilities/activation.py +118,"Students are at the heart of the system, add all your students",學生在系統的心臟，添加所有的學生
-apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py +16,Member ID,會員ID
-DocType: Employee Tax Exemption Proof Submission,Monthly Eligible Amount,每月合格金額
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}無法支票日期前{2}
-DocType: Asset Maintenance Task,Certificate Required,證書要求
-DocType: Company,Default Holiday List,預設假日表列
-DocType: Pricing Rule,Supplier Group,供應商集團
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +163,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：從時間和結束時間{1}是具有重疊{2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Stock Liabilities,現貨負債
-DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
-DocType: Opportunity,Contact Mobile No,聯絡手機號碼
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +53,Select Company,選擇公司
-,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
-DocType: Staffing Plan Detail,Estimated Cost Per Position,估計的每位成本
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用戶{0}沒有任何默認的POS配置文件。檢查此用戶的行{1}處的默認值。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +166,Employee Referral,員工推薦
-DocType: Student Group,Set 0 for no limit,為不限制設為0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +191,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
-DocType: Customer,Primary Address and Contact Detail,主要地址和聯繫人詳情
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +21,Resend Payment Email,重新發送付款電子郵件
-apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任務
-DocType: Clinical Procedure,Appointment,約定
-apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,請報價
-apps/erpnext/erpnext/config/education.py +230,Other Reports,其他報告
-apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,請選擇至少一個域名。
-DocType: Dependent Task,Dependent Task,相關任務
-DocType: Shopify Settings,Shopify Tax Account,Shopify稅收帳戶
-apps/erpnext/erpnext/stock/doctype/item/item.py +475,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +257,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
-DocType: Delivery Trip,Optimize Route,優化路線
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
+Sales Partner Target,銷售合作夥伴目標
+Pricing Rule,定價規則
+Duplicate roll number for student {0},學生{0}的重複卷號
+Duplicate roll number for student {0},學生{0}的重複卷號
+Material Request to Purchase Order,材料要求採購訂單
+Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
+Bank Accounts,銀行帳戶
+Bank Reconciliation Statement,銀行對帳表
+Medical Coding,醫學編碼
+Lead Name,主導者名稱
+POS,POS,
+Opening Stock Balance,期初存貨餘額
+Capital Work In Progress Account,資本工作進行中的帳戶
+Asset Value Adjustment,資產價值調整
+Payroll Date,工資日期
+{0} must appear only once,{0}必須只出現一次
+Leaves Allocated Successfully for {0},{0}的排假成功
+No Items to pack,無項目包裝
+From Value,從價值
+Manufacturing Quantity is mandatory,生產數量是必填的
+"If checked, the Home page will be the default Item Group for the website",如果選中，主頁將是網站的默認項目組
+Reading 4,4閱讀
+"Students are at the heart of the system, add all your students",學生在系統的心臟，添加所有的學生
+Member ID,會員ID,
+Monthly Eligible Amount,每月合格金額
+Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}無法支票日期前{2}
+Certificate Required,證書要求
+Default Holiday List,預設假日表列
+Supplier Group,供應商集團
+Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：從時間和結束時間{1}是具有重疊{2}
+Stock Liabilities,現貨負債
+Supplier Warehouse,供應商倉庫
+Contact Mobile No,聯絡手機號碼
+Select Company,選擇公司
+Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
+Estimated Cost Per Position,估計的每位成本
+User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用戶{0}沒有任何默認的POS配置文件。檢查此用戶的行{1}處的默認值。
+Employee Referral,員工推薦
+Set 0 for no limit,為不限制設為0,
+The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
+Primary Address and Contact Detail,主要地址和聯繫人詳情
+Resend Payment Email,重新發送付款電子郵件
+New task,新任務
+Appointment,約定
+Make Quotation,請報價
+Other Reports,其他報告
+Please select at least one domain.,請選擇至少一個域名。
+Dependent Task,相關任務
+Shopify Tax Account,Shopify稅收帳戶
+Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+Optimize Route,優化路線
+Try planning operations for X days in advance.,嘗試提前X天規劃作業。
+"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",已為{3}的子公司計劃{2}的{0}空缺和{1}預算。 \根據母公司{3}的員工計劃{6}，您只能計劃最多{4}個職位空缺和預算{5}。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
-DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,通過亞馬遜獲取稅收和收費數據的財務分解
-DocType: SMS Center,Receiver List,收受方列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,搜索項目
-DocType: Payment Schedule,Payment Amount,付款金額
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +20,Half Day Date should be in between Work From Date and Work End Date,半天日期應在工作日期和工作結束日期之間
-DocType: Healthcare Settings,Healthcare Service Items,醫療服務項目
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +69,Net Change in Cash,現金淨變動
-DocType: Assessment Plan,Grading Scale,分級量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +617,Already completed,已經完成
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,庫存在手
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +68,"Please add the remaining benefits {0} to the application as \
+Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
+Get financial breakup of Taxes and charges data by Amazon ,通過亞馬遜獲取稅收和收費數據的財務分解
+Receiver List,收受方列表
+Search Item,搜索項目
+Payment Amount,付款金額
+Half Day Date should be in between Work From Date and Work End Date,半天日期應在工作日期和工作結束日期之間
+Healthcare Service Items,醫療服務項目
+Net Change in Cash,現金淨變動
+Grading Scale,分級量表
+Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+Already completed,已經完成
+Stock In Hand,庫存在手
+"Please add the remaining benefits {0} to the application as \
pro-rata component",請將剩餘的權益{0}作為\ pro-rata組件添加到應用程序中
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,導入成功！
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +35,Payment Request already exists {0},付款申請已經存在{0}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
-DocType: Healthcare Practitioner,Hospital,醫院
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +534,Quantity must not be more than {0},數量必須不超過{0}
-DocType: Travel Request Costing,Funded Amount,資助金額
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +120,Previous Financial Year is not closed,上一財政年度未關閉
-DocType: Practitioner Schedule,Practitioner Schedule,從業者時間表
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +84,Age (Days),時間（天）
-DocType: Additional Salary,Additional Salary,額外的薪水
-DocType: Quotation Item,Quotation Item,產品報價
-DocType: Customer,Customer POS Id,客戶POS ID
-DocType: Account,Account Name,帳戶名稱
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +536,From Date cannot be greater than To Date,起始日期不能大於結束日期
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,請輸入Woocommerce服務器網址
-DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +137,Conversion rate cannot be 0 or 1,轉化率不能為0或1
-apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +27,All the mandatory Task for employee creation hasn't been done yet.,所有員工創建的強制性任務尚未完成。
-DocType: Accounts Settings,Credit Controller,信用控制器
-DocType: Loan,Applicant Type,申請人類型
-DocType: Purchase Invoice,03-Deficiency in services,03-服務不足
-DocType: Healthcare Settings,Default Medical Code Standard,默認醫療代碼標準
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +267,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
-DocType: Company,Default Payable Account,預設應付帳款科目
-apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車，如航運規則，價格表等
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}％已開立帳單
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +73,Reserved Qty,保留數量
-DocType: Party Account,Party Account,參與者科目
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +142,Please select Company and Designation,請選擇公司和指定
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力資源
-apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,拒絕
-DocType: Journal Entry Account,Debit in Company Currency,借記卡在公司貨幣
-DocType: BOM Item,BOM Item,BOM項目
-DocType: Appraisal,For Employee,對於員工
-apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,請輸入支付
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
-DocType: Company,Default Values,默認值
-DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-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/hr/doctype/additional_salary/additional_salary.py +21,Payroll date can not be less than employee's joining date,工資日期不能低於員工的加入日期
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.py +87,{0} {1} created,已創建{0} {1}
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +46,"Job Openings for designation {0} already open \
+Import Successful!,導入成功！
+Payment Request already exists {0},付款申請已經存在{0}
+Cost of Issued Items,發布項目成本
+Hospital,醫院
+Quantity must not be more than {0},數量必須不超過{0}
+Funded Amount,資助金額
+Previous Financial Year is not closed,上一財政年度未關閉
+Practitioner Schedule,從業者時間表
+Age (Days),時間（天）
+Additional Salary,額外的薪水
+Quotation Item,產品報價
+Customer POS Id,客戶POS ID,
+Account Name,帳戶名稱
+From Date cannot be greater than To Date,起始日期不能大於結束日期
+Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
+Please enter Woocommerce Server URL,請輸入Woocommerce服務器網址
+Supplier Part Number,供應商零件編號
+Conversion rate cannot be 0 or 1,轉化率不能為0或1,
+All the mandatory Task for employee creation hasn't been done yet.,所有員工創建的強制性任務尚未完成。
+Credit Controller,信用控制器
+03-Deficiency in services,03-服務不足
+Default Medical Code Standard,默認醫療代碼標準
+Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+Default Payable Account,預設應付帳款科目
+"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車，如航運規則，價格表等
+{0}% Billed,{0}％已開立帳單
+Reserved Qty,保留數量
+Party Account,參與者科目
+Please select Company and Designation,請選擇公司和指定
+Human Resources,人力資源
+Reject,拒絕
+Debit in Company Currency,借記卡在公司貨幣
+BOM Item,BOM項目
+For Employee,對於員工
+Make Disbursement Entry,請輸入支付
+Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
+Default Values,默認值
+Total Amount Reimbursed,報銷金額合計
+This is based on logs against this Vehicle. See timeline below for details,這是基於對本車輛的日誌。詳情請參閱以下時間表
+Payroll date can not be less than employee's joining date,工資日期不能低於員工的加入日期
+{0} {1} created,已創建{0} {1}
+"Job Openings for designation {0} already open \
or hiring completed as per Staffing Plan {1}",指定{0}的職位空缺已根據人員配置計劃{1}已打開或正在招聘
-DocType: Vital Signs,Constipated,大便乾燥
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
-DocType: Customer,Default Price List,預設價格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,資產運動記錄{0}創建
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,未找到任何項目。
-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: Share Transfer,Equity/Liability Account,庫存/負債科目
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,一個同名的客戶已經存在
-DocType: Contract,Inactive,待用
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +224,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,這將提交工資單，並創建權責發生製日記賬分錄。你想繼續嗎？
-DocType: Purchase Invoice,Total Net Weight,總淨重
-DocType: Purchase Order,Order Confirmation No,訂單確認號
-DocType: Purchase Invoice,Eligibility For ITC,適用於ITC的資格
-DocType: Journal Entry,Entry Type,條目類型
-,Customer Credit Balance,客戶信用平衡
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +82,Net Change in Accounts Payable,應付帳款淨額變化
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +257,Credit limit has been crossed for customer {0} ({1}/{2}),客戶{0}（{1} / {2}）的信用額度已超過
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
-apps/erpnext/erpnext/config/accounts.py +136,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +26,Pricing,價錢
-DocType: Quotation,Term Details,長期詳情
-DocType: Employee Incentive,Employee Incentive,員工激勵
-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/stock/report/item_price_stock/item_price_stock.py +42,Stock Available,現貨供應
-DocType: Manufacturing Settings,Capacity Planning For (Days),產能規劃的範圍（天）
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,採購
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +22,Mandatory field - Program,強制性領域 - 計劃
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +22,Mandatory field - Program,強制性領域 - 計劃
-DocType: Special Test Template,Result Component,結果組件
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保修索賠
-,Lead Details,潛在客戶詳情
-DocType: Salary Slip,Loan repayment,償還借款
-DocType: Share Transfer,Asset Account,資產科目
-DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
-DocType: Pricing Rule,Applicable For,適用
-DocType: Lab Test,Technician Name,技術員姓名
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +425,"Cannot ensure delivery by Serial No as \
+Constipated,大便乾燥
+Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
+Default Price List,預設價格表
+Asset Movement record {0} created,資產運動記錄{0}創建
+No items found.,未找到任何項目。
+You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
+Equity/Liability Account,庫存/負債科目
+A customer with the same name already exists,一個同名的客戶已經存在
+Inactive,待用
+This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,這將提交工資單，並創建權責發生製日記賬分錄。你想繼續嗎？
+Total Net Weight,總淨重
+Order Confirmation No,訂單確認號
+Eligibility For ITC,適用於ITC的資格
+Entry Type,條目類型
+Customer Credit Balance,客戶信用平衡
+Net Change in Accounts Payable,應付帳款淨額變化
+Credit limit has been crossed for customer {0} ({1}/{2}),客戶{0}（{1} / {2}）的信用額度已超過
+Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
+Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
+Pricing,價錢
+Term Details,長期詳情
+Employee Incentive,員工激勵
+Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
+Total (Without Tax),總計（不含稅）
+Lead Count,鉛計數
+Lead Count,鉛計數
+Stock Available,現貨供應
+Capacity Planning For (Days),產能規劃的範圍（天）
+Procurement,採購
+None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
+Mandatory field - Program,強制性領域 - 計劃
+Mandatory field - Program,強制性領域 - 計劃
+Result Component,結果組件
+Warranty Claim,保修索賠
+Lead Details,潛在客戶詳情
+Loan repayment,償還借款
+Asset Account,資產科目
+End date of current invoice's period,當前發票的期限的最後一天
+Applicable For,適用
+Technician Name,技術員姓名
+"Cannot ensure delivery by Serial No as \
Item {0} is added with and without Ensure Delivery by \
Serial No.",無法通過序列號確保交貨，因為\項目{0}是否添加了確保交貨\序列號
-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,沒有出現
-DocType: Shipping Rule Country,Shipping Rule Country,航運規則國家
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,假離和缺勤
-DocType: Asset,Comprehensive Insurance,綜合保險
-apps/erpnext/erpnext/selling/doctype/customer/customer.js +118,Loyalty Point: {0},忠誠度積分：{0}
-apps/erpnext/erpnext/public/js/event.js +15,Add Leads,添加潛在客戶
-DocType: Leave Type,Include holidays within leaves as leaves,休假中包含節日做休假
-DocType: Loyalty Program,Redemption,贖回
-DocType: Sales Invoice,Packed Items,盒裝項目
-DocType: Tax Withholding Category,Tax Withholding Rates,預扣稅率
-apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,針對序列號保修索賠
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +237,'Total','總數'
-DocType: Loyalty Program,Collection Tier,收集層
-apps/erpnext/erpnext/hr/utils.py +156,From date can not be less than employee's joining date,起始日期不得少於員工的加入日期
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,"Advance paid against {0} {1} cannot be greater \
+Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
+Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
+No Show,沒有出現
+Shipping Rule Country,航運規則國家
+Leave and Attendance,假離和缺勤
+Comprehensive Insurance,綜合保險
+Loyalty Point: {0},忠誠度積分：{0}
+Add Leads,添加潛在客戶
+Include holidays within leaves as leaves,休假中包含節日做休假
+Redemption,贖回
+Packed Items,盒裝項目
+Tax Withholding Rates,預扣稅率
+Warranty Claim against Serial No.,針對序列號保修索賠
+'Total','總數'
+Collection Tier,收集層
+From date can not be less than employee's joining date,起始日期不得少於員工的加入日期
+"Advance paid against {0} {1} cannot be greater \
than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
-DocType: Patient,Medication,藥物治療
-DocType: Production Plan,Include Non Stock Items,包括非庫存項目
-DocType: Project Update,Challenging/Slow,具有挑戰性/慢
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,請選擇商品代碼
-DocType: Student Sibling,Studying in Same Institute,就讀於同一研究所
-DocType: Leave Type,Earned Leave,獲得休假
-DocType: Employee,Salary Details,薪資明細
-DocType: Territory,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,銷售設置
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,網上拍賣
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,履行
-apps/erpnext/erpnext/templates/generators/item.html +101,View in Cart,查看你的購物車
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Marketing Expenses,市場推廣開支
-,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,無法創建標準條件。請重命名標準
-apps/erpnext/erpnext/stock/doctype/item/item.js +366,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
-DocType: Hub User,Hub Password,集線器密碼
-DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
-DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
-apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,該產品的一個單元。
-DocType: Fee Category,Fee Category,收費類別
-DocType: Agriculture Task,Next Business Day,下一個營業日
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +3,Allocated Leaves,分配的葉子
-DocType: Drug Prescription,Dosage by time interval,劑量按時間間隔
-DocType: Cash Flow Mapper,Section Header,章節標題
-,Student Fee Collection,學生費徵收
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +24,Appointment Duration (mins),預約時間（分鐘）
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
-DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/public/js/setup_wizard.js +178,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
-DocType: Employee,Date Of Retirement,退休日
-DocType: Upload Attendance,Get Template,獲取模板
-,Sales Person Commission Summary,銷售人員委員會摘要
-DocType: Additional Salary Component,Additional Salary Component,額外的薪資組件
-DocType: Material Request,Transferred,轉入
-DocType: Vehicle,Doors,門
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +118,ERPNext Setup Complete!,ERPNext設定完成！
-DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登記費
-apps/erpnext/erpnext/stock/doctype/item/item.py +737,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,庫存交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
-DocType: Course Assessment Criteria,Weightage,權重
-DocType: Purchase Invoice,Tax Breakup,稅收分解
-DocType: Employee,Joining Details,加入詳情
-DocType: Member,Non Profit Member,非盈利會員
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的損益“科目成本中心{2}。請設置為公司默認的成本中心。
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +175,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
-DocType: Location,Area,區
-apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,新建聯絡人
-DocType: Company,Company Description,公司介紹
-DocType: Territory,Parent Territory,家長領地
-DocType: Purchase Invoice,Place of Supply,供貨地點
-DocType: Quality Inspection Reading,Reading 2,閱讀2
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +101,Employee {0} already submited an apllication {1} for the payroll period {2},員工{0}已經在工資期間{2}提交了申請{1}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Material Receipt,收料
-DocType: Bank Statement Transaction Entry,Submit/Reconcile Payments,提交/協調付款
-DocType: Homepage,Products,產品
-DocType: Announcement,Instructor,講師
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +102,Select Item (optional),選擇項目（可選）
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +103,The Loyalty Program isn't valid for the selected company,忠誠度計劃對所選公司無效
-DocType: Fee Schedule Student Group,Fee Schedule Student Group,費用計劃學生組
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
-DocType: Lead,Next Contact By,下一個聯絡人由
-DocType: Compensatory Leave Request,Compensatory Leave Request,補償請假
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +339,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
-DocType: Blanket Order,Order Type,訂單類型
-,Item-wise Sales Register,項目明智的銷售登記
-DocType: Asset,Gross Purchase Amount,總購買金額
-apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,期初餘額
-DocType: Asset,Depreciation Method,折舊方法
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Target,總目標
-DocType: Job Applicant,Applicant for a Job,申請人作業
-DocType: Production Plan Material Request,Production Plan Material Request,生產計劃申請材料
-DocType: Purchase Invoice,Release Date,發布日期
-DocType: Stock Reconciliation,Reconciliation JSON,JSON對賬
-apps/erpnext/erpnext/accounts/report/financial_statements.html +5,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
-DocType: Purchase Invoice Item,Batch No,批號
-DocType: Marketplace Settings,Hub Seller Name,集線器賣家名稱
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,員工發展
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
-DocType: Student Group Instructor,Student Group Instructor,學生組教練
-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 +263,Main,主頁
-apps/erpnext/erpnext/controllers/buying_controller.py +774,Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master,項目{0}之後未標記為{1}項目。您可以從項目主文件中將它們作為{1}項啟用
-apps/erpnext/erpnext/stock/doctype/item/item.js +74,Variant,變種
-apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",對於商品{0}，數量必須是負數
-DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
-DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
-DocType: Employee,Leave Encashed?,離開兌現？
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
-DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1309,Make Purchase Order,製作採購訂單
-DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +201,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
-DocType: Payment Reconciliation Payment,Allocated amount,分配量
-DocType: Sales Team,Contribution to Net Total,貢獻淨合計
-DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
-DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
-DocType: Territory,Territory Name,地區名稱
-DocType: Email Digest,Purchase Orders to Receive,要收貨的採購訂單
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +71,You can only have Plans with the same billing cycle in a Subscription,您只能在訂閱中擁有相同結算週期的計劃
-DocType: Bank Statement Transaction Settings Item,Mapped Data,映射數據
-DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
-DocType: Payroll Period Date,Payroll Period Date,工資期間日期
-DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
-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 +262,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +113,"Subsidiary companies have already planned for {1} vacancies at a budget of {2}. \
+Medication,藥物治療
+Include Non Stock Items,包括非庫存項目
+Challenging/Slow,具有挑戰性/慢
+Please select item code,請選擇商品代碼
+Studying in Same Institute,就讀於同一研究所
+Earned Leave,獲得休假
+Salary Details,薪資明細
+Territory Manager,區域經理
+To Warehouse (Optional),倉庫（可選）
+GST Accounts,GST科目
+Paid Amount (Company Currency),支付的金額（公司貨幣）
+Additional Discount,更多優惠
+Selling Settings,銷售設置
+Online Auctions,網上拍賣
+Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+Fulfillment,履行
+View in Cart,查看你的購物車
+Marketing Expenses,市場推廣開支
+Item Shortage Report,商品短缺報告
+Can't create standard criteria. Please rename the criteria,無法創建標準條件。請重命名標準
+"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
+Hub Password,集線器密碼
+Separate course based Group for every Batch,為每個批次分離基於課程的組
+Separate course based Group for every Batch,為每個批次分離基於課程的組
+Single unit of an Item.,該產品的一個單元。
+Fee Category,收費類別
+Next Business Day,下一個營業日
+Allocated Leaves,分配的葉子
+Dosage by time interval,劑量按時間間隔
+Section Header,章節標題
+Student Fee Collection,學生費徵收
+Appointment Duration (mins),預約時間（分鐘）
+Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
+Total Leaves Allocated,已安排的休假總計
+Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
+Date Of Retirement,退休日
+Get Template,獲取模板
+Sales Person Commission Summary,銷售人員委員會摘要
+Additional Salary Component,額外的薪資組件
+Transferred,轉入
+Doors,門
+ERPNext Setup Complete!,ERPNext設定完成！
+Collect Fee for Patient Registration,收取病人登記費
+Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,庫存交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
+Weightage,權重
+Tax Breakup,稅收分解
+Joining Details,加入詳情
+Non Profit Member,非盈利會員
+{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的損益“科目成本中心{2}。請設置為公司默認的成本中心。
+A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
+Area,區
+New Contact,新建聯絡人
+Company Description,公司介紹
+Parent Territory,家長領地
+Place of Supply,供貨地點
+Reading 2,閱讀2,
+Employee {0} already submited an apllication {1} for the payroll period {2},員工{0}已經在工資期間{2}提交了申請{1}
+Material Receipt,收料
+Submit/Reconcile Payments,提交/協調付款
+Products,產品
+Instructor,講師
+Select Item (optional),選擇項目（可選）
+The Loyalty Program isn't valid for the selected company,忠誠度計劃對所選公司無效
+Fee Schedule Student Group,費用計劃學生組
+"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
+Next Contact By,下一個聯絡人由
+Compensatory Leave Request,補償請假
+Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
+Order Type,訂單類型
+Item-wise Sales Register,項目明智的銷售登記
+Gross Purchase Amount,總購買金額
+Opening Balances,期初餘額
+Depreciation Method,折舊方法
+Is this Tax included in Basic Rate?,包括在基本速率此稅？
+Total Target,總目標
+Applicant for a Job,申請人作業
+Production Plan Material Request,生產計劃申請材料
+Release Date,發布日期
+Reconciliation JSON,JSON對賬
+Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
+Batch No,批號
+Hub Seller Name,集線器賣家名稱
+Employee Advances,員工發展
+Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
+Student Group Instructor,學生組教練
+Student Group Instructor,學生組教練
+Assessment Mark (Out of 10),評估標記（滿分10分）
+Guardian2 Mobile No,Guardian2手機號碼
+Main,主頁
+Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master,項目{0}之後未標記為{1}項目。您可以從項目主文件中將它們作為{1}項啟用
+Variant,變種
+"For an item {0}, quantity must be negative number",對於商品{0}，數量必須是負數
+Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
+Employees HTML,員工HTML,
+Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+Leave Encashed?,離開兌現？
+Opportunity From field is mandatory,機會從字段是強制性的
+Variants,變種
+Make Purchase Order,製作採購訂單
+Send To,發送到
+There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+Allocated amount,分配量
+Contribution to Net Total,貢獻淨合計
+Customer's Item Code,客戶的產品編號
+Stock Reconciliation,庫存調整
+Territory Name,地區名稱
+Purchase Orders to Receive,要收貨的採購訂單
+Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
+You can only have Plans with the same billing cycle in a Subscription,您只能在訂閱中擁有相同結算週期的計劃
+Mapped Data,映射數據
+Warehouse and Reference,倉庫及參考
+Payroll Period Date,工資期間日期
+Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
+Serial Nos and Batches,序列號和批號
+Serial Nos and Batches,序列號和批號
+Student Group Strength,學生群體力量
+Student Group Strength,學生群體力量
+Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
+"Subsidiary companies have already planned for {1} vacancies at a budget of {2}. \
Staffing Plan for {0} should allocate more vacancies and budget for {3} than planned for its subsidiary companies",子公司已經計劃{2}的預算{1}空缺。 \ {0}的人員配備計劃應為其子公司分配更多空缺和預算{3}
-apps/erpnext/erpnext/config/hr.py +166,Appraisals,估價
-apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培訓活動
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +210,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
-apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,通過鉛源追踪潛在客戶。
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +182,Please enter ,請輸入
-apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +64,Maintenance Log,維護日誌
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +256,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +43,Make Inter Company Journal Entry,使公司日記帳分錄
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +901,Discount amount cannot be greater than 100%,折扣金額不能大於100％
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +26,"Number of new Cost Center, it will be included in the cost center name as a prefix",新成本中心的數量，它將作為前綴包含在成本中心名稱中
-DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
-DocType: Student Group,Instructors,教師
-DocType: GL Entry,Credit Amount in Account Currency,在科目幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +631,BOM {0} must be submitted,BOM {0}必須提交
-DocType: Authorization Control,Authorization Control,授權控制
-apps/erpnext/erpnext/controllers/buying_controller.py +416,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
-apps/erpnext/erpnext/controllers/stock_controller.py +96,"Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}.",倉庫{0}未與任何科目關聯，請在倉庫記錄中設定科目，或在公司{1}中設置默認庫存科目。
-apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,管理您的訂單
-DocType: Work Order Operation,Actual Time and Cost,實際時間和成本
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。
-DocType: Crop,Crop Spacing,作物間距
-DocType: Course,Course Abbreviation,當然縮寫
-DocType: Budget,Action if Annual Budget Exceeded on PO,年度預算超出採購訂單時採取的行動
-DocType: Student Leave Application,Student Leave Application,學生請假申請
-DocType: Item,Will also apply for variants,同時將申請變種
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},員工{0}上半天{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {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.,在銷售時捆綁項目。
-DocType: Delivery Settings,Dispatch Settings,發貨設置
-DocType: Material Request Plan Item,Actual Qty,實際數量
-DocType: Sales Invoice Item,References,參考
-DocType: Quality Inspection Reading,Reading 10,閱讀10
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +48,Serial nos {0} does not belongs to the location {1},序列號{0}不屬於位置{1}
-DocType: Item,Barcodes,條形碼
-DocType: Hub Tracked Item,Hub Node,樞紐節點
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +92,Associate,關聯
-DocType: Asset Movement,Asset Movement,資產運動
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +605,Work Order {0} must be submitted,必須提交工單{0}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2227,New Cart,新的車
-DocType: Taxable Salary Slab,From Amount,從金額
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
-DocType: Leave Type,Encashment,兌現
-DocType: Delivery Settings,Delivery Settings,交貨設置
-apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,獲取數據
-apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},假期類型{0}允許的最大休假是{1}
-DocType: SMS Center,Create Receiver List,創建接收器列表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,可供使用的日期應在購買日期之後
-DocType: Vehicle,Wheels,車輪
-DocType: Packing Slip,To Package No.,以包號
-DocType: Sales Invoice Item,Deferred Revenue Account,遞延收入科目
-DocType: Production Plan,Material Requests,材料要求
-DocType: Warranty Claim,Issue Date,發行日期
-DocType: Activity Cost,Activity Cost,項目成本
-DocType: Sales Invoice Timesheet,Timesheet Detail,詳細時間表
-DocType: Purchase Receipt Item Supplied,Consumed Qty,消耗的數量
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +52,Telecommunications,電信
-apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,帳單貨幣必須等於默認公司的貨幣或科目幣種
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
-apps/erpnext/erpnext/controllers/accounts_controller.py +786,Row {0}: Due Date cannot be before posting date,行{0}：到期日期不能在發布日期之前
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,製作付款分錄
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
-,Sales Invoice Trends,銷售發票趨勢
-DocType: Leave Application,Apply / Approve Leaves,申請/審批葉
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +180,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
-DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
-DocType: Leave Type,Earned Leave Frequency,獲得休假頻率
-apps/erpnext/erpnext/config/accounts.py +209,Tree of financial Cost Centers.,財務成本中心的樹。
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +151,Sub Type,子類型
-DocType: Serial No,Delivery Document No,交貨證明文件號碼
-DocType: Sales Order Item,Ensure Delivery Based on Produced Serial No,確保基於生產的序列號的交貨
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +197,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},請公司制定“關於資產處置收益/損失科目”{0}
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單取得項目
-DocType: Serial No,Creation Date,創建日期
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +55,Target Location is required for the asset {0},目標位置是資產{0}所必需的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
-DocType: Production Plan Material Request,Material Request Date,材料申請日期
-DocType: Purchase Order Item,Supplier Quotation Item,供應商報價項目
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +208,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生產設置中設置。
-apps/erpnext/erpnext/templates/pages/help.html +46,Visit the forums,訪問論壇
-DocType: Student,Student Mobile Number,學生手機號碼
-DocType: Item,Has Variants,有變種
-DocType: Employee Benefit Claim,Claim Benefit For,索賠利益
-apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新響應
-apps/erpnext/erpnext/public/js/utils.js +538,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
-DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +100,Batch ID is mandatory,批號是必需的
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +100,Batch ID is mandatory,批號是必需的
-DocType: Sales Person,Parent Sales Person,母公司銷售人員
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,No items to be received are overdue,沒有收到的物品已逾期
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +101,The seller and the buyer cannot be the same,賣方和買方不能相同
-DocType: Project,Collect Progress,收集進度
-apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,首先選擇程序
-DocType: Patient Appointment,Patient Age,患者年齡
-apps/erpnext/erpnext/config/learn.py +253,Managing Projects,項目管理
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +229,Serial no {0} has been already returned,序列號{0}已被返回
-DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
-DocType: Budget,Fiscal Year,財政年度
-DocType: Asset Maintenance Log,Planned,計劃
-apps/erpnext/erpnext/hr/utils.py +199,A {0} exists between {1} and {2} (,{1}和{2}之間存在{0}（
-DocType: Vehicle Log,Fuel Price,燃油價格
-DocType: Bank Guarantee,Margin Money,保證金
-DocType: Budget,Budget,預算
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +83,Set Open,設置打開
-apps/erpnext/erpnext/stock/doctype/item/item.py +287,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +60,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出科目
-apps/erpnext/erpnext/hr/utils.py +228,Max exemption amount for {0} is {1},{0}的最大免除金額為{1}
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已實現
-DocType: Student Admission,Application Form Route,申請表路線
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +58,Leave Type {0} cannot be allocated since it is leave without pay,休假類型{0}，因為它是停薪留職無法分配
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +167,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
-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 +55,Item Group Tree,項目群組的樹狀結構
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +73,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定，請檢查項目主檔
-DocType: Maintenance Visit,Maintenance Time,維護時間
-,Amount to Deliver,量交付
-DocType: Asset,Insurance Start Date,保險開始日期
-DocType: Salary Component,Flexible Benefits,靈活的好處
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +350,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 +201,There were errors.,有錯誤。
-apps/erpnext/erpnext/hr/doctype/shift_request/shift_request.py +68,Employee {0} has already applied for {1} between {2} and {3} : ,員工{0}已在{2}和{3}之間申請{1}：
-DocType: Guardian,Guardian Interests,守護興趣
-apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,更新帳戶名稱/號碼
-DocType: Naming Series,Current Value,當前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +331,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,序列號狀態
-DocType: Payment Entry Reference,Outstanding,優秀
-,Daily Timesheet Summary,每日時間表摘要
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
+Appraisals,估價
+Training Events,培訓活動
+Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
+Track Leads by Lead Source.,通過鉛源追踪潛在客戶。
+A condition for a Shipping Rule,為運輸規則的條件
+Please enter ,請輸入
+Maintenance Log,維護日誌
+Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
+The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
+Make Inter Company Journal Entry,使公司日記帳分錄
+Discount amount cannot be greater than 100%,折扣金額不能大於100％
+"Number of new Cost Center, it will be included in the cost center name as a prefix",新成本中心的數量，它將作為前綴包含在成本中心名稱中
+To Deliver and Bill,準備交貨及開立發票
+Instructors,教師
+Credit Amount in Account Currency,在科目幣金額
+BOM {0} must be submitted,BOM {0}必須提交
+Authorization Control,授權控制
+Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
+"Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}.",倉庫{0}未與任何科目關聯，請在倉庫記錄中設定科目，或在公司{1}中設置默認庫存科目。
+Manage your orders,管理您的訂單
+Actual Time and Cost,實際時間和成本
+Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。
+Crop Spacing,作物間距
+Course Abbreviation,當然縮寫
+Action if Annual Budget Exceeded on PO,年度預算超出採購訂單時採取的行動
+Student Leave Application,學生請假申請
+Will also apply for variants,同時將申請變種
+"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
+Employee {0} on Half day on {1},員工{0}上半天{1}
+Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
+On,開啟
+Bundle items at time of sale.,在銷售時捆綁項目。
+Dispatch Settings,發貨設置
+Actual Qty,實際數量
+References,參考
+Reading 10,閱讀10,
+Serial nos {0} does not belongs to the location {1},序列號{0}不屬於位置{1}
+Barcodes,條形碼
+Hub Node,樞紐節點
+You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
+Associate,關聯
+Asset Movement,資產運動
+Work Order {0} must be submitted,必須提交工單{0}
+New Cart,新的車
+From Amount,從金額
+Item {0} is not a serialized Item,項{0}不是一個序列化的項目
+Encashment,兌現
+Delivery Settings,交貨設置
+Fetch Data,獲取數據
+Maximum leave allowed in the leave type {0} is {1},假期類型{0}允許的最大休假是{1}
+Create Receiver List,創建接收器列表
+Available-for-use Date should be after purchase date,可供使用的日期應在購買日期之後
+Wheels,車輪
+To Package No.,以包號
+Deferred Revenue Account,遞延收入科目
+Material Requests,材料要求
+Issue Date,發行日期
+Activity Cost,項目成本
+Timesheet Detail,詳細時間表
+Consumed Qty,消耗的數量
+Telecommunications,電信
+Billing currency must be equal to either default company's currency or party account currency,帳單貨幣必須等於默認公司的貨幣或科目幣種
+Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
+Row {0}: Due Date cannot be before posting date,行{0}：到期日期不能在發布日期之前
+Make Payment Entry,製作付款分錄
+Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
+Sales Invoice Trends,銷售發票趨勢
+Apply / Approve Leaves,申請/審批葉
+Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
+Delivery Warehouse,交貨倉庫
+Earned Leave Frequency,獲得休假頻率
+Tree of financial Cost Centers.,財務成本中心的樹。
+Sub Type,子類型
+Delivery Document No,交貨證明文件號碼
+Ensure Delivery Based on Produced Serial No,確保基於生產的序列號的交貨
+Please set 'Gain/Loss Account on Asset Disposal' in Company {0},請公司制定“關於資產處置收益/損失科目”{0}
+Get Items From Purchase Receipts,從採購入庫單取得項目
+Creation Date,創建日期
+Target Location is required for the asset {0},目標位置是資產{0}所必需的
+"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
+Material Request Date,材料申請日期
+Supplier Quotation Item,供應商報價項目
+Material Consumption is not set in Manufacturing Settings.,材料消耗未在生產設置中設置。
+Visit the forums,訪問論壇
+Student Mobile Number,學生手機號碼
+Has Variants,有變種
+Claim Benefit For,索賠利益
+Update Response,更新響應
+You have already selected items from {0} {1},您已經選擇從項目{0} {1}
+Name of the Monthly Distribution,每月分配的名稱
+Batch ID is mandatory,批號是必需的
+Batch ID is mandatory,批號是必需的
+Parent Sales Person,母公司銷售人員
+No items to be received are overdue,沒有收到的物品已逾期
+The seller and the buyer cannot be the same,賣方和買方不能相同
+Collect Progress,收集進度
+Select the program first,首先選擇程序
+Patient Age,患者年齡
+Managing Projects,項目管理
+Serial no {0} has been already returned,序列號{0}已被返回
+Supplier of Goods or Services.,供應商的商品或服務。
+Fiscal Year,財政年度
+Planned,計劃
+A {0} exists between {1} and {2} (,{1}和{2}之間存在{0}（
+Fuel Price,燃油價格
+Margin Money,保證金
+Budget,預算
+Set Open,設置打開
+Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
+"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出科目
+Max exemption amount for {0} is {1},{0}的最大免除金額為{1}
+Achieved,已實現
+Application Form Route,申請表路線
+Leave Type {0} cannot be allocated since it is leave without pay,休假類型{0}，因為它是停薪留職無法分配
+Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
+In Words will be visible once you save the Sales Invoice.,銷售發票一被儲存，就會顯示出來。
+Follow Up,跟進
+Is Sales Item,是銷售項目
+Item Group Tree,項目群組的樹狀結構
+Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定，請檢查項目主檔
+Maintenance Time,維護時間
+Amount to Deliver,量交付
+Insurance Start Date,保險開始日期
+Flexible Benefits,靈活的好處
+Same item has been entered multiple times. {0},相同的物品已被多次輸入。 {0}
+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.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早（學年{}）。請更正日期，然後再試一次。
+There were errors.,有錯誤。
+Employee {0} has already applied for {1} between {2} and {3} : ,員工{0}已在{2}和{3}之間申請{1}：
+Guardian Interests,守護興趣
+Update Account Name / Number,更新帳戶名稱/號碼
+Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
+Instructor Records to be created by,導師記錄由
+{0} created,{0}已新增
+GST Account,GST帳戶
+Against Sales Order,對銷售訂單
+Serial No Status,序列號狀態
+Outstanding,優秀
+Daily Timesheet Summary,每日時間表摘要
+"Row {0}: To set {1} periodicity, difference between from and to date \
must be greater than or equal to {2}","行{0}：設置{1}的週期性，從和到日期\
之間差必須大於或等於{2}"
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,這是基於庫存移動。見{0}詳情
-DocType: Pricing Rule,Selling,銷售
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +394,Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
-DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-DocType: Website Item Group,Website Item Group,網站項目群組
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,關稅和稅款
-DocType: Projects Settings,Projects Settings,項目設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,參考日期請輸入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
-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/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,請先取消購買收據{0}
-apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,項目群組樹。
-DocType: Production Plan,Total Produced Qty,總生產數量
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
-,Item-wise Purchase History,全部項目的購買歷史
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
-DocType: Account,Frozen,凍結的
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +382,Vehicle Type,車輛類型
-DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金額（公司幣種）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1002,Raw Materials,原料
-DocType: Installation Note,Installation Time,安裝時間
-DocType: Sales Invoice,Accounting Details,會計細節
-DocType: Shopify Settings,status html,狀態HTML
-apps/erpnext/erpnext/setup/doctype/company/company.js +133,Delete all the Transactions for this Company,刪除所有交易本公司
-DocType: Inpatient Record,O Positive,O積極
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Investments,投資
-DocType: Issue,Resolution Details,詳細解析
-apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +170,Transaction Type,交易類型
-DocType: Item Quality Inspection Parameter,Acceptance Criteria,驗收標準
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,請輸入在上表請求材料
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,沒有可用於日記帳分錄的還款
-DocType: Hub Tracked Item,Image List,圖像列表
-DocType: Item Attribute,Attribute Name,屬性名稱
-DocType: Subscription,Generate Invoice At Beginning Of Period,在期初生成發票
-DocType: BOM,Show In Website,顯示在網站
-DocType: Loan Application,Total Payable Amount,合計應付額
-DocType: Task,Expected Time (in hours),預期時間（以小時計）
-DocType: Item Reorder,Check in (group),檢查（組）
-,Qty to Order,訂購數量
-DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",負債或權益下的科目頭，其中利潤/虧損將被黃牌警告
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4},對於財務年度{4}，{1}'{2}'和科目“{3}”已存在另一個預算記錄“{0}”
-apps/erpnext/erpnext/config/projects.py +36,Gantt chart of all tasks.,所有任務的甘特圖。
-DocType: Opportunity,Mins to First Response,分鐘為第一個反應
-DocType: Pricing Rule,Margin Type,保證金類型
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小時
-DocType: Course,Default Grading Scale,默認等級規模
-DocType: Appraisal,For Employee Name,對於員工姓名
-DocType: Woocommerce Settings,Tax Account,稅收科目
-DocType: C-Form Invoice Detail,Invoice No,發票號碼
-DocType: Room,Room Name,房間名稱
-DocType: Prescription Duration,Prescription Duration,處方時間
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
-apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,客戶的地址和聯絡方式
-,Campaign Efficiency,運動效率
-,Campaign Efficiency,運動效率
-DocType: Discussion,Discussion,討論
-DocType: Payment Entry,Transaction ID,事務ID
-DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,扣除未提交免稅證明的稅額
-DocType: Volunteer,Anytime,任何時候
-DocType: Bank Account,Bank Account No,銀行帳號
-DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,員工免稅證明提交
-DocType: Patient,Surgical History,手術史
-DocType: Bank Statement Settings Item,Mapped Header,映射的標題
-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/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
-DocType: Inpatient Record,Discharge,卸貨
-DocType: Task,Total Billing Amount (via Time Sheet),總開票金額（通過時間表）
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
-DocType: Bank Statement Settings,Mapped Items,映射項目
-DocType: Amazon MWS Settings,IT,它
-DocType: Chapter,Chapter,章節
-apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,對
-DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,選擇此模式後，默認帳戶將在POS發票中自動更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1048,Select BOM and Qty for Production,選擇BOM和數量生產
-DocType: Asset,Depreciation Schedule,折舊計劃
-apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,銷售合作夥伴地址和聯繫人
-DocType: Bank Reconciliation Detail,Against Account,針對帳戶
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
-DocType: Maintenance Schedule Detail,Actual Date,實際日期
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +135,Please set the Default Cost Center in {0} company.,請在{0}公司中設置默認成本中心。
-DocType: Item,Has Batch No,有批號
-DocType: Shopify Webhook Detail,Shopify Webhook Detail,Shopify Webhook詳細信息
-apps/erpnext/erpnext/config/accounts.py +479,Goods and Services Tax (GST India),商品和服務稅（印度消費稅）
-DocType: Delivery Note,Excise Page Number,消費頁碼
-DocType: Asset,Purchase Date,購買日期
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,無法生成秘密
-DocType: Volunteer,Volunteer Type,志願者類型
-DocType: Shift Assignment,Shift Type,班次類型
-DocType: Student,Personal Details,個人資料
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +199,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
-,Maintenance Schedules,保養時間表
-DocType: Task,Actual End Date (via Time Sheet),實際結束日期（通過時間表）
-DocType: Soil Texture,Soil Type,土壤類型
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +389,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
-,Quotation Trends,報價趨勢
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +166,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-DocType: GoCardless Mandate,GoCardless Mandate,GoCardless任務
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Debit To account must be a Receivable account,借方科目必須是應收帳款科目
-DocType: Shipping Rule,Shipping Amount,航運量
-DocType: Supplier Scorecard Period,Period Score,期間得分
-apps/erpnext/erpnext/public/js/event.js +19,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: Loyalty Program,Conversion Factor,轉換因子
-DocType: Purchase Order,Delivered,交付
-,Vehicle Expenses,車輛費用
-DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,在銷售發票上創建實驗室測試提交
-DocType: Serial No,Invoice Details,發票明細
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +72,Please enable Google Maps Settings to estimate and optimize routes,請啟用Google地圖設置以估算和優化路線
-DocType: Grant Application,Show on Website,在網站上顯示
-apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,開始
-DocType: Hub Tracked Item,Hub Category,中心類別
-DocType: Purchase Receipt,Vehicle Number,車號
-DocType: Loan,Loan Amount,貸款額度
-DocType: Student Report Generation Tool,Add Letterhead,添加信頭
-DocType: Program Enrollment,Self-Driving Vehicle,自駕車
-DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供應商記分卡站立
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +479,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清單未找到項目{1}
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +112,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
-DocType: Journal Entry,Accounts Receivable,應收帳款
-,Supplier-Wise Sales Analytics,供應商相關的銷售分析
-DocType: Purchase Invoice,Availed ITC Central Tax,有效的ITC中央稅收
-DocType: Sales Invoice,Company Address Name,公司地址名稱
-DocType: Work Order,Use Multi-Level BOM,採用多級物料清單
-DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
-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: Projects Settings,Timesheets,時間表
-DocType: HR Settings,HR Settings,人力資源設置
-DocType: Salary Slip,net pay info,淨工資信息
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +334,CESS Amount,CESS金額
-DocType: Woocommerce Settings,Enable Sync,啟用同步
-DocType: Tax Withholding Rate,Single Transaction Threshold,單一交易閾值
-DocType: Lab Test Template,This value is updated in the Default Sales Price List.,該值在默認銷售價格表中更新。
-DocType: Email Digest,New Expenses,新的費用
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +123,PDC/LC Amount,PDC / LC金額
-DocType: Shareholder,Shareholder,股東
-DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1803,Get Items from Prescriptions,從Prescriptions獲取物品
-DocType: Patient,Patient Details,患者細節
-DocType: Inpatient Record,B Positive,B積極
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
+This is based on stock movement. See {0} for details,這是基於庫存移動。見{0}詳情
+Selling,銷售
+Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
+Name and Employee ID,姓名和僱員ID,
+Website Item Group,網站項目群組
+No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
+Duties and Taxes,關稅和稅款
+Projects Settings,項目設置
+Please enter Reference date,參考日期請輸入
+{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
+Table for Item that will be shown in Web Site,表項，將在網站顯示出來
+Supplied Qty,附送數量
+Material Request Item,物料需求項目
+Please cancel Purchase Receipt {0} first,請先取消購買收據{0}
+Tree of Item Groups.,項目群組樹。
+Total Produced Qty,總生產數量
+Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
+Item-wise Purchase History,全部項目的購買歷史
+Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
+Frozen,凍結的
+Vehicle Type,車輛類型
+Base Amount (Company Currency),基本金額（公司幣種）
+Raw Materials,原料
+Installation Time,安裝時間
+Accounting Details,會計細節
+status html,狀態HTML,
+Delete all the Transactions for this Company,刪除所有交易本公司
+O Positive,O積極
+Investments,投資
+Resolution Details,詳細解析
+Transaction Type,交易類型
+Acceptance Criteria,驗收標準
+Please enter Material Requests in the above table,請輸入在上表請求材料
+No repayments available for Journal Entry,沒有可用於日記帳分錄的還款
+Image List,圖像列表
+Attribute Name,屬性名稱
+Generate Invoice At Beginning Of Period,在期初生成發票
+Show In Website,顯示在網站
+Expected Time (in hours),預期時間（以小時計）
+Check in (group),檢查（組）
+Qty to Order,訂購數量
+"The account head under Liability or Equity, in which Profit/Loss will be booked",負債或權益下的科目頭，其中利潤/虧損將被黃牌警告
+Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4},對於財務年度{4}，{1}'{2}'和科目“{3}”已存在另一個預算記錄“{0}”
+Gantt chart of all tasks.,所有任務的甘特圖。
+Mins to First Response,分鐘為第一個反應
+Margin Type,保證金類型
+{0} hours,{0}小時
+Default Grading Scale,默認等級規模
+For Employee Name,對於員工姓名
+Tax Account,稅收科目
+Invoice No,發票號碼
+Room Name,房間名稱
+Prescription Duration,處方時間
+"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
+Customer Addresses And Contacts,客戶的地址和聯絡方式
+Campaign Efficiency,運動效率
+Campaign Efficiency,運動效率
+Discussion,討論
+Transaction ID,事務ID,
+Deduct Tax For Unsubmitted Tax Exemption Proof,扣除未提交免稅證明的稅額
+Anytime,任何時候
+Bank Account No,銀行帳號
+Employee Tax Exemption Proof Submission,員工免稅證明提交
+Surgical History,手術史
+Mapped Header,映射的標題
+Resignation Letter Date,辭退信日期
+Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
+Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+Discharge,卸貨
+Repeat Customer Revenue,重複客戶收入
+Mapped Items,映射項目
+IT,它
+Chapter,章節
+Pair,對
+Default account will be automatically updated in POS Invoice when this mode is selected.,選擇此模式後，默認帳戶將在POS發票中自動更新。
+Select BOM and Qty for Production,選擇BOM和數量生產
+Depreciation Schedule,折舊計劃
+Sales Partner Addresses And Contacts,銷售合作夥伴地址和聯繫人
+Against Account,針對帳戶
+Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
+Actual Date,實際日期
+Please set the Default Cost Center in {0} company.,請在{0}公司中設置默認成本中心。
+Has Batch No,有批號
+Shopify Webhook Detail,Shopify Webhook詳細信息
+Goods and Services Tax (GST India),商品和服務稅（印度消費稅）
+Excise Page Number,消費頁碼
+Purchase Date,購買日期
+Could not generate Secret,無法生成秘密
+Volunteer Type,志願者類型
+Shift Type,班次類型
+Personal Details,個人資料
+Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
+Maintenance Schedules,保養時間表
+Actual End Date (via Timesheet),實際結束日期（通過時間表）
+Soil Type,土壤類型
+Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
+Quotation Trends,報價趨勢
+Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
+GoCardless Mandate,GoCardless任務
+Debit To account must be a Receivable account,借方科目必須是應收帳款科目
+Shipping Amount,航運量
+Period Score,期間得分
+Add Customers,添加客戶
+Pending Amount,待審核金額
+Special,特別
+Conversion Factor,轉換因子
+Delivered,交付
+Vehicle Expenses,車輛費用
+Create Lab Test(s) on Sales Invoice Submit,在銷售發票上創建實驗室測試提交
+Invoice Details,發票明細
+Please enable Google Maps Settings to estimate and optimize routes,請啟用Google地圖設置以估算和優化路線
+Show on Website,在網站上顯示
+Start on,開始
+Hub Category,中心類別
+Vehicle Number,車號
+Add Letterhead,添加信頭
+Self-Driving Vehicle,自駕車
+Supplier Scorecard Standing,供應商記分卡站立
+Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清單未找到項目{1}
+Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
+Accounts Receivable,應收帳款
+Supplier-Wise Sales Analytics,供應商相關的銷售分析
+Availed ITC Central Tax,有效的ITC中央稅收
+Company Address Name,公司地址名稱
+Use Multi-Level BOM,採用多級物料清單
+Include Reconciled Entries,包括對賬項目
+"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
+"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
+Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
+Distribute Charges Based On,分銷費基於
+Timesheets,時間表
+HR Settings,人力資源設置
+net pay info,淨工資信息
+CESS Amount,CESS金額
+Enable Sync,啟用同步
+Single Transaction Threshold,單一交易閾值
+This value is updated in the Default Sales Price List.,該值在默認銷售價格表中更新。
+New Expenses,新的費用
+PDC/LC Amount,PDC / LC金額
+Shareholder,股東
+Additional Discount Amount,額外的折扣金額
+Get Items from Prescriptions,從Prescriptions獲取物品
+Patient Details,患者細節
+B Positive,B積極
+"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
amount",員工{0}的最大權益超過{1}，前面聲明的金額\金額為{2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +671,"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 +349,Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
-DocType: Patient Medical Record,Patient Medical Record,病人醫療記錄
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Non-Group,集團以非組
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,體育
-DocType: Loan Type,Loan Name,貸款名稱
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +85,Total Actual,實際總計
-DocType: Student Siblings,Student Siblings,學生兄弟姐妹
-DocType: Subscription Plan Detail,Subscription Plan Detail,訂閱計劃詳情
-apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,單位
-apps/erpnext/erpnext/stock/get_item_details.py +157,Please specify Company,請註明公司
-,Customer Acquisition and Loyalty,客戶取得和忠誠度
-DocType: Asset Maintenance Task,Maintenance Task,維護任務
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +125,Please set B2C Limit in GST Settings.,請在GST設置中設置B2C限制。
-DocType: Marketplace Settings,Marketplace Settings,市場設置
-DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
-DocType: Work Order,Skip Material Transfer,跳過材料轉移
-DocType: Work Order,Skip Material Transfer,跳過材料轉移
-apps/erpnext/erpnext/setup/utils.py +112,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,無法為關鍵日期{2}查找{0}到{1}的匯率。請手動創建貨幣兌換記錄
-DocType: POS Profile,Price List,價格表
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
-apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,報銷
-DocType: Employee Tax Exemption Declaration,Total Exemption Amount,免稅總額
-,BOM Search,BOM搜索
-DocType: Project,Total Consumed Material Cost (via Stock Entry),總消耗材料成本（通過庫存輸入）
-DocType: Subscription,Subscription Period,訂閱期
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +169,To Date cannot be less than From Date,迄今不能少於起始日期
-DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基於倉庫中的庫存，在Hub上發布“庫存”或“庫存”。
-DocType: Vehicle,Fuel Type,燃料類型
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,請公司指定的貨幣
-DocType: Workstation,Wages per hour,時薪
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
-apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +376,Account {0} is invalid. Account Currency must be {1},科目{0}是無效的。科目貨幣必須是{1}
-apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在員工解除日期之後{1}
-DocType: Supplier,Is Internal Supplier,是內部供應商
-DocType: Employee,Create User Permission,創建用戶權限
-DocType: Employee Benefit Claim,Employee Benefit Claim,員工福利索賠
-DocType: Healthcare Settings,Remind Before,提醒之前
-apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
-DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1120,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
-DocType: Loyalty Program,1 Loyalty Points = How much base currency?,1忠誠度積分=多少基礎貨幣？
-DocType: Item,Retain Sample,保留樣品
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
-DocType: Stock Reconciliation Item,Amount Difference,金額差異
-apps/erpnext/erpnext/stock/get_item_details.py +416,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
-DocType: Delivery Stop,Order Information,訂單信息
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
-DocType: Territory,Classification of Customers by region,客戶按區域分類
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,在生產中
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +66,Difference Amount must be zero,差量必須是零
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +74,{0} applicable after {1} working days,在{1}個工作日後適用{0}
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +60,Please enter Production Item first,請先輸入生產項目
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
-DocType: Normal Test Template,Normal Test Template,正常測試模板
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +970,Quotation,報價
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
-DocType: Salary Slip,Total Deduction,扣除總額
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,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 +136,Item {0} has already been returned,項{0}已被退回
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
-DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
-DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供應商記分卡設置
-apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,評估計劃名稱
-DocType: Work Order Operation,Work Order Operation,工作訂單操作
-apps/erpnext/erpnext/stock/doctype/item/item.py +262,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
-apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務，你所有的聯繫人和更添加為您的線索
-DocType: Work Order Operation,Actual Operation Time,實際操作時間
-DocType: Authorization Rule,Applicable To (User),適用於（用戶）
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Job Description,職位描述
-DocType: Student Applicant,Applied,應用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +942,Re-open,重新打開
-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名稱
-DocType: Attendance,Attendance Request,出席請求
-DocType: Purchase Invoice,02-Post Sale Discount,02-售後折扣
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +139,"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.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +115,You can't redeem Loyalty Points having more value than the Grand Total.,您無法兌換價值超過總計的忠誠度積分。
-DocType: Department Approver,Approver,審批人
-,SO Qty,SO數量
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +92,The field To Shareholder cannot be blank,“股東”字段不能為空
-DocType: Appraisal,Calculate Total Score,計算總分
-DocType: Employee,Health Insurance,健康保險
-DocType: Asset Repair,Manufacturing Manager,生產經理
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
-DocType: Plant Analysis Criteria,Minimum Permissible Value,最小允許值
-apps/erpnext/erpnext/education/doctype/guardian/guardian.py +41,User {0} already exists,用戶{0}已經存在
-apps/erpnext/erpnext/hooks.py +115,Shipments,發貨
-DocType: Payment Entry,Total Allocated Amount (Company Currency),總撥款額（公司幣種）
-DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
-DocType: BOM,Scrap Material Cost,廢料成本
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +243,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
-DocType: Grant Application,Email Notification Sent,電子郵件通知已發送
-DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
-apps/erpnext/erpnext/accounts/doctype/bank_account/bank_account.py +24,Company is manadatory for company account,公司是公司科目的管理者
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1092,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼，倉庫，數量
-DocType: Bank Guarantee,Supplier,供應商
-apps/erpnext/erpnext/hr/doctype/department/department.js +9,This is a root department and cannot be edited.,這是根部門，無法編輯。
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,顯示付款詳情
-apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +53,Duration in Days,持續時間天數
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Miscellaneous Expenses,雜項開支
-DocType: Global Defaults,Default Company,預設公司
-DocType: Company,Transactions Annual History,交易年曆
-apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異科目是強制必填的，因為它影響整個庫存總值。
-DocType: Bank,Bank Name,銀行名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +78,-Above,-以上
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1301,Leave the field empty to make purchase orders for all suppliers,將該字段留空以為所有供應商下達採購訂單
-DocType: Healthcare Practitioner,Inpatient Visit Charge Item,住院訪問費用項目
-DocType: Vital Signs,Fluid,流體
-DocType: Leave Application,Total Leave Days,總休假天數
-DocType: Email Digest,Note: Email will not be sent to disabled users,注意：電子郵件將不會被發送到被禁用的用戶
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
-apps/erpnext/erpnext/stock/doctype/item/item.js +107,Item Variant Settings,項目變式設置
-apps/erpnext/erpnext/public/js/account_tree_grid.js +57,Select Company...,選擇公司...
-DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +506,{0} is mandatory for Item {1},{0}是強制性的項目{1}
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +149,"Item {0}: {1} qty produced, ",項目{0}：{1}產生的數量，
-DocType: Currency Exchange,From Currency,從貨幣
-DocType: Vital Signs,Weight (In Kilogram),體重（公斤）
-DocType: Chapter,"chapters/chapter_name
+"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
+Leave Block List Allow,休假區塊清單准許
+Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
+Patient Medical Record,病人醫療記錄
+Group to Non-Group,集團以非組
+Sports,體育
+Total Actual,實際總計
+Student Siblings,學生兄弟姐妹
+Subscription Plan Detail,訂閱計劃詳情
+Unit,單位
+Please specify Company,請註明公司
+Customer Acquisition and Loyalty,客戶取得和忠誠度
+Maintenance Task,維護任務
+Please set B2C Limit in GST Settings.,請在GST設置中設置B2C限制。
+Marketplace Settings,市場設置
+Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
+Skip Material Transfer,跳過材料轉移
+Skip Material Transfer,跳過材料轉移
+Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,無法為關鍵日期{2}查找{0}到{1}的匯率。請手動創建貨幣兌換記錄
+Price List,價格表
+{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
+Expense Claims,報銷
+Total Exemption Amount,免稅總額
+BOM Search,BOM搜索
+Total Consumed Material Cost (via Stock Entry),總消耗材料成本（通過庫存輸入）
+Subscription Period,訂閱期
+To Date cannot be less than From Date,迄今不能少於起始日期
+"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基於倉庫中的庫存，在Hub上發布“庫存”或“庫存”。
+Fuel Type,燃料類型
+Please specify currency in Company,請公司指定的貨幣
+Wages per hour,時薪
+Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
+Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
+Account {0} is invalid. Account Currency must be {1},科目{0}是無效的。科目貨幣必須是{1}
+From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在員工解除日期之後{1}
+Is Internal Supplier,是內部供應商
+Create User Permission,創建用戶權限
+Employee Benefit Claim,員工福利索賠
+Remind Before,提醒之前
+UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
+material_request_item,material_request_item,
+"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
+1 Loyalty Points = How much base currency?,1忠誠度積分=多少基礎貨幣？
+Retain Sample,保留樣品
+Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
+Amount Difference,金額差異
+Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+Order Information,訂單信息
+Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
+Classification of Customers by region,客戶按區域分類
+In Production,在生產中
+Difference Amount must be zero,差量必須是零
+{0} applicable after {1} working days,在{1}個工作日後適用{0}
+Please enter Production Item first,請先輸入生產項目
+Calculated Bank Statement balance,計算的銀行對賬單餘額
+Normal Test Template,正常測試模板
+disabled user,禁用的用戶
+Quotation,報價
+Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
+Total Deduction,扣除總額
+Select an account to print in account currency,選擇一個科目以科目貨幣進行打印
+Production Analytics,生產Analytics（分析）
+This is based on transactions against this Patient. See timeline below for details,這是基於對這個病人的交易。有關詳情，請參閱下面的時間表
+Item {0} has already been returned,項{0}已被退回
+**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
+Customer / Lead Address,客戶/鉛地址
+Supplier Scorecard Setup,供應商記分卡設置
+Assessment Plan Name,評估計劃名稱
+Work Order Operation,工作訂單操作
+Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務，你所有的聯繫人和更添加為您的線索
+Actual Operation Time,實際操作時間
+Applicable To (User),適用於（用戶）
+Job Description,職位描述
+Applied,應用的
+Re-open,重新打開
+Qty as per Stock UOM,數量按庫存計量單位
+Guardian2 Name,Guardian2名稱
+Attendance Request,出席請求
+02-Post Sale Discount,02-售後折扣
+"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
+"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
+You can't redeem Loyalty Points having more value than the Grand Total.,您無法兌換價值超過總計的忠誠度積分。
+Approver,審批人
+SO Qty,SO數量
+The field To Shareholder cannot be blank,“股東”字段不能為空
+Calculate Total Score,計算總分
+Health Insurance,健康保險
+Manufacturing Manager,生產經理
+Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
+Minimum Permissible Value,最小允許值
+User {0} already exists,用戶{0}已經存在
+Shipments,發貨
+Total Allocated Amount (Company Currency),總撥款額（公司幣種）
+To be delivered to customer,要傳送給客戶
+Scrap Material Cost,廢料成本
+Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
+Email Notification Sent,電子郵件通知已發送
+In Words (Company Currency),大寫（Company Currency）
+Company is manadatory for company account,公司是公司科目的管理者
+"Item Code, warehouse, quantity are required on row",在行上需要項目代碼，倉庫，數量
+Supplier,供應商
+This is a root department and cannot be edited.,這是根部門，無法編輯。
+Show Payment Details,顯示付款詳情
+Duration in Days,持續時間天數
+Miscellaneous Expenses,雜項開支
+Default Company,預設公司
+Transactions Annual History,交易年曆
+Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異科目是強制必填的，因為它影響整個庫存總值。
+Bank Name,銀行名稱
+-Above,-以上
+Leave the field empty to make purchase orders for all suppliers,將該字段留空以為所有供應商下達採購訂單
+Inpatient Visit Charge Item,住院訪問費用項目
+Fluid,流體
+Total Leave Days,總休假天數
+Note: Email will not be sent to disabled users,注意：電子郵件將不會被發送到被禁用的用戶
+Number of Interaction,交互次數
+Number of Interaction,交互次數
+Item Variant Settings,項目變式設置
+Select Company...,選擇公司...
+Leave blank if considered for all departments,保持空白如果考慮到全部部門
+{0} is mandatory for Item {1},{0}是強制性的項目{1}
+"Item {0}: {1} qty produced, ",項目{0}：{1}產生的數量，
+From Currency,從貨幣
+Weight (In Kilogram),體重（公斤）
+"chapters/chapter_name,
leave blank automatically set after saving chapter.",保存章節後自動設置章節/章節名稱。
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +218,Please set GST Accounts in GST Settings,請在GST設置中設置GST帳戶
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +46,Type of Business,業務類型
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"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 +143,Cost of New Purchase,新的採購成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +98,Sales Order required for Item {0},所需的{0}項目銷售訂單
-DocType: Grant Application,Grant Description,授予說明
-DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
-DocType: Payment Entry,Unallocated Amount,未分配金額
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +77,Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses,請啟用適用於採購訂單並適用於預訂實際費用
-apps/erpnext/erpnext/templates/includes/product_page.js +101,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
-DocType: POS Profile,Taxes and Charges,稅收和收費
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買，出售或持有的庫存。
-apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,沒有更多的更新
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,這涵蓋了與此安裝程序相關的所有記分卡
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,銀行業
-apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,添加時間表
-DocType: Vehicle Service,Service Item,服務項目
-DocType: Bank Guarantee,Bank Guarantee,銀行擔保
-DocType: Bank Guarantee,Bank Guarantee,銀行擔保
-DocType: Payment Request,Transaction Details,交易明細
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
-DocType: Blanket Order Item,Ordered Quantity,訂購數量
-apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",例如「建設建設者工具“
-DocType: Grading Scale,Grading Scale Intervals,分級刻度間隔
-DocType: Item Default,Purchase Defaults,購買默認值
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +117,Make Job Card,製作工作卡
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +329,"Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again",無法自動創建Credit Note，請取消選中'Issue Credit Note'並再次提交
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,年度利潤
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言：{3}
-DocType: Fee Schedule,In Process,在過程
-DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
-apps/erpnext/erpnext/config/accounts.py +53,Tree of financial accounts.,財務賬目的樹。
-DocType: Bank Guarantee,Reference Document Type,參考文檔類型
-DocType: Cash Flow Mapping,Cash Flow Mapping,現金流量映射
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,{0} against Sales Order {1},{0}針對銷售訂單{1}
-DocType: Account,Fixed Asset,固定資產
-DocType: Amazon MWS Settings,After Date,日期之後
-apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,序列化庫存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
-,Department Analytics,部門分析
-apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默認聯繫人中找不到電子郵件
-DocType: Loan,Account Info,帳戶信息
-DocType: Activity Type,Default Billing Rate,默認計費率
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}創建學生組。
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}創建學生組。
-DocType: Sales Invoice,Total Billing Amount,總結算金額
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,費用結構和學生組{0}中的課程是不同的。
-DocType: Bank Statement Transaction Entry,Receivable Account,應收帳款
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,有效起始日期必須小於有效起始日期。
-apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
-DocType: Quotation Item,Stock Balance,庫存餘額
-apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,銷售訂單到付款
-DocType: Purchase Invoice,With Payment of Tax,繳納稅款
-DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
-DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供應商提供服務
-DocType: Exchange Rate Revaluation Account,New Balance In Base Currency,基礎貨幣的新平衡
-DocType: Crop Cycle,This will be day 1 of the crop cycle,這將是作物週期的第一天
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +915,Please select correct account,請選擇正確的科目
-DocType: Salary Structure Assignment,Salary Structure Assignment,薪酬結構分配
-DocType: Purchase Invoice Item,Weight UOM,重量計量單位
-apps/erpnext/erpnext/config/accounts.py +435,List of available Shareholders with folio numbers,包含folio號碼的可用股東名單
-DocType: Salary Structure Employee,Salary Structure Employee,薪資結構員工
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +62,Show Variant Attributes,顯示變體屬性
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +48,The payment gateway account in plan {0} is different from the payment gateway account in this payment request,計劃{0}中的支付閘道科目與此付款請求中的支付閘道科目不同
-DocType: Course,Course Name,課程名
-apps/erpnext/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +50,No Tax Withholding data found for the current Fiscal Year.,未找到當前財年的預扣稅數據。
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Office Equipments,辦公設備
-DocType: Purchase Invoice Item,Qty,數量
-DocType: Fiscal Year,Companies,企業
-DocType: Supplier Scorecard,Scoring Setup,得分設置
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,電子
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +364,Debit ({0}),借記卡（{0}）
-DocType: BOM,Allow Same Item Multiple Times,多次允許相同的項目
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +76,Full-time,全日制
-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: BOM Scrap Item,Basic Amount (Company Currency),基本金額（公司幣種）
-DocType: Student,Guardians,守護者
-apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,付款確認
-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 +434,Debit To is required,借方是必填項
-DocType: Clinical Procedure,Inpatient Record,住院病歷
-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 +41,Purchase Price List,採購價格表
-apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
-DocType: Job Offer Term,Offer Term,要約期限
-DocType: Asset,Quality Manager,質量經理
-DocType: Job Applicant,Job Opening,開放職位
-DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,請選擇Incharge人的名字
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +51,Technology,技術
-DocType: BOM Website Operation,BOM Website Operation,BOM網站運營
-DocType: Bank Statement Transaction Payment Item,outstanding_amount,outstanding_amount
-DocType: Supplier Scorecard,Supplier Score,供應商分數
-apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js +37,Schedule Admission,安排入場
-DocType: Tax Withholding Rate,Cumulative Transaction Threshold,累積交易閾值
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,Total Invoiced Amt,總開票金額
-DocType: BOM,Conversion Rate,兌換率
-apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,產品搜索
-DocType: Cashier Closing,To Time,要時間
-apps/erpnext/erpnext/hr/utils.py +202,) for {0},）為{0}
-DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +147,Credit To account must be a Payable account,信用科目必須是應付帳款
-DocType: Loan,Total Amount Paid,總金額支付
-DocType: Asset,Insurance End Date,保險終止日期
-apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,請選擇付費學生申請者必須入學的學生
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +370,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +40,Budget List,預算清單
-DocType: Work Order Operation,Completed Qty,完成數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方科目可以連接另一個貸方分錄
-DocType: Manufacturing Settings,Allow Overtime,允許加班
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
-DocType: Training Event Employee,Training Event Employee,培訓活動的員工
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1299,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以為批次{1}和項目{2}保留最大樣本數量{0}。
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +7,Add Time Slots,添加時間插槽
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +206,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
-DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
-DocType: Training Event,Advance,提前
-apps/erpnext/erpnext/config/integrations.py +13,GoCardless payment gateway settings,GoCardless支付網關設置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,兌換收益/損失
-DocType: Opportunity,Lost Reason,失落的原因
-DocType: Amazon MWS Settings,Enable Amazon,啟用亞馬遜
-apps/erpnext/erpnext/controllers/accounts_controller.py +322,Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不屬於公司{2}
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},無法找到DocType {0}
-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 +412,All items have already been invoiced,所有項目已開具發票
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period,在此期間，總分配的離職時間超過員工{1}的最大分配{0}離職類型的天數
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
-DocType: Branch,Branch,分支機構
-DocType: Soil Analysis,Ca/(K+Ca+Mg),的Ca /（K +鈣+鎂）
-DocType: Delivery Trip,Fulfillment User,履行用戶
-DocType: Company,Total Monthly Sales,每月銷售總額
-DocType: Payment Request,Subscription Plans,訂閱計劃
-DocType: Agriculture Analysis Criteria,Weather,天氣
-DocType: Bin,Actual Quantity,實際數量
-DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列號{0}未找到
-DocType: Fee Schedule Program,Fee Schedule Program,費用計劃計劃
-DocType: Fee Schedule Program,Student Batch,學生批
-apps/erpnext/erpnext/utilities/activation.py +119,Make Student,使學生
-DocType: Supplier Scorecard Scoring Standing,Min Grade,最小成績
-DocType: Healthcare Service Unit Type,Healthcare Service Unit Type,醫療服務單位類型
-apps/erpnext/erpnext/projects/doctype/project/project.py +279,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
-DocType: Supplier Group,Parent Supplier Group,父供應商組
-DocType: Email Digest,Purchase Orders to Bill,向比爾購買訂單
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +54,Accumulated Values in Group Company,集團公司累計價值
-DocType: Leave Block List Date,Block Date,封鎖日期
-DocType: Purchase Receipt,Supplier Delivery Note,供應商交貨單
-apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,現在申請
-DocType: Employee Tax Exemption Proof Submission Detail,Type of Proof,證明類型
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
-DocType: Purchase Invoice,E-commerce GSTIN,電子商務GSTIN
-,Bank Clearance Summary,銀行結算摘要
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_dashboard.py +6,This is based on transactions against this Sales Person. See timeline below for details,這是基於針對此銷售人員的交易。請參閱下面的時間表了解詳情
-DocType: Appraisal Goal,Appraisal Goal,考核目標
-DocType: Stock Reconciliation Item,Current Amount,電流量
-apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py +24,Tax Declaration of {0} for period {1} already submitted.,已提交期間{1}的稅務申報{0}。
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +76,Leaves has been granted sucessfully,葉子已成功獲得
-DocType: Fee Schedule,Fee Structure,費用結構
-DocType: Timesheet Detail,Costing Amount,成本核算金額
-DocType: Student Admission Program,Application Fee,報名費
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +75,Submit Salary Slip,提交工資單
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,On Hold,等候接聽
-DocType: Account,Inter Company Account,公司內帳戶
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +17,Import in Bulk,進口散裝
-DocType: Sales Partner,Address & Contacts,地址及聯絡方式
-DocType: SMS Log,Sender Name,發件人名稱
-DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,農業分析標準
-DocType: HR Settings,Leave Approval Notification Template,留下批准通知模板
-DocType: POS Profile,[Select],[選擇]
-DocType: Staffing Plan Detail,Number Of Positions,職位數
-DocType: Vital Signs,Blood Pressure (diastolic),血壓（舒張）
-DocType: SMS Log,Sent To,發給
-DocType: Payment Request,Make Sales Invoice,做銷售發票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,軟件
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,接下來跟日期不能過去
-DocType: Company,For Reference Only.,僅供參考。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2595,Select Batch No,選擇批號
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +80,Invalid {0}: {1},無效的{0}：{1}
-DocType: Fee Validity,Reference Inv,參考文獻
-DocType: Sales Invoice Advance,Advance Amount,提前量
-DocType: Manufacturing Settings,Capacity Planning,產能規劃
-DocType: Supplier Quotation,Rounding Adjustment (Company Currency,四捨五入調整（公司貨幣）
-DocType: Asset,Policy number,保單號碼
-DocType: Journal Entry,Reference Number,參考號碼
-DocType: Employee,New Workplace,新工作空間
-DocType: Retention Bonus,Retention Bonus,保留獎金
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,設置為關閉
-apps/erpnext/erpnext/stock/get_item_details.py +146,No Item with Barcode {0},沒有條碼{0}的品項
-DocType: Normal Test Items,Require Result Value,需要結果值
-DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
-DocType: Tax Withholding Rate,Tax Withholding Rate,稅收預扣稅率
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +552,Boms,物料清單
-apps/erpnext/erpnext/stock/doctype/item/item.py +191,Stores,商店
-DocType: Project Type,Projects Manager,項目經理
-DocType: Serial No,Delivery Time,交貨時間
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +15,Ageing Based On,老齡化基於
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +103,Appointment cancelled,預約被取消
-DocType: Item,End of Life,壽命結束
-apps/erpnext/erpnext/demo/setup/setup_data.py +344,Travel,旅遊
-DocType: Student Report Generation Tool,Include All Assessment Group,包括所有評估小組
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
-DocType: Leave Block List,Allow Users,允許用戶
-DocType: Purchase Order,Customer Mobile No,客戶手機號碼
-DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,現金流量映射模板細節
-apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,貸款管理
-DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
-DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +488,Show Salary Slip,顯示工資單
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +881,Transfer Material,轉印材料
-DocType: Fees,Send Payment Request,發送付款請求
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
-DocType: Travel Request,Any other details,任何其他細節
-apps/erpnext/erpnext/controllers/status_updater.py +207,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 +1288,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,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: Topic,Topic,話題
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +99,Cash Flow from Financing,從融資現金流
-DocType: Budget Account,Budget Account,預算科目
-DocType: Quality Inspection,Verified By,認證機構
-DocType: Travel Request,Name of Organizer,主辦單位名稱
-apps/erpnext/erpnext/setup/doctype/company/company.py +84,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
-DocType: Cash Flow Mapping,Is Income Tax Liability,是所得稅責任
-DocType: Grading Scale Interval,Grade Description,等級說明
-DocType: Clinical Procedure,Is Invoiced,已開票
-DocType: Stock Entry,Purchase Receipt No,採購入庫單編號
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,保證金
-DocType: Sales Invoice, Shipping Bill Number,裝運單編號
-DocType: Asset Maintenance Log,Actions performed,已執行的操作
-DocType: Cash Flow Mapper,Section Leader,科長
-DocType: Delivery Note,Transport Receipt No,運輸收據編號
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Source of Funds (Liabilities),資金來源（負債）
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +52,Source and Target Location cannot be same,源和目標位置不能相同
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +522,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
-DocType: Supplier Scorecard Scoring Standing,Employee,僱員
-DocType: Bank Guarantee,Fixed Deposit Number,定期存款編號
-DocType: Asset Repair,Failure Date,失敗日期
-DocType: Support Search Source,Result Title Field,結果標題字段
-DocType: Sample Collection,Collected Time,收集時間
-DocType: Company,Sales Monthly History,銷售月曆
-DocType: Asset Maintenance Task,Next Due Date,下一個到期日
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +242,Select Batch,選擇批次
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,{0} {1} is fully billed,{0} {1}}已開票
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +30,Vital Signs,生命體徵
-DocType: Payment Entry,Payment Deductions or Loss,付款扣除或損失
-DocType: Soil Analysis,Soil Analysis Criterias,土壤分析標準
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,Group by Voucher,集團透過券
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +391,Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎？
-DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房間價格套餐
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,銷售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},請薪酬部分設置默認科目{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,獲取訂閱更新
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
-apps/erpnext/erpnext/controllers/buying_controller.py +719,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,課程：
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +246,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
-DocType: POS Profile,Applicable for Users,適用於用戶
-DocType: Notification Control,Expense Claim Approved,報銷批准
-DocType: Purchase Invoice,Set Advances and Allocate (FIFO),設置進度和分配（FIFO）
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,沒有創建工作訂單
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Pharmaceutical,製藥
-apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,您只能提交離開封存以獲得有效的兌換金額
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
-DocType: Employee Separation,Employee Separation Template,員工分離模板
-DocType: Selling Settings,Sales Order Required,銷售訂單需求
-apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,成為賣家
-DocType: Purchase Invoice,Credit To,信貸
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,有效訊息/客戶
-DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,留空以使用標準的交貨單格式
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
-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 +248,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,出席會議日期
-DocType: Request for Quotation Supplier,No Quote,沒有報價
-DocType: Support Search Source,Post Title Key,帖子標題密鑰
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +232,For Job Card,對於工作卡
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1556,Prescriptions,處方
-DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1112,Please specify Company to proceed,請註明公司以處理
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +81,Net Change in Accounts Receivable,應收帳款淨額變化
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +66,Compensatory Off,補假
-DocType: Job Offer,Accepted,接受的
-DocType: POS Closing Voucher,Sales Invoices Summary,銷售發票摘要
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +225,To Party Name,到黨名
-DocType: Grant Application,Organization,組織
-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_calculated/bom_stock_calculated.js +23,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 +111,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.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
-apps/erpnext/erpnext/templates/pages/product_search.html +21,Search Results,搜索結果
-DocType: Room,Room Number,房間號
-apps/erpnext/erpnext/utilities/transaction_base.py +112,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})不能大於計劃數量
+Please set GST Accounts in GST Settings,請在GST設置中設置GST帳戶
+Type of Business,業務類型
+"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
+Cost of New Purchase,新的採購成本
+Sales Order required for Item {0},所需的{0}項目銷售訂單
+Grant Description,授予說明
+Rate (Company Currency),率（公司貨幣）
+Unallocated Amount,未分配金額
+Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses,請啟用適用於採購訂單並適用於預訂實際費用
+Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
+Taxes and Charges,稅收和收費
+"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買，出售或持有的庫存。
+No more updates,沒有更多的更新
+Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
+This covers all scorecards tied to this Setup,這涵蓋了與此安裝程序相關的所有記分卡
+Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
+Banking,銀行業
+Add Timesheets,添加時間表
+Service Item,服務項目
+Bank Guarantee,銀行擔保
+Bank Guarantee,銀行擔保
+Transaction Details,交易明細
+Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
+Ordered Quantity,訂購數量
+"e.g. ""Build tools for builders""",例如「建設建設者工具“
+Grading Scale Intervals,分級刻度間隔
+Purchase Defaults,購買默認值
+Make Job Card,製作工作卡
+"Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again",無法自動創建Credit Note，請取消選中'Issue Credit Note'並再次提交
+Profit for the year,年度利潤
+{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言：{3}
+In Process,在過程
+Itemwise Discount,Itemwise折扣
+Tree of financial accounts.,財務賬目的樹。
+Reference Document Type,參考文檔類型
+Cash Flow Mapping,現金流量映射
+{0} against Sales Order {1},{0}針對銷售訂單{1}
+Fixed Asset,固定資產
+After Date,日期之後
+Serialized Inventory,序列化庫存
+Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
+Department Analytics,部門分析
+Email not found in default contact,在默認聯繫人中找不到電子郵件
+Default Billing Rate,默認計費率
+{0} Student Groups created.,{0}創建學生組。
+{0} Student Groups created.,{0}創建學生組。
+Total Billing Amount,總結算金額
+Program in the Fee Structure and Student Group {0} are different.,費用結構和學生組{0}中的課程是不同的。
+Receivable Account,應收帳款
+Valid From Date must be lesser than Valid Upto Date.,有效起始日期必須小於有效起始日期。
+Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
+Stock Balance,庫存餘額
+Sales Order to Payment,銷售訂單到付款
+With Payment of Tax,繳納稅款
+Expense Claim Detail,報銷詳情
+TRIPLICATE FOR SUPPLIER,供應商提供服務
+New Balance In Base Currency,基礎貨幣的新平衡
+This will be day 1 of the crop cycle,這將是作物週期的第一天
+Please select correct account,請選擇正確的科目
+Salary Structure Assignment,薪酬結構分配
+Weight UOM,重量計量單位
+List of available Shareholders with folio numbers,包含folio號碼的可用股東名單
+Salary Structure Employee,薪資結構員工
+Show Variant Attributes,顯示變體屬性
+The payment gateway account in plan {0} is different from the payment gateway account in this payment request,計劃{0}中的支付閘道科目與此付款請求中的支付閘道科目不同
+Course Name,課程名
+No Tax Withholding data found for the current Fiscal Year.,未找到當前財年的預扣稅數據。
+Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
+Office Equipments,辦公設備
+Qty,數量
+Companies,企業
+Scoring Setup,得分設置
+Electronics,電子
+Debit ({0}),借記卡（{0}）
+Allow Same Item Multiple Times,多次允許相同的項目
+Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
+Full-time,全日制
+Employees,僱員
+Contact Details,聯絡方式
+Received Date,接收日期
+"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已經創建了銷售稅和費模板標準模板，選擇一個，然後點擊下面的按鈕。
+Basic Amount (Company Currency),基本金額（公司幣種）
+Guardians,守護者
+Payment Confirmation,付款確認
+Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
+Total Incoming Value,總收入值
+Debit To is required,借方是必填項
+Inpatient Record,住院病歷
+"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間，費用和結算由你的團隊做activites,
+Purchase Price List,採購價格表
+Templates of supplier scorecard variables.,供應商記分卡變數模板。
+Offer Term,要約期限
+Quality Manager,質量經理
+Job Opening,開放職位
+Payment Reconciliation,付款對帳
+Please select Incharge Person's name,請選擇Incharge人的名字
+Technology,技術
+BOM Website Operation,BOM網站運營
+outstanding_amount,outstanding_amount,
+Supplier Score,供應商分數
+Schedule Admission,安排入場
+Cumulative Transaction Threshold,累積交易閾值
+Total Invoiced Amt,總開票金額
+Conversion Rate,兌換率
+Product Search,產品搜索
+To Time,要時間
+) for {0},）為{0}
+Approving Role (above authorized value),批准角色（上述授權值）
+Credit To account must be a Payable account,信用科目必須是應付帳款
+Insurance End Date,保險終止日期
+Please select Student Admission which is mandatory for the paid student applicant,請選擇付費學生申請者必須入學的學生
+BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+Budget List,預算清單
+Completed Qty,完成數量
+"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方科目可以連接另一個貸方分錄
+Allow Overtime,允許加班
+"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
+"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
+Training Event Employee,培訓活動的員工
+Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以為批次{1}和項目{2}保留最大樣本數量{0}。
+Add Time Slots,添加時間插槽
+{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
+Current Valuation Rate,目前的估值價格
+Advance,提前
+GoCardless payment gateway settings,GoCardless支付網關設置
+Exchange Gain/Loss,兌換收益/損失
+Lost Reason,失落的原因
+Enable Amazon,啟用亞馬遜
+Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不屬於公司{2}
+Unable to find DocType {0},無法找到DocType {0}
+Sample Size,樣本大小
+Please enter Receipt Document,請輸入收據憑證
+All items have already been invoiced,所有項目已開具發票
+Please specify a valid 'From Case No.',請指定一個有效的“從案號”
+Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
+Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period,在此期間，總分配的離職時間超過員工{1}的最大分配{0}離職類型的天數
+Users and Permissions,用戶和權限
+Branch,分支機構
+Ca/(K+Ca+Mg),的Ca /（K +鈣+鎂）
+Fulfillment User,履行用戶
+Total Monthly Sales,每月銷售總額
+Subscription Plans,訂閱計劃
+Weather,天氣
+Actual Quantity,實際數量
+example: Next Day Shipping,例如：次日發貨
+Serial No {0} not found,序列號{0}未找到
+Fee Schedule Program,費用計劃計劃
+Student Batch,學生批
+Make Student,使學生
+Min Grade,最小成績
+Healthcare Service Unit Type,醫療服務單位類型
+You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
+Parent Supplier Group,父供應商組
+Purchase Orders to Bill,向比爾購買訂單
+Accumulated Values in Group Company,集團公司累計價值
+Block Date,封鎖日期
+Supplier Delivery Note,供應商交貨單
+Apply Now,現在申請
+Type of Proof,證明類型
+Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
+Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
+E-commerce GSTIN,電子商務GSTIN,
+Bank Clearance Summary,銀行結算摘要
+"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
+This is based on transactions against this Sales Person. See timeline below for details,這是基於針對此銷售人員的交易。請參閱下面的時間表了解詳情
+Appraisal Goal,考核目標
+Current Amount,電流量
+Tax Declaration of {0} for period {1} already submitted.,已提交期間{1}的稅務申報{0}。
+Leaves has been granted sucessfully,葉子已成功獲得
+Fee Structure,費用結構
+Costing Amount,成本核算金額
+Application Fee,報名費
+Submit Salary Slip,提交工資單
+On Hold,等候接聽
+Inter Company Account,公司內帳戶
+Import in Bulk,進口散裝
+Address & Contacts,地址及聯絡方式
+Sender Name,發件人名稱
+Agriculture Analysis Criteria,農業分析標準
+Leave Approval Notification Template,留下批准通知模板
+[Select],[選擇]
+Number Of Positions,職位數
+Blood Pressure (diastolic),血壓（舒張）
+Sent To,發給
+Make Sales Invoice,做銷售發票
+Softwares,軟件
+Next Contact Date cannot be in the past,接下來跟日期不能過去
+For Reference Only.,僅供參考。
+Select Batch No,選擇批號
+Invalid {0}: {1},無效的{0}：{1}
+Reference Inv,參考文獻
+Advance Amount,提前量
+Capacity Planning,產能規劃
+Rounding Adjustment (Company Currency,四捨五入調整（公司貨幣）
+Policy number,保單號碼
+Reference Number,參考號碼
+New Workplace,新工作空間
+Retention Bonus,保留獎金
+Set as Closed,設置為關閉
+No Item with Barcode {0},沒有條碼{0}的品項
+Require Result Value,需要結果值
+Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
+Tax Withholding Rate,稅收預扣稅率
+Boms,物料清單
+Stores,商店
+Projects Manager,項目經理
+Delivery Time,交貨時間
+Ageing Based On,老齡化基於
+Appointment cancelled,預約被取消
+End of Life,壽命結束
+Travel,旅遊
+Include All Assessment Group,包括所有評估小組
+No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
+Allow Users,允許用戶
+Customer Mobile No,客戶手機號碼
+Cash Flow Mapping Template Details,現金流量映射模板細節
+Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
+Item Reorder,項目重新排序
+Show Salary Slip,顯示工資單
+Transfer Material,轉印材料
+Send Payment Request,發送付款請求
+"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
+Any other details,任何其他細節
+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}？
+Please set recurring after saving,請設置保存後復發
+Select change amount account,選擇變化量科目
+Price List Currency,價格表之貨幣
+User must always select,用戶必須始終選擇
+Allow Negative Stock,允許負庫存
+Installation Note,安裝注意事項
+Topic,話題
+Cash Flow from Financing,從融資現金流
+Budget Account,預算科目
+Verified By,認證機構
+Name of Organizer,主辦單位名稱
+"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
+Is Income Tax Liability,是所得稅責任
+Grade Description,等級說明
+Is Invoiced,已開票
+Purchase Receipt No,採購入庫單編號
+Earnest Money,保證金
+ Shipping Bill Number,裝運單編號
+Actions performed,已執行的操作
+Section Leader,科長
+Transport Receipt No,運輸收據編號
+Source of Funds (Liabilities),資金來源（負債）
+Source and Target Location cannot be same,源和目標位置不能相同
+Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
+Employee,僱員
+Fixed Deposit Number,定期存款編號
+Failure Date,失敗日期
+Result Title Field,結果標題字段
+Collected Time,收集時間
+Sales Monthly History,銷售月曆
+Next Due Date,下一個到期日
+Select Batch,選擇批次
+{0} {1} is fully billed,{0} {1}}已開票
+Vital Signs,生命體徵
+Payment Deductions or Loss,付款扣除或損失
+Soil Analysis Criterias,土壤分析標準
+Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
+Group by Voucher,集團透過券
+Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎？
+Hotel Room Pricing Package,酒店房間價格套餐
+Sales Pipeline,銷售渠道
+Please set default account in Salary Component {0},請薪酬部分設置默認科目{0}
+Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
+Fetch Subscription Updates,獲取訂閱更新
+Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
+Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
+Course: ,課程：
+Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+Applicable for Users,適用於用戶
+Expense Claim Approved,報銷批准
+Set Advances and Allocate (FIFO),設置進度和分配（FIFO）
+No Work Orders created,沒有創建工作訂單
+Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
+Pharmaceutical,製藥
+You can only submit Leave Encashment for a valid encashment amount,您只能提交離開封存以獲得有效的兌換金額
+Cost of Purchased Items,購買的物品成本
+Employee Separation Template,員工分離模板
+Sales Order Required,銷售訂單需求
+Become a Seller,成為賣家
+Credit To,信貸
+Active Leads / Customers,有效訊息/客戶
+Leave blank to use the standard Delivery Note format,留空以使用標準的交貨單格式
+Maintenance Schedule Detail,維護計劃細節
+Warn for new Purchase Orders,警告新的採購訂單
+Reading 9,9閱讀
+Is Frozen,就是冰凍
+Group node warehouse is not allowed to select for transactions,組節點倉庫不允許選擇用於交易
+Buying Settings,採購設定
+BOM No. for a Finished Good Item,BOM編號為成品產品
+Attendance To Date,出席會議日期
+No Quote,沒有報價
+Post Title Key,帖子標題密鑰
+For Job Card,對於工作卡
+Prescriptions,處方
+Payment Account,付款帳號
+Please specify Company to proceed,請註明公司以處理
+Net Change in Accounts Receivable,應收帳款淨額變化
+Compensatory Off,補假
+Accepted,接受的
+Sales Invoices Summary,銷售發票摘要
+To Party Name,到黨名
+Organization,組織
+Organization,組織
+BOM Update Tool,BOM更新工具
+Student Group Name,學生組名稱
+Show exploded view,顯示爆炸視圖
+Creating Fees,創造費用
+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.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
+Search Results,搜索結果
+Room Number,房間號
+Invalid reference {0} {1},無效的參考{0} {1}
+{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1})不能大於計劃數量
({2})生產訂單的 {3}"
-DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
-DocType: Journal Entry Account,Payroll Entry,工資項目
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +76,View Fees Records,查看費用記錄
-apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,使稅收模板
-apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +333,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金額必須為負數
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
-DocType: Contract,Fulfilment Status,履行狀態
-DocType: Lab Test Sample,Lab Test Sample,實驗室測試樣品
-DocType: Item Variant Settings,Allow Rename Attribute Value,允許重命名屬性值
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +533,Quick Journal Entry,快速日記帳分錄
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +244,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
-DocType: Restaurant,Invoice Series Prefix,發票系列前綴
-DocType: Employee,Previous Work Experience,以前的工作經驗
-apps/erpnext/erpnext/accounts/doctype/account/account.js +140,Update Account Number / Name,更新帳號/名稱
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +413,Assign Salary Structure,分配薪資結構
-DocType: Support Settings,Response Key List,響應密鑰列表
-DocType: Job Card,For Quantity,對於數量
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
-DocType: Support Search Source,API,API
-DocType: Support Search Source,Result Preview Field,結果預覽字段
-DocType: Item Price,Packing Unit,包裝單位
-DocType: Subscription,Trialling,試用
-DocType: Sales Invoice Item,Deferred Revenue,遞延收入
-DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,現金科目將用於創建銷售發票
-DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,豁免子類別
-DocType: Member,Membership Expiry Date,會員到期日
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +134,{0} must be negative in return document,{0}必須返回文檔中負
-,Minutes to First Response for Issues,分鐘的問題第一個反應
-DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
-apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +45,Latest price updated in all BOMs,最新價格在所有BOM中更新
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
-DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
-DocType: Student Admission Program,Naming Series (for Student Applicant),命名系列（面向學生申請人）
-apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +16,Bonus Payment Date cannot be a past date,獎金支付日期不能是過去的日期
-DocType: Travel Request,Copy of Invitation/Announcement,邀請/公告的副本
-DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,從業者服務單位時間表
-DocType: Delivery Note,Transporter Name,貨運公司名稱
-DocType: Authorization Rule,Authorized Value,授權值
-DocType: BOM,Show Operations,顯示操作
-,Minutes to First Response for Opportunity,分鐘的機會第一個反應
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1064,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
-apps/erpnext/erpnext/config/stock.py +194,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 +1083,Opportunity,機會
-DocType: Operation,Default Workstation,預設工作站
-DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
-DocType: Payment Entry,Deductions or Loss,扣除或損失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +279,{0} {1} is closed,{0} {1}關閉
-DocType: Email Digest,How frequently?,多久？
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +56,Total Collected: {0},總計：{0}
-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,員工在假期工作
-,TDS Computation Summary,TDS計算摘要
-DocType: Share Balance,Current State,當前狀態
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,馬克現在
-DocType: Share Transfer,From Shareholder,來自股東
-apps/erpnext/erpnext/healthcare/setup.py +180,Drug,藥物
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
-DocType: Job Card,Actual End Date,實際結束日期
-DocType: Cash Flow Mapping,Is Finance Cost Adjustment,財務成本調整
-DocType: BOM,Operating Cost (Company Currency),營業成本（公司貨幣）
-DocType: Authorization Rule,Applicable To (Role),適用於（角色）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +10,Pending Leaves,等待葉子
-DocType: BOM Update Tool,Replace BOM,更換BOM
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +113,Code {0} already exist,代碼{0}已經存在
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +37,Sales orders are not available for production,銷售訂單不可用於生產
-DocType: Company,Fixed Asset Depreciation Settings,固定資產折舊設置
-DocType: Item,Will also apply for variants unless overrridden,同時將申請變種，除非overrridden
-DocType: Purchase Invoice,Advances,進展
-DocType: Work Order,Manufacture against Material Request,對製造材料要求
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +17,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),基本速率（按庫存計量單位）
-DocType: SMS Log,No of Requested SMS,無的請求短信
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +328,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
-DocType: Travel Request,Domestic,國內
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +853,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +19,Employee Transfer cannot be submitted before Transfer Date ,員工轉移無法在轉移日期前提交
-apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js +7,Make Invoice,製作發票
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +130,Remaining Balance,保持平衡
-DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +83,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡，{0}不允許採購訂單。
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Barcode {0} is not a valid {1} code,條形碼{0}不是有效的{1}代碼
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +25,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 %,報價/鉛％
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
-DocType: Driver,Driver,司機
-DocType: Vital Signs,Nutrition Values,營養價值觀
-DocType: Lab Test Template,Is billable,是可計費的
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +412,{0} against Purchase Order {1},{0}針對採購訂單{1}
-DocType: Patient,Patient Demographics,患者人口統計學
-DocType: Task,Actual Start Date (via Time Sheet),實際開始日期（通過時間表）
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +28,Ageing Range 1,老齡範圍1
-DocType: Shopify Settings,Enable Shopify,啟用Shopify
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Total advance amount cannot be greater than total claimed amount,總預付金額不能超過索賠總額
-DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+Shipping Rule Label,送貨規則標籤
+Payroll Entry,工資項目
+View Fees Records,查看費用記錄
+Make Tax Template,使稅收模板
+User Forum,用戶論壇
+Raw Materials cannot be blank.,原材料不能為空。
+Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金額必須為負數
+"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+Fulfilment Status,履行狀態
+Lab Test Sample,實驗室測試樣品
+Allow Rename Attribute Value,允許重命名屬性值
+Quick Journal Entry,快速日記帳分錄
+You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
+Invoice Series Prefix,發票系列前綴
+Previous Work Experience,以前的工作經驗
+Update Account Number / Name,更新帳號/名稱
+Assign Salary Structure,分配薪資結構
+Response Key List,響應密鑰列表
+For Quantity,對於數量
+Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
+API,API,
+Result Preview Field,結果預覽字段
+Packing Unit,包裝單位
+Trialling,試用
+Deferred Revenue,遞延收入
+Cash Account will used for Sales Invoice creation,現金科目將用於創建銷售發票
+Exemption Sub Category,豁免子類別
+Membership Expiry Date,會員到期日
+{0} must be negative in return document,{0}必須返回文檔中負
+Minutes to First Response for Issues,分鐘的問題第一個反應
+Terms and Conditions1,條款及條件1,
+The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
+"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
+Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
+Latest price updated in all BOMs,最新價格在所有BOM中更新
+Project Status,項目狀態
+Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
+Naming Series (for Student Applicant),命名系列（面向學生申請人）
+Bonus Payment Date cannot be a past date,獎金支付日期不能是過去的日期
+Copy of Invitation/Announcement,邀請/公告的副本
+Practitioner Service Unit Schedule,從業者服務單位時間表
+Transporter Name,貨運公司名稱
+Authorized Value,授權值
+Show Operations,顯示操作
+Minutes to First Response for Opportunity,分鐘的機會第一個反應
+Total Absent,共缺席
+Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
+Unit of Measure,計量單位
+Year End Date,年結結束日期
+Task Depends On,任務取決於
+Opportunity,機會
+Default Workstation,預設工作站
+Expense Claim Approved Message,報銷批准的訊息
+Deductions or Loss,扣除或損失
+{0} {1} is closed,{0} {1}關閉
+How frequently?,多久？
+Total Collected: {0},總計：{0}
+Get Current Stock,取得當前庫存資料
+Tree of Bill of Materials,物料清單樹狀圖
+Joining Date,入職日期
+Employees working on a holiday,員工在假期工作
+TDS Computation Summary,TDS計算摘要
+Current State,當前狀態
+Mark Present,馬克現在
+From Shareholder,來自股東
+Drug,藥物
+Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
+Actual End Date,實際結束日期
+Is Finance Cost Adjustment,財務成本調整
+Operating Cost (Company Currency),營業成本（公司貨幣）
+Applicable To (Role),適用於（角色）
+Pending Leaves,等待葉子
+Replace BOM,更換BOM,
+Code {0} already exist,代碼{0}已經存在
+Sales orders are not available for production,銷售訂單不可用於生產
+Fixed Asset Depreciation Settings,固定資產折舊設置
+Will also apply for variants unless overrridden,同時將申請變種，除非overrridden,
+Advances,進展
+Manufacture against Material Request,對製造材料要求
+Assessment Group: ,評估組：
+Request for,要求
+Approving User cannot be same as user the rule is Applicable To,批准用戶作為用戶的規則適用於不能相同
+Basic Rate (as per Stock UOM),基本速率（按庫存計量單位）
+No of Requested SMS,無的請求短信
+Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
+Domestic,國內
+Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+Employee Transfer cannot be submitted before Transfer Date ,員工轉移無法在轉移日期前提交
+Make Invoice,製作發票
+Remaining Balance,保持平衡
+Auto close Opportunity after 15 days,15天之後自動關閉商機
+Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡，{0}不允許採購訂單。
+Barcode {0} is not a valid {1} code,條形碼{0}不是有效的{1}代碼
+End Year,結束年份
+Quot/Lead %,報價/鉛％
+Quot/Lead %,報價/鉛％
+Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
+Driver,司機
+Nutrition Values,營養價值觀
+Is billable,是可計費的
+A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
+{0} against Purchase Order {1},{0}針對採購訂單{1}
+Patient Demographics,患者人口統計學
+Actual Start Date (via Timesheet),實際開始日期（通過時間表）
+This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
+Ageing Range 1,老齡範圍1,
+Enable Shopify,啟用Shopify,
+Total advance amount cannot be greater than total claimed amount,總預付金額不能超過索賠總額
+"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
-#### Note
+#### Note,
The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
-#### Description of Columns
+#### Description of Columns,
1. Calculation Type:
- This can be on **Net Total** (that is the sum of basic amount).
- **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
- **Actual** (as mentioned).
-2. Account Head: The Account ledger under which this tax will be booked
+2. Account Head: The Account ledger under which this tax will be booked,
3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
4. Description: Description of the tax (that will be printed in invoices / quotes).
5. Rate: Tax rate.
@@ -3349,287 +3325,286 @@
8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
9。考慮稅收或收費為：在本節中，你可以指定是否稅/費僅用於評估（總不是部分），或只為總（不增加價值的項目），或兩者兼有。
10。添加或扣除：無論你是想增加或扣除的稅。"
-DocType: Homepage,Homepage,主頁
-DocType: Grant Application,Grant Application Details ,授予申請細節
-DocType: Employee Separation,Employee Separation,員工分離
-DocType: BOM Item,Original Item,原始項目
-DocType: Purchase Receipt Item,Recd Quantity,到貨數量
-apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},費紀錄創造 - {0}
-DocType: Asset Category Account,Asset Category Account,資產類別的科目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金額必須為正值
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/stock/doctype/item/item.js +446,Select Attribute Values,選擇屬性值
-DocType: Purchase Invoice,Reason For Issuing document,簽發文件的原因
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,庫存輸入{0}不提交
-DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金科目
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,接著聯繫到不能相同鉛郵箱地址
-DocType: Tax Rule,Billing City,結算城市
-DocType: Asset,Manual,手冊
-DocType: Salary Component Account,Salary Component Account,薪金部分科目
-DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +281,Sales Opportunities by Source,來源的銷售機會
-apps/erpnext/erpnext/config/accounts.py +287,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
-DocType: Job Applicant,Source Name,源名稱
-DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成年人的正常靜息血壓約為收縮期120mmHg，舒張壓80mmHg，縮寫為“120 / 80mmHg”
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +124,"Set items shelf life in days, to set expiry based on manufacturing_date plus self life",以天為單位設置貨架保質期，根據manufacturer_date加上自我壽命設置到期日
-DocType: Journal Entry,Credit Note,信用票據
-DocType: Projects Settings,Ignore Employee Time Overlap,忽略員工時間重疊
-DocType: Warranty Claim,Service Address,服務地址
-DocType: Asset Maintenance Task,Calibration,校準
-apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,離開狀態通知
-DocType: Patient Appointment,Procedure Prescription,程序處方
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,家具及固定裝置
-DocType: Travel Request,Travel Type,旅行類型
-DocType: Item,Manufacture,製造
-apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,安裝公司
-,Lab Test Report,實驗室測試報告
-DocType: Employee Benefit Application,Employee Benefit Application,員工福利申請
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,請送貨單第一
-DocType: Student Applicant,Application Date,申請日期
-DocType: Salary Component,Amount based on formula,量基於式
-DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
-DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +115,Clearance Date not mentioned,清拆日期未提及
-DocType: Payroll Period,Taxable Salary Slabs,應稅薪金板塊
-apps/erpnext/erpnext/config/manufacturing.py +7,Production,生產
-DocType: Guardian,Occupation,佔用
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +210,For Quantity must be less than quantity {0},對於數量必須小於數量{0}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
-DocType: Salary Component,Max Benefit Amount (Yearly),最大福利金額（每年）
-DocType: Crop,Planting Area,種植面積
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
-DocType: Installation Note Item,Installed Qty,安裝數量
-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: Products Settings,Products per Page,每頁產品
-DocType: Stock Ledger Entry,Outgoing Rate,傳出率
-DocType: Sales Order,Billing Status,計費狀態
-apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,報告問題
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,公用事業費用
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +253,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/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,留下批准通知
-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 +55,Buying Rate,購買率
-apps/erpnext/erpnext/controllers/buying_controller.py +602,Row {0}: Enter location for the asset item {1},行{0}：輸入資產項目{1}的位置
-DocType: Company,About the Company,關於公司
-DocType: Notification Control,Sales Order Message,銷售訂單訊息
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
-DocType: Payment Entry,Payment Type,付款類型
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +245,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +245,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1184,No gain or loss in the exchange rate,匯率沒有收益或損失
-DocType: Payroll Entry,Select Employees,選擇僱員
-DocType: Shopify Settings,Sales Invoice Series,銷售發票系列
-DocType: Opportunity,Potential Sales Deal,潛在的銷售交易
-DocType: Complaint,Complaints,投訴
-DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,僱員免稅聲明
-DocType: Payment Entry,Cheque/Reference Date,支票/參考日期
-DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
-DocType: Employee,Emergency Contact,緊急聯絡人
-DocType: Bank Reconciliation Detail,Payment Entry,付款輸入
-,sales-browser,銷售瀏覽器
-apps/erpnext/erpnext/accounts/doctype/account/account.js +78,Ledger,分類帳
-DocType: Drug Prescription,Drug Code,藥品代碼
-DocType: Target Detail,Target Amount,目標金額
-DocType: POS Profile,Print Format for Online,在線打印格式
-DocType: Shopping Cart Settings,Shopping Cart Settings,購物車設定
-DocType: Journal Entry,Accounting Entries,會計分錄
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, 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.",如果選定的定價規則是針對“費率”制定的，則會覆蓋價目表。定價規則費率是最終費率，因此不應再應用更多折扣。因此，在諸如銷售訂單，採購訂單等交易中，它將在'費率'字段中取代，而不是在'價格列表率'字段中取出。
-DocType: Journal Entry,Paid Loan,付費貸款
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重複的條目。請檢查授權規則{0}
-DocType: Journal Entry Account,Reference Due Date,參考到期日
-DocType: Purchase Order,Ref SQ,參考SQ
-DocType: Leave Type,Applicable After (Working Days),適用於（工作日）
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,收到文件必須提交
-DocType: Purchase Invoice Item,Received Qty,到貨數量
-DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +359,Not Paid and Not Delivered,沒有支付，未送達
-DocType: Product Bundle,Parent Item,父項目
-DocType: Account,Account Type,科目類型
-DocType: Shopify Settings,Webhooks Details,Webhooks詳細信息
-apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,沒有考勤表
-DocType: GoCardless Mandate,GoCardless Customer,GoCardless客戶
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +160,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
-,To Produce,以生產
-DocType: Leave Encashment,Payroll,工資表
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +209,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
-DocType: Healthcare Service Unit,Parent Service Unit,家長服務單位
-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,保留數量
-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,志願者技能
-DocType: Purchase Invoice,Inter Company Invoice Reference,Inter公司發票參考
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +883,Please select an item in the cart,請在購物車中選擇一個項目
-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 +52,Arrear,拖欠
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,期間折舊額
-DocType: Sales Invoice,Is Return (Credit Note),是退貨（信用票據）
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,開始工作
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},資產{0}需要序列號
-apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,殘疾人模板必須不能默認模板
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +542,For row {0}: Enter planned qty,對於行{0}：輸入計劃的數量
-DocType: Account,Income Account,收入科目
-DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +880,Delivery,交貨
-DocType: Stock Reconciliation Item,Current Qty,目前數量
-DocType: Restaurant Menu,Restaurant Menu,餐廳菜單
-apps/erpnext/erpnext/public/js/event.js +23,Add Suppliers,添加供應商
-DocType: Loyalty Program,Help Section,幫助科
-apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,上一頁
-DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
-DocType: Delivery Trip,Distance UOM,距離UOM
-apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤，評估和費用
-DocType: Payment Entry,Total Allocated Amount,總撥款額
-apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存科目
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +261,"Cannot deliver Serial No {0} of item {1} as it is reserved to \
+Homepage,主頁
+Grant Application Details ,授予申請細節
+Employee Separation,員工分離
+Original Item,原始項目
+Recd Quantity,到貨數量
+Fee Records Created - {0},費紀錄創造 - {0}
+Asset Category Account,資產類別的科目
+Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金額必須為正值
+Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
+Select Attribute Values,選擇屬性值
+Reason For Issuing document,簽發文件的原因
+Stock Entry {0} is not submitted,庫存輸入{0}不提交
+Bank / Cash Account,銀行／現金科目
+Next Contact By cannot be same as the Lead Email Address,接著聯繫到不能相同鉛郵箱地址
+Billing City,結算城市
+Manual,手冊
+Salary Component Account,薪金部分科目
+Hide Currency Symbol,隱藏貨幣符號
+Sales Opportunities by Source,來源的銷售機會
+"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+Source Name,源名稱
+"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成年人的正常靜息血壓約為收縮期120mmHg，舒張壓80mmHg，縮寫為“120 / 80mmHg”
+"Set items shelf life in days, to set expiry based on manufacturing_date plus self life",以天為單位設置貨架保質期，根據manufacturer_date加上自我壽命設置到期日
+Credit Note,信用票據
+Ignore Employee Time Overlap,忽略員工時間重疊
+Service Address,服務地址
+Calibration,校準
+Leave Status Notification,離開狀態通知
+Procedure Prescription,程序處方
+Furnitures and Fixtures,家具及固定裝置
+Travel Type,旅行類型
+Manufacture,製造
+Setup Company,安裝公司
+Lab Test Report,實驗室測試報告
+Employee Benefit Application,員工福利申請
+Please Delivery Note first,請送貨單第一
+Application Date,申請日期
+Amount based on formula,量基於式
+Currency and Price List,貨幣和價格表
+Customer / Lead Name,客戶/鉛名稱
+Clearance Date not mentioned,清拆日期未提及
+Taxable Salary Slabs,應稅薪金板塊
+Production,生產
+Occupation,佔用
+For Quantity must be less than quantity {0},對於數量必須小於數量{0}
+Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
+Max Benefit Amount (Yearly),最大福利金額（每年）
+Planting Area,種植面積
+Total(Qty),總計（數量）
+Installed Qty,安裝數量
+Training Result,訓練結果
+Is Paid,支付
+Total Earning,總盈利
+Time at which materials were received,物料收到的時間
+Products per Page,每頁產品
+Outgoing Rate,傳出率
+Billing Status,計費狀態
+Report an Issue,報告問題
+Utility Expenses,公用事業費用
+Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日記條目{1}沒有帳戶{2}或已經對另一憑證匹配
+Criteria Weight,標準重量
+Leave Approval Notification,留下批准通知
+Default Buying Price List,預設採購價格表
+Salary Slip Based on Timesheet,基於時間表工資單
+Buying Rate,購買率
+Row {0}: Enter location for the asset item {1},行{0}：輸入資產項目{1}的位置
+About the Company,關於公司
+Sales Order Message,銷售訂單訊息
+"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
+Payment Type,付款類型
+Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+No gain or loss in the exchange rate,匯率沒有收益或損失
+Select Employees,選擇僱員
+Sales Invoice Series,銷售發票系列
+Potential Sales Deal,潛在的銷售交易
+Complaints,投訴
+Employee Tax Exemption Declaration,僱員免稅聲明
+Cheque/Reference Date,支票/參考日期
+Total Taxes and Charges,總營業稅金及費用
+Emergency Contact,緊急聯絡人
+Payment Entry,付款輸入
+sales-browser,銷售瀏覽器
+Ledger,分類帳
+Drug Code,藥品代碼
+Target Amount,目標金額
+Print Format for Online,在線打印格式
+Shopping Cart Settings,購物車設定
+Accounting Entries,會計分錄
+"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, 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.",如果選定的定價規則是針對“費率”制定的，則會覆蓋價目表。定價規則費率是最終費率，因此不應再應用更多折扣。因此，在諸如銷售訂單，採購訂單等交易中，它將在'費率'字段中取代，而不是在'價格列表率'字段中取出。
+Paid Loan,付費貸款
+Duplicate Entry. Please check Authorization Rule {0},重複的條目。請檢查授權規則{0}
+Reference Due Date,參考到期日
+Ref SQ,參考SQ,
+Applicable After (Working Days),適用於（工作日）
+Receipt document must be submitted,收到文件必須提交
+Received Qty,到貨數量
+Serial No / Batch,序列號/批次
+Not Paid and Not Delivered,沒有支付，未送達
+Parent Item,父項目
+Account Type,科目類型
+Webhooks Details,Webhooks詳細信息
+No time sheets,沒有考勤表
+GoCardless Customer,GoCardless客戶
+Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
+Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
+To Produce,以生產
+Payroll,工資表
+"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
+Parent Service Unit,家長服務單位
+Make User,使用戶
+Identification of the package for the delivery (for print),寄送包裹的識別碼（用於列印）
+Reserved Quantity,保留數量
+Please enter valid email address,請輸入有效的電子郵件地址
+Please enter valid email address,請輸入有效的電子郵件地址
+Volunteer Skill,志願者技能
+Inter Company Invoice Reference,Inter公司發票參考
+Please select an item in the cart,請在購物車中選擇一個項目
+Purchase Receipt Items,採購入庫項目
+Customizing Forms,自定義表單
+Arrear,拖欠
+Depreciation Amount during the period,期間折舊額
+Is Return (Credit Note),是退貨（信用票據）
+Start Job,開始工作
+Serial no is required for the asset {0},資產{0}需要序列號
+Disabled template must not be default template,殘疾人模板必須不能默認模板
+For row {0}: Enter planned qty,對於行{0}：輸入計劃的數量
+Income Account,收入科目
+Amount in customer's currency,量客戶的貨幣
+Delivery,交貨
+Current Qty,目前數量
+Restaurant Menu,餐廳菜單
+Add Suppliers,添加供應商
+Help Section,幫助科
+Prev,上一頁
+Key Responsibility Area,關鍵責任區
+Distance UOM,距離UOM,
+"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤，評估和費用
+Total Allocated Amount,總撥款額
+Set default inventory account for perpetual inventory,設置永久庫存的默認庫存科目
+"Cannot deliver Serial No {0} of item {1} as it is reserved to \
fullfill Sales Order {2}",無法提供項目{1}的序列號{0}，因為它保留在\ fullfill銷售訂單{2}中
-DocType: Item Reorder,Material Request Type,材料需求類型
-apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,發送格蘭特回顧郵件
-apps/erpnext/erpnext/accounts/page/pos/pos.js +859,"LocalStorage is full, did not save",localStorage的是滿的，沒救
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +130,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
-DocType: Employee Benefit Claim,Claim Date,索賠日期
-apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,房間容量
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},已有記錄存在項目{0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,參考
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,您將失去先前生成的發票記錄。您確定要重新啟用此訂閱嗎？
-DocType: Healthcare Settings,Registration Fee,註冊費用
-DocType: Loyalty Program Collection,Loyalty Program Collection,忠誠度計劃集
-DocType: Stock Entry Detail,Subcontracted Item,轉包項目
-apps/erpnext/erpnext/education/__init__.py +9,Student {0} does not belong to group {1},學生{0}不屬於組{1}
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +57,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,解除日期
-DocType: Purchase Invoice,Total Quantity,總數（量
-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,類／百分比
-DocType: Shopify Settings,Shopify Settings,Shopify設置
-DocType: Amazon MWS Settings,Market Place ID,市場ID
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +97,Head of Marketing and Sales,營銷和銷售主管
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +50,Income Tax,所得稅
-apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,以行業類型追蹤訊息。
-apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,去信頭
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +114,Property already added,已添加屬性
-DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1389,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,沒有選擇轉移項目
-DocType: Company,Stock Settings,庫存設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
-DocType: Vehicle,Electric,電動
-DocType: Task,% Progress,％進展
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,在資產處置收益/損失
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +24,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中將只選擇狀態為“已批准”的學生申請人。
-DocType: Tax Withholding Category,Rates,價格
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +121,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,科目{0}的科目號碼不可用。 <br>請正確設置您的會計科目表。
-DocType: Task,Depends on Tasks,取決於任務
-apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客戶群組樹。
-DocType: Normal Test Items,Result Value,結果值
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新的成本中心名稱
-DocType: Project,Task Completion,任務完成
-apps/erpnext/erpnext/templates/includes/product_page.js +31,Not in Stock,沒存貨
-DocType: Volunteer,Volunteer Skills,志願者技能
-DocType: Additional Salary,HR User,HR用戶
-DocType: Bank Guarantee,Reference Document Name,參考文件名稱
-DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
-DocType: Support Settings,Issues,問題
-DocType: Loyalty Program,Loyalty Program Name,忠誠計劃名稱
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
-apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +64,Reminder to update GSTIN Sent,提醒更新GSTIN發送
-DocType: Sales Invoice,Debit To,借方
-DocType: Restaurant Menu Item,Restaurant Menu Item,餐廳菜單項
-DocType: Delivery Note,Required only for sample item.,只對樣品項目所需。
-DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
-,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
-apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,學生入學
-apps/erpnext/erpnext/accounts/party.py +421,{0} {1} is disabled,{0} {1}被禁用
-DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +152,Extra Large,特大號
-DocType: Loan,Loan Application,申請貸款
-DocType: Crop,Scientific Name,科學名稱
-DocType: Healthcare Service Unit,Service Unit Type,服務單位類型
-DocType: Bank Account,Branch Code,分行代碼
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Leaves,葉總
-DocType: Customer,"Reselect, if the chosen contact is edited after save",重新選擇，如果所選聯繫人在保存後被編輯
-DocType: Patient Encounter,In print,已出版
-,Profit and Loss Statement,損益表
-DocType: Bank Reconciliation Detail,Cheque Number,支票號碼
-apps/erpnext/erpnext/healthcare/utils.py +264,The item referenced by {0} - {1} is already invoiced,{0} - {1}引用的項目已開具發票
-,Sales Browser,銷售瀏覽器
-DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +586,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
-apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,當地
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款（資產）
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
-DocType: Bank Statement Settings,Bank Statement Settings,銀行對賬單設置
-DocType: Shopify Settings,Customer Settings,客戶設置
-DocType: Homepage Featured Product,Homepage Featured Product,首頁推薦產品
-apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +12,View Orders,查看訂單
-DocType: Marketplace Settings,Marketplace URL (to hide and update label),市場URL（隱藏和更新標籤）
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +206,All Assessment Groups,所有評估組
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名稱
-DocType: Shopify Settings,App Type,應用類型
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +401,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,預設的估值方法
-apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +26,Fee,費用
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +59,Show Cumulative Amount,顯示累計金額
-apps/erpnext/erpnext/setup/doctype/company/company.js +174,Update in progress. It might take a while.,正在更新。它可能需要一段時間。
-DocType: Production Plan Item,Produced Qty,生產數量
-DocType: Vehicle Log,Fuel Qty,燃油數量
-DocType: Stock Entry,Target Warehouse Name,目標倉庫名稱
-DocType: Work Order Operation,Planned Start Time,計劃開始時間
-DocType: Course,Assessment,評定
-DocType: Payment Entry Reference,Allocated,分配
-apps/erpnext/erpnext/config/accounts.py +235,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
-DocType: Student Applicant,Application Status,應用現狀
-DocType: Additional Salary,Salary Component Type,薪資組件類型
-DocType: Sensitivity Test Items,Sensitivity Test Items,靈敏度測試項目
-DocType: Project Update,Project Update,項目更新
-DocType: Fees,Fees,費用
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Quotation {0} is cancelled,{0}報價被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +139,Total Outstanding Amount,未償還總額
-DocType: Sales Partner,Targets,目標
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +40,Please register the SIREN number in the company information file,請在公司信息文件中註冊SIREN號碼
-DocType: Email Digest,Sales Orders to Bill,比爾的銷售訂單
-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.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1184,Link to Material Request,鏈接到材料請求
-apps/erpnext/erpnext/templates/pages/help.html +35,Forum Activity,論壇活動
-,S.O. No.,SO號
-DocType: Bank Statement Transaction Settings Item,Bank Statement Transaction Settings Item,銀行對賬單交易設置項目
-apps/erpnext/erpnext/hr/utils.py +158,To date can not greater than employee's relieving date,迄今為止不能超過員工的免除日期
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +242,Please create Customer from Lead {0},請牽頭建立客戶{0}
-apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,選擇患者
-DocType: Price List,Applicable for Countries,適用於國家
-DocType: Supplier Scorecard Scoring Variable,Parameter Name,參數名稱
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +46,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申請“已批准”和“拒絕”，就可以提交
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},學生組名稱是強制性的行{0}
-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.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded on PO,採購訂單上累計每月預算超出時的操作
-DocType: Exchange Rate Revaluation,Exchange Rate Revaluation,匯率重估
-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",送貨地址沒有國家，這是此送貨規則所必需的
-DocType: Journal Entry,Excise Entry,海關入境
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +69,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
-DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+Material Request Type,材料需求類型
+Send Grant Review Email,發送格蘭特回顧郵件
+"LocalStorage is full, did not save",localStorage的是滿的，沒救
+Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
+Claim Date,索賠日期
+Room Capacity,房間容量
+Already record exists for the item {0},已有記錄存在項目{0}
+Ref,參考
+You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,您將失去先前生成的發票記錄。您確定要重新啟用此訂閱嗎？
+Registration Fee,註冊費用
+Loyalty Program Collection,忠誠度計劃集
+Subcontracted Item,轉包項目
+Student {0} does not belong to group {1},學生{0}不屬於組{1}
+Voucher #,憑證＃
+Purchase Order Message,採購訂單的訊息
+Shipping Country,航運國家
+Hide Customer's Tax Id from Sales Transactions,從銷售交易隱藏客戶的稅號
+Upload HTML,上傳HTML,
+Relieving Date,解除日期
+Total Quantity,總數（量
+"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
+Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
+Class / Percentage,類／百分比
+Shopify Settings,Shopify設置
+Market Place ID,市場ID,
+Head of Marketing and Sales,營銷和銷售主管
+Income Tax,所得稅
+Track Leads by Industry Type.,以行業類型追蹤訊息。
+Go to Letterheads,去信頭
+Property already added,已添加屬性
+Item Supplier,產品供應商
+Please enter Item Code to get batch no,請輸入產品編號，以取得批號
+Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+No Items selected for transfer,沒有選擇轉移項目
+Stock Settings,庫存設定
+"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
+Electric,電動
+% Progress,％進展
+Gain/Loss on Asset Disposal,在資產處置收益/損失
+"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中將只選擇狀態為“已批准”的學生申請人。
+Rates,價格
+Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,科目{0}的科目號碼不可用。 <br>請正確設置您的會計科目表。
+Depends on Tasks,取決於任務
+Manage Customer Group Tree.,管理客戶群組樹。
+Result Value,結果值
+New Cost Center Name,新的成本中心名稱
+Task Completion,任務完成
+Not in Stock,沒存貨
+Volunteer Skills,志願者技能
+HR User,HR用戶
+Reference Document Name,參考文件名稱
+Taxes and Charges Deducted,稅收和費用扣除
+Issues,問題
+Loyalty Program Name,忠誠計劃名稱
+Status must be one of {0},狀態必須是一個{0}
+Reminder to update GSTIN Sent,提醒更新GSTIN發送
+Debit To,借方
+Restaurant Menu Item,餐廳菜單項
+Required only for sample item.,只對樣品項目所需。
+Actual Qty After Transaction,交易後實際數量
+Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
+Student Admissions,學生入學
+{0} {1} is disabled,{0} {1}被禁用
+Billing Currency,結算貨幣
+Extra Large,特大號
+Scientific Name,科學名稱
+Service Unit Type,服務單位類型
+Branch Code,分行代碼
+Total Leaves,葉總
+"Reselect, if the chosen contact is edited after save",重新選擇，如果所選聯繫人在保存後被編輯
+In print,已出版
+Profit and Loss Statement,損益表
+Cheque Number,支票號碼
+The item referenced by {0} - {1} is already invoiced,{0} - {1}引用的項目已開具發票
+Sales Browser,銷售瀏覽器
+Total Credit,貸方總額
+Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
+Local,當地
+Loans and Advances (Assets),貸款及墊款（資產）
+Debtors,債務人
+Bank Statement Settings,銀行對賬單設置
+Customer Settings,客戶設置
+Homepage Featured Product,首頁推薦產品
+View Orders,查看訂單
+Marketplace URL (to hide and update label),市場URL（隱藏和更新標籤）
+All Assessment Groups,所有評估組
+New Warehouse Name,新倉庫名稱
+App Type,應用類型
+Total {0} ({1}),總{0}（{1}）
+Territory,領土
+Please mention no of visits required,請註明無需訪問
+Default Valuation Method,預設的估值方法
+Fee,費用
+Show Cumulative Amount,顯示累計金額
+Update in progress. It might take a while.,正在更新。它可能需要一段時間。
+Produced Qty,生產數量
+Fuel Qty,燃油數量
+Target Warehouse Name,目標倉庫名稱
+Planned Start Time,計劃開始時間
+Assessment,評定
+Allocated,分配
+Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+Application Status,應用現狀
+Salary Component Type,薪資組件類型
+Sensitivity Test Items,靈敏度測試項目
+Project Update,項目更新
+Fees,費用
+Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
+Quotation {0} is cancelled,{0}報價被取消
+Total Outstanding Amount,未償還總額
+Targets,目標
+Please register the SIREN number in the company information file,請在公司信息文件中註冊SIREN號碼
+Sales Orders to Bill,比爾的銷售訂單
+Price List Master,價格表主檔
+CESS Account,CESS帳戶
+All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
+Link to Material Request,鏈接到材料請求
+Forum Activity,論壇活動
+S.O. No.,SO號
+Bank Statement Transaction Settings Item,銀行對賬單交易設置項目
+To date can not greater than employee's relieving date,迄今為止不能超過員工的免除日期
+Please create Customer from Lead {0},請牽頭建立客戶{0}
+Select Patient,選擇患者
+Applicable for Countries,適用於國家
+Parameter Name,參數名稱
+Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申請“已批准”和“拒絕”，就可以提交
+Student Group Name is mandatory in row {0},學生組名稱是強制性的行{0}
+Products to be shown on website homepage,在網站首頁中顯示的產品
+This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
+Action if Accumulated Monthly Budget Exceeded on PO,採購訂單上累計每月預算超出時的操作
+Exchange Rate Revaluation,匯率重估
+Ignore Pricing Rule,忽略定價規則
+Graduate,畢業生
+Block Days,封鎖天數
+"Shipping Address does not have country, which is required for this Shipping Rule",送貨地址沒有國家，這是此送貨規則所必需的
+Excise Entry,海關入境
+Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
+"Standard Terms and Conditions that can be added to Sales and Purchases.
Examples:
@@ -3654,2895 +3629,2881 @@
1。航運條款（如果適用）。
1。的解決糾紛，賠償，法律責任等
1的方式。地址和公司聯繫。"
-DocType: Issue,Issue Type,發行類型
-DocType: Attendance,Leave Type,休假類型
-DocType: Purchase Invoice,Supplier Invoice Details,供應商發票明細
-apps/erpnext/erpnext/controllers/stock_controller.py +237,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異科目（{0}）必須是一個'收益或損失'的科目
-DocType: Project,Copied From,複製自
-DocType: Project,Copied From,複製自
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +265,Invoice already created for all billing hours,發票已在所有結算時間創建
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Name error: {0},名稱錯誤：{0}
-DocType: Healthcare Service Unit Type,Item Details,產品詳細信息
-DocType: Cash Flow Mapping,Is Finance Cost,財務成本
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,員工{0}的考勤已標記
-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,家長倉庫
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +41,Chart,圖表
-DocType: Subscription,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}找不到默認BOM
-apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,定義不同的貸款類型
-DocType: Bank Statement Transaction Invoice Item,Outstanding Amount,未償還的金額
-apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間（分鐘）
-DocType: Project Task,Working,工作的
-DocType: Stock Ledger Entry,Stock Queue (FIFO),庫存序列（先進先出）
-apps/erpnext/erpnext/public/js/setup_wizard.js +128,Financial Year,財政年度
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,{0} does not belong to Company {1},{0}不屬於公司{1}
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,無法解決{0}的標準分數函數。確保公式有效。
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +34,Repayment amount {} should be greater than monthly interest amount {},還款金額{}應大於每月的利息金額{}
-DocType: Healthcare Settings,Out Patient Settings,出患者設置
-DocType: Account,Round Off,四捨五入
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +305,Quantity must be positive,數量必須是正數
-DocType: Material Request Plan Item,Requested Qty,要求數量
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +97,The fields From Shareholder and To Shareholder cannot be blank,來自股東和股東的字段不能為空
-DocType: Cashier Closing,Cashier Closing,收銀員關閉
-DocType: Tax Rule,Use for Shopping Cart,使用的購物車
-apps/erpnext/erpnext/controllers/item_variant.py +101,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 +81,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",費用將被分配比例根據項目數量或金額，按您的選擇
-DocType: Travel Request,Require Full Funding,需要全額資助
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
-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}，分解成運行多個操作
-DocType: Membership,Membership Status,成員身份
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +121,No Remarks,暫無產品說明
-DocType: Asset,In Maintenance,在維護中
-DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,單擊此按鈕可從亞馬遜MWS中提取銷售訂單數據。
-DocType: Purchase Invoice,Overdue,過期的
-DocType: Account,Stock Received But Not Billed,庫存接收，但不付款
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,Root Account must be a group,Root 科目必須是群組科目
-DocType: Drug Prescription,Drug Prescription,藥物處方
-DocType: Loan,Repaid/Closed,償還/關閉
-DocType: Item,Total Projected Qty,預計總數量
-DocType: Monthly Distribution,Distribution Name,分配名稱
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +56,Include UOM,包括UOM
-apps/erpnext/erpnext/stock/stock_ledger.py +482,"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",對於{1} {2}進行會計分錄所需的項目{0}，找不到估值。如果該項目在{1}中作為零估值率項目進行交易，請在{1}項目表中提及。否則，請在項目記錄中創建貨物的進貨庫存交易或提交估值費率，然後嘗試提交/取消此條目
-DocType: Course,Course Code,課程代碼
-apps/erpnext/erpnext/controllers/stock_controller.py +341,Quality Inspection required for Item {0},項目{0}需要品質檢驗
-DocType: POS Settings,Use POS in Offline Mode,在離線模式下使用POS
-DocType: Supplier Scorecard,Supplier Variables,供應商變量
-apps/erpnext/erpnext/accounts/page/pos/pos.js +77,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2},{0}是強制性的。可能沒有為{1}到{2}創建貨幣兌換記錄
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
-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: Patient Service Unit,Patient Service Unit,病人服務單位
-DocType: Bank Statement Transaction Invoice Item,Sales Invoice,銷售發票
-DocType: Journal Entry Account,Party Balance,黨平衡
-DocType: Cash Flow Mapper,Section Subtotal,部分小計
-apps/erpnext/erpnext/accounts/page/pos/pos.js +500,Please select Apply Discount On,請選擇適用的折扣
-DocType: Stock Settings,Sample Retention Warehouse,樣品保留倉庫
-DocType: Company,Default Receivable Account,預設應收帳款
-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/purchase_invoice/purchase_invoice.py +432,Accounting Entry for Stock,存貨的會計分錄
-DocType: Lab Test,LabTest Approver,LabTest審批者
-apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已經評估了評估標準{}。
-DocType: Vehicle Service,Engine Oil,機油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Work Orders Created: {0},創建的工單：{0}
-DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item {0} does not exist,項目{0}不存在
-DocType: Sales Invoice,Customer Address,客戶地址
-DocType: Loan,Loan Details,貸款詳情
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +62,Failed to setup post company fixtures,未能設置公司固定裝置
-DocType: Company,Default Inventory Account,默認庫存科目
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +193,The folio numbers are not matching,作品集編號不匹配
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +304,Payment Request for {0},付款申請{0}
-DocType: Item Barcode,Barcode Type,條碼類型
-DocType: Antibiotic,Antibiotic Name,抗生素名稱
-apps/erpnext/erpnext/config/buying.py +43,Supplier Group master.,供應商組主人。
-DocType: Healthcare Service Unit,Occupancy Status,佔用狀況
-DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +66,Select Type...,選擇類型...
-DocType: Account,Root Type,root類型
-DocType: Item,FIFO,FIFO
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +558,Close the POS,關閉POS
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +139,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
-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 +256,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
-DocType: Cheque Print Template,Primary Settings,主要設置
-DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
-apps/erpnext/erpnext/public/js/event.js +27,Add Employees,添加員工
-DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
-DocType: Company,Standard Template,標準模板
-DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1103,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,帳戶{0}被凍結
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
-DocType: Payment Request,Mute Email,靜音電子郵件
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
-DocType: Account,Account Number,帳號
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +794,Can only make payment against unbilled {0},只能使支付對未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +114,Commission rate cannot be greater than 100,佣金比率不能大於100
-DocType: Sales Invoice,Allocate Advances Automatically (FIFO),自動分配進度（FIFO）
-DocType: Volunteer,Volunteer,志願者
-DocType: Buying Settings,Subcontract,轉包
-apps/erpnext/erpnext/public/js/utils/party.js +167,Please enter {0} first,請輸入{0}第一
-apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +104,No replies from,從沒有回复
-DocType: Work Order Operation,Actual End Time,實際結束時間
-DocType: Item,Manufacturer Part Number,製造商零件編號
-DocType: Taxable Salary Slab,Taxable Salary Slab,應納稅薪金平台
-DocType: Work Order Operation,Estimated Time and Cost,估計時間和成本
-DocType: Bin,Bin,箱子
-DocType: Crop,Crop Name,作物名稱
-apps/erpnext/erpnext/hub_node/api.py +54,Only users with {0} role can register on Marketplace,只有{0}角色的用戶才能在Marketplace上註冊
-DocType: SMS Log,No of Sent SMS,沒有發送短信
-apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +8,Appointments and Encounters,約會和遭遇
-DocType: Antibiotic,Healthcare Administrator,醫療管理員
-apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,設定目標
-DocType: Dosage Strength,Dosage Strength,劑量強度
-DocType: Healthcare Practitioner,Inpatient Visit Charge,住院訪問費用
-DocType: Account,Expense Account,費用科目
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,軟件
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Colour,顏色
-DocType: Assessment Plan Criteria,Assessment Plan Criteria,評估計劃標準
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +123,Expiry date is mandatory for selected item,有效期限對所選項目是強制性的
-DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,防止採購訂單
-DocType: Patient Appointment,Scheduled,預定
-apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,詢價。
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
-apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,選擇客戶
-DocType: Student Log,Academic,學術的
-DocType: Patient,Personal and Social History,個人和社會史
-apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,用戶{0}已創建
-DocType: Fee Schedule,Fee Breakup for each student,每名學生的費用分手
-apps/erpnext/erpnext/controllers/accounts_controller.py +617,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/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代碼
-DocType: Purchase Invoice Item,Valuation Rate,估值率
-DocType: Vehicle,Diesel,柴油機
-apps/erpnext/erpnext/stock/get_item_details.py +546,Price List Currency not selected,尚未選擇價格表之貨幣
-DocType: Purchase Invoice,Availed ITC Cess,採用ITC Cess
-,Student Monthly Attendance Sheet,學生每月考勤表
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,運費規則僅適用於銷售
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折舊行{0}：下一個折舊日期不能在購買日期之前
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
-DocType: Rename Tool,Rename Log,重命名日誌
-apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
-apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,維護發票時間和工作時間的時間表相同
-DocType: Maintenance Visit Purpose,Against Document No,對文件編號
-DocType: BOM,Scrap,廢料
-apps/erpnext/erpnext/utilities/user_progress.py +217,Go to Instructors,去教練
-apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理銷售合作夥伴。
-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
-DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,項目和公司應根據銷售交易多久更新一次。
-apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增學生
-apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},請選擇{0}
-DocType: C-Form,C-Form No,C-表格編號
-DocType: BOM,Exploded_items,Exploded_items
-DocType: Delivery Stop,Distance,距離
-apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所購買或出售的產品或服務。
-DocType: Water Analysis,Storage Temperature,儲存溫度
-DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +256,Creating Payment Entries......,創建支付條目......
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Researcher,研究員
-DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,計劃註冊學生工具
-apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},開始日期應該小於任務{0}的結束日期
-,Consolidated Financial Statement,合併財務報表
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或電子郵件是強制性
-DocType: Instructor,Instructor Log,講師日誌
-DocType: Clinical Procedure,Clinical Procedure,臨床程序
-DocType: Shopify Settings,Delivery Note Series,送貨單系列
-DocType: Purchase Order Item,Returned Qty,返回的數量
-DocType: Student,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Root Type is mandatory,root類型是強制性的
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +30,Failed to install presets,無法安裝預設
-DocType: Healthcare Service Unit Type,UOM Conversion in Hours,UOM按小時轉換
-DocType: Contract,Signee Details,簽名詳情
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，並且謹慎地向該供應商發出詢價。
-DocType: Certified Consultant,Non Profit Manager,非營利經理
-DocType: BOM,Total Cost(Company Currency),總成本（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +398,Serial No {0} created,序列號{0}創建
-DocType: Homepage,Company Description for website homepage,公司介紹了網站的首頁
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
-apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名稱
-apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,無法檢索{0}的信息。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,開幕詞報
-DocType: Contract,Fulfilment Terms,履行條款
-DocType: Sales Invoice,Time Sheet List,時間表列表
-DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
-DocType: Healthcare Settings,Result Printed,結果打印
-DocType: Asset Category Account,Depreciation Expense Account,折舊費用科目
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Probationary Period,試用期
-DocType: Purchase Taxes and Charges Template,Is Inter State,是國際
-apps/erpnext/erpnext/config/hr.py +269,Shift Management,班次管理
-DocType: Customer Group,Only leaf nodes are allowed in transaction,只有葉節點中允許交易
-DocType: Project,Total Costing Amount (via Timesheets),總成本金額（通過時間表）
-DocType: Department,Expense Approver,費用審批
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +168,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
-DocType: Project,Hourly,每小時
-apps/erpnext/erpnext/accounts/doctype/account/account.js +88,Non-Group to Group,非集團集團
-DocType: Employee,ERPNext User,ERPNext用戶
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},在{0}行中必須使用批處理
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},在{0}行中必須使用批處理
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
-DocType: Amazon MWS Settings,Enable Scheduled Synch,啟用預定同步
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期時間
-apps/erpnext/erpnext/config/selling.py +308,Logs for maintaining sms delivery status,日誌維護短信發送狀態
-DocType: Accounts Settings,Make Payment via Journal Entry,通過日記帳分錄進行付款
-DocType: Clinical Procedure Template,Clinical Procedure Template,臨床步驟模板
-DocType: Item,Inspection Required before Delivery,分娩前檢查所需
-DocType: Item,Inspection Required before Purchase,購買前檢查所需
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活動
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js +41,Create Lab Test,創建實驗室測試
-DocType: Patient Appointment,Reminded,提醒
-apps/erpnext/erpnext/public/js/setup_wizard.js +126,View Chart of Accounts,查看會計科目表
-DocType: Chapter Member,Chapter Member,章會員
-DocType: Material Request Plan Item,Minimum Order Quantity,最小起訂量
-apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,你的組織
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +84,"Skipping Leave Allocation for the following employees, as Leave Allocation records already exists against them. {0}",跳過以下員工的休假分配，因為已經存在針對他們的休假分配記錄。 {0}
-DocType: Fee Component,Fees Category,費用類別
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Please enter relieving date.,請輸入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-DocType: Travel Request,"Details of Sponsor (Name, Location)",贊助商詳情（名稱，地點）
-DocType: Supplier Scorecard,Notify Employee,通知員工
-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/hr/utils.py +154,Future dates not allowed,未來的日期不允許
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,選擇財政年度
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,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,會計科目模板
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +80,Update stock must be enable for the purchase invoice {0},必須為購買發票{0}啟用更新庫存
-apps/erpnext/erpnext/stock/get_item_details.py +405,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +135,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
-DocType: Purchase Invoice Item,Accepted Warehouse,收料倉庫
-DocType: Bank Reconciliation Detail,Posting Date,發布日期
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +30,One customer can be part of only single Loyalty Program.,一個客戶只能參與一個忠誠度計劃。
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,馬克半天
-DocType: Sales Invoice,Sales Team,銷售團隊
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重複的條目
-apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,在提交之前輸入受益人的姓名。
-DocType: Program Enrollment Tool,Get Students,讓學生
-DocType: Serial No,Under Warranty,在保修期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +530,[Error],[錯誤]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
-,Employee Birthday,員工生日
-apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,請選擇完成修復的完成日期
-DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,學生考勤批處理工具
-apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,計劃的高級
-DocType: Company,Date of Establishment,成立時間
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +55,Venture Capital,創業投資
-apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,這個“學年”一個學期{0}和“術語名稱”{1}已經存在。請修改這些條目，然後再試一次。
-DocType: UOM,Must be Whole Number,必須是整數
-DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
-DocType: Purchase Invoice,Invoice Copy,發票副本
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列號{0}不存在
-DocType: Sales Invoice Item,Customer Warehouse (Optional),客戶倉庫（可選）
-DocType: Blanket Order Item,Blanket Order Item,一攬子訂單項目
-DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
-DocType: Shopping Cart Settings,Orders,訂單
-DocType: Travel Request,Event Details,活動詳情
-DocType: Department,Leave Approver,休假審批人
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +316,Please select a batch,請選擇一個批次
-apps/erpnext/erpnext/config/hr.py +145,Travel and Expense Claim,旅行和費用索賠
-DocType: Sales Invoice,Redemption Cost Center,贖回成本中心
-DocType: QuickBooks Migrator,Scope,範圍
-DocType: Assessment Group,Assessment Group Name,評估小組名稱
-DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +60,Add to Details,添加到詳細信息
-DocType: Travel Itinerary,Taxi,出租車
-DocType: Shopify Settings,Last Sync Datetime,上次同步日期時間
-DocType: Landed Cost Item,Receipt Document Type,收據憑證類型
-DocType: Daily Work Summary Settings,Select Companies,選擇公司
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +225,Proposal/Price Quote,提案/報價
-DocType: Antibiotic,Healthcare,衛生保健
-DocType: Target Detail,Target Detail,目標詳細資訊
-apps/erpnext/erpnext/stock/doctype/item/item.js +67,Single Variant,單一變種
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +51,All Jobs,所有職位
-DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
-DocType: Program Enrollment,Mode of Transportation,運輸方式
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +65,Period Closing Entry,期末進入
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +72,Select Department...,選擇部門...
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +40,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
-DocType: QuickBooks Migrator,Authorization URL,授權URL
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +376,Amount {0} {1} {2} {3},金額{0} {1} {2} {3}
-DocType: Account,Depreciation,折舊
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +103,The number of shares and the share numbers are inconsistent,股份數量和庫存數量不一致
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +50,Supplier(s),供應商（S）
-DocType: Employee Attendance Tool,Employee Attendance Tool,員工考勤工具
-DocType: Guardian Student,Guardian Student,學生監護人
-DocType: Supplier,Credit Limit,信用額度
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Selling Price List Rate,平均。出售價目表率
-DocType: Additional Salary,Salary Component,薪金部分
-apps/erpnext/erpnext/accounts/utils.py +519,Payment Entries {0} are un-linked,付款項{0}是聯合國聯
-DocType: GL Entry,Voucher No,憑證編號
-,Lead Owner Efficiency,主導效率
-,Lead Owner Efficiency,主導效率
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +65,"You can claim only an amount of {0}, the rest amount {1} should be in the application \
+Issue Type,發行類型
+Leave Type,休假類型
+Supplier Invoice Details,供應商發票明細
+Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異科目（{0}）必須是一個'收益或損失'的科目
+Copied From,複製自
+Copied From,複製自
+Invoice already created for all billing hours,發票已在所有結算時間創建
+Name error: {0},名稱錯誤：{0}
+Item Details,產品詳細信息
+Is Finance Cost,財務成本
+Attendance for employee {0} is already marked,員工{0}的考勤已標記
+If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於列印）
+Please set default customer in Restaurant Settings,請在“餐廳設置”中設置默認客戶
+Salary Register,薪酬註冊
+Parent Warehouse,家長倉庫
+Chart,圖表
+Net Total,總淨值
+Default BOM not found for Item {0} and Project {1},項目{0}和項目{1}找不到默認BOM,
+Define various loan types,定義不同的貸款類型
+Outstanding Amount,未償還的金額
+Time(in mins),時間（分鐘）
+Working,工作的
+Stock Queue (FIFO),庫存序列（先進先出）
+Financial Year,財政年度
+{0} does not belong to Company {1},{0}不屬於公司{1}
+Could not solve criteria score function for {0}. Make sure the formula is valid.,無法解決{0}的標準分數函數。確保公式有效。
+Repayment amount {} should be greater than monthly interest amount {},還款金額{}應大於每月的利息金額{}
+Out Patient Settings,出患者設置
+Round Off,四捨五入
+Quantity must be positive,數量必須是正數
+Requested Qty,要求數量
+The fields From Shareholder and To Shareholder cannot be blank,來自股東和股東的字段不能為空
+Cashier Closing,收銀員關閉
+Use for Shopping Cart,使用的購物車
+Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的屬性{1}不在有效的項目列表中存在的屬性值項{2}
+Select Serial Numbers,選擇序列號
+Scrap %,廢鋼％
+"Charges will be distributed proportionately based on item qty or amount, as per your selection",費用將被分配比例根據項目數量或金額，按您的選擇
+Require Full Funding,需要全額資助
+Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
+"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
+Membership Status,成員身份
+No Remarks,暫無產品說明
+In Maintenance,在維護中
+Click this button to pull your Sales Order data from Amazon MWS.,單擊此按鈕可從亞馬遜MWS中提取銷售訂單數據。
+Overdue,過期的
+Stock Received But Not Billed,庫存接收，但不付款
+Root Account must be a group,Root 科目必須是群組科目
+Drug Prescription,藥物處方
+Repaid/Closed,償還/關閉
+Total Projected Qty,預計總數量
+Distribution Name,分配名稱
+Include UOM,包括UOM,
+"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",對於{1} {2}進行會計分錄所需的項目{0}，找不到估值。如果該項目在{1}中作為零估值率項目進行交易，請在{1}項目表中提及。否則，請在項目記錄中創建貨物的進貨庫存交易或提交估值費率，然後嘗試提交/取消此條目
+Course Code,課程代碼
+Quality Inspection required for Item {0},項目{0}需要品質檢驗
+Use POS in Offline Mode,在離線模式下使用POS,
+Supplier Variables,供應商變量
+{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2},{0}是強制性的。可能沒有為{1}到{2}創建貨幣兌換記錄
+Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
+Net Rate (Company Currency),淨利率（公司貨幣）
+Condition and Formula Help,條件和公式幫助
+Manage Territory Tree.,管理領地樹。
+Patient Service Unit,病人服務單位
+Sales Invoice,銷售發票
+Party Balance,黨平衡
+Section Subtotal,部分小計
+Please select Apply Discount On,請選擇適用的折扣
+Sample Retention Warehouse,樣品保留倉庫
+Default Receivable Account,預設應收帳款
+Deemed Export,被視為出口
+Material Transfer for Manufacture,物料轉倉用於製造
+Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
+Accounting Entry for Stock,存貨的會計分錄
+LabTest Approver,LabTest審批者
+You have already assessed for the assessment criteria {}.,您已經評估了評估標準{}。
+Engine Oil,機油
+Work Orders Created: {0},創建的工單：{0}
+Sales Team1,銷售團隊1,
+Item {0} does not exist,項目{0}不存在
+Customer Address,客戶地址
+Failed to setup post company fixtures,未能設置公司固定裝置
+Default Inventory Account,默認庫存科目
+The folio numbers are not matching,作品集編號不匹配
+Payment Request for {0},付款申請{0}
+Barcode Type,條碼類型
+Antibiotic Name,抗生素名稱
+Supplier Group master.,供應商組主人。
+Occupancy Status,佔用狀況
+Apply Additional Discount On,收取額外折扣
+Select Type...,選擇類型...
+Root Type,root類型
+FIFO,FIFO,
+Close the POS,關閉POS,
+Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
+Show this slideshow at the top of the page,這顯示在幻燈片頁面頂部
+Item UOM,項目計量單位
+Tax Amount After Discount Amount (Company Currency),稅額後，優惠金額（公司貨幣）
+Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+Primary Settings,主要設置
+Select Supplier Address,選擇供應商地址
+Add Employees,添加員工
+Quality Inspection,品質檢驗
+Standard Template,標準模板
+Theory,理論
+Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+Account {0} is frozen,帳戶{0}被凍結
+Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
+Mute Email,靜音電子郵件
+"Food, Beverage & Tobacco",食品、飲料＆煙草
+Account Number,帳號
+Can only make payment against unbilled {0},只能使支付對未付款的{0}
+Commission rate cannot be greater than 100,佣金比率不能大於100,
+Allocate Advances Automatically (FIFO),自動分配進度（FIFO）
+Volunteer,志願者
+Subcontract,轉包
+Please enter {0} first,請輸入{0}第一
+No replies from,從沒有回复
+Actual End Time,實際結束時間
+Manufacturer Part Number,製造商零件編號
+Taxable Salary Slab,應納稅薪金平台
+Estimated Time and Cost,估計時間和成本
+Bin,箱子
+Crop Name,作物名稱
+Only users with {0} role can register on Marketplace,只有{0}角色的用戶才能在Marketplace上註冊
+No of Sent SMS,沒有發送短信
+Appointments and Encounters,約會和遭遇
+Healthcare Administrator,醫療管理員
+Set a Target,設定目標
+Dosage Strength,劑量強度
+Inpatient Visit Charge,住院訪問費用
+Expense Account,費用科目
+Software,軟件
+Colour,顏色
+Assessment Plan Criteria,評估計劃標準
+Expiry date is mandatory for selected item,有效期限對所選項目是強制性的
+Prevent Purchase Orders,防止採購訂單
+Scheduled,預定
+Request for quotation.,詢價。
+"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
+Select Customer,選擇客戶
+Academic,學術的
+Personal and Social History,個人和社會史
+User {0} created,用戶{0}已創建
+Fee Breakup for each student,每名學生的費用分手
+Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
+Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
+Change Code,更改代碼
+Valuation Rate,估值率
+Diesel,柴油機
+Price List Currency not selected,尚未選擇價格表之貨幣
+Availed ITC Cess,採用ITC Cess,
+Student Monthly Attendance Sheet,學生每月考勤表
+Shipping rule only applicable for Selling,運費規則僅適用於銷售
+Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折舊行{0}：下一個折舊日期不能在購買日期之前
+Project Start Date,專案開始日期
+Rename Log,重命名日誌
+Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
+Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
+Maintain Billing Hours and Working Hours Same on Timesheet,維護發票時間和工作時間的時間表相同
+Against Document No,對文件編號
+Scrap,廢料
+Go to Instructors,去教練
+Manage Sales Partners.,管理銷售合作夥伴。
+Inspection Type,檢驗類型
+Visited yet,已訪問
+Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
+Result HTML,結果HTML,
+How often should project and company be updated based on Sales Transactions.,項目和公司應根據銷售交易多久更新一次。
+Add Students,新增學生
+Please select {0},請選擇{0}
+C-Form No,C-表格編號
+Exploded_items,Exploded_items,
+Distance,距離
+List your products or services that you buy or sell.,列出您所購買或出售的產品或服務。
+Storage Temperature,儲存溫度
+Unmarked Attendance,無標記考勤
+Creating Payment Entries......,創建支付條目......
+Researcher,研究員
+Program Enrollment Tool Student,計劃註冊學生工具
+Start date should be less than end date for task {0},開始日期應該小於任務{0}的結束日期
+Consolidated Financial Statement,合併財務報表
+Name or Email is mandatory,姓名或電子郵件是強制性
+Instructor Log,講師日誌
+Clinical Procedure,臨床程序
+Delivery Note Series,送貨單系列
+Returned Qty,返回的數量
+Exit,出口
+Root Type is mandatory,root類型是強制性的
+Failed to install presets,無法安裝預設
+UOM Conversion in Hours,UOM按小時轉換
+Signee Details,簽名詳情
+"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，並且謹慎地向該供應商發出詢價。
+Non Profit Manager,非營利經理
+Total Cost(Company Currency),總成本（公司貨幣）
+Serial No {0} created,序列號{0}創建
+Company Description for website homepage,公司介紹了網站的首頁
+"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
+Suplier Name,Suplier名稱
+Could not retrieve information for {0}.,無法檢索{0}的信息。
+Opening Entry Journal,開幕詞報
+Fulfilment Terms,履行條款
+Time Sheet List,時間表列表
+You can enter any date manually,您可以手動輸入任何日期
+Result Printed,結果打印
+Depreciation Expense Account,折舊費用科目
+Probationary Period,試用期
+Is Inter State,是國際
+Shift Management,班次管理
+Only leaf nodes are allowed in transaction,只有葉節點中允許交易
+Total Costing Amount (via Timesheet),總成本金額（通過時間表）
+Expense Approver,費用審批
+Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
+Hourly,每小時
+Non-Group to Group,非集團集團
+ERPNext User,ERPNext用戶
+Batch is mandatory in row {0},在{0}行中必須使用批處理
+Batch is mandatory in row {0},在{0}行中必須使用批處理
+Purchase Receipt Item Supplied,採購入庫項目供應商
+Enable Scheduled Synch,啟用預定同步
+To Datetime,以日期時間
+Logs for maintaining sms delivery status,日誌維護短信發送狀態
+Make Payment via Journal Entry,通過日記帳分錄進行付款
+Clinical Procedure Template,臨床步驟模板
+Inspection Required before Delivery,分娩前檢查所需
+Inspection Required before Purchase,購買前檢查所需
+Pending Activities,待活動
+Create Lab Test,創建實驗室測試
+Reminded,提醒
+View Chart of Accounts,查看會計科目表
+Chapter Member,章會員
+Minimum Order Quantity,最小起訂量
+Your Organization,你的組織
+"Skipping Leave Allocation for the following employees, as Leave Allocation records already exists against them. {0}",跳過以下員工的休假分配，因為已經存在針對他們的休假分配記錄。 {0}
+Fees Category,費用類別
+Please enter relieving date.,請輸入解除日期。
+Amt,AMT,
+"Details of Sponsor (Name, Location)",贊助商詳情（名稱，地點）
+Notify Employee,通知員工
+Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
+Newspaper Publishers,報紙出版商
+Future dates not allowed,未來的日期不允許
+Select Fiscal Year,選擇財政年度
+Expected Delivery Date should be after Sales Order Date,預計交貨日期應在銷售訂單日期之後
+Reorder Level,重新排序級別
+Chart Of Accounts Template,會計科目模板
+Update stock must be enable for the purchase invoice {0},必須為購買發票{0}啟用更新庫存
+Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
+Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
+Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
+Accepted Warehouse,收料倉庫
+Posting Date,發布日期
+One customer can be part of only single Loyalty Program.,一個客戶只能參與一個忠誠度計劃。
+Mark Half Day,馬克半天
+Sales Team,銷售團隊
+Duplicate entry,重複的條目
+Enter the name of the Beneficiary before submittting.,在提交之前輸入受益人的姓名。
+Get Students,讓學生
+Under Warranty,在保修期
+[Error],[錯誤]
+In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
+Employee Birthday,員工生日
+Please select Completion Date for Completed Repair,請選擇完成修復的完成日期
+Student Batch Attendance Tool,學生考勤批處理工具
+Scheduled Upto,計劃的高級
+Date of Establishment,成立時間
+Venture Capital,創業投資
+An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,這個“學年”一個學期{0}和“術語名稱”{1}已經存在。請修改這些條目，然後再試一次。
+Must be Whole Number,必須是整數
+New Leaves Allocated (In Days),新的排假（天）
+Invoice Copy,發票副本
+Serial No {0} does not exist,序列號{0}不存在
+Customer Warehouse (Optional),客戶倉庫（可選）
+Blanket Order Item,一攬子訂單項目
+Invoice Number,發票號碼
+Orders,訂單
+Event Details,活動詳情
+Leave Approver,休假審批人
+Please select a batch,請選擇一個批次
+Travel and Expense Claim,旅行和費用索賠
+Redemption Cost Center,贖回成本中心
+Scope,範圍
+Assessment Group Name,評估小組名稱
+Material Transferred for Manufacture,轉移至製造的物料
+Add to Details,添加到詳細信息
+Taxi,出租車
+Last Sync Datetime,上次同步日期時間
+Receipt Document Type,收據憑證類型
+Select Companies,選擇公司
+Proposal/Price Quote,提案/報價
+Healthcare,衛生保健
+Target Detail,目標詳細資訊
+Single Variant,單一變種
+All Jobs,所有職位
+% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
+Mode of Transportation,運輸方式
+Period Closing Entry,期末進入
+Select Department...,選擇部門...
+Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
+Authorization URL,授權URL,
+Amount {0} {1} {2} {3},金額{0} {1} {2} {3}
+Depreciation,折舊
+The number of shares and the share numbers are inconsistent,股份數量和庫存數量不一致
+Supplier(s),供應商（S）
+Employee Attendance Tool,員工考勤工具
+Guardian Student,學生監護人
+Credit Limit,信用額度
+Avg. Selling Price List Rate,平均。出售價目表率
+Salary Component,薪金部分
+Payment Entries {0} are un-linked,付款項{0}是聯合國聯
+Voucher No,憑證編號
+Lead Owner Efficiency,主導效率
+Lead Owner Efficiency,主導效率
+"You can claim only an amount of {0}, the rest amount {1} should be in the application \
as pro-rata component",您只能聲明一定數量的{0}，剩餘數量{1}應該在應用程序中作為按比例分量
-DocType: Amazon MWS Settings,Customer Type,客戶類型
-DocType: Compensatory Leave Request,Leave Allocation,排假
-DocType: Payment Request,Recipient Message And Payment Details,收件人郵件和付款細節
-DocType: Support Search Source,Source DocType,源DocType
-apps/erpnext/erpnext/templates/pages/help.html +60,Open a new ticket,打開一張新票
-DocType: Training Event,Trainer Email,教練電子郵件
-DocType: Driver,Transporter,運輸車
-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: Bank Account,Address and Contact,地址和聯絡方式
-DocType: Cheque Print Template,Is Account Payable,為應付帳款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +306,Stock cannot be updated against Purchase Receipt {0},庫存不能對外購入庫單進行更新{0}
-DocType: Support Settings,Auto close Issue after 7 days,7天之後自動關閉問題
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +85,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
-apps/erpnext/erpnext/accounts/party.py +350,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
-apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,學生申請
-DocType: Hub Tracked Item,Hub Tracked Item,Hub跟踪物品
-DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
-DocType: Certified Consultant,Discuss ID,討論ID
-DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
-DocType: Program Enrollment,Boarding Student,寄宿學生
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Please enable Applicable on Booking Actual Expenses,請啟用適用於預訂實際費用
-DocType: Asset Finance Book,Expected Value After Useful Life,期望值使用壽命結束後
-DocType: Item,Reorder level based on Warehouse,根據倉庫訂貨點水平
-DocType: Activity Cost,Billing Rate,結算利率
-,Qty to Deliver,數量交付
-DocType: Amazon MWS Settings,Amazon will synch data updated after this date,亞馬遜將同步在此日期之後更新的數據
-,Stock Analytics,庫存分析
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +72,Lab Test(s) ,實驗室測試
-DocType: Maintenance Visit Purpose,Against Document Detail No,對文件詳細編號
-apps/erpnext/erpnext/regional/__init__.py +11,Deletion is not permitted for country {0},國家{0}不允許刪除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +111,Party Type is mandatory,黨的類型是強制性
-DocType: Quality Inspection,Outgoing,發送
-DocType: Material Request,Requested For,要求
-DocType: Quotation Item,Against Doctype,針對文檔類型
-apps/erpnext/erpnext/controllers/buying_controller.py +503,{0} {1} is cancelled or closed,{0} {1} 被取消或結案
-DocType: Asset,Calculate Depreciation,計算折舊
-DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Cash from Investing,從投資淨現金
-DocType: Work Order,Work-in-Progress Warehouse,在製品倉庫
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +116,Asset {0} must be submitted,資產{0}必須提交
-DocType: Fee Schedule Program,Total Students,學生總數
-apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,Reference #{0} dated {1},參考＃ {0}於{1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +179,Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
-DocType: Employee Transfer,New Employee ID,新員工ID
-DocType: Loan,Member,會員
-DocType: Work Order Item,Work Order Item,工作訂單項目
-DocType: Pricing Rule,Item Code,產品編號
-DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
-apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
-DocType: Journal Entry,User Remark,用戶備註
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +97,Optimizing routes.,優化路線。
-DocType: Travel Itinerary,Non Diary,非日記
-apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,無法為左員工創建保留獎金
-DocType: Lead,Market Segment,市場分類
-DocType: Agriculture Analysis Criteria,Agriculture Manager,農業經理
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +999,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
-DocType: Supplier Scorecard Period,Variables,變量
-DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +271,Closing (Dr),關閉（Dr）
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +284,Serial No {0} not in stock,序列號{0}無貨
-apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,稅務模板賣出的交易。
-DocType: Sales Invoice,Write Off Outstanding Amount,核銷額（億元）
-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,預設庫存計量單位
-DocType: Asset,Number of Depreciations Booked,預訂折舊數
-apps/erpnext/erpnext/public/js/pos/pos.html +71,Qty Total,數量總計
-DocType: Employee Education,School/University,學校/大學
-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: Share Transfer,(including),（包括）
-DocType: Asset,Double Declining Balance,雙倍餘額遞減
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +188,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
-apps/erpnext/erpnext/config/hr.py +120,Payroll Setup,工資單設置
-DocType: Amazon MWS Settings,Synch Products,同步產品
-DocType: Loyalty Point Entry,Loyalty Program,忠誠計劃
-DocType: Student Guardian,Father,父親
-apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,支持門票
-apps/erpnext/erpnext/controllers/accounts_controller.py +703,'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/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}科目{2}不屬於公司{3}
-apps/erpnext/erpnext/stock/doctype/item/item.js +452,Select at least one value from each of the attributes.,從每個屬性中至少選擇一個值。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +164,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +219,Dispatch State,派遣國
-apps/erpnext/erpnext/config/hr.py +399,Leave Management,離開管理
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +17,Groups,組
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +51,Group by Account,以科目分群組
-DocType: Purchase Invoice,Hold Invoice,保留發票
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +37,Please select Employee,請選擇員工
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +214,Lower Income,較低的收入
-DocType: Restaurant Order Entry,Current Order,當前訂單
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +25,Number of serial nos and quantity must be the same,序列號和數量必須相同
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +275,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
-DocType: Account,Asset Received But Not Billed,已收到但未收費的資產
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異科目必須是資產/負債類型的科目，因為此庫存調整是一個開帳分錄
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
-apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,轉到程序
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}＃分配的金額{1}不能大於無人認領的金額{2}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +91,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
-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/hr/doctype/job_opening/job_opening.js +32,No Staffing Plans found for this Designation,本指定沒有發現人員配備計劃
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1079,Batch {0} of Item {1} is disabled.,項目{1}的批處理{0}已禁用。
-DocType: Leave Policy Detail,Annual Allocation,年度分配
-DocType: Travel Request,Address of Organizer,主辦單位地址
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +68,Select Healthcare Practitioner...,選擇醫療從業者......
-DocType: Employee Boarding Activity,Applicable in the case of Employee Onboarding,適用於員工入職的情況
-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 +516,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 Invoice,Customer's Purchase Order,客戶採購訂單
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +49,Bypass credit check at Sales Order ,在銷售訂單旁通過信用檢查
-DocType: Employee Onboarding Activity,Employee Onboarding Activity,員工入職活動
-DocType: Location,Check if it is a hydroponic unit,檢查它是否是水培單位
-apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列號和批次
-DocType: Warranty Claim,From Company,從公司
-apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,評估標準的得分之和必須是{0}。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,請設置折舊數預訂
-DocType: Supplier Scorecard Period,Calculations,計算
-apps/erpnext/erpnext/public/js/stock_analytics.js +48,Value or Qty,價值或數量
-DocType: Payment Terms Template,Payment Terms,付款條件
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +485,Productions Orders cannot be raised for:,製作訂單不能上調：
-apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分鐘
-DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
-DocType: Chapter,Meetup Embed HTML,Meetup嵌入HTML
-DocType: Asset,Insured value,保價值
-apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供應商
-DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS關閉憑證稅
-,Qty to Receive,未到貨量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +564,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",開始日期和結束日期不在有效的工資核算期間內，無法計算{0}。
-DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
-DocType: Grading Scale Interval,Grading Scale Interval,分級分度值
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
-DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
-DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
-DocType: Healthcare Service Unit Type,Rate / UOM,費率/ UOM
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有倉庫
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
-DocType: Travel Itinerary,Rented Car,租車
-apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,關於貴公司
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,貸方科目必須是資產負債表科目
-DocType: Donor,Donor,捐贈者
-DocType: Global Defaults,Disable In Words,禁用詞
-apps/erpnext/erpnext/stock/doctype/item/item.py +74,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +102,Quotation {0} not of type {1},報價{0}非為{1}類型
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
-DocType: Sales Order,% Delivered,％交付
-apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,請設置學生的電子郵件ID以發送付款請求
-DocType: Patient,Medical History,醫學史
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Bank Overdraft Account,銀行透支戶口
-DocType: Practitioner Schedule,Schedule Name,計劃名稱
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +302,Sales Pipeline by Stage,按階段劃分的銷售渠道
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,製作工資單
-DocType: Currency Exchange,For Buying,為了購買
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +897,Add All Suppliers,添加所有供應商
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +95,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金額不能大於未結算金額。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,Browse BOM,瀏覽BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Secured Loans,抵押貸款
-DocType: Purchase Invoice,Edit Posting Date and Time,編輯投稿時間
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +106,Please set Depreciation related Accounts in Asset Category {0} or Company {1},請設置在資產類別{0}或公司折舊相關科目{1}
-DocType: Lab Test Groups,Normal Range,普通範圍
-DocType: Academic Term,Academic Year,學年
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,可用銷售
-DocType: Loyalty Point Entry Redemption,Loyalty Point Entry Redemption,忠誠度積分兌換
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Opening Balance Equity,期初餘額權益
-DocType: Purchase Invoice,N,ñ
-apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,剩餘
-DocType: Appraisal,Appraisal,評價
-DocType: Loan,Loan Account,貸款科目
-DocType: Purchase Invoice,GST Details,消費稅細節
-apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py +6,This is based on transactions against this Healthcare Practitioner.,這是基於針對此醫療保健從業者的交易。
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},電子郵件發送到供應商{0}
-DocType: Item,Default Sales Unit of Measure,默認銷售單位
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +12,Academic Year: ,學年：
-DocType: Inpatient Record,Admission Schedule Date,入學時間表日期
-DocType: Subscription,Past Due Date,過去的截止日期
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +19,Not allow to set alternative item for the item {0},不允許為項目{0}設置替代項目
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +65,Create Fees,創造費用
-DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +549,Select Quantity,選擇數量
-DocType: Loyalty Point Entry,Loyalty Points,忠誠度積分
-DocType: Customs Tariff Number,Customs Tariff Number,海關稅則號
-DocType: Patient Appointment,Patient Appointment,患者預約
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +887,Get Suppliers By,獲得供應商
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +187,{0} not found for Item {1},找不到項目{1} {0}
-apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去課程
-DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中顯示包含稅
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory",銀行科目，從日期到日期是強制性的
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +29,Message Sent,發送訊息
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with child nodes cannot be set as ledger,科目與子節點不能被設置為分類帳
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
-DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +223,Total advance amount cannot be greater than total sanctioned amount,總預付金額不得超過全部認可金額
-DocType: Salary Slip,Hour Rate,小時率
-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: Work Order,Material Transferred for Manufacturing,物料轉倉用於製造
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Account {0} does not exists,科目{0}不存在
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1608,Select Loyalty Program,選擇忠誠度計劃
-DocType: Project,Project Type,專案類型
-apps/erpnext/erpnext/projects/doctype/task/task.py +157,Child Task exists for this Task. You can not delete this Task.,子任務存在這個任務。你不能刪除這個任務。
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +17,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
-apps/erpnext/erpnext/config/projects.py +56,Cost of various activities,各種活動的費用
-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}",設置活動為{0}，因為附連到下面的銷售者的僱員不具有用戶ID {1}
-DocType: Timesheet,Billing Details,結算明細
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +163,Source and target warehouse must be different,源和目標倉庫必須是不同的
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +140,Payment Failed. Please check your GoCardless Account for more details,支付失敗。請檢查您的GoCardless帳戶以了解更多詳情
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
-DocType: BOM,Inspection Required,需要檢驗
-DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
-apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,在提交之前輸入銀行保證號碼。
-DocType: Driving License Category,Class,類
-DocType: Sales Order,Fully Billed,完全開票
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +387,Work Order cannot be raised against a Item Template,工作訂單不能針對項目模板產生
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,運費規則只適用於購買
-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 +143,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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結科目，並新增/修改對凍結科目的會計分錄
-DocType: Vital Signs,Cuts,削減
-DocType: Serial No,Is Cancelled,被註銷
-DocType: Student Group,Group Based On,基於組
-DocType: Student Group,Group Based On,基於組
-DocType: Journal Entry,Bill Date,帳單日期
-DocType: Healthcare Settings,Laboratory SMS Alerts,實驗室短信
-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:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
-DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析標準
-DocType: Supplier,Supplier Details,供應商詳細資訊
-DocType: Setup Progress,Setup Progress,設置進度
-DocType: Expense Claim,Approval Status,審批狀態
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},來源值必須小於列{0}的值
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Wire Transfer,電匯
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +93,Check all,全面檢查
-,Issued Items Against Work Order,針對工單發布物品
-,BOM Stock Calculated,BOM庫存計算
-DocType: Vehicle Log,Invoice Ref,發票編號
-DocType: Company,Default Income Account,預設收入科目
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Unclosed Fiscal Years Profit / Loss (Credit),未關閉的財年利潤/損失（信用）
-DocType: Sales Invoice,Time Sheets,考勤表
-DocType: Healthcare Service Unit Type,Change In Item,更改項目
-DocType: Payment Gateway Account,Default Payment Request Message,預設的付款請求訊息
-DocType: Retention Bonus,Bonus Amount,獎金金額
-DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +376,Balance ({0}),餘額（{0}）
-DocType: Loyalty Point Entry,Redeem Against,兌換
-apps/erpnext/erpnext/config/accounts.py +130,Banking and Payments,銀行和支付
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,請輸入API使用者密鑰
-,Welcome to ERPNext,歡迎來到ERPNext
-apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,主導報價
-apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +34,Email Reminders will be sent to all parties with email contacts,電子郵件提醒將通過電子郵件聯繫方式發送給各方
-DocType: Project,Twice Daily,每天兩次
-DocType: Inpatient Record,A Negative,一個負面的
-apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,沒有更多的表現。
-DocType: Lead,From Customer,從客戶
-apps/erpnext/erpnext/demo/setup/setup_data.py +340,Calls,電話
-apps/erpnext/erpnext/utilities/user_progress.py +143,A Product,一個產品
-DocType: Employee Tax Exemption Declaration,Declarations,聲明
-apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,製作費用表
-DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +263,Purchase Order {0} is not submitted,採購訂單{0}未提交
-DocType: Account,Expenses Included In Asset Valuation,資產評估中包含的費用
-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,稅則號
-DocType: Work Order Item,Available Qty at WIP Warehouse,在WIP倉庫可用的數量
-apps/erpnext/erpnext/stock/doctype/item/item.js +41,Projected,預計
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +233,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
-apps/erpnext/erpnext/controllers/status_updater.py +180,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
-DocType: Notification Control,Quotation Message,報價訊息
-DocType: Issue,Opening Date,開幕日期
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,請先保存患者
-apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,出席已成功標記。
-DocType: Delivery Note,GST Vehicle Type,GST車型
-DocType: Soil Texture,Silt Composition (%),粉塵成分（％）
-DocType: Journal Entry,Remark,備註
-DocType: Healthcare Settings,Avoid Confirmation,避免確認
-DocType: Purchase Receipt Item,Rate and Amount,率及金額
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Account Type for {0} must be {1},科目類型為{0}必須{1}
-apps/erpnext/erpnext/config/hr.py +34,Leaves and Holiday,休假及假日
-DocType: Education Settings,Current Academic Term,當前學術期限
-DocType: Education Settings,Current Academic Term,當前學術期限
-DocType: Sales Order,Not Billed,不發單
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
-DocType: Employee Grade,Default Leave Policy,默認離開政策
-DocType: Shopify Settings,Shop URL,商店網址
-apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,尚未新增聯絡人。
-DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本憑證金額
-,Item Balance (Simple),物品餘額（簡單）
-apps/erpnext/erpnext/config/accounts.py +19,Bills raised by Suppliers.,由供應商提出的帳單。
-DocType: POS Profile,Write Off Account,核銷帳戶
-DocType: Patient Appointment,Get prescribed procedures,獲取規定的程序
-DocType: Sales Invoice,Redemption Account,贖回科目
-DocType: Purchase Invoice Item,Discount Amount,折扣金額
-DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
-DocType: Item,Warranty Period (in days),保修期限（天數）
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,與關係Guardian1
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +879,Please select BOM against item {0},請選擇物料{0}的物料清單
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,製作發票
-DocType: Shopping Cart Settings,Show Stock Quantity,顯示庫存數量
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +77,Net Cash from Operations,從運營的淨現金
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
-DocType: Student Admission,Admission End Date,錄取結束日期
-DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
-apps/erpnext/erpnext/education/doctype/academic_year/academic_year.js +3,Student Group,學生組
-DocType: Shopping Cart Settings,Quotation Series,報價系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +60,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
-DocType: Soil Analysis Criteria,Soil Analysis Criteria,土壤分析標準
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2052,Please select customer,請選擇客戶
-DocType: C-Form,I,一世
-DocType: Company,Asset Depreciation Cost Center,資產折舊成本中心
-DocType: Production Plan Sales Order,Sales Order Date,銷售訂單日期
-DocType: Sales Invoice Item,Delivered Qty,交付數量
-DocType: Assessment Plan,Assessment Plan,評估計劃
-DocType: Travel Request,Fully Sponsored,完全贊助
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,反向日記帳分錄
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客戶{0}已創建。
-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,打印數量
-DocType: Hotel Room Reservation Item,Hotel Room Reservation Item,酒店房間預訂項目
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +59,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
-DocType: Employee Health Insurance,Health Insurance Name,健康保險名稱
-DocType: Assessment Plan,Examiner,檢查員
-DocType: Journal Entry,Stock Entry,存貨分錄
-DocType: Payment Entry,Payment References,付款參考
-DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",間隔字段的間隔數，例如，如果間隔為'天數'並且計費間隔計數為3，則會每3天生成一次發票
-DocType: Clinical Procedure Template,Allow Stock Consumption,允許庫存消耗
-DocType: Asset,Insurance Details,保險詳情
-DocType: Account,Payable,支付
-DocType: Share Balance,Share Type,分享類型
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,請輸入還款期
-apps/erpnext/erpnext/shopping_cart/cart.py +378,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/healthcare/doctype/patient_appointment/patient_appointment.py +90,Appointment {0} and Sales Invoice {1} cancelled,約會{0}和銷售發票{1}已取消
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +43,Opportunities by lead source,鉛來源的機會
-DocType: Appraisal Goal,Weightage (%),權重（％）
-DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +742,"Asset is already exists against the item {0}, you cannot change the has serial no value",資產已針對商品{0}存在，您無法更改已連續編號的值
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Report,評估報告
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +26,Get Employees,獲得員工
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,總消費金額是強制性
-apps/erpnext/erpnext/setup/doctype/company/company.js +115,Company name not same,公司名稱不一樣
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +114,Party is mandatory,黨是強制性
-DocType: Topic,Topic Name,主題名稱
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,Please set default template for Leave Approval Notification in HR Settings.,請在人力資源設置中為離職審批通知設置默認模板。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,選擇一名員工以推進員工。
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,請選擇一個有效的日期
-apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,選擇您的業務的性質。
-DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value
+Customer Type,客戶類型
+Leave Allocation,排假
+Recipient Message And Payment Details,收件人郵件和付款細節
+Source DocType,源DocType,
+Open a new ticket,打開一張新票
+Trainer Email,教練電子郵件
+Transporter,運輸車
+Material Requests {0} created,{0}物料需求已建立
+No of People,沒有人
+Template of terms or contract.,模板條款或合同。
+Address and Contact,地址和聯絡方式
+Is Account Payable,為應付帳款
+Stock cannot be updated against Purchase Receipt {0},庫存不能對外購入庫單進行更新{0}
+Auto close Issue after 7 days,7天之後自動關閉問題
+"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
+Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+Student Applicant,學生申請
+Hub Tracked Item,Hub跟踪物品
+Accumulated Depreciation Account,累計折舊科目
+Discuss ID,討論ID,
+Freeze Stock Entries,凍結庫存項目
+Boarding Student,寄宿學生
+Please enable Applicable on Booking Actual Expenses,請啟用適用於預訂實際費用
+Expected Value After Useful Life,期望值使用壽命結束後
+Reorder level based on Warehouse,根據倉庫訂貨點水平
+Billing Rate,結算利率
+Qty to Deliver,數量交付
+Amazon will synch data updated after this date,亞馬遜將同步在此日期之後更新的數據
+Stock Analytics,庫存分析
+Lab Test(s) ,實驗室測試
+Against Document Detail No,對文件詳細編號
+Deletion is not permitted for country {0},國家{0}不允許刪除
+Party Type is mandatory,黨的類型是強制性
+Outgoing,發送
+Requested For,要求
+Against Doctype,針對文檔類型
+{0} {1} is cancelled or closed,{0} {1} 被取消或結案
+Calculate Depreciation,計算折舊
+Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
+Net Cash from Investing,從投資淨現金
+Work-in-Progress Warehouse,在製品倉庫
+Asset {0} must be submitted,資產{0}必須提交
+Total Students,學生總數
+Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
+Reference #{0} dated {1},參考＃ {0}於{1}
+Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
+New Employee ID,新員工ID,
+Work Order Item,工作訂單項目
+Item Code,產品編號
+Warranty / AMC Details,保修/ AMC詳情
+Select students manually for the Activity based Group,為基於活動的組手動選擇學生
+User Remark,用戶備註
+Optimizing routes.,優化路線。
+Non Diary,非日記
+Cannot create Retention Bonus for left Employees,無法為左員工創建保留獎金
+Market Segment,市場分類
+Agriculture Manager,農業經理
+Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
+Variables,變量
+Employee Internal Work History,員工內部工作經歷
+Closing (Dr),關閉（Dr）
+Serial No {0} not in stock,序列號{0}無貨
+Tax template for selling transactions.,稅務模板賣出的交易。
+Write Off Outstanding Amount,核銷額（億元）
+Account {0} does not match with Company {1},科目{0}與公司{1}不符
+Current Academic Year,當前學年
+Current Academic Year,當前學年
+Default Stock UOM,預設庫存計量單位
+Number of Depreciations Booked,預訂折舊數
+Qty Total,數量總計
+School/University,學校/大學
+Available Qty at Warehouse,有貨數量在倉庫
+Billed Amount,帳單金額
+(including),（包括）
+Double Declining Balance,雙倍餘額遞減
+Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+Payroll Setup,工資單設置
+Synch Products,同步產品
+Loyalty Program,忠誠計劃
+Father,父親
+Support Tickets,支持門票
+'Update Stock' cannot be checked for fixed asset sale,"""更新庫存"" 無法檢查固定資產銷售"
+Bank Reconciliation,銀行對帳
+Get Updates,獲取更新
+{0} {1}: Account {2} does not belong to Company {3},{0} {1}科目{2}不屬於公司{3}
+Select at least one value from each of the attributes.,從每個屬性中至少選擇一個值。
+Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+Dispatch State,派遣國
+Leave Management,離開管理
+Groups,組
+Group by Account,以科目分群組
+Hold Invoice,保留發票
+Please select Employee,請選擇員工
+Lower Income,較低的收入
+Current Order,當前訂單
+Number of serial nos and quantity must be the same,序列號和數量必須相同
+Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
+Asset Received But Not Billed,已收到但未收費的資產
+"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異科目必須是資產/負債類型的科目，因為此庫存調整是一個開帳分錄
+Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
+Go to Programs,轉到程序
+Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}＃分配的金額{1}不能大於無人認領的金額{2}
+Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
+No Staffing Plans found for this Designation,本指定沒有發現人員配備計劃
+Batch {0} of Item {1} is disabled.,項目{1}的批處理{0}已禁用。
+Annual Allocation,年度分配
+Address of Organizer,主辦單位地址
+Select Healthcare Practitioner...,選擇醫療從業者......
+Applicable in the case of Employee Onboarding,適用於員工入職的情況
+Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
+Fully Depreciated,已提足折舊
+Stock Projected Qty,存貨預計數量
+Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+Marked Attendance HTML,顯著的考勤HTML,
+"Quotations are proposals, bids you have sent to your customers",語錄是建議，你已經發送到你的客戶提高出價
+Customer's Purchase Order,客戶採購訂單
+Bypass credit check at Sales Order ,在銷售訂單旁通過信用檢查
+Employee Onboarding Activity,員工入職活動
+Check if it is a hydroponic unit,檢查它是否是水培單位
+Serial No and Batch,序列號和批次
+From Company,從公司
+Sum of Scores of Assessment Criteria needs to be {0}.,評估標準的得分之和必須是{0}。
+Please set Number of Depreciations Booked,請設置折舊數預訂
+Calculations,計算
+Value or Qty,價值或數量
+Payment Terms,付款條件
+Productions Orders cannot be raised for:,製作訂單不能上調：
+Minute,分鐘
+Purchase Taxes and Charges,購置稅和費
+Meetup Embed HTML,Meetup嵌入HTML,
+Insured value,保價值
+Go to Suppliers,去供應商
+POS Closing Voucher Taxes,POS關閉憑證稅
+Qty to Receive,未到貨量
+"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",開始日期和結束日期不在有效的工資核算期間內，無法計算{0}。
+Leave Block List Allowed,准許的休假區塊清單
+Grading Scale Interval,分級分度值
+Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
+Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
+Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
+Rate / UOM,費率/ UOM,
+All Warehouses,所有倉庫
+No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
+Rented Car,租車
+About your Company,關於貴公司
+Credit To account must be a Balance Sheet account,貸方科目必須是資產負債表科目
+Donor,捐贈者
+Disable In Words,禁用詞
+Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
+Quotation {0} not of type {1},報價{0}非為{1}類型
+Maintenance Schedule Item,維護計劃項目
+% Delivered,％交付
+Please set the Email ID for the Student to send the Payment Request,請設置學生的電子郵件ID以發送付款請求
+Medical History,醫學史
+Bank Overdraft Account,銀行透支戶口
+Schedule Name,計劃名稱
+Sales Pipeline by Stage,按階段劃分的銷售渠道
+Make Salary Slip,製作工資單
+For Buying,為了購買
+Add All Suppliers,添加所有供應商
+Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金額不能大於未結算金額。
+Browse BOM,瀏覽BOM,
+Secured Loans,抵押貸款
+Edit Posting Date and Time,編輯投稿時間
+Please set Depreciation related Accounts in Asset Category {0} or Company {1},請設置在資產類別{0}或公司折舊相關科目{1}
+Normal Range,普通範圍
+Academic Year,學年
+Available Selling,可用銷售
+Loyalty Point Entry Redemption,忠誠度積分兌換
+Opening Balance Equity,期初餘額權益
+N,ñ
+Remaining,剩餘
+Appraisal,評價
+GST Details,消費稅細節
+This is based on transactions against this Healthcare Practitioner.,這是基於針對此醫療保健從業者的交易。
+Email sent to supplier {0},電子郵件發送到供應商{0}
+Default Sales Unit of Measure,默認銷售單位
+Academic Year: ,學年：
+Admission Schedule Date,入學時間表日期
+Past Due Date,過去的截止日期
+Not allow to set alternative item for the item {0},不允許為項目{0}設置替代項目
+Date is repeated,日期重複
+Authorized Signatory,授權簽字人
+Create Fees,創造費用
+Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
+Select Quantity,選擇數量
+Loyalty Points,忠誠度積分
+Customs Tariff Number,海關稅則號
+Patient Appointment,患者預約
+Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
+Unsubscribe from this Email Digest,從該電子郵件摘要退訂
+Get Suppliers By,獲得供應商
+{0} not found for Item {1},找不到項目{1} {0}
+Go to Courses,去課程
+Show Inclusive Tax In Print,在打印中顯示包含稅
+"Bank Account, From Date and To Date are Mandatory",銀行科目，從日期到日期是強制性的
+Message Sent,發送訊息
+Account with child nodes cannot be set as ledger,科目與子節點不能被設置為分類帳
+Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
+Net Amount (Company Currency),淨金額（公司貨幣）
+Total advance amount cannot be greater than total sanctioned amount,總預付金額不得超過全部認可金額
+Hour Rate,小時率
+Item Naming By,產品命名規則
+Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
+Material Transferred for Manufacturing,物料轉倉用於製造
+Account {0} does not exists,科目{0}不存在
+Select Loyalty Program,選擇忠誠度計劃
+Project Type,專案類型
+Child Task exists for this Task. You can not delete this Task.,子任務存在這個任務。你不能刪除這個任務。
+Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
+Cost of various activities,各種活動的費用
+"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",設置活動為{0}，因為附連到下面的銷售者的僱員不具有用戶ID {1}
+Billing Details,結算明細
+Source and target warehouse must be different,源和目標倉庫必須是不同的
+Payment Failed. Please check your GoCardless Account for more details,支付失敗。請檢查您的GoCardless帳戶以了解更多詳情
+Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
+Inspection Required,需要檢驗
+PR Detail,詳細新聞稿
+Enter the Bank Guarantee Number before submittting.,在提交之前輸入銀行保證號碼。
+Class,類
+Fully Billed,完全開票
+Work Order cannot be raised against a Item Template,工作訂單不能針對項目模板產生
+Shipping rule only applicable for Buying,運費規則只適用於購買
+Cash In Hand,手頭現金
+Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
+Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結科目，並新增/修改對凍結科目的會計分錄
+Cuts,削減
+Is Cancelled,被註銷
+Group Based On,基於組
+Group Based On,基於組
+Bill Date,帳單日期
+Laboratory SMS Alerts,實驗室短信
+"Service Item,Type,frequency and expense amount are required",服務項目，類型，頻率和消費金額要求
+"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
+Plant Analysis Criteria,植物分析標準
+Supplier Details,供應商詳細資訊
+Setup Progress,設置進度
+Approval Status,審批狀態
+From value must be less than to value in row {0},來源值必須小於列{0}的值
+Wire Transfer,電匯
+Check all,全面檢查
+Issued Items Against Work Order,針對工單發布物品
+BOM Stock Calculated,BOM庫存計算
+Invoice Ref,發票編號
+Default Income Account,預設收入科目
+Unclosed Fiscal Years Profit / Loss (Credit),未關閉的財年利潤/損失（信用）
+Time Sheets,考勤表
+Change In Item,更改項目
+Default Payment Request Message,預設的付款請求訊息
+Bonus Amount,獎金金額
+Check this if you want to show in website,勾選本項以顯示在網頁上
+Balance ({0}),餘額（{0}）
+Redeem Against,兌換
+Banking and Payments,銀行和支付
+Please enter API Consumer Key,請輸入API使用者密鑰
+Welcome to ERPNext,歡迎來到ERPNext,
+Lead to Quotation,主導報價
+Email Reminders will be sent to all parties with email contacts,電子郵件提醒將通過電子郵件聯繫方式發送給各方
+Twice Daily,每天兩次
+A Negative,一個負面的
+Nothing more to show.,沒有更多的表現。
+From Customer,從客戶
+Calls,電話
+A Product,一個產品
+Declarations,聲明
+Make Fee Schedule,製作費用表
+Stock UOM,庫存計量單位
+Purchase Order {0} is not submitted,採購訂單{0}未提交
+Expenses Included In Asset Valuation,資產評估中包含的費用
+Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),成人的正常參考範圍是16-20次呼吸/分鐘（RCP 2012）
+Tariff Number,稅則號
+Available Qty at WIP Warehouse,在WIP倉庫可用的數量
+Projected,預計
+Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
+Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0,
+Quotation Message,報價訊息
+Opening Date,開幕日期
+Please save the patient first,請先保存患者
+Attendance has been marked successfully.,出席已成功標記。
+GST Vehicle Type,GST車型
+Silt Composition (%),粉塵成分（％）
+Remark,備註
+Avoid Confirmation,避免確認
+Rate and Amount,率及金額
+Account Type for {0} must be {1},科目類型為{0}必須{1}
+Leaves and Holiday,休假及假日
+Current Academic Term,當前學術期限
+Current Academic Term,當前學術期限
+Not Billed,不發單
+Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
+Default Leave Policy,默認離開政策
+Shop URL,商店網址
+No contacts added yet.,尚未新增聯絡人。
+Landed Cost Voucher Amount,到岸成本憑證金額
+Item Balance (Simple),物品餘額（簡單）
+Bills raised by Suppliers.,由供應商提出的帳單。
+Write Off Account,核銷帳戶
+Get prescribed procedures,獲取規定的程序
+Redemption Account,贖回科目
+Discount Amount,折扣金額
+Return Against Purchase Invoice,回到對採購發票
+Warranty Period (in days),保修期限（天數）
+Relation with Guardian1,與關係Guardian1,
+Please select BOM against item {0},請選擇物料{0}的物料清單
+Make Invoices,製作發票
+Show Stock Quantity,顯示庫存數量
+Net Cash from Operations,從運營的淨現金
+Item 4,項目4,
+Admission End Date,錄取結束日期
+Journal Entry Account,日記帳分錄帳號
+Student Group,學生組
+Quotation Series,報價系列
+"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+Soil Analysis Criteria,土壤分析標準
+Please select customer,請選擇客戶
+I,一世
+Asset Depreciation Cost Center,資產折舊成本中心
+Sales Order Date,銷售訂單日期
+Delivered Qty,交付數量
+Assessment Plan,評估計劃
+Fully Sponsored,完全贊助
+Reverse Journal Entry,反向日記帳分錄
+Customer {0} is created.,客戶{0}已創建。
+ Currently no stock available in any warehouse,目前任何倉庫沒有庫存
+Payment Period Based On Invoice Date,基於發票日的付款期
+No. of print,打印數量
+Hotel Room Reservation Item,酒店房間預訂項目
+Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
+Health Insurance Name,健康保險名稱
+Examiner,檢查員
+Stock Entry,存貨分錄
+Payment References,付款參考
+"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",間隔字段的間隔數，例如，如果間隔為'天數'並且計費間隔計數為3，則會每3天生成一次發票
+Allow Stock Consumption,允許庫存消耗
+Insurance Details,保險詳情
+Payable,支付
+Share Type,分享類型
+Debtors ({0}),債務人（{0}）
+Margin,餘量
+New Customers,新客戶
+Appointment {0} and Sales Invoice {1} cancelled,約會{0}和銷售發票{1}已取消
+Opportunities by lead source,鉛來源的機會
+Weightage (%),權重（％）
+Clearance Date,清拆日期
+"Asset is already exists against the item {0}, you cannot change the has serial no value",資產已針對商品{0}存在，您無法更改已連續編號的值
+Assessment Report,評估報告
+Get Employees,獲得員工
+Gross Purchase Amount is mandatory,總消費金額是強制性
+Company name not same,公司名稱不一樣
+Party is mandatory,黨是強制性
+Topic Name,主題名稱
+Please set default template for Leave Approval Notification in HR Settings.,請在人力資源設置中為離職審批通知設置默認模板。
+Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
+Select an employee to get the employee advance.,選擇一名員工以推進員工。
+Please select a valid Date,請選擇一個有效的日期
+Select the nature of your business.,選擇您的業務的性質。
+"Single for results which require only a single input, result UOM and normal value
<br>
-Compound for results which require multiple input fields with corresponding event names, result UOMs and normal values
+Compound for results which require multiple input fields with corresponding event names, result UOMs and normal values,
<br>
Descriptive for tests which have multiple result components and corresponding result entry fields.
<br>
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.",單一的結果只需要一個輸入，結果UOM和正常值<br>對於需要具有相應事件名稱的多個輸入字段的結果的化合物，結果為UOM和正常值<br>具有多個結果組件和相應結果輸入字段的測試的描述。 <br>分組為一組其他測試模板的測試模板。 <br>沒有沒有結果的測試結果。此外，沒有創建實驗室測試。例如。分組測試的子測試。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +87,Row #{0}: Duplicate entry in References {1} {2},行＃{0}：引用{1} {2}中的重複條目
-apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生產作業於此進行。
-apps/erpnext/erpnext/education/doctype/instructor/instructor.js +39,As Examiner,作為考官
-DocType: Company,Default Expense Claim Payable Account,默認費用索賠應付帳款
-DocType: Appointment Type,Default Duration,默認時長
-DocType: BOM Explosion Item,Source Warehouse,來源倉庫
-DocType: Installation Note,Installation Date,安裝日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,已創建銷售發票{0}
-DocType: Employee,Confirmation Date,確認日期
-DocType: Inpatient Occupancy,Check Out,查看
-DocType: C-Form,Total Invoiced Amount,發票總金額
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +51,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
-DocType: Account,Accumulated Depreciation,累計折舊
-DocType: Supplier Scorecard Scoring Standing,Standing Name,常務名稱
-DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細訊息
-DocType: Asset Value Adjustment,Current Asset Value,流動資產價值
-DocType: Travel Request,Travel Funding,旅行資助
-DocType: Crop Cycle,A link to all the Locations in which the Crop is growing,指向作物生長的所有位置的鏈接
-DocType: Lead,Lead Owner,主導擁有者
-DocType: Production Plan,Sales Orders Detail,銷售訂單明細
-DocType: Bin,Requested Quantity,要求的數量
-DocType: Fees,EDU-FEE-.YYYY.-,EDU-收費.YYYY.-
-DocType: Patient,Marital Status,婚姻狀況
-DocType: Stock Settings,Auto Material Request,自動物料需求
-DocType: Woocommerce Settings,API consumer secret,API消費者秘密
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
-DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +39,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,工資單編號
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
-apps/erpnext/erpnext/stock/doctype/item/item.js +70,Multiple Variants,多種變體
-DocType: Sales Invoice,Against Income Account,對收入科目
-DocType: Subscription,Trial Period Start Date,試用期開始日期
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
-DocType: Certification Application,Certified,認證
-DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
-DocType: Daily Work Summary Group User,Daily Work Summary Group User,日常工作摘要組用戶
-DocType: Territory,Territory Targets,境內目標
-DocType: Soil Analysis,Ca/Mg,鈣/鎂
-DocType: Delivery Note,Transporter Info,貨運公司資訊
-apps/erpnext/erpnext/accounts/utils.py +526,Please set default {0} in Company {1},請設置在默認情況下公司{0} {1}
-DocType: Cheque Print Template,Starting position from top edge,起價頂邊位置
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +33,Same supplier has been entered multiple times,同一個供應商已多次輸入
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,總利潤/虧損
-,Warehouse wise Item Balance Age and Value,倉庫明智的項目平衡年齡和價值
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,採購訂單項目供應商
-apps/erpnext/erpnext/public/js/setup_wizard.js +94,Company Name cannot be Company,公司名稱不能為公司
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,信頭的列印模板。
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
-DocType: Student Guardian,Student Guardian,學生家長
-DocType: Member,Member Name,成員名字
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +231,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
-DocType: POS Profile,Update Stock,庫存更新
-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: Certification Application,Payment Details,付款詳情
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,BOM Rate,BOM率
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +249,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工作訂單不能取消，先取消它
-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/manufacturing/doctype/work_order/work_order.py +242,Row {0}: select the workstation against the operation {1},行{0}：根據操作{1}選擇工作站
-apps/erpnext/erpnext/accounts/utils.py +496,Journal Entries {0} are un-linked,日記條目{0}都是非聯
-apps/erpnext/erpnext/accounts/utils.py +825,{0} Number {1} already used in account {2},已在{2}科目中使用的{0}號碼{1}
-apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
-DocType: Supplier Scorecard Scoring Standing,Supplier Scorecard Scoring Standing,供應商記分卡
-DocType: Manufacturer,Manufacturers used in Items,在項目中使用製造商
-apps/erpnext/erpnext/accounts/general_ledger.py +181,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
-DocType: Purchase Invoice,Terms,條款
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,選擇天數
-DocType: Academic Term,Term Name,術語名稱
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,創建工資單......
-apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,您不能編輯根節點。
-DocType: Buying Settings,Purchase Order Required,採購訂單為必要項
-apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,計時器
-,Item-wise Sales History,項目明智的銷售歷史
-DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
-,Purchase Analytics,採購分析
-DocType: Sales Invoice Item,Delivery Note Item,送貨單項目
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +373,Current invoice {0} is missing,當前發票{0}缺失
-DocType: Asset Maintenance Log,Task,任務
-DocType: Purchase Taxes and Charges,Reference Row #,參考列#
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +22,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
-DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
-DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
-DocType: Asset Settings,Number of Days in Fiscal Year,會計年度的天數
-,Stock Ledger,庫存總帳
-apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},價格：{0}
-DocType: Company,Exchange Gain / Loss Account,匯兌損益科目
-DocType: Amazon MWS Settings,MWS Credentials,MWS憑證
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,員工考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +123,Purpose must be one of {0},目的必須是一個{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,填寫表格，並將其保存
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,實際庫存數量
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,實際庫存數量
-DocType: Homepage,"URL for ""All Products""",網址“所有產品”
-DocType: Leave Application,Leave Balance Before Application,離開平衡應用前
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +41,Send SMS,發送短信
-DocType: Supplier Scorecard Criteria,Max Score,最高分數
-DocType: Cheque Print Template,Width of amount in word,在字量的寬度
-DocType: Company,Default Letter Head,預設信頭
-DocType: Purchase Order,Get Items from Open Material Requests,從開放狀態的物料需求取得項目
-DocType: Hotel Room Amenity,Billable,計費
-DocType: Lab Test Template,Standard Selling Rate,標準銷售率
-DocType: Account,Rate at which this tax is applied,此稅適用的匯率
-DocType: Cash Flow Mapper,Section Name,部分名稱
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,再訂購數量
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折舊行{0}：使用壽命後的預期值必須大於或等於{1}
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,當前職位空缺
-DocType: Company,Stock Adjustment Account,庫存調整科目
-apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
-DocType: Healthcare Service Unit,Allow Overlap,允許重疊
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +86,Enter depreciation details,輸入折舊明細
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：從{1}
-apps/erpnext/erpnext/education/doctype/student_leave_application/student_leave_application.py +31,Leave application {0} already exists against the student {1},對學生{1}已經存在申請{0}
-DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +78,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
-DocType: POS Profile,Display Items In Stock,顯示庫存商品
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
-DocType: Payment Order,Payment Order Reference,付款訂單參考
-DocType: Water Analysis,Appearance,出現
-DocType: HR Settings,Leave Status Notification Template,離開狀態通知模板
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,平均。買價格表價格
-DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
-apps/erpnext/erpnext/config/non_profit.py +23,Member information.,會員信息。
-DocType: Identification Document Type,Identification Document Type,識別文件類型
-apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃窗體/項目/ {0}）缺貨
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +87,Asset Maintenance,資產維護
-,Sales Payment Summary,銷售付款摘要
-DocType: Restaurant,Restaurant,餐廳
-DocType: Woocommerce Settings,API consumer key,API消費者密鑰
-apps/erpnext/erpnext/accounts/party.py +353,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,資料輸入和輸出
-DocType: Tax Withholding Category,Account Details,帳戶細節
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +76,No students Found,沒有發現學生
-DocType: Clinical Procedure,Medical Department,醫學系
-DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,供應商記分卡評分標準
-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,整數總計
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +91,Slots for {0} are not added to the schedule,{0}的插槽未添加到計劃中
-DocType: Product Bundle,List items that form the package.,形成包列表項。
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +42,Not permitted. Please disable the Test Template,不允許。請禁用測試模板
-DocType: Delivery Note,Distance (in km),距離（公里）
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +611,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
-DocType: Program Enrollment,School House,學校議院
-DocType: Serial No,Out of AMC,出資產管理公司
-DocType: Opportunity,Opportunity Amount,機會金額
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
-DocType: Purchase Order,Order Confirmation Date,訂單確認日期
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
-DocType: Employee Transfer,Employee Transfer Details,員工轉移詳情
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +263,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
-DocType: Company,Default Cash Account,預設的現金科目
-apps/erpnext/erpnext/config/accounts.py +40,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,這是基於這名學生出席
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +179,No Students in,沒有學生
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +180,Add more items or open full form,添加更多項目或全開放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
-apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,轉到用戶
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +198,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
-apps/erpnext/erpnext/regional/india/utils.py +19,Invalid GSTIN or Enter NA for Unregistered,無效的GSTIN或輸入NA未註冊
-DocType: Training Event,Seminar,研討會
-DocType: Program Enrollment Fee,Program Enrollment Fee,計劃註冊費
-DocType: Item,Supplier Items,供應商項目
-DocType: Opportunity,Opportunity Type,機會型
-DocType: Asset Movement,To Employee,給員工
-DocType: Employee Transfer,New Company,新公司
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +19,Transactions can only be deleted by the creator of the Company,交易只能由公司的創建者被刪除
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,不正確的數字總帳條目中找到。你可能會在交易中選擇了錯誤的科目。
-DocType: Employee,Prefered Contact Email,首選聯繫郵箱
-DocType: Cheque Print Template,Cheque Width,支票寬度
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,驗證售價反對預訂價或估價RATE項目
-DocType: Fee Schedule,Fee Schedule,收費表
-DocType: Company,Create Chart Of Accounts Based On,基於會計科目表創建
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Date of Birth cannot be greater than today.,出生日期不能大於今天。
-,Stock Ageing,存貨帳齡分析表
-DocType: Travel Request,"Partially Sponsored, Require Partial Funding",部分贊助，需要部分資金
-apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},學生{0}存在針對學生申請{1}
-DocType: Purchase Invoice,Rounding Adjustment (Company Currency),四捨五入調整（公司貨幣）
-apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,時間表
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,批量：
-DocType: Loyalty Program,Loyalty Program Help,忠誠度計劃幫助
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
-DocType: Cheque Print Template,Scanned Cheque,支票掃描
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,對提交的交易，自動發送電子郵件給聯絡人。
-DocType: Timesheet,Total Billable Amount,總結算金額
-DocType: Customer,Credit Limit and Payment Terms,信用額度和付款條款
-DocType: Loyalty Program,Collection Rules,收集規則
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
-apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,訂單輸入
-DocType: Purchase Order,Customer Contact Email,客戶聯絡電子郵件
-DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
-DocType: Chapter,Chapter Members,章節成員
-DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +143,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行科目”未指定
-apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,項目{0}已經存在
-DocType: Clinical Procedure,Nursing User,護理用戶
-DocType: Employee Benefit Application,Payroll Period,工資期
-DocType: Plant Analysis,Plant Analysis Criterias,植物分析標準
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},序列號{0}不屬於批次{1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Responsibilities,職責
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此報價的有效期已經結束。
-DocType: Expense Claim Account,Expense Claim Account,報銷科目
-DocType: Account,Capital Work in Progress,資本工作正在進行中
-DocType: Accounts Settings,Allow Stale Exchange Rates,允許陳舊的匯率
-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,請在表中輸入至少一筆發票
-apps/erpnext/erpnext/utilities/user_progress.py +247,Add Users,添加用戶
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py +74,No Lab Test created,沒有創建實驗室測試
-DocType: POS Item Group,Item Group,項目群組
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +19,Student Group: ,學生組：
-DocType: Depreciation Schedule,Finance Book Id,金融書籍ID
-DocType: Item,Safety Stock,安全庫存
-DocType: Healthcare Settings,Healthcare Settings,醫療設置
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +8,Total Allocated Leaves,總分配的葉子
-apps/erpnext/erpnext/projects/doctype/task/task.py +57,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
-DocType: Stock Reconciliation Item,Before reconciliation,調整前
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +507,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有科目類型為"稅" 或 "收入" 或 "支出" 或 "課稅的"
-DocType: Sales Order,Partly Billed,天色帳單
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +54,Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
-apps/erpnext/erpnext/stock/doctype/item/item.js +427,Make Variants,變種
-DocType: Item,Default BOM,預設的BOM
-DocType: Project,Total Billed Amount (via Sales Invoices),總開票金額（通過銷售發票）
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +138,Debit Note Amount,借方票據金額
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +107,"There are inconsistencies between the rate, no of shares and the amount calculated",費率，股份數量和計算的金額之間不一致
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +39,You are not present all day(s) between compensatory leave request days,您在補休請求日之間不是全天
-apps/erpnext/erpnext/setup/doctype/company/company.js +109,Please re-type company name to confirm,請確認重新輸入公司名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +50,Total Outstanding Amt,總街貨量金額
-DocType: Journal Entry,Printing Settings,列印設定
-DocType: Employee Advance,Advance Account,預付款科目
-DocType: Job Offer,Job Offer Terms,招聘條款
-DocType: Sales Invoice,Include Payment (POS),包括支付（POS）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,汽車
-DocType: Vehicle,Insurance Company,保險公司
-DocType: Asset Category Account,Fixed Asset Account,固定資產科目
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +442,Variable,變量
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,從送貨單
-DocType: Chapter,Members,會員
-DocType: Student,Student Email Address,學生的電子郵件地址
-DocType: Item,Hub Warehouse,Hub倉庫
-DocType: Cashier Closing,From Time,從時間
-DocType: Hotel Settings,Hotel Settings,酒店設置
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有現貨：
-DocType: Notification Control,Custom Message,自定義訊息
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +33,Investment Banking,投資銀行業務
-DocType: Purchase Invoice,input,輸入
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行科目是強制性輸入的欄位。
-DocType: Loyalty Program,Multiple Tier Program,多層計劃
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,學生地址
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,學生地址
-DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
-apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py +27,All Supplier Groups,所有供應商組織
-DocType: Employee Boarding Activity,Required for Employee Creation,員工創建需要
-apps/erpnext/erpnext/accounts/doctype/account/account.py +214,Account Number {0} already used in account {1},已在科目{1}中使用的帳號{0}
-DocType: Hotel Room Reservation,Booked,預訂
-DocType: Detected Disease,Tasks Created,創建的任務
-DocType: Purchase Invoice Item,Rate,單價
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +82,Intern,實習生
-DocType: Delivery Stop,Address Name,地址名稱
-DocType: Stock Entry,From BOM,從BOM
-DocType: Assessment Code,Assessment Code,評估準則
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +51,Basic,基本的
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',請點擊“生成表”
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +154,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
-DocType: Bank Reconciliation Detail,Payment Document,付款單據
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,評估標準公式時出錯
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +132,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
-DocType: Subscription,Plans,計劃
-DocType: Salary Slip,Salary Structure,薪酬結構
-DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +886,Issue Material,發行材料
-apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,將Shopify與ERPNext連接
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1161,For Warehouse,對於倉庫
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +92,Delivery Notes {0} updated,已更新交貨單{0}
-DocType: Employee,Offer Date,到職日期
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,語錄
-apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.js +90,Grant,格蘭特
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,沒有學生團體創建的。
-DocType: Purchase Invoice Item,Serial No,序列號
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,請先輸入維護細節
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +60,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行＃{0}：預計交貨日期不能在採購訂單日期之前
-DocType: Purchase Invoice,Print Language,打印語言
-DocType: Salary Slip,Total Working Hours,總的工作時間
-DocType: Sales Invoice,Customer PO Details,客戶PO詳細信息
-DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
-DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,臨時開戶
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1979,Enter value must be positive,輸入值必須為正
-DocType: Asset,Finance Books,財務書籍
-DocType: Employee Tax Exemption Declaration Category,Employee Tax Exemption Declaration Category,員工免稅申報類別
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +451,All Territories,所有的領土
-apps/erpnext/erpnext/hr/utils.py +216,Please set leave policy for employee {0} in Employee / Grade record,請在員工/成績記錄中為員工{0}設置休假政策
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1472,Invalid Blanket Order for the selected Customer and Item,所選客戶和物料的無效總訂單
-apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,添加多個任務
-DocType: Purchase Invoice,Items,項目
-apps/erpnext/erpnext/crm/doctype/contract/contract.py +38,End Date cannot be before Start Date.,結束日期不能在開始日期之前。
-apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +33,Student is already enrolled.,學生已經註冊。
-DocType: Fiscal Year,Year Name,年結名稱
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
-apps/erpnext/erpnext/controllers/buying_controller.py +772,Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master,以下項{0}未標記為{1}項。您可以從項目主文件中將它們作為{1}項啟用
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +117,PDC/LC Ref,PDC / LC參考
-DocType: Production Plan Item,Product Bundle Item,產品包項目
-DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
-apps/erpnext/erpnext/hooks.py +148,Request for Quotations,索取報價
-DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
-DocType: Normal Test Items,Normal Test Items,正常測試項目
-DocType: QuickBooks Migrator,Company Settings,公司設置
-DocType: Additional Salary,Overwrite Salary Structure Amount,覆蓋薪資結構金額
-DocType: Student Language,Student Language,學生語言
-apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
-DocType: Cash Flow Mapping,Is Working Capital,是營運資本
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,訂單/報價％
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,訂單/報價％
-apps/erpnext/erpnext/config/healthcare.py +25,Record Patient Vitals,記錄患者維生素
-DocType: Fee Schedule,Institution,機構
-DocType: Asset,Partially Depreciated,部分貶抑
-DocType: Issue,Opening Time,開放時間
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +97,From and To dates required,需要起始和到達日期
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +760,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
-DocType: Shipping Rule,Calculate Based On,計算的基礎上
-DocType: Contract,Unfulfilled,秕
-DocType: Delivery Note Item,From Warehouse,從倉庫
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,沒有僱員提到的標準
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1033,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
-DocType: Shopify Settings,Default Customer,默認客戶
-DocType: Sales Stage,Stage Name,藝名
-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,課程註冊課程
-DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
-apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py +59,User {0} is already assigned to Healthcare Practitioner {1},用戶{0}已分配給Healthcare Practitioner {1}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +187,Make Sample Retention Stock Entry,使樣品保留庫存條目
-DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +226,Negotiation/Review,談判/評論
-DocType: Leave Encashment,Encashment Amount,填充量
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,記分卡
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +159,Expired Batches,過期批次
-DocType: Employee,This will restrict user access to other employee records,這將限制用戶訪問其他員工記錄
-DocType: Tax Rule,Shipping City,航運市
-DocType: Staffing Plan Detail,Current Openings,當前空缺
-DocType: Notification Control,Customize the Notification,自定義通知
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +78,Cash Flow from Operations,運營現金流
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +316,CGST Amount,CGST金額
-DocType: Purchase Invoice,Shipping Rule,送貨規則
-DocType: Patient Relation,Spouse,伴侶
-DocType: Lab Test Groups,Add Test,添加測試
-DocType: Manufacturer,Limited to 12 characters,限12個字符
-DocType: Journal Entry,Print Heading,列印標題
-apps/erpnext/erpnext/config/stock.py +149,Delivery Trip service tours to customers.,送貨服務遊覽給顧客。
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,總計不能為零
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
-DocType: Plant Analysis Criteria,Maximum Permissible Value,最大允許值
-DocType: Journal Entry Account,Employee Advance,員工晉升
-DocType: Payroll Entry,Payroll Frequency,工資頻率
-DocType: Lab Test Template,Sensitivity,靈敏度
-apps/erpnext/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py +132,Sync has been temporarily disabled because maximum retries have been exceeded,暫時禁用了同步，因為已超出最大重試次數
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1015,Raw Material,原料
-DocType: Leave Application,Follow via Email,透過電子郵件追蹤
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,廠房和機械設備
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-DocType: Patient,Inpatient Status,住院狀況
-DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
-apps/erpnext/erpnext/controllers/buying_controller.py +693,Please enter Reqd by Date,請輸入按日期請求
-DocType: Payment Entry,Internal Transfer,內部轉賬
-DocType: Asset Maintenance,Maintenance Tasks,維護任務
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +627,Please select Posting Date first,請選擇發布日期第一
-apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
-DocType: Travel Itinerary,Flight,飛行
-DocType: Leave Control Panel,Carry Forward,發揚
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +32,Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心，不能轉換為總賬
-DocType: Budget,Applicable on booking actual expenses,適用於預訂實際費用
-DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
-DocType: Crop Cycle,Detected Disease,檢測到的疾病
-,Produced,生產
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,還款開始日期不能在付款日期之前。
-DocType: Item,Item Code for Suppliers,對於供應商產品編號
-DocType: Issue,Raised By (Email),由（電子郵件）提出
-DocType: Training Event,Trainer Name,培訓師姓名
-DocType: Mode of Payment,General,一般
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
-,TDS Payable Monthly,TDS應付月度
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +73,Queued for replacing the BOM. It may take a few minutes.,排隊等待更換BOM。可能需要幾分鐘時間。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +385,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +286,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
-apps/erpnext/erpnext/config/accounts.py +140,Match Payments with Invoices,付款與發票對照
-DocType: Journal Entry,Bank Entry,銀行分錄
-DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
-DocType: Fees,Student Email,學生電子郵件
-DocType: Patient,"Allergies, Medical and Surgical History",過敏，醫療和外科史
-apps/erpnext/erpnext/templates/generators/item.html +96,Add to Cart,添加到購物車
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,集團通過
-DocType: Guardian,Interests,興趣
-apps/erpnext/erpnext/config/accounts.py +266,Enable / disable currencies.,啟用／禁用的貨幣。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,無法提交一些薪資單
-DocType: Exchange Rate Revaluation,Get Entries,獲取條目
-DocType: Production Plan,Get Material Request,獲取材質要求
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,郵政費用
-apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html +8,Sales Summary,銷售摘要
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,娛樂休閒
-,Item Variant Details,項目變體的詳細信息
-DocType: Quality Inspection,Item Serial No,產品序列號
-DocType: Payment Request,Is a Subscription,是訂閱
-apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,建立員工檔案
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Present,總現
-apps/erpnext/erpnext/config/accounts.py +83,Accounting Statements,會計報表
-DocType: Drug Prescription,Hour,小時
-DocType: Restaurant Order Entry,Last Sales Invoice,上次銷售發票
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +881,Please select Qty against item {0},請選擇項目{0}的數量
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +33,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
-DocType: Lead,Lead Type,主導類型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +183,You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +408,All these items have already been invoiced,所有這些項目已開具發票
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1024,Set New Release Date,設置新的發布日期
-DocType: Company,Monthly Sales Target,每月銷售目標
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
-DocType: Hotel Room,Hotel Room Type,酒店房間類型
-DocType: Leave Allocation,Leave Period,休假期間
-DocType: Item,Default Material Request Type,默認材料請求類型
-DocType: Supplier Scorecard,Evaluation Period,評估期
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1032,Work Order not created,工作訂單未創建
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +36,"An amount of {0} already claimed for the component {1},\
+Row #{0}: Duplicate entry in References {1} {2},行＃{0}：引用{1} {2}中的重複條目
+Where manufacturing operations are carried.,生產作業於此進行。
+As Examiner,作為考官
+Default Expense Claim Payable Account,默認費用索賠應付帳款
+Default Duration,默認時長
+Source Warehouse,來源倉庫
+Installation Date,安裝日期
+Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
+Sales Invoice {0} created,已創建銷售發票{0}
+Confirmation Date,確認日期
+Check Out,查看
+Total Invoiced Amount,發票總金額
+Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
+Accumulated Depreciation,累計折舊
+Standing Name,常務名稱
+Customer or Supplier Details,客戶或供應商詳細訊息
+Current Asset Value,流動資產價值
+Travel Funding,旅行資助
+A link to all the Locations in which the Crop is growing,指向作物生長的所有位置的鏈接
+Lead Owner,主導擁有者
+Sales Orders Detail,銷售訂單明細
+Requested Quantity,要求的數量
+EDU-FEE-.YYYY.-,EDU-收費.YYYY.-
+Marital Status,婚姻狀況
+Auto Material Request,自動物料需求
+API consumer secret,API消費者秘密
+Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
+Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
+Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
+Salary Slip ID,工資單編號
+Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
+Multiple Variants,多種變體
+Against Income Account,對收入科目
+Trial Period Start Date,試用期開始日期
+Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
+Certified,認證
+Monthly Distribution Percentage,每月分配比例
+Daily Work Summary Group User,日常工作摘要組用戶
+Territory Targets,境內目標
+Ca/Mg,鈣/鎂
+Transporter Info,貨運公司資訊
+Please set default {0} in Company {1},請設置在默認情況下公司{0} {1}
+Starting position from top edge,起價頂邊位置
+Same supplier has been entered multiple times,同一個供應商已多次輸入
+Gross Profit / Loss,總利潤/虧損
+Warehouse wise Item Balance Age and Value,倉庫明智的項目平衡年齡和價值
+Purchase Order Item Supplied,採購訂單項目供應商
+Company Name cannot be Company,公司名稱不能為公司
+Letter Heads for print templates.,信頭的列印模板。
+Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
+Student Guardian,學生家長
+Member Name,成員名字
+Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
+Update Stock,庫存更新
+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.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
+BOM Rate,BOM率
+"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工作訂單不能取消，先取消它
+Journal Entry for Scrap,日記帳分錄報廢
+Please pull items from Delivery Note,請送貨單拉項目
+Row {0}: select the workstation against the operation {1},行{0}：根據操作{1}選擇工作站
+Journal Entries {0} are un-linked,日記條目{0}都是非聯
+{0} Number {1} already used in account {2},已在{2}科目中使用的{0}號碼{1}
+"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
+Supplier Scorecard Scoring Standing,供應商記分卡
+Manufacturers used in Items,在項目中使用製造商
+Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
+Terms,條款
+Select Days,選擇天數
+Term Name,術語名稱
+Creating Salary Slips...,創建工資單......
+You cannot edit root node.,您不能編輯根節點。
+Purchase Order Required,採購訂單為必要項
+Timer,計時器
+Item-wise Sales History,項目明智的銷售歷史
+Total Sanctioned Amount,總被制裁金額
+Purchase Analytics,採購分析
+Delivery Note Item,送貨單項目
+Current invoice {0} is missing,當前發票{0}缺失
+Task,任務
+Reference Row #,參考列#
+Batch number is mandatory for Item {0},批號是強制性的項目{0}
+This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
+"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
+"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
+Number of Days in Fiscal Year,會計年度的天數
+Stock Ledger,庫存總帳
+Rate: {0},價格：{0}
+Exchange Gain / Loss Account,匯兌損益科目
+MWS Credentials,MWS憑證
+Employee and Attendance,員工考勤
+Purpose must be one of {0},目的必須是一個{0}
+Fill the form and save it,填寫表格，並將其保存
+Community Forum,社區論壇
+Actual qty in stock,實際庫存數量
+Actual qty in stock,實際庫存數量
+"URL for ""All Products""",網址“所有產品”
+Leave Balance Before Application,離開平衡應用前
+Send SMS,發送短信
+Max Score,最高分數
+Width of amount in word,在字量的寬度
+Default Letter Head,預設信頭
+Get Items from Open Material Requests,從開放狀態的物料需求取得項目
+Billable,計費
+Standard Selling Rate,標準銷售率
+Rate at which this tax is applied,此稅適用的匯率
+Section Name,部分名稱
+Reorder Qty,再訂購數量
+Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折舊行{0}：使用壽命後的預期值必須大於或等於{1}
+Current Job Openings,當前職位空缺
+Stock Adjustment Account,庫存調整科目
+Write Off,註銷項款
+Allow Overlap,允許重疊
+"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
+Enter depreciation details,輸入折舊明細
+{0}: From {1},{0}：從{1}
+Leave application {0} already exists against the student {1},對學生{1}已經存在申請{0}
+depends_on,depends_on,
+Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
+Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
+Display Items In Stock,顯示庫存商品
+Country wise default Address Templates,依據國家別啟發式的預設地址模板
+Payment Order Reference,付款訂單參考
+Appearance,出現
+Leave Status Notification Template,離開狀態通知模板
+Avg. Buying Price List Rate,平均。買價格表價格
+Supplier delivers to Customer,供應商提供給客戶
+Member information.,會員信息。
+Identification Document Type,識別文件類型
+[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃窗體/項目/ {0}）缺貨
+Asset Maintenance,資產維護
+Sales Payment Summary,銷售付款摘要
+Restaurant,餐廳
+API consumer key,API消費者密鑰
+Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+Data Import and Export,資料輸入和輸出
+Account Details,帳戶細節
+No students Found,沒有發現學生
+Medical Department,醫學系
+Supplier Scorecard Scoring Criteria,供應商記分卡評分標準
+Invoice Posting Date,發票發布日期
+Sell,賣
+Rounded Total,整數總計
+Slots for {0} are not added to the schedule,{0}的插槽未添加到計劃中
+List items that form the package.,形成包列表項。
+Not permitted. Please disable the Test Template,不允許。請禁用測試模板
+Distance (in km),距離（公里）
+Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
+Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
+School House,學校議院
+Out of AMC,出資產管理公司
+Opportunity Amount,機會金額
+Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
+Order Confirmation Date,訂單確認日期
+Make Maintenance Visit,使維護訪問
+Employee Transfer Details,員工轉移詳情
+Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
+Default Cash Account,預設的現金科目
+Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
+This is based on the attendance of this Student,這是基於這名學生出席
+No Students in,沒有學生
+Add more items or open full form,添加更多項目或全開放形式
+Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+Go to Users,轉到用戶
+Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
+Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+Invalid GSTIN or Enter NA for Unregistered,無效的GSTIN或輸入NA未註冊
+Seminar,研討會
+Program Enrollment Fee,計劃註冊費
+Supplier Items,供應商項目
+Opportunity Type,機會型
+To Employee,給員工
+New Company,新公司
+Transactions can only be deleted by the creator of the Company,交易只能由公司的創建者被刪除
+Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,不正確的數字總帳條目中找到。你可能會在交易中選擇了錯誤的科目。
+Prefered Contact Email,首選聯繫郵箱
+Cheque Width,支票寬度
+Validate Selling Price for Item against Purchase Rate or Valuation Rate,驗證售價反對預訂價或估價RATE項目
+Fee Schedule,收費表
+Create Chart Of Accounts Based On,基於會計科目表創建
+Date of Birth cannot be greater than today.,出生日期不能大於今天。
+Stock Ageing,存貨帳齡分析表
+"Partially Sponsored, Require Partial Funding",部分贊助，需要部分資金
+Student {0} exist against student applicant {1},學生{0}存在針對學生申請{1}
+Rounding Adjustment (Company Currency),四捨五入調整（公司貨幣）
+Timesheet,時間表
+Batch: ,批量：
+Loyalty Program Help,忠誠度計劃幫助
+Set as Open,設置為打開
+Scanned Cheque,支票掃描
+Send automatic emails to Contacts on Submitting transactions.,對提交的交易，自動發送電子郵件給聯絡人。
+Total Billable Amount,總結算金額
+Credit Limit and Payment Terms,信用額度和付款條款
+Collection Rules,收集規則
+Item 3,項目3,
+Order Entry,訂單輸入
+Customer Contact Email,客戶聯絡電子郵件
+Item and Warranty Details,項目和保修細節
+Chapter Members,章節成員
+Contribution (%),貢獻（％）
+Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行科目”未指定
+Project {0} already exists,項目{0}已經存在
+Nursing User,護理用戶
+Payroll Period,工資期
+Plant Analysis Criterias,植物分析標準
+Serial No {0} does not belong to Batch {1},序列號{0}不屬於批次{1}
+Responsibilities,職責
+Validity period of this quotation has ended.,此報價的有效期已經結束。
+Expense Claim Account,報銷科目
+Capital Work in Progress,資本工作正在進行中
+Allow Stale Exchange Rates,允許陳舊的匯率
+Sales Person Name,銷售人員的姓名
+Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
+Add Users,添加用戶
+No Lab Test created,沒有創建實驗室測試
+Item Group,項目群組
+Student Group: ,學生組：
+Finance Book Id,金融書籍ID,
+Safety Stock,安全庫存
+Healthcare Settings,醫療設置
+Total Allocated Leaves,總分配的葉子
+Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
+Before reconciliation,調整前
+Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
+Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"商品稅行{0}必須有科目類型為""稅"" 或 ""收入"" 或 ""支出"" 或 ""課稅的"""
+Partly Billed,天色帳單
+Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
+Make Variants,變種
+Default BOM,預設的BOM,
+Total Billed Amount (via Sales Invoice),總開票金額（通過銷售發票）
+Debit Note Amount,借方票據金額
+"There are inconsistencies between the rate, no of shares and the amount calculated",費率，股份數量和計算的金額之間不一致
+You are not present all day(s) between compensatory leave request days,您在補休請求日之間不是全天
+Please re-type company name to confirm,請確認重新輸入公司名稱
+Total Outstanding Amt,總街貨量金額
+Printing Settings,列印設定
+Advance Account,預付款科目
+Job Offer Terms,招聘條款
+Include Payment (POS),包括支付（POS）
+Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+Automotive,汽車
+Insurance Company,保險公司
+Fixed Asset Account,固定資產科目
+Variable,變量
+From Delivery Note,從送貨單
+Members,會員
+Student Email Address,學生的電子郵件地址
+Hub Warehouse,Hub倉庫
+From Time,從時間
+Hotel Settings,酒店設置
+In Stock: ,有現貨：
+Custom Message,自定義訊息
+Investment Banking,投資銀行業務
+input,輸入
+Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行科目是強制性輸入的欄位。
+Multiple Tier Program,多層計劃
+Student Address,學生地址
+Student Address,學生地址
+Price List Exchange Rate,價目表匯率
+All Supplier Groups,所有供應商組織
+Required for Employee Creation,員工創建需要
+Account Number {0} already used in account {1},已在科目{1}中使用的帳號{0}
+Booked,預訂
+Tasks Created,創建的任務
+Rate,單價
+Intern,實習生
+Address Name,地址名稱
+From BOM,從BOM,
+Assessment Code,評估準則
+Basic,基本的
+Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
+Please click on 'Generate Schedule',請點擊“生成表”
+Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
+Payment Document,付款單據
+Error evaluating the criteria formula,評估標準公式時出錯
+Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
+Plans,計劃
+Salary Structure,薪酬結構
+Bank,銀行
+Issue Material,發行材料
+Connect Shopify with ERPNext,將Shopify與ERPNext連接
+For Warehouse,對於倉庫
+Delivery Notes {0} updated,已更新交貨單{0}
+Offer Date,到職日期
+Quotations,語錄
+You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
+Grant,格蘭特
+No Student Groups created.,沒有學生團體創建的。
+Serial No,序列號
+Please enter Maintaince Details first,請先輸入維護細節
+Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行＃{0}：預計交貨日期不能在採購訂單日期之前
+Print Language,打印語言
+Total Working Hours,總的工作時間
+Customer PO Details,客戶PO詳細信息
+Including items for sub assemblies,包括子組件項目
+Temporary Opening Account,臨時開戶
+Enter value must be positive,輸入值必須為正
+Finance Books,財務書籍
+Employee Tax Exemption Declaration Category,員工免稅申報類別
+All Territories,所有的領土
+Please set leave policy for employee {0} in Employee / Grade record,請在員工/成績記錄中為員工{0}設置休假政策
+Invalid Blanket Order for the selected Customer and Item,所選客戶和物料的無效總訂單
+Add Multiple Tasks,添加多個任務
+Items,項目
+End Date cannot be before Start Date.,結束日期不能在開始日期之前。
+Student is already enrolled.,學生已經註冊。
+Year Name,年結名稱
+There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master,以下項{0}未標記為{1}項。您可以從項目主文件中將它們作為{1}項啟用
+PDC/LC Ref,PDC / LC參考
+Product Bundle Item,產品包項目
+Sales Partner Name,銷售合作夥伴名稱
+Request for Quotations,索取報價
+Maximum Invoice Amount,最大發票額
+Normal Test Items,正常測試項目
+Company Settings,公司設置
+Overwrite Salary Structure Amount,覆蓋薪資結構金額
+Student Language,學生語言
+Customers,顧客
+Is Working Capital,是營運資本
+Order/Quot %,訂單/報價％
+Order/Quot %,訂單/報價％
+Record Patient Vitals,記錄患者維生素
+Institution,機構
+Partially Depreciated,部分貶抑
+Opening Time,開放時間
+From and To dates required,需要起始和到達日期
+Securities & Commodity Exchanges,證券及商品交易所
+Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+Calculate Based On,計算的基礎上
+Unfulfilled,秕
+From Warehouse,從倉庫
+No employees for the mentioned criteria,沒有僱員提到的標準
+No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
+Default Customer,默認客戶
+Stage Name,藝名
+Supervisor Name,主管名稱
+Do not confirm if appointment is created for the same day,不要確認是否在同一天創建約會
+Program Enrollment Course,課程註冊課程
+Program Enrollment Course,課程註冊課程
+User {0} is already assigned to Healthcare Practitioner {1},用戶{0}已分配給Healthcare Practitioner {1}
+Make Sample Retention Stock Entry,使樣品保留庫存條目
+Valuation and Total,估值與總計
+Negotiation/Review,談判/評論
+Encashment Amount,填充量
+Scorecards,記分卡
+Expired Batches,過期批次
+This will restrict user access to other employee records,這將限制用戶訪問其他員工記錄
+Shipping City,航運市
+Current Openings,當前空缺
+Customize the Notification,自定義通知
+Cash Flow from Operations,運營現金流
+CGST Amount,CGST金額
+Shipping Rule,送貨規則
+Spouse,伴侶
+Add Test,添加測試
+Limited to 12 characters,限12個字符
+Print Heading,列印標題
+Delivery Trip service tours to customers.,送貨服務遊覽給顧客。
+Total cannot be zero,總計不能為零
+'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
+Maximum Permissible Value,最大允許值
+Employee Advance,員工晉升
+Payroll Frequency,工資頻率
+Sensitivity,靈敏度
+Sync has been temporarily disabled because maximum retries have been exceeded,暫時禁用了同步，因為已超出最大重試次數
+Raw Material,原料
+Follow via Email,透過電子郵件追蹤
+Plants and Machineries,廠房和機械設備
+Tax Amount After Discount Amount,稅額折後金額
+Inpatient Status,住院狀況
+Daily Work Summary Settings,每日工作總結設置
+Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
+Please enter Reqd by Date,請輸入按日期請求
+Internal Transfer,內部轉賬
+Maintenance Tasks,維護任務
+Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
+Please select Posting Date first,請選擇發布日期第一
+Opening Date should be before Closing Date,開業日期應該是截止日期之前，
+Flight,飛行
+Carry Forward,發揚
+Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心，不能轉換為總賬
+Applicable on booking actual expenses,適用於預訂實際費用
+Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
+Detected Disease,檢測到的疾病
+Produced,生產
+Repayment Start Date cannot be before Disbursement Date.,還款開始日期不能在付款日期之前。
+Item Code for Suppliers,對於供應商產品編號
+Raised By (Email),由（電子郵件）提出
+Trainer Name,培訓師姓名
+General,一般
+Last Communication,最後溝通
+Last Communication,最後溝通
+TDS Payable Monthly,TDS應付月度
+Queued for replacing the BOM. It may take a few minutes.,排隊等待更換BOM。可能需要幾分鐘時間。
+Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
+Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
+Match Payments with Invoices,付款與發票對照
+Bank Entry,銀行分錄
+Applicable To (Designation),適用於（指定）
+Student Email,學生電子郵件
+"Allergies, Medical and Surgical History",過敏，醫療和外科史
+Add to Cart,添加到購物車
+Group By,集團通過
+Interests,興趣
+Enable / disable currencies.,啟用／禁用的貨幣。
+Could not submit some Salary Slips,無法提交一些薪資單
+Get Entries,獲取條目
+Get Material Request,獲取材質要求
+Postal Expenses,郵政費用
+Sales Summary,銷售摘要
+Entertainment & Leisure,娛樂休閒
+Item Variant Details,項目變體的詳細信息
+Item Serial No,產品序列號
+Is a Subscription,是訂閱
+Create Employee Records,建立員工檔案
+Total Present,總現
+Accounting Statements,會計報表
+Hour,小時
+Last Sales Invoice,上次銷售發票
+Please select Qty against item {0},請選擇項目{0}的數量
+New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
+Lead Type,主導類型
+You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
+All these items have already been invoiced,所有這些項目已開具發票
+Set New Release Date,設置新的發布日期
+Monthly Sales Target,每月銷售目標
+Can be approved by {0},可以通過{0}的批准
+Hotel Room Type,酒店房間類型
+Leave Period,休假期間
+Default Material Request Type,默認材料請求類型
+Evaluation Period,評估期
+Work Order not created,工作訂單未創建
+"An amount of {0} already claimed for the component {1},\
set the amount equal or greater than {2}",已為組件{1}申請的金額{0}，設置等於或大於{2}的金額
-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,更換後的新物料清單
-,Point of Sale,銷售點
-DocType: Payment Entry,Received Amount,收金額
-DocType: Patient,Widow,寡婦
-DocType: GST Settings,GSTIN Email Sent On,發送GSTIN電子郵件
-DocType: Program Enrollment,Pick/Drop by Guardian,由守護者選擇
-DocType: Bank Account,SWIFT number,SWIFT號碼
-DocType: Payment Entry,Party Name,方名稱
-DocType: Employee Benefit Application,Benefits Applied,應用的好處
-DocType: Crop,Planting UOM,種植UOM
-DocType: Account,Tax,稅
-apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,未標記
-DocType: Contract,Signed,簽
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,打開發票摘要
-DocType: Education Settings,Education Manager,教育經理
-DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,每個工廠之間的最小長度為最佳的增長
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
-DocType: Quality Inspection,Report Date,報告日期
-DocType: Student,Middle Name,中間名字
-DocType: Serial No,Asset Details,資產詳情
-DocType: Bank Statement Transaction Payment Item,Invoices,發票
-DocType: Water Analysis,Type of Sample,樣品類型
-DocType: Batch,Source Document Name,源文檔名稱
-DocType: Production Plan,Get Raw Materials For Production,獲取生產原料
-DocType: Job Opening,Job Title,職位
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +89,"{0} indicates that {1} will not provide a quotation, but all items \
+Shipping Rule Conditions,送貨規則條件
+Export Type,導出類型
+Salary Slip Loan,工資單貸款
+The new BOM after replacement,更換後的新物料清單
+Point of Sale,銷售點
+Received Amount,收金額
+Widow,寡婦
+GSTIN Email Sent On,發送GSTIN電子郵件
+Pick/Drop by Guardian,由守護者選擇
+SWIFT number,SWIFT號碼
+Party Name,方名稱
+Benefits Applied,應用的好處
+Planting UOM,種植UOM,
+Tax,稅
+Not Marked,未標記
+Signed,簽
+Opening Invoices Summary,打開發票摘要
+Education Manager,教育經理
+The minimum length between each plant in the field for optimum growth,每個工廠之間的最小長度為最佳的增長
+"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
+"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
+Report Date,報告日期
+Middle Name,中間名字
+Asset Details,資產詳情
+Invoices,發票
+Type of Sample,樣品類型
+Source Document Name,源文檔名稱
+Get Raw Materials For Production,獲取生產原料
+Job Title,職位
+"{0} indicates that {1} will not provide a quotation, but all items \
have been quoted. Updating the RFQ quote status.",{0}表示{1}不會提供報價，但所有項目都已被引用。更新詢價狀態。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1294,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,批次{1}和批次{3}中的項目{2}已保留最大樣本數量{0}。
-DocType: Manufacturing Settings,Update BOM Cost Automatically,自動更新BOM成本
-DocType: Lab Test,Test Name,測試名稱
-DocType: Healthcare Settings,Clinical Procedure Consumable Item,臨床程序消耗品
-apps/erpnext/erpnext/utilities/activation.py +99,Create Users,創建用戶
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +30,Subscriptions,訂閱
-DocType: Education Settings,Make Academic Term Mandatory,強制學術期限
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +414,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
-DocType: Asset Settings,Calculate Prorated Depreciation Schedule Based on Fiscal Year,根據會計年度計算折舊折舊計劃
-apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,訪問報告維修電話。
-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: Loyalty Program,Customer Group,客戶群組
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +300,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成{2}工件訂單＃{3}中成品的數量。請通過時間日誌更新操作狀態
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批號（可選）
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批號（可選）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},交際費是強制性的項目{0}
-DocType: BOM,Website Description,網站簡介
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,在淨資產收益變化
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
-apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,不允許。請禁用服務單位類型
-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到期時間
-DocType: Asset,Receipt,收據
-,Sales Register,銷售登記
-DocType: Daily Work Summary Group,Send Emails At,發送電子郵件在
-DocType: Quotation,Quotation Lost Reason,報價遺失原因
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +383,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
-apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +5,There is nothing to edit.,無內容可供編輯
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +542,Form View,表單視圖
-DocType: HR Settings,Expense Approver Mandatory In Expense Claim,費用審批人必須在費用索賠中
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +124,Summary for this month and pending activities,本月和待活動總結
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +91,Please set Unrealized Exchange Gain/Loss Account in Company {0},請在公司{0}中設置未實現的匯兌收益/損失科目
-apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",將用戶添加到您的組織，而不是您自己。
-DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,還沒有客戶！
-DocType: Healthcare Service Unit,Healthcare Service Unit,醫療服務單位
-apps/erpnext/erpnext/public/js/financial_statements.js +58,Cash Flow Statement,現金流量表
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +374,No material request created,沒有創建重要請求
-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 +563,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: Healthcare Practitioner,Phone (R),電話（R）
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +104,Time slots added,添加時隙
-DocType: Item,Attributes,屬性
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +36,Enable Template,啟用模板
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +256,Please enter Write Off Account,請輸入核銷科目
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
-DocType: Salary Component,Is Payable,應付
-DocType: Inpatient Record,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,維護狀態必須取消或完成提交
-DocType: Amazon MWS Settings,US,我們
-DocType: Holiday List,Add Weekly Holidays,添加每週假期
-DocType: Staffing Plan Detail,Vacancies,職位空缺
-DocType: Hotel Room,Hotel Room,旅館房間
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},科目{0}不屬於公司{1}
-DocType: Leave Type,Rounding,四捨五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
-DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),分配金額（按比例分配）
-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 Group, Campaign, Sales Partner etc.",然後根據客戶，客戶組，地區，供應商，供應商組織，市場活動，銷售合作夥伴等篩選定價規則。
-DocType: Student,Guardian Details,衛詳細
-DocType: Agriculture Task,Start Day,開始日
-DocType: Vehicle,Chassis No,底盤無
-DocType: Payment Request,Initiated,啟動
-DocType: Production Plan Item,Planned Start Date,計劃開始日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +649,Please select a BOM,請選擇一個物料清單
-DocType: Purchase Invoice,Availed ITC Integrated Tax,有效的ITC綜合稅收
-DocType: Purchase Order Item,Blanket Order Rate,一攬子訂單費率
-apps/erpnext/erpnext/hooks.py +164,Certification,證明
-DocType: Bank Guarantee,Clauses and Conditions,條款和條件
-DocType: Serial No,Creation Document Type,創建文件類型
-DocType: Project Task,View Timesheet,查看時間表
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +24,Make Journal Entry,使日記帳分錄
-DocType: Leave Allocation,New Leaves Allocated,新的排假
-apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
-apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +30,End on,結束
-DocType: Project,Expected End Date,預計結束日期
-DocType: Budget Account,Budget Amount,預算額
-DocType: Donor,Donor Name,捐助者名稱
-DocType: Journal Entry,Inter Company Journal Entry Reference,Inter公司日記帳分錄參考
-DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,商業
-DocType: Patient,Alcohol Current Use,酒精當前使用
-DocType: Employee Tax Exemption Proof Submission,House Rent Payment Amount,房屋租金付款金額
-DocType: Student Admission Program,Student Admission Program,學生入學計劃
-DocType: Employee Tax Exemption Sub Category,Tax Exemption Category,免稅類別
-DocType: Payment Entry,Account Paid To,科目付至
-DocType: Subscription Settings,Grace Period,寬限期
-DocType: Item Alternative,Alternative Item Name,替代項目名稱
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +164,Website Listing,網站列表
-apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的產品或服務。
-DocType: Email Digest,Open Quotations,打開報價單
-DocType: Expense Claim,More Details,更多詳情
-DocType: Supplier Quotation,Supplier Address,供應商地址
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +168,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}預算科目{1}對{2} {3}是{4}。這將超過{5}
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,輸出數量
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +49,Series is mandatory,系列是強制性的
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,金融服務
-DocType: Student Sibling,Student ID,學生卡
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +214,For Quantity must be greater than zero,對於數量必須大於零
-apps/erpnext/erpnext/config/projects.py +51,Types of activities for Time Logs,活動類型的時間記錄
-DocType: Opening Invoice Creation Tool,Sales,銷售
-DocType: Stock Entry Detail,Basic Amount,基本金額
-DocType: Training Event,Exam,考試
-apps/erpnext/erpnext/public/js/hub/hub_call.js +46,Marketplace Error,市場錯誤
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
-apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,進行還款分錄
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,所有部門
-DocType: Patient,Alcohol Past Use,酒精過去使用
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +248,Cr,鉻
-DocType: Project Update,Problematic/Stuck,問題/卡住
-DocType: Tax Rule,Billing State,計費狀態
-DocType: Share Transfer,Transfer,轉讓
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前，必須先取消工單{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1008,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
-DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
-apps/erpnext/erpnext/controllers/accounts_controller.py +180,Due Date is mandatory,截止日期是強制性的
-apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
-DocType: Employee Benefit Claim,Benefit Type and Amount,福利類型和金額
-apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房預訂
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +57,Ends On date cannot be before Next Contact Date.,結束日期不能在下一次聯繫日期之前。
-DocType: Journal Entry,Pay To / Recd From,支付/ 接收
-DocType: Naming Series,Setup Series,設置系列
-DocType: Payment Reconciliation,To Invoice Date,要發票日期
-DocType: Bank Account,Contact HTML,聯繫HTML
-DocType: Support Settings,Support Portal,支持門戶
-apps/erpnext/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py +19,Registration fee can not be Zero,註冊費不能為零
-DocType: Disease,Treatment Period,治療期
-DocType: Travel Itinerary,Travel Itinerary,旅遊行程
-apps/erpnext/erpnext/education/api.py +336,Result already Submitted,結果已提交
-apps/erpnext/erpnext/controllers/buying_controller.py +209,Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,保留倉庫對於提供的原材料中的項目{0}是強制性的
-,Inactive Customers,不活躍的客戶
-DocType: Student Admission Program,Maximum Age,最大年齡
-apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +28,Please wait 3 days before resending the reminder.,請重新發送提醒之前請等待3天。
-DocType: Landed Cost Voucher,Purchase Receipts,採購入庫
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定價規則被如何應用？
-DocType: Stock Entry,Delivery Note No,送貨單號
-DocType: Cheque Print Template,Message to show,信息顯示
-DocType: Student Attendance,Absent,缺席
-DocType: Staffing Plan,Staffing Plan Detail,人員配置計劃詳情
-DocType: Employee Promotion,Promotion Date,促銷日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +622,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/accounts/doctype/journal_entry/journal_entry.py +244,Row {0}: Invalid reference {1},行{0}：無效參考{1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,採購稅負和費用模板
-DocType: Subscription,Current Invoice Start Date,當前發票開始日期
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：無論是借方或貸方金額需要{2}
-DocType: GL Entry,Remarks,備註
-DocType: Hotel Room Amenity,Hotel Room Amenity,酒店客房舒適
-DocType: Budget,Action if Annual Budget Exceeded on MR,年度預算超出MR的行動
-DocType: Payment Entry,Account Paid From,帳戶支付從
-DocType: Purchase Order Item Supplied,Raw Material Item Code,原料產品編號
-DocType: Task,Parent Task,父任務
-DocType: Journal Entry,Write Off Based On,核銷的基礎上
-apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使鉛
-DocType: Stock Settings,Show Barcode Field,顯示條形碼域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +866,Send Supplier Emails,發送電子郵件供應商
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +165,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1}，留下申請期之間不能在此日期範圍內的時期。
-DocType: Fiscal Year,Auto Created,自動創建
-apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +19,Submit this to create the Employee record,提交這個來創建員工記錄
-DocType: Item Default,Item Default,項目默認值
-DocType: Chapter Member,Leave Reason,離開原因
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +197,Invoice {0} no longer exists,發票{0}不再存在
-DocType: Guardian Interest,Guardian Interest,衛利息
-apps/erpnext/erpnext/config/accounts.py +544,Setup default values for POS Invoices,設置POS發票的默認值
-apps/erpnext/erpnext/config/hr.py +248,Training,訓練
-DocType: Project,Time to send,發送時間
-DocType: Timesheet,Employee Detail,員工詳細信息
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py +19,Set warehouse for Procedure {0} ,為過程{0}設置倉庫
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1電子郵件ID
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1電子郵件ID
-DocType: Lab Prescription,Test Code,測試代碼
-apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,對網站的主頁設置
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +895,{0} is on hold till {1},{0}一直保持到{1}
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},由於{1}的記分卡，{0}不允許使用RFQ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +9,Used Leaves,使用的葉子
-DocType: Job Offer,Awaiting Response,正在等待回應
-DocType: Support Search Source,Link Options,鏈接選項
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1557,Total Amount {0},總金額{0}
-apps/erpnext/erpnext/controllers/item_variant.py +323,Invalid attribute {0} {1},無效的屬性{0} {1}
-DocType: Supplier,Mention if non-standard payable account,如果非標準應付帳款提到
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}：項目{1}需要費用中心
-DocType: Training Event Employee,Optional,可選的
-apps/erpnext/erpnext/stock/doctype/item/item.js +476,{0} variants created.,創建了{0}個變體。
-DocType: Amazon MWS Settings,Region,區域
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,負面評價率是不允許的
-DocType: Holiday List,Weekly Off,每週關閉
-apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,重新加載鏈接分析
-DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +99,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
-DocType: Sales Invoice,Return Against Sales Invoice,射向銷售發票
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,項目5
-DocType: Serial No,Creation Time,創作時間
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,總收入
-DocType: Patient,Other Risk Factors,其他風險因素
-DocType: Sales Invoice,Product Bundle Help,產品包幫助
-apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,沒有資料
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Cost of Scrapped Asset,報廢資產成本
-apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Get Items from Product Bundle,從產品包取得項目
-DocType: Asset,Straight Line,直線
-DocType: Project User,Project User,項目用戶
-DocType: Employee Transfer,Re-allocate Leaves,重新分配葉子
-DocType: GL Entry,Is Advance,為進
-apps/erpnext/erpnext/config/hr.py +202,Employee Lifecycle,員工生命週期
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
-apps/erpnext/erpnext/controllers/buying_controller.py +196,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
-DocType: Item,Default Purchase Unit of Measure,默認採購單位
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
-DocType: Clinical Procedure Item,Clinical Procedure Item,臨床流程項目
-DocType: Sales Team,Contact No.,聯絡電話
-DocType: Bank Reconciliation,Payment Entries,付款項
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +33,Access token or Shopify URL missing,訪問令牌或Shopify網址丟失
-DocType: Location,Latitude,緯度
-DocType: Work Order,Scrap Warehouse,廢料倉庫
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行，需要倉庫，請為公司{2}的物料{1}設置默認倉庫
-DocType: Work Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
-DocType: Work Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
-DocType: Program Enrollment Tool,Get Students From,讓學生從
-apps/erpnext/erpnext/config/learn.py +263,Publish Items on Website,公佈於網頁上的項目
-apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,一群學生在分批
-DocType: Authorization Rule,Authorization Rule,授權規則
-DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
-apps/erpnext/erpnext/templates/generators/item.html +118,Specifications,產品規格
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +70,Total (Credit),總（信用）
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +10,Apparel & Accessories,服裝及配飾
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,無法解決加權分數函數。確保公式有效。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +186,Purchase Order Items not received on time,未按時收到採購訂單項目
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,訂購數量
-DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML／橫幅，將顯示在產品列表的頂部。
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定條件來計算運費金額
-DocType: Program Enrollment,Institute's Bus,學院的巴士
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結科目和編輯凍結分錄的角色
-DocType: Supplier Scorecard Scoring Variable,Path,路徑
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬，因為它有子節點
-DocType: Production Plan,Total Planned Qty,總計劃數量
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +83,Opening Value,開度值
-DocType: Salary Component,Formula,式
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +59,Serial #,序列號
-DocType: Lab Test Template,Lab Test Template,實驗室測試模板
-apps/erpnext/erpnext/setup/doctype/company/company.py +196,Sales Account,銷售科目
-DocType: Purchase Invoice Item,Total Weight,總重量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,銷售佣金
-DocType: Job Offer Term,Value / Description,值/說明
-apps/erpnext/erpnext/controllers/accounts_controller.py +706,"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: Restaurant Order Entry,Restaurant Order Entry,餐廳訂單錄入
-apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
-DocType: Clinical Procedure Item,Invoice Separately as Consumables,作為耗材單獨發票
-DocType: Budget,Control Action,控制行動
-DocType: Asset Maintenance Task,Assign To Name,分配到名稱
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Entertainment Expenses,娛樂費用
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,製作材料要求
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
-DocType: Asset Finance Book,Written Down Value,寫下價值
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +235,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
-DocType: Clinical Procedure,Age,年齡
-DocType: Sales Invoice Timesheet,Billing Amount,開票金額
-DocType: Cash Flow Mapping,Select Maximum Of 1,選擇最多1個
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
-DocType: Company,Default Employee Advance Account,默認員工高級帳戶
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1181,Search Item (Ctrl + i),搜索項目（Ctrl + i）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +171,Account with existing transaction can not be deleted,科目與現有的交易不能被刪除
-DocType: Vehicle,Last Carbon Check,最後檢查炭
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Legal Expenses,法律費用
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +147,Please select quantity on row ,請選擇行數量
-apps/erpnext/erpnext/config/accounts.py +245,Make Opening Sales and Purchase Invoices,打開銷售和購買發票
-DocType: Purchase Invoice,Posting Time,登錄時間
-DocType: Timesheet,% Amount Billed,（％）金額已開立帳單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +125,Telephone Expenses,電話費
-DocType: Sales Partner,Logo,標誌
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
-apps/erpnext/erpnext/stock/get_item_details.py +150,No Item with Serial No {0},沒有序號{0}的品項
-DocType: Email Digest,Open Notifications,打開通知
-DocType: Payment Entry,Difference Amount (Company Currency),差異金額（公司幣種）
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Direct Expenses,直接費用
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Travel Expenses,差旅費
-DocType: Maintenance Visit,Breakdown,展開
-DocType: Travel Itinerary,Vegetarian,素
-apps/erpnext/erpnext/controllers/accounts_controller.py +907,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
-DocType: Bank Statement Transaction Settings Item,Bank Data,銀行數據
-DocType: Purchase Receipt Item,Sample Quantity,樣品數量
-DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根據最新的估值/價格清單率/最近的原材料採購率，通過計劃程序自動更新BOM成本。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},科目{0}：上層科目{1}不屬於公司：{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +22,As on Date,隨著對日
-DocType: Program Enrollment,Enrollment Date,報名日期
-DocType: Healthcare Settings,Out Patient SMS Alerts,輸出病人短信
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +78,Probation,緩刑
-DocType: Program Enrollment Tool,New Academic Year,新學年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +866,Return / Credit Note,返回/信用票據
-DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +137,Total Paid Amount,總支付金額
-DocType: Job Card,Transferred Qty,轉讓數量
-apps/erpnext/erpnext/config/learn.py +11,Navigating,導航
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +141,Planning,規劃
-DocType: Contract,Signee,簽署人
-DocType: Share Balance,Issued,發行
-DocType: Loan,Repayment Start Date,還款開始日期
-apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,學生活動
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供應商編號
-DocType: Payment Request,Payment Gateway Details,支付網關細節
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +290,Quantity should be greater than 0,量應大於0
-DocType: Journal Entry,Cash Entry,現金分錄
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子節點可以在'集團'類型的節點上創建
-DocType: Academic Year,Academic Year Name,學年名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
-DocType: Sales Partner,Contact Desc,聯絡倒序
-DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},請報銷類型設置默認科目{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +11,Available Leaves,可用的葉子
-DocType: Assessment Result,Student Name,學生姓名
-DocType: Hub Tracked Item,Item Manager,項目經理
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Payroll Payable,應付職工薪酬
-DocType: Plant Analysis,Collection Datetime,收集日期時間
-DocType: Work Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +172,Note: Item {0} entered multiple times,注：項目{0}多次輸入
-apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有聯絡人。
-DocType: Accounting Period,Closed Documents,關閉的文件
-DocType: Healthcare Settings,Manage Appointment Invoice submit and cancel automatically for Patient Encounter,管理約會發票提交並自動取消患者遭遇
-DocType: Patient Appointment,Referring Practitioner,轉介醫生
-apps/erpnext/erpnext/public/js/setup_wizard.js +71,Company Abbreviation,公司縮寫
-apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py +51,User {0} does not exist,用戶{0}不存在
-DocType: Payment Term,Day(s) after invoice date,發票日期後的天數
-apps/erpnext/erpnext/setup/doctype/company/company.js +34,Date of Commencement should be greater than Date of Incorporation,開始日期應大於公司註冊日期
-DocType: Contract,Signed On,簽名
-DocType: Bank Account,Party Type,黨的類型
-DocType: Payment Schedule,Payment Schedule,付款時間表
-DocType: Item Attribute Value,Abbreviation,縮寫
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +220,Payment Entry already exists,付款項目已存在
-DocType: Subscription,Trial Period End Date,試用期結束日期
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
-DocType: Serial No,Asset Status,資產狀態
-DocType: Delivery Note,Over Dimensional Cargo (ODC),超尺寸貨物（ODC）
-DocType: Hotel Room,Hotel Manager,酒店經理
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,購物車稅收規則設定
-DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折舊行{0}：下一個折舊日期不能在可供使用的日期之前
-,Sales Funnel,銷售漏斗
-apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,縮寫是強制性的
-DocType: Project,Task Progress,任務進度
-apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,車
-DocType: Staffing Plan,Total Estimated Budget,預計總預算
-,Qty to Transfer,轉移數量
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,行情到引線或客戶。
-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 +108,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,每月累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +864,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
-apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},已存在人員配置計劃{0}以用於指定{1}
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,稅務模板是強制性的。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,科目{0}：上層科目{1}不存在
-DocType: POS Closing Voucher,Period Start Date,期間開始日期
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
-DocType: Products Settings,Products Settings,產品設置
-,Item Price Stock,項目價格庫存
-apps/erpnext/erpnext/config/accounts.py +550,To make Customer based incentive schemes.,制定基於客戶的激勵計劃。
-DocType: Lab Prescription,Test Created,測試創建
-DocType: Healthcare Settings,Custom Signature in Print,自定義簽名打印
-DocType: Account,Temporary,臨時
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +127,Customer LPO No.,客戶LPO號
-DocType: Amazon MWS Settings,Market Place Account Group,市場科目組
-apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +14,Make Payment Entries,付款條目
-DocType: Program,Courses,培訓班
-DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Secretary,秘書
-apps/erpnext/erpnext/regional/india/utils.py +177,House rented dates required for exemption calculation,房子租用日期計算免責
-DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在詞”字段不會在任何交易可見
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作將停止未來的結算。您確定要取消此訂閱嗎？
-DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
-DocType: Supplier Scorecard Criteria,Criteria Name,標準名稱
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.js +406,Please set Company,請設公司
-DocType: Procedure Prescription,Procedure Created,程序已創建
-DocType: Pricing Rule,Buying,採購
-apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病與肥料
-DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
-DocType: Inpatient Record,AB Negative,AB陰性
-DocType: POS Profile,Apply Discount On,申請折扣
-DocType: Member,Membership Type,會員類型
-,Reqd By Date,REQD按日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Creditors,債權人
-DocType: Assessment Plan,Assessment Name,評估名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +107,Show PDC in Print,在打印中顯示PDC
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
-DocType: Employee Onboarding,Job Offer,工作機會
-apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,研究所縮寫
-,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1156,Supplier Quotation,供應商報價
-DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
-apps/erpnext/erpnext/utilities/transaction_base.py +169,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
-apps/erpnext/erpnext/utilities/transaction_base.py +169,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
-DocType: Contract,Unsigned,無符號
-DocType: Selling Settings,Each Transaction,每筆交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +523,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
-apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +72,Varaiance ,Varaiance
-DocType: Item,Opening Stock,打開庫存
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
-DocType: Lab Test,Result Date,結果日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +129,PDC/LC Date,PDC / LC日期
-DocType: Purchase Order,To Receive,接受
-DocType: Leave Period,Holiday List for Optional Leave,可選假期的假期列表
-DocType: Asset,Asset Owner,資產所有者
-DocType: Purchase Invoice,Reason For Putting On Hold,擱置的理由
-DocType: Employee,Personal Email,個人電子郵件
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +86,Total Variance,總方差
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果啟用，系統將自動為發布庫存會計分錄。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +264,Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
-DocType: Work Order Operation,"in Minutes
+Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,批次{1}和批次{3}中的項目{2}已保留最大樣本數量{0}。
+Update BOM Cost Automatically,自動更新BOM成本
+Test Name,測試名稱
+Clinical Procedure Consumable Item,臨床程序消耗品
+Create Users,創建用戶
+Subscriptions,訂閱
+Make Academic Term Mandatory,強制學術期限
+Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+Calculate Prorated Depreciation Schedule Based on Fiscal Year,根據會計年度計算折舊折舊計劃
+Visit report for maintenance call.,訪問報告維修電話。
+Update Rate and Availability,更新率和可用性
+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個單位量。
+Customer Group,客戶群組
+Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成{2}工件訂單＃{3}中成品的數量。請通過時間日誌更新操作狀態
+New Batch ID (Optional),新批號（可選）
+New Batch ID (Optional),新批號（可選）
+Expense account is mandatory for item {0},交際費是強制性的項目{0}
+Website Description,網站簡介
+Net Change in Equity,在淨資產收益變化
+Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
+Not permitted. Please disable the Service Unit Type,不允許。請禁用服務單位類型
+"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的，已經存在了{0}
+AMC Expiry Date,AMC到期時間
+Receipt,收據
+Sales Register,銷售登記
+Send Emails At,發送電子郵件在
+Quotation Lost Reason,報價遺失原因
+Transaction reference no {0} dated {1},交易參考編號{0}日{1}
+There is nothing to edit.,無內容可供編輯
+Form View,表單視圖
+Expense Approver Mandatory In Expense Claim,費用審批人必須在費用索賠中
+Summary for this month and pending activities,本月和待活動總結
+Please set Unrealized Exchange Gain/Loss Account in Company {0},請在公司{0}中設置未實現的匯兌收益/損失科目
+"Add users to your organization, other than yourself.",將用戶添加到您的組織，而不是您自己。
+Customer Group Name,客戶群組名稱
+No Customers yet!,還沒有客戶！
+Healthcare Service Unit,醫療服務單位
+Cash Flow Statement,現金流量表
+No material request created,沒有創建重要請求
+License,執照
+Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉，如果你還需要包括上一會計年度的資產負債葉本財年
+Against Voucher Type,對憑證類型
+Phone (R),電話（R）
+Time slots added,添加時隙
+Attributes,屬性
+Enable Template,啟用模板
+Please enter Write Off Account,請輸入核銷科目
+Last Order Date,最後訂購日期
+Is Payable,應付
+B Negative,B負面
+Maintenance Status has to be Cancelled or Completed to Submit,維護狀態必須取消或完成提交
+US,我們
+Add Weekly Holidays,添加每週假期
+Vacancies,職位空缺
+Hotel Room,旅館房間
+Account {0} does not belongs to company {1},科目{0}不屬於公司{1}
+Rounding,四捨五入
+Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+Dispensed Amount (Pro-rated),分配金額（按比例分配）
+"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",然後根據客戶，客戶組，地區，供應商，供應商組織，市場活動，銷售合作夥伴等篩選定價規則。
+Guardian Details,衛詳細
+Start Day,開始日
+Chassis No,底盤無
+Initiated,啟動
+Planned Start Date,計劃開始日期
+Please select a BOM,請選擇一個物料清單
+Availed ITC Integrated Tax,有效的ITC綜合稅收
+Blanket Order Rate,一攬子訂單費率
+Certification,證明
+Clauses and Conditions,條款和條件
+Creation Document Type,創建文件類型
+View Timesheet,查看時間表
+Make Journal Entry,使日記帳分錄
+New Leaves Allocated,新的排假
+Project-wise data is not available for Quotation,項目明智的數據不適用於報價
+End on,結束
+Expected End Date,預計結束日期
+Budget Amount,預算額
+Donor Name,捐助者名稱
+Inter Company Journal Entry Reference,Inter公司日記帳分錄參考
+Appraisal Template Title,評估模板標題
+Commercial,商業
+Alcohol Current Use,酒精當前使用
+House Rent Payment Amount,房屋租金付款金額
+Student Admission Program,學生入學計劃
+Tax Exemption Category,免稅類別
+Account Paid To,科目付至
+Grace Period,寬限期
+Alternative Item Name,替代項目名稱
+Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
+Website Listing,網站列表
+All Products or Services.,所有的產品或服務。
+Open Quotations,打開報價單
+More Details,更多詳情
+Supplier Address,供應商地址
+{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}預算科目{1}對{2} {3}是{4}。這將超過{5}
+Out Qty,輸出數量
+Series is mandatory,系列是強制性的
+Financial Services,金融服務
+Student ID,學生卡
+For Quantity must be greater than zero,對於數量必須大於零
+Types of activities for Time Logs,活動類型的時間記錄
+Sales,銷售
+Basic Amount,基本金額
+Exam,考試
+Marketplace Error,市場錯誤
+Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+Make Repayment Entry,進行還款分錄
+All Departments,所有部門
+Alcohol Past Use,酒精過去使用
+Cr,鉻
+Problematic/Stuck,問題/卡住
+Billing State,計費狀態
+Transfer,轉讓
+Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前，必須先取消工單{0}
+Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+Applicable To (Employee),適用於（員工）
+Due Date is mandatory,截止日期是強制性的
+Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0,
+Benefit Type and Amount,福利類型和金額
+Rooms Booked,客房預訂
+Ends On date cannot be before Next Contact Date.,結束日期不能在下一次聯繫日期之前。
+Pay To / Recd From,支付/ 接收
+Setup Series,設置系列
+To Invoice Date,要發票日期
+Contact HTML,聯繫HTML,
+Support Portal,支持門戶
+Registration fee can not be Zero,註冊費不能為零
+Treatment Period,治療期
+Travel Itinerary,旅遊行程
+Result already Submitted,結果已提交
+Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,保留倉庫對於提供的原材料中的項目{0}是強制性的
+Inactive Customers,不活躍的客戶
+Maximum Age,最大年齡
+Please wait 3 days before resending the reminder.,請重新發送提醒之前請等待3天。
+Purchase Receipts,採購入庫
+How Pricing Rule is applied?,定價規則被如何應用？
+Delivery Note No,送貨單號
+Message to show,信息顯示
+Absent,缺席
+Staffing Plan Detail,人員配置計劃詳情
+Promotion Date,促銷日期
+Product Bundle,產品包
+Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,無法從{0}開始獲得分數。你需要有0到100的常規分數
+Row {0}: Invalid reference {1},行{0}：無效參考{1}
+Purchase Taxes and Charges Template,採購稅負和費用模板
+Current Invoice Start Date,當前發票開始日期
+{0} {1}: Either debit or credit amount is required for {2},{0} {1}：無論是借方或貸方金額需要{2}
+Remarks,備註
+Hotel Room Amenity,酒店客房舒適
+Action if Annual Budget Exceeded on MR,年度預算超出MR的行動
+Account Paid From,帳戶支付從
+Raw Material Item Code,原料產品編號
+Parent Task,父任務
+Write Off Based On,核銷的基礎上
+Make Lead,使鉛
+Show Barcode Field,顯示條形碼域
+Send Supplier Emails,發送電子郵件供應商
+"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1}，留下申請期之間不能在此日期範圍內的時期。
+Auto Created,自動創建
+Submit this to create the Employee record,提交這個來創建員工記錄
+Item Default,項目默認值
+Leave Reason,離開原因
+Invoice {0} no longer exists,發票{0}不再存在
+Guardian Interest,衛利息
+Setup default values for POS Invoices,設置POS發票的默認值
+Training,訓練
+Time to send,發送時間
+Employee Detail,員工詳細信息
+Set warehouse for Procedure {0} ,為過程{0}設置倉庫
+Guardian1 Email ID,Guardian1電子郵件ID,
+Guardian1 Email ID,Guardian1電子郵件ID,
+Test Code,測試代碼
+Settings for website homepage,對網站的主頁設置
+{0} is on hold till {1},{0}一直保持到{1}
+RFQs are not allowed for {0} due to a scorecard standing of {1},由於{1}的記分卡，{0}不允許使用RFQ,
+Used Leaves,使用的葉子
+Awaiting Response,正在等待回應
+Link Options,鏈接選項
+Total Amount {0},總金額{0}
+Invalid attribute {0} {1},無效的屬性{0} {1}
+Mention if non-standard payable account,如果非標準應付帳款提到
+Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
+Row {0}: Cost center is required for an item {1},行{0}：項目{1}需要費用中心
+Optional,可選的
+{0} variants created.,創建了{0}個變體。
+Region,區域
+Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+Negative Valuation Rate is not allowed,負面評價率是不允許的
+Weekly Off,每週關閉
+Reload Linked Analysis,重新加載鏈接分析
+"For e.g. 2012, 2012-13",對於例如2012、2012-13,
+Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
+Return Against Sales Invoice,射向銷售發票
+Item 5,項目5,
+Creation Time,創作時間
+Total Revenue,總收入
+Other Risk Factors,其他風險因素
+Product Bundle Help,產品包幫助
+No record found,沒有資料
+Cost of Scrapped Asset,報廢資產成本
+{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
+Get Items from Product Bundle,從產品包取得項目
+Straight Line,直線
+Project User,項目用戶
+Re-allocate Leaves,重新分配葉子
+Is Advance,為進
+Employee Lifecycle,員工生命週期
+Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
+Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO,
+Default Purchase Unit of Measure,默認採購單位
+Last Communication Date,最後通訊日期
+Last Communication Date,最後通訊日期
+Clinical Procedure Item,臨床流程項目
+Contact No.,聯絡電話
+Payment Entries,付款項
+Access token or Shopify URL missing,訪問令牌或Shopify網址丟失
+Latitude,緯度
+Scrap Warehouse,廢料倉庫
+"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行，需要倉庫，請為公司{2}的物料{1}設置默認倉庫
+Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+Get Students From,讓學生從
+Publish Items on Website,公佈於網頁上的項目
+Group your students in batches,一群學生在分批
+Authorization Rule,授權規則
+Terms and Conditions Details,條款及細則詳情
+Specifications,產品規格
+Sales Taxes and Charges Template,營業稅金及費用套版
+Total (Credit),總（信用）
+Apparel & Accessories,服裝及配飾
+Could not solve weighted score function. Make sure the formula is valid.,無法解決加權分數函數。確保公式有效。
+Purchase Order Items not received on time,未按時收到採購訂單項目
+Number of Order,訂購數量
+HTML / Banner that will show on the top of product list.,HTML／橫幅，將顯示在產品列表的頂部。
+Specify conditions to calculate shipping amount,指定條件來計算運費金額
+Institute's Bus,學院的巴士
+Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結科目和編輯凍結分錄的角色
+Path,路徑
+Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬，因為它有子節點
+Total Planned Qty,總計劃數量
+Opening Value,開度值
+Formula,式
+Serial #,序列號
+Lab Test Template,實驗室測試模板
+Sales Account,銷售科目
+Total Weight,總重量
+Commission on Sales,銷售佣金
+Value / Description,值/說明
+"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
+Billing Country,結算國家
+Expected Delivery Date,預計交貨日期
+Restaurant Order Entry,餐廳訂單錄入
+Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
+Invoice Separately as Consumables,作為耗材單獨發票
+Control Action,控制行動
+Assign To Name,分配到名稱
+Entertainment Expenses,娛樂費用
+Make Material Request,製作材料要求
+Open Item {0},打開項目{0}
+Written Down Value,寫下價值
+Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+Age,年齡
+Billing Amount,開票金額
+Select Maximum Of 1,選擇最多1個
+Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
+Default Employee Advance Account,默認員工高級帳戶
+Search Item (Ctrl + i),搜索項目（Ctrl + i）
+Account with existing transaction can not be deleted,科目與現有的交易不能被刪除
+Last Carbon Check,最後檢查炭
+Legal Expenses,法律費用
+Please select quantity on row ,請選擇行數量
+Make Opening Sales and Purchase Invoices,打開銷售和購買發票
+Posting Time,登錄時間
+% Amount Billed,（％）金額已開立帳單
+Telephone Expenses,電話費
+Logo,標誌
+Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
+No Item with Serial No {0},沒有序號{0}的品項
+Open Notifications,打開通知
+Difference Amount (Company Currency),差異金額（公司幣種）
+Direct Expenses,直接費用
+New Customer Revenue,新客戶收入
+Travel Expenses,差旅費
+Breakdown,展開
+Vegetarian,素
+Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+Bank Data,銀行數據
+Sample Quantity,樣品數量
+"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根據最新的估值/價格清單率/最近的原材料採購率，通過計劃程序自動更新BOM成本。
+Account {0}: Parent account {1} does not belong to company: {2},科目{0}：上層科目{1}不屬於公司：{2}
+Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
+As on Date,隨著對日
+Enrollment Date,報名日期
+Out Patient SMS Alerts,輸出病人短信
+Probation,緩刑
+New Academic Year,新學年
+Return / Credit Note,返回/信用票據
+Auto insert Price List rate if missing,自動插入價目表率，如果丟失
+Total Paid Amount,總支付金額
+Transferred Qty,轉讓數量
+Navigating,導航
+Planning,規劃
+Signee,簽署人
+Issued,發行
+Student Activity,學生活動
+Supplier Id,供應商編號
+Payment Gateway Details,支付網關細節
+Quantity should be greater than 0,量應大於0,
+Cash Entry,現金分錄
+Child nodes can be only created under 'Group' type nodes,子節點可以在'集團'類型的節點上創建
+Academic Year Name,學年名稱
+{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
+Contact Desc,聯絡倒序
+Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
+Please set default account in Expense Claim Type {0},請報銷類型設置默認科目{0}
+Available Leaves,可用的葉子
+Student Name,學生姓名
+Item Manager,項目經理
+Payroll Payable,應付職工薪酬
+Collection Datetime,收集日期時間
+Total Operating Cost,總營運成本
+Note: Item {0} entered multiple times,注：項目{0}多次輸入
+All Contacts.,所有聯絡人。
+Closed Documents,關閉的文件
+Manage Appointment Invoice submit and cancel automatically for Patient Encounter,管理約會發票提交並自動取消患者遭遇
+Referring Practitioner,轉介醫生
+Company Abbreviation,公司縮寫
+User {0} does not exist,用戶{0}不存在
+Day(s) after invoice date,發票日期後的天數
+Date of Commencement should be greater than Date of Incorporation,開始日期應大於公司註冊日期
+Signed On,簽名
+Party Type,黨的類型
+Payment Schedule,付款時間表
+Abbreviation,縮寫
+Payment Entry already exists,付款項目已存在
+Trial Period End Date,試用期結束日期
+Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
+Asset Status,資產狀態
+Over Dimensional Cargo (ODC),超尺寸貨物（ODC）
+Hotel Manager,酒店經理
+Set Tax Rule for shopping cart,購物車稅收規則設定
+Taxes and Charges Added,稅費上架
+Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折舊行{0}：下一個折舊日期不能在可供使用的日期之前
+Sales Funnel,銷售漏斗
+Abbreviation is mandatory,縮寫是強制性的
+Task Progress,任務進度
+Cart,車
+Total Estimated Budget,預計總預算
+Qty to Transfer,轉移數量
+Quotes to Leads or Customers.,行情到引線或客戶。
+Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
+Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
+All Customer Groups,所有客戶群組
+Accumulated Monthly,每月累計
+{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+Staffing Plan {0} already exist for designation {1},已存在人員配置計劃{0}以用於指定{1}
+Tax Template is mandatory.,稅務模板是強制性的。
+Account {0}: Parent account {1} does not exist,科目{0}：上層科目{1}不存在
+Period Start Date,期間開始日期
+Price List Rate (Company Currency),價格列表費率（公司貨幣）
+Products Settings,產品設置
+Item Price Stock,項目價格庫存
+To make Customer based incentive schemes.,制定基於客戶的激勵計劃。
+Test Created,測試創建
+Custom Signature in Print,自定義簽名打印
+Temporary,臨時
+Customer LPO No.,客戶LPO號
+Market Place Account Group,市場科目組
+Make Payment Entries,付款條目
+Courses,培訓班
+Percentage Allocation,百分比分配
+Secretary,秘書
+House rented dates required for exemption calculation,房子租用日期計算免責
+"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在詞”字段不會在任何交易可見
+This action will stop future billing. Are you sure you want to cancel this subscription?,此操作將停止未來的結算。您確定要取消此訂閱嗎？
+Distinct unit of an Item,一個項目的不同的單元
+Criteria Name,標準名稱
+Please set Company,請設公司
+Procedure Created,程序已創建
+Buying,採購
+Diseases & Fertilizers,疾病與肥料
+Employee Records to be created by,員工紀錄的創造者
+AB Negative,AB陰性
+Apply Discount On,申請折扣
+Membership Type,會員類型
+Reqd By Date,REQD按日期
+Creditors,債權人
+Assessment Name,評估名稱
+Show PDC in Print,在打印中顯示PDC,
+Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
+Item Wise Tax Detail,項目智者稅制明細
+Job Offer,工作機會
+Institute Abbreviation,研究所縮寫
+Item-wise Price List Rate,全部項目的價格表
+Supplier Quotation,供應商報價
+In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
+Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
+Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
+Unsigned,無符號
+Each Transaction,每筆交易
+Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+Rules for adding shipping costs.,增加運輸成本的規則。
+Varaiance ,Varaiance,
+Opening Stock,打開庫存
+Customer is required,客戶是必需的
+Result Date,結果日期
+PDC/LC Date,PDC / LC日期
+To Receive,接受
+Holiday List for Optional Leave,可選假期的假期列表
+Asset Owner,資產所有者
+Reason For Putting On Hold,擱置的理由
+Personal Email,個人電子郵件
+Total Variance,總方差
+"If enabled, the system will post accounting entries for inventory automatically.",如果啟用，系統將自動為發布庫存會計分錄。
+Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
+"in Minutes,
Updated via 'Time Log'","在分
經由“時間日誌”更新"
-DocType: Customer,From Lead,從鉛
-DocType: Amazon MWS Settings,Synch Orders,同步訂單
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
-apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +639,POS Profile required to make POS Entry,所需的POS資料，使POS進入
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +15,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",忠誠度積分將根據所花費的完成量（通過銷售發票）計算得出。
-DocType: Company,HRA Settings,HRA設置
-DocType: Employee Transfer,Transfer Date,轉移日期
-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 +244,Atleast one warehouse is mandatory,至少要有一間倉庫
-apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",配置項目字段，如UOM，項目組，描述和小時數。
-DocType: Certification Application,Certification Status,認證狀態
-DocType: Travel Itinerary,Travel Advance Required,需要旅行預付款
-DocType: Subscriber,Subscriber Name,訂戶名稱
-DocType: Bank Statement Transaction Settings Item,Mapped Data Type,映射數據類型
-DocType: BOM Update Tool,Replace,更換
-apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,找不到產品。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +396,{0} against Sales Invoice {1},{0}針對銷售發票{1}
-DocType: Antibiotic,Laboratory User,實驗室用戶
-DocType: Request for Quotation Item,Project Name,專案名稱
-DocType: Customer,Mention if non-standard receivable account,提到如果不規範應收帳款
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +63,Please add the remaining benefits {0} to any of the existing component,請將其餘好處{0}添加到任何現有組件
-DocType: Journal Entry Account,If Income or Expense,如果收入或支出
-DocType: Bank Statement Transaction Entry,Matching Invoices,匹配發票
-DocType: Work Order,Required Items,所需物品
-DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: {1} {2} does not exist in above '{1}' table,項目行{0}：{1} {2}在上面的“{1}”表格中不存在
-apps/erpnext/erpnext/config/learn.py +229,Human Resource,人力資源
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
-DocType: Disease,Treatment Task,治療任務
-DocType: Payment Order Reference,Bank Account Details,銀行科目明細
-DocType: Purchase Order Item,Blanket Order,總訂單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,所得稅資產
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +631,Production Order has been {0},生產訂單已經{0}
-apps/erpnext/erpnext/regional/india/utils.py +186,House rent paid days overlap with {0},房租支付天數與{0}重疊
-DocType: BOM Item,BOM No,BOM No.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
-DocType: Item,Moving Average,移動平均線
-DocType: BOM Update Tool,The BOM which will be replaced,這將被替換的物料清單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,電子設備
-DocType: Asset,Maintenance Required,需要維護
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +63,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
-DocType: Work Order,Operation Cost,運營成本
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +223,Identifying Decision Makers,確定決策者
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Outstanding Amt,優秀的金額
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
-DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
-DocType: Payment Request,Payment Ordered,付款訂購
-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/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,如果選擇“機會來源”作為客戶，則客戶是強制性的
-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.,允許以下用戶批准許可申請的區塊天。
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +30,Lifecycle,生命週期
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +142,Make BOM,製作BOM
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
-DocType: Subscription,Taxes,稅
-DocType: Purchase Invoice,capital goods,資本貨物
-DocType: Purchase Invoice Item,Weight Per Unit,每單位重量
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +363,Paid and Not Delivered,支付和未送達
-DocType: QuickBooks Migrator,Default Cost Center,預設的成本中心
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
-DocType: Budget,Budget Accounts,預算科目
-DocType: Employee,Internal Work History,內部工作經歷
-DocType: Depreciation Schedule,Accumulated Depreciation Amount,累計折舊額
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,私募股權投資
-DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,供應商記分卡變數
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +75,Please create purchase receipt or purchase invoice for the item {0},請為項目{0}創建購買收據或購買發票
-DocType: Employee Advance,Due Advance Amount,到期金額
-DocType: Maintenance Visit,Customer Feedback,客戶反饋
-DocType: Account,Expense,費用
-apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +48,Score cannot be greater than Maximum Score,分數不能超過最高得分更大
-DocType: Support Search Source,Source Type,來源類型
-apps/erpnext/erpnext/utilities/user_progress.py +129,Customers and Suppliers,客戶和供應商
-DocType: Item Attribute,From Range,從範圍
-DocType: BOM,Set rate of sub-assembly item based on BOM,基於BOM設置子組合項目的速率
-DocType: Inpatient Occupancy,Invoiced,已開發票
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +179,Syntax error in formula or condition: {0},式或條件語法錯誤：{0}
-DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作總結公司的設置
-apps/erpnext/erpnext/stock/utils.py +149,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
-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,家長評估小組
-,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.,“From Package No.”字段不能為空，也不能小於1。
-DocType: Employee,Held On,舉行
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +36,Production Item,生產項目
-,Employee Information,僱員資料
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +242,Healthcare Practitioner not available on {0},醫療從業者在{0}上不可用
-DocType: Stock Entry Detail,Additional Cost,額外費用
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,"Can not filter based on Voucher No, if grouped by Voucher",是凍結的帳戶。要禁止該帳戶創建/編輯事務，你需要有指定的身份
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +975,Make Supplier Quotation,讓供應商報價
-DocType: Quality Inspection,Incoming,來
-apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
-apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
-DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如：ABCD。#####。如果系列已設置且交易中未提及批號，則將根據此系列創建自動批號。如果您始終想要明確提及此料品的批號，請將此留為空白。注意：此設置將優先於庫存設置中的命名系列前綴。
-DocType: BOM,Materials Required (Exploded),所需材料（分解）
-DocType: Contract,Party User,派對用戶
-apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，請設置公司過濾器空白
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +68,Posting Date cannot be future date,發布日期不能是未來的日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
-DocType: Stock Entry,Target Warehouse Address,目標倉庫地址
-DocType: Agriculture Task,End Day,結束的一天
-,Delivery Note Trends,送貨單趨勢
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +120,This Week's Summary,本週的總結
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +24,In Stock Qty,庫存數量
-,Daily Work Summary Replies,日常工作總結回复
-DocType: Delivery Trip,Calculate Estimated Arrival Times,計算預計到達時間
-apps/erpnext/erpnext/accounts/general_ledger.py +113,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過庫存的交易進行更新
-DocType: Student Group Creation Tool,Get Courses,獲取課程
-DocType: Shopify Settings,Webhooks,網絡掛接
-DocType: Bank Account,Party,黨
-DocType: Variant Field,Variant Field,變種場
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +370,Target Location,目標位置
-DocType: Sales Order,Delivery Date,交貨日期
-DocType: Opportunity,Opportunity Date,機會日期
-DocType: Employee,Health Insurance Provider,健康保險提供者
-DocType: Products Settings,Show Availability Status,顯示可用性狀態
-DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
-DocType: Water Analysis,Person Responsible,負責人
-DocType: Request for Quotation Item,Request for Quotation Item,詢價項目
-DocType: Purchase Order,To Bill,發票待輸入
-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.",對於基於課程的學生小組，課程將從入學課程中的每個學生確認。
-DocType: Employee Grade,Employee Grade,員工等級
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +81,Piecework,計件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均。買入價
-DocType: Share Balance,From No,來自No
-DocType: Task,Actual Time (in Hours),實際時間（小時）
-DocType: Employee,History In Company,公司歷史
-DocType: Customer,Customer Primary Address,客戶主要地址
-apps/erpnext/erpnext/config/learn.py +107,Newsletters,簡訊
-apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +175,Reference No.,參考編號。
-DocType: Drug Prescription,Description/Strength,說明/力量
-DocType: Bank Statement Transaction Entry,Create New Payment/Journal Entry,創建新的付款/日記賬分錄
-DocType: Certification Application,Certification Application,認證申請
-DocType: Leave Type,Is Optional Leave,是可選的休假
-DocType: Share Balance,Is Company,是公司
-DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +190,{0} on Half day Leave on {1},半天{0}離開{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一項目已進入多次
-DocType: Department,Leave Block List,休假區塊清單
-DocType: Purchase Invoice,Tax ID,稅號
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號，此列必須為空白
-DocType: Accounts Settings,Accounts Settings,會計設定
-DocType: Loyalty Program,Customer Territory,客戶地區
-DocType: Email Digest,Sales Orders to Deliver,要交付的銷售訂單
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",新帳號的數量，將作為前綴包含在帳號名稱中
-DocType: Maintenance Team Member,Team Member,隊員
-apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,沒有結果提交
-DocType: Customer,Sales Partner and Commission,銷售合作夥伴及佣金
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能是你應該“基於分佈式費用”改變
-apps/erpnext/erpnext/hr/utils.py +152,To date can not be less than from date,迄今為止不能少於起始日期
-DocType: Opportunity,To Discuss,為了討論
-apps/erpnext/erpnext/stock/stock_ledger.py +382,{0} units of {1} needed in {2} to complete this transaction.,{0}單位{1}在{2}完成此交易所需。
-DocType: Support Settings,Forum URL,論壇URL
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +75,Temporary Accounts,臨時科目
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +40,Source Location is required for the asset {0},源位置對資產{0}是必需的
-DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
-DocType: Shareholder,Contact List,聯繫人列表
-DocType: Account,Auditor,核數師
-DocType: Project,Frequency To Collect Progress,頻率收集進展
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +254,{0} items produced,生產{0}項目
-apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,學到更多
-DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
-DocType: POS Closing Voucher Invoices,Quantity of Items,項目數量
-apps/erpnext/erpnext/stock/get_item_details.py +521,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
-DocType: Purchase Invoice,Return,退貨
-DocType: Pricing Rule,Disable,關閉
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +184,Mode of payment is required to make a payment,付款方式需要進行付款
-DocType: Project Task,Pending Review,待審核
-apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",在整頁上編輯更多選項，如資產，序列號，批次等。
-DocType: Leave Type,Maximum Continuous Days Applicable,最大持續天數適用
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} 未在批次處理中註冊 {2}
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +118,"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄，因為它已經是{1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +93,Cheques Required,需要檢查
-DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,馬克缺席
-DocType: Job Applicant Source,Job Applicant Source,求職者來源
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +328,IGST Amount,IGST金額
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +41,Failed to setup company,未能成立公司
-DocType: Asset Repair,Asset Repair,資產修復
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +155,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 +657,Sales Order {0} is not submitted,銷售訂單{0}未提交
-DocType: Homepage,Tag Line,標語
-DocType: Fee Component,Fee Component,收費組件
-apps/erpnext/erpnext/config/hr.py +286,Fleet Management,車隊的管理
-DocType: Fertilizer,Density (if liquid),密度（如果液體）
-apps/erpnext/erpnext/education/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100％
-DocType: Purchase Order Item,Last Purchase Rate,最後預訂價
-DocType: Account,Asset,財富
-DocType: Project Task,Task ID,任務ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,庫存可以為項目不存在{0}，因為有變種
-DocType: Healthcare Practitioner,Mobile,移動
-,Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
-DocType: Training Event,Contact Number,聯繫電話
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,倉庫{0}不存在
-DocType: Employee Tax Exemption Proof Submission Detail,Employee Tax Exemption Proof Submission Detail,員工免稅證明提交細節
-DocType: Monthly Distribution,Monthly Distribution Percentages,每月分佈百分比
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,The selected item cannot have Batch,所選項目不能批
-DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
-DocType: Asset Maintenance Log,Has Certificate,有證書
-DocType: Project,Customer Details,客戶詳細資訊
-DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,檢查資產是否需要預防性維護或校準
-apps/erpnext/erpnext/public/js/setup_wizard.js +87,Company Abbreviation cannot have more than 5 characters,公司縮寫不能超過5個字符
-DocType: Employee,Reports to,隸屬於
-,Unpaid Expense Claim,未付費用報銷
-DocType: Payment Entry,Paid Amount,支付的金額
-apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索銷售週期
-DocType: Assessment Plan,Supervisor,監
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +934,Retention Stock Entry,保留庫存入場
-,Available Stock for Packing Items,可用庫存包裝項目
-DocType: Item Variant,Item Variant,項目變
-,Work Order Stock Report,工單庫存報表
-DocType: Purchase Receipt,Auto Repeat Detail,自動重複細節
-DocType: Assessment Result Tool,Assessment Result Tool,評價結果工具
-apps/erpnext/erpnext/education/doctype/instructor/instructor.js +45,As Supervisor,作為主管
-DocType: Leave Policy Detail,Leave Policy Detail,退出政策細節
-DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +906,Submitted orders can not be deleted,提交的訂單不能被刪除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +121,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",科目餘額已歸為借方科目，不允許設為貸方
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +391,Quality Management,品質管理
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +52,Item {0} has been disabled,項{0}已被禁用
-DocType: Project,Total Billable Amount (via Timesheets),總計費用金額（通過時間表）
-DocType: Agriculture Task,Previous Business Day,前一個營業日
-DocType: Loan,Repay Fixed Amount per Period,償還每期固定金額
-DocType: Employee,Health Insurance No,健康保險No
-DocType: Employee Tax Exemption Proof Submission,Tax Exemption Proofs,免稅證明
-apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
-apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,應納稅總額
-DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +691,Job card {0} created,已創建作業卡{0}
-DocType: Opening Invoice Creation Tool,Purchase,採購
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,餘額數量
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目標不能為空
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +18,Enrolling students,招收學生
-DocType: Item Group,Parent Item Group,父項目群組
-DocType: Appointment Type,Appointment Type,預約類型
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
-DocType: Healthcare Settings,Valid number of days,有效天數
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,重新啟動訂閱
-DocType: Linked Plant Analysis,Linked Plant Analysis,鏈接的工廠分析
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +358,Transporter ID,運輸商ID
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +222,Value Proposition,價值主張
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
-DocType: Purchase Invoice Item,Service End Date,服務結束日期
-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: Training Event Employee,Invited,邀請
-apps/erpnext/erpnext/config/accounts.py +276,Setup Gateway accounts.,設置閘道科目。
-DocType: Employee,Employment Type,就業類型
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定資產
-DocType: Payment Entry,Set Exchange Gain / Loss,設置兌換收益/損失
-,GST Purchase Register,消費稅購買登記冊
-,Cash Flow,現金周轉
-apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +25,Combined invoice portion must equal 100%,合併發票部分必須等於100％
-DocType: Item Default,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,學生的電子郵件ID
-DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS關閉憑證發票
-DocType: Tax Rule,Sales Tax Template,銷售稅模板
-DocType: Employee Benefit Application Detail,Pay Against Benefit Claim,支付利益索賠
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +21,Update Cost Center Number,更新成本中心編號
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2524,Select items to save the invoice,選取要保存發票
-DocType: Employee,Encashment Date,兌現日期
-DocType: Training Event,Internet,互聯網
-DocType: Special Test Template,Special Test Template,特殊測試模板
-DocType: Account,Stock Adjustment,庫存調整
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 - {0}
-DocType: Work Order,Planned Operating Cost,計劃運營成本
-DocType: Academic Term,Term Start Date,期限起始日期
-apps/erpnext/erpnext/config/accounts.py +440,List of all share transactions,所有股份交易清單
-DocType: Supplier,Is Transporter,是運輸車
-DocType: Shopify Settings,Import Sales Invoice from Shopify if Payment is marked,如果付款已標記，則從Shopify導入銷售發票
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,必須設置試用期開始日期和試用期結束日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +808,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
-DocType: Subscription Plan Detail,Plan,計劃
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
-DocType: Job Applicant,Applicant Name,申請人名稱
-DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
-DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
+From Lead,從鉛
+Synch Orders,同步訂單
+Orders released for production.,發布生產訂單。
+Select Fiscal Year...,選擇會計年度...
+POS Profile required to make POS Entry,所需的POS資料，使POS進入
+"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",忠誠度積分將根據所花費的完成量（通過銷售發票）計算得出。
+HRA Settings,HRA設置
+Transfer Date,轉移日期
+Standard Selling,標準銷售
+Atleast one warehouse is mandatory,至少要有一間倉庫
+"Configure Item Fields like UOM, Item Group, Description and No of Hours.",配置項目字段，如UOM，項目組，描述和小時數。
+Certification Status,認證狀態
+Travel Advance Required,需要旅行預付款
+Subscriber Name,訂戶名稱
+Mapped Data Type,映射數據類型
+Replace,更換
+No products found.,找不到產品。
+{0} against Sales Invoice {1},{0}針對銷售發票{1}
+Laboratory User,實驗室用戶
+Project Name,專案名稱
+Mention if non-standard receivable account,提到如果不規範應收帳款
+Please add the remaining benefits {0} to any of the existing component,請將其餘好處{0}添加到任何現有組件
+If Income or Expense,如果收入或支出
+Matching Invoices,匹配發票
+Required Items,所需物品
+Stock Value Difference,庫存價值差異
+Item Row {0}: {1} {2} does not exist in above '{1}' table,項目行{0}：{1} {2}在上面的“{1}”表格中不存在
+Human Resource,人力資源
+Payment Reconciliation Payment,付款方式付款對賬
+Treatment Task,治療任務
+Bank Account Details,銀行科目明細
+Blanket Order,總訂單
+Tax Assets,所得稅資產
+Production Order has been {0},生產訂單已經{0}
+House rent paid days overlap with {0},房租支付天數與{0}重疊
+BOM No,BOM No.
+Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
+Moving Average,移動平均線
+The BOM which will be replaced,這將被替換的物料清單
+Electronic Equipments,電子設備
+Maintenance Required,需要維護
+Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
+Operation Cost,運營成本
+Identifying Decision Makers,確定決策者
+Outstanding Amt,優秀的金額
+Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
+Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
+Payment Ordered,付款訂購
+Maintenance Team Name,維護組名稱
+"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，而預設值是零（空）。數字越大，意味著其將優先考慮是否有與相同條件下多個定價規則。
+Customer is mandatory if 'Opportunity From' is selected as Customer,如果選擇“機會來源”作為客戶，則客戶是強制性的
+Fiscal Year: {0} does not exists,會計年度：{0}不存在
+To Currency,到貨幣
+Allow the following users to approve Leave Applications for block days.,允許以下用戶批准許可申請的區塊天。
+Lifecycle,生命週期
+Make BOM,製作BOM,
+Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
+Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
+Taxes,稅
+capital goods,資本貨物
+Weight Per Unit,每單位重量
+Paid and Not Delivered,支付和未送達
+Default Cost Center,預設的成本中心
+Stock Transactions,庫存交易明細
+Budget Accounts,預算科目
+Internal Work History,內部工作經歷
+Accumulated Depreciation Amount,累計折舊額
+Private Equity,私募股權投資
+Supplier Scorecard Variable,供應商記分卡變數
+Please create purchase receipt or purchase invoice for the item {0},請為項目{0}創建購買收據或購買發票
+Due Advance Amount,到期金額
+Customer Feedback,客戶反饋
+Expense,費用
+Score cannot be greater than Maximum Score,分數不能超過最高得分更大
+Source Type,來源類型
+Customers and Suppliers,客戶和供應商
+From Range,從範圍
+Set rate of sub-assembly item based on BOM,基於BOM設置子組合項目的速率
+Invoiced,已開發票
+Syntax error in formula or condition: {0},式或條件語法錯誤：{0}
+Daily Work Summary Settings Company,每日工作總結公司的設置
+Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
+"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一個特定的交易不適用於定價規則，所有適用的定價規則應該被禁用。
+Day(s) after the end of the invoice month,發票月份結束後的一天
+Parent Assessment Group,家長評估小組
+Sales Order Trends,銷售訂單趨勢
+The 'From Package No.' field must neither be empty nor it's value less than 1.,“From Package No.”字段不能為空，也不能小於1。
+Held On,舉行
+Production Item,生產項目
+Employee Information,僱員資料
+Healthcare Practitioner not available on {0},醫療從業者在{0}上不可用
+Additional Cost,額外費用
+"Can not filter based on Voucher No, if grouped by Voucher",是凍結的帳戶。要禁止該帳戶創建/編輯事務，你需要有指定的身份
+Make Supplier Quotation,讓供應商報價
+Incoming,來
+Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
+Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
+"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如：ABCD。#####。如果系列已設置且交易中未提及批號，則將根據此系列創建自動批號。如果您始終想要明確提及此料品的批號，請將此留為空白。注意：此設置將優先於庫存設置中的命名系列前綴。
+Materials Required (Exploded),所需材料（分解）
+Party User,派對用戶
+Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，請設置公司過濾器空白
+Posting Date cannot be future date,發布日期不能是未來的日期
+Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
+Target Warehouse Address,目標倉庫地址
+End Day,結束的一天
+Delivery Note Trends,送貨單趨勢
+This Week's Summary,本週的總結
+In Stock Qty,庫存數量
+Daily Work Summary Replies,日常工作總結回复
+Calculate Estimated Arrival Times,計算預計到達時間
+Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過庫存的交易進行更新
+Get Courses,獲取課程
+Webhooks,網絡掛接
+Party,黨
+Variant Field,變種場
+Target Location,目標位置
+Delivery Date,交貨日期
+Opportunity Date,機會日期
+Health Insurance Provider,健康保險提供者
+Show Availability Status,顯示可用性狀態
+Return Against Purchase Receipt,採購入庫的退貨
+Person Responsible,負責人
+Request for Quotation Item,詢價項目
+To Bill,發票待輸入
+% Ordered,% 已訂購
+"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",對於基於課程的學生小組，課程將從入學課程中的每個學生確認。
+Employee Grade,員工等級
+Piecework,計件工作
+Avg. Buying Rate,平均。買入價
+From No,來自No,
+Actual Time in Hours (via Timesheet),實際時間（小時）
+History In Company,公司歷史
+Customer Primary Address,客戶主要地址
+Newsletters,簡訊
+Reference No.,參考編號。
+Description/Strength,說明/力量
+Create New Payment/Journal Entry,創建新的付款/日記賬分錄
+Certification Application,認證申請
+Is Optional Leave,是可選的休假
+Is Company,是公司
+Stock Ledger Entry,庫存總帳條目
+{0} on Half day Leave on {1},半天{0}離開{1}
+Same item has been entered multiple times,同一項目已進入多次
+Leave Block List,休假區塊清單
+Tax ID,稅號
+Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號，此列必須為空白
+Accounts Settings,會計設定
+Customer Territory,客戶地區
+Sales Orders to Deliver,要交付的銷售訂單
+"Number of new Account, it will be included in the account name as a prefix",新帳號的數量，將作為前綴包含在帳號名稱中
+Team Member,隊員
+No Result to submit,沒有結果提交
+Sales Partner and Commission,銷售合作夥伴及佣金
+"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能是你應該“基於分佈式費用”改變
+To date can not be less than from date,迄今為止不能少於起始日期
+To Discuss,為了討論
+{0} units of {1} needed in {2} to complete this transaction.,{0}單位{1}在{2}完成此交易所需。
+Forum URL,論壇URL,
+Temporary Accounts,臨時科目
+Source Location is required for the asset {0},源位置對資產{0}是必需的
+BOM Explosion Item,BOM展開項目
+Contact List,聯繫人列表
+Auditor,核數師
+Frequency To Collect Progress,頻率收集進展
+{0} items produced,生產{0}項目
+Learn More,學到更多
+Distance from top edge,從頂邊的距離
+Quantity of Items,項目數量
+Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
+Return,退貨
+Disable,關閉
+Mode of payment is required to make a payment,付款方式需要進行付款
+Pending Review,待審核
+"Edit in full page for more options like assets, serial nos, batches etc.",在整頁上編輯更多選項，如資產，序列號，批次等。
+Maximum Continuous Days Applicable,最大持續天數適用
+{0} - {1} is not enrolled in the Batch {2},{0} - {1} 未在批次處理中註冊 {2}
+"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄，因為它已經是{1}
+Cheques Required,需要檢查
+Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
+Mark Absent,馬克缺席
+Job Applicant Source,求職者來源
+IGST Amount,IGST金額
+Failed to setup company,未能成立公司
+Asset Repair,資產修復
+Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
+Exchange Rate,匯率
+Additional information regarding the patient,有關患者的其他信息
+Sales Order {0} is not submitted,銷售訂單{0}未提交
+Tag Line,標語
+Fee Component,收費組件
+Fleet Management,車隊的管理
+Density (if liquid),密度（如果液體）
+Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100％
+Last Purchase Rate,最後預訂價
+Asset,財富
+Task ID,任務ID,
+Stock cannot exist for Item {0} since has variants,庫存可以為項目不存在{0}，因為有變種
+Mobile,移動
+Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
+Contact Number,聯繫電話
+Warehouse {0} does not exist,倉庫{0}不存在
+Employee Tax Exemption Proof Submission Detail,員工免稅證明提交細節
+Monthly Distribution Percentages,每月分佈百分比
+The selected item cannot have Batch,所選項目不能批
+% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
+Has Certificate,有證書
+Customer Details,客戶詳細資訊
+Check if Asset requires Preventive Maintenance or Calibration,檢查資產是否需要預防性維護或校準
+Company Abbreviation cannot have more than 5 characters,公司縮寫不能超過5個字符
+Reports to,隸屬於
+Unpaid Expense Claim,未付費用報銷
+Paid Amount,支付的金額
+Explore Sales Cycle,探索銷售週期
+Supervisor,監
+Retention Stock Entry,保留庫存入場
+Available Stock for Packing Items,可用庫存包裝項目
+Item Variant,項目變
+Work Order Stock Report,工單庫存報表
+Auto Repeat Detail,自動重複細節
+Assessment Result Tool,評價結果工具
+As Supervisor,作為主管
+Leave Policy Detail,退出政策細節
+BOM Scrap Item,BOM項目廢料
+Submitted orders can not be deleted,提交的訂單不能被刪除
+"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",科目餘額已歸為借方科目，不允許設為貸方
+Quality Management,品質管理
+Item {0} has been disabled,項{0}已被禁用
+Total Billable Amount (via Timesheet),總計費用金額（通過時間表）
+Previous Business Day,前一個營業日
+Health Insurance No,健康保險No,
+Tax Exemption Proofs,免稅證明
+Please enter quantity for Item {0},請輸入項目{0}的量
+Total Taxable Amount,應納稅總額
+Employee External Work History,員工對外工作歷史
+Job card {0} created,已創建作業卡{0}
+Purchase,採購
+Balance Qty,餘額數量
+Goals cannot be empty,目標不能為空
+Enrolling students,招收學生
+Parent Item Group,父項目群組
+Appointment Type,預約類型
+{0} for {1},{0}for {1}
+Valid number of days,有效天數
+Restart Subscription,重新啟動訂閱
+Linked Plant Analysis,鏈接的工廠分析
+Transporter ID,運輸商ID,
+Value Proposition,價值主張
+Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
+Service End Date,服務結束日期
+Row #{0}: Timings conflicts with row {1},行＃{0}：與排時序衝突{1}
+Allow Zero Valuation Rate,允許零估值
+Allow Zero Valuation Rate,允許零估值
+Invited,邀請
+Setup Gateway accounts.,設置閘道科目。
+Employment Type,就業類型
+Fixed Assets,固定資產
+Set Exchange Gain / Loss,設置兌換收益/損失
+GST Purchase Register,消費稅購買登記冊
+Cash Flow,現金周轉
+Combined invoice portion must equal 100%,合併發票部分必須等於100％
+Default Expense Account,預設費用科目
+CGST Account,CGST科目
+Student Email ID,學生的電子郵件ID,
+POS Closing Voucher Invoices,POS關閉憑證發票
+Sales Tax Template,銷售稅模板
+Pay Against Benefit Claim,支付利益索賠
+Update Cost Center Number,更新成本中心編號
+Select items to save the invoice,選取要保存發票
+Encashment Date,兌現日期
+Internet,互聯網
+Special Test Template,特殊測試模板
+Stock Adjustment,庫存調整
+Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 - {0}
+Planned Operating Cost,計劃運營成本
+Term Start Date,期限起始日期
+List of all share transactions,所有股份交易清單
+Is Transporter,是運輸車
+Import Sales Invoice from Shopify if Payment is marked,如果付款已標記，則從Shopify導入銷售發票
+Opp Count,Opp Count,
+Opp Count,Opp Count,
+Both Trial Period Start Date and Trial Period End Date must be set,必須設置試用期開始日期和試用期結束日期
+Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
+Plan,計劃
+Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
+Customer / Item Name,客戶／品項名稱
+"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
Note: BOM = Bill of Materials",聚合組** **項目到另一個項目** **的。如果你是捆綁了一定**項目你保持庫存的包裝**項目的**，而不是聚集**項這是一個有用的**到一個包和**。包** **項目將有“是庫存項目”為“否”和“是銷售項目”為“是”。例如：如果你是銷售筆記本電腦和背包分開，並有一個特殊的價格，如果客戶購買兩個，那麼筆記本電腦+背包將是一個新的產品包項目。注：物料BOM =比爾
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
-DocType: Item Variant Attribute,Attribute,屬性
-DocType: Staffing Plan Detail,Current Count,當前計數
-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,在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/config/selling.py +153,Default settings for selling transactions.,銷售交易的預設設定。
-DocType: Guardian,Guardian Of ,守護者
-DocType: Grading Scale Interval,Threshold,閾
-DocType: BOM Update Tool,Current BOM,當前BOM表
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +32,Balance (Dr - Cr),平衡（Dr - Cr）
-apps/erpnext/erpnext/public/js/utils.js +56,Add Serial No,添加序列號
-DocType: Work Order Item,Available Qty at Source Warehouse,源倉庫可用數量
-apps/erpnext/erpnext/config/support.py +22,Warranty,保證
-DocType: Purchase Invoice,Debit Note Issued,借記發行說明
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +60,Filter based on Cost Center is only applicable if Budget Against is selected as Cost Center,基於成本中心的過濾僅適用於選擇Budget Against作為成本中心的情況
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1182,"Search by item code, serial number, batch no or barcode",按項目代碼，序列號，批號或條碼進行搜索
-DocType: Work Order,Warehouses,倉庫
-apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +19,{0} asset cannot be transferred,{0}資產不得轉讓
-DocType: Hotel Room Pricing,Hotel Room Pricing,酒店房間價格
-apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py +121,"Can not mark Inpatient Record Discharged, there are Unbilled Invoices {0}",無法標記出院的住院病歷，有未開單的發票{0}
-apps/erpnext/erpnext/stock/doctype/item/item.js +82,This Item is a Variant of {0} (Template).,此項目是{0}（模板）的變體。
-DocType: Workstation,per hour,每小時
-DocType: Blanket Order,Purchasing,購買
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +139,Customer LPO,客戶LPO
-DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",對於基於批次的學生組，學生批次將由課程註冊中的每位學生進行驗證。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +51,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
-DocType: Journal Entry Account,Loan,貸款
-DocType: Expense Claim Advance,Expense Claim Advance,費用索賠預付款
-DocType: Lab Test,Report Preference,報告偏好
-apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,志願者信息。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +96,Project Manager,專案經理
-,Quoted Item Comparison,項目報價比較
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之間的得分重疊
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +387,Dispatch,調度
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +191,Net Asset value as on,淨資產值作為
-DocType: Crop,Produce,生產
-DocType: Hotel Settings,Default Taxes and Charges,默認稅費
-DocType: Account,Receivable,應收帳款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +325,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
-DocType: Stock Entry,Material Consumption for Manufacture,材料消耗製造
-DocType: Item Alternative,Alternative Item Code,替代項目代碼
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1068,Select Items to Manufacture,選擇項目，以製造
-DocType: Delivery Stop,Delivery Stop,交貨停止
-apps/erpnext/erpnext/accounts/page/pos/pos.js +974,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
-DocType: Item,Material Issue,發料
-DocType: Employee Education,Qualification,合格
-DocType: Item Price,Item Price,商品價格
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
-DocType: BOM,Show Items,顯示項目
-apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +125,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶？
-DocType: Subscription Plan,Billing Interval,計費間隔
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,電影和視頻
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +76,Actual start date and actual end date is mandatory,實際開始日期和實際結束日期是強制性的
-DocType: Salary Detail,Component,零件
-apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}：{1}必須大於0
-DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
-DocType: Sales Invoice Item,Enable Deferred Revenue,啟用延期收入
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
-DocType: Warehouse,Warehouse Name,倉庫名稱
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,實際開始日期必須小於實際結束日期
-DocType: Naming Series,Select Transaction,選擇交易
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
-DocType: Journal Entry,Write Off Entry,核銷進入
-DocType: BOM,Rate Of Materials Based On,材料成本基於
-DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",如果啟用，則在學期註冊工具中，字段學術期限將是強制性的。
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +103,Uncheck all,取消所有
-DocType: POS Profile,Terms and Conditions,條款和條件
-DocType: Asset,Booked Fixed Asset,預訂的固定資產
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
-DocType: Leave Block List,Applies to Company,適用於公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +222,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交庫存輸入{0}存在
-DocType: BOM Update Tool,Update latest price in all BOMs,更新所有BOM的最新價格
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +24,Medical Record,醫療記錄
-DocType: Vehicle,Vehicle,車輛
-DocType: Purchase Invoice,In Words,大寫
-apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,在提交之前輸入銀行或貸款機構的名稱。
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,必須提交{0}
-DocType: POS Profile,Item Groups,項目組
-DocType: Sales Order Item,For Production,對於生產
-DocType: Payment Request,payment_url,payment_url
-DocType: Exchange Rate Revaluation Account,Balance In Account Currency,科目貨幣餘額
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +188,Please add a Temporary Opening account in Chart of Accounts,請在會計科目表中添加一個臨時開戶科目
-DocType: Customer,Customer Primary Contact,客戶主要聯繫人
-DocType: Project Task,View Task,查看任務
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
-DocType: Bank Guarantee,Bank Account Info,銀行科目信息
-DocType: Bank Guarantee,Bank Guarantee Type,銀行擔保類型
-DocType: Payment Schedule,Invoice Portion,發票部分
-,Asset Depreciations and Balances,資產折舊和平衡
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +372,Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +200,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0}沒有醫療從業者時間表。將其添加到Healthcare Practitioner master中
-DocType: Sales Invoice,Get Advances Received,取得預先付款
-DocType: Email Digest,Add/Remove Recipients,添加／刪除收件人
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
-apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +130,Amount of TDS Deducted,扣除TDS的金額
-DocType: Production Plan,Include Subcontracted Items,包括轉包物料
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +81,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +792,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
-DocType: Loan,Repay from Salary,從工資償還
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +405,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
-DocType: Additional Salary,Salary Slip,工資單
-DocType: Lead,Lost Quotation,遺失報價
-apps/erpnext/erpnext/utilities/user_progress.py +221,Student Batches,學生批
-DocType: Pricing Rule,Margin Rate or Amount,保證金稅率或稅額
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,“至日期”是必需填寫的
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
-apps/erpnext/erpnext/projects/doctype/project/project.py +90,Task weight cannot be negative,任務權重不能為負
-DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
-DocType: Salary Slip,Payment Days,付款日
-DocType: Stock Settings,Convert Item Description to Clean HTML,將項目描述轉換為清理HTML
-DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,扣除未領取僱員福利的稅
-DocType: Salary Slip,Total Interest Amount,利息總額
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
-DocType: BOM,Manage cost of operations,管理作業成本
-DocType: Accounts Settings,Stale Days,陳舊的日子
-DocType: Travel Itinerary,Arrival Datetime,到達日期時間
-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.",當任何選取的交易都是“已提交”時，郵件會自動自動打開，發送電子郵件到相關的“聯絡人”通知相關交易，並用該交易作為附件。用戶可決定是否發送電子郵件。
-DocType: Tax Rule,Billing Zipcode,計費郵編
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
-DocType: Assessment Result Detail,Assessment Result Detail,評價結果詳細
-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,在項目組表中找到重複的項目組
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1247,It is needed to fetch Item Details.,需要獲取項目細節。
-DocType: Fertilizer,Fertilizer Name,肥料名稱
-DocType: Salary Slip,Net Pay,淨收費
-DocType: Cash Flow Mapping Accounts,Account,帳戶
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} has already been received,已收到序號{0}
-,Requested Items To Be Transferred,將要轉倉的需求項目
-DocType: Expense Claim,Vehicle Log,車輛登錄
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded on Actual,累計每月預算超出實際的行動
-DocType: Salary Component,Create Separate Payment Entry Against Benefit Claim,針對福利申請創建單獨的付款條目
-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,銷售團隊詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Delete permanently?,永久刪除？
-DocType: Expense Claim,Total Claimed Amount,總索賠額
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
-DocType: Shareholder,Folio no.,Folio no。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +251,Invalid {0},無效的{0}
-DocType: Email Digest,Email Digest,電子郵件摘要
-DocType: Delivery Note,Billing Address Name,帳單地址名稱
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,百貨
-,Item Delivery Date,物品交貨日期
-DocType: Selling Settings,Sales Update Frequency,銷售更新頻率
-DocType: Production Plan,Material Requested,要求的材料
-DocType: Warehouse,PIN,銷
-DocType: Bin,Reserved Qty for sub contract,分包合同的保留數量
-DocType: Patient Service Unit,Patinet Service Unit,Patinet服務單位
-DocType: Sales Invoice,Base Change Amount (Company Currency),基地漲跌額（公司幣種）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +310,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
-apps/erpnext/erpnext/projects/doctype/project/project.js +98,Save the document first.,首先保存文檔。
-apps/erpnext/erpnext/shopping_cart/cart.py +74,Only {0} in stock for item {1},物品{1}的庫存僅為{0}
-DocType: Account,Chargeable,收費
-DocType: Company,Change Abbreviation,更改縮寫
-DocType: Contract,Fulfilment Details,履行細節
-DocType: Employee Onboarding,Activities,活動
-DocType: Expense Claim Detail,Expense Date,犧牲日期
-DocType: Item,No of Months,沒有幾個月
-DocType: Item,Max Discount (%),最大折讓（％）
-apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,信用日不能是負數
-DocType: Purchase Invoice Item,Service Stop Date,服務停止日期
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最後訂單金額
-DocType: Cash Flow Mapper,e.g Adjustments for:,例如調整：
-apps/erpnext/erpnext/stock/doctype/item/item.py +304," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} 留樣品是基於批次, 請檢查是否有批次不保留專案的樣品"
-DocType: Certification Application,Yet to appear,尚未出現
-DocType: Delivery Stop,Email Sent To,電子郵件發送給
-DocType: Job Card Item,Job Card Item,工作卡項目
-DocType: Accounts Settings,Allow Cost Center In Entry of Balance Sheet Account,允許成本中心輸入資產負債表科目
-apps/erpnext/erpnext/accounts/doctype/account/account.js +102,Merge with Existing Account,與現有科目合併
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +992,All items have already been transferred for this Work Order.,所有項目已經為此工作單轉移。
-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: Subscription Plan,Payment Plan,付款計劃
-DocType: Shopping Cart Settings,Enable purchase of items via the website,通過網站啟用購買項目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +296,Currency of the price list {0} must be {1} or {2},價目表{0}的貨幣必須是{1}或{2}
-apps/erpnext/erpnext/config/accounts.py +561,Subscription Management,訂閱管理
-DocType: Appraisal,Appraisal Template,評估模板
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +255,To Pin Code,要密碼
-DocType: Soil Texture,Ternary Plot,三元劇情
-DocType: Amazon MWS Settings,Check this to enable a scheduled Daily synchronization routine via scheduler,選中此選項可通過調度程序啟用計劃的每日同步例程
-DocType: Item Group,Item Classification,項目分類
-DocType: Driver,License Number,許可證號
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +94,Business Development Manager,業務發展經理
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,維護訪問目的
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,發票患者登記
-DocType: Crop,Period,期間
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,總帳
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,To Fiscal Year,到財政年度
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看訊息
-DocType: Item Attribute Value,Attribute Value,屬性值
-DocType: POS Closing Voucher Details,Expected Amount,預期金額
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js +16,Create Multiple,創建多個
-,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
-apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1}級員工{0}沒有默認離開政策
-DocType: Salary Detail,Salary Detail,薪酬詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,請先選擇{0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,添加了{0}個用戶
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",在多層程序的情況下，客戶將根據其花費自動分配到相關層
-DocType: Appointment Type,Physician,醫師
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1076,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +56,"Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, UOM, Qty and Dates.",物料價格根據價格表，供應商/客戶，貨幣，物料，UOM，數量和日期多次出現。
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +203,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0}（{1}）不能大於計畫數量 {3} 在工作訂單中（{2}）
-DocType: Certification Application,Name of Applicant,申請人名稱
-apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
-apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
-apps/erpnext/erpnext/stock/doctype/item/item.py +731,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,庫存交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
-apps/erpnext/erpnext/config/integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授權
-DocType: Healthcare Practitioner,Charges,收費
-DocType: Production Plan,Get Items For Work Order,獲取工作訂單的物品
-DocType: Salary Detail,Default Amount,預設數量
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,倉庫系統中未找到
-DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結庫存早於`應該是少於％d天。
-DocType: Tax Rule,Purchase Tax Template,購置稅模板
-apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,為您的公司設定您想要實現的銷售目標。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1553,Healthcare Services,醫療服務
-,Project wise Stock Tracking,項目明智的庫存跟踪
-DocType: GST HSN Code,Regional,區域性
-apps/erpnext/erpnext/config/healthcare.py +50,Laboratory,實驗室
-DocType: UOM Category,UOM Category,UOM類別
-DocType: Clinical Procedure Item,Actual Qty (at source/target),實際的數量（於 來源/目標）
-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中需要客戶組
-DocType: HR Settings,Payroll Settings,薪資設置
-apps/erpnext/erpnext/config/accounts.py +142,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
-DocType: POS Settings,POS Settings,POS設置
-apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下單
-DocType: Email Digest,New Purchase Orders,新的採購訂單
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Root cannot have a parent cost center,root不能有一個父成本中心
-apps/erpnext/erpnext/public/js/stock_analytics.js +54,Select Brand...,選擇品牌...
-apps/erpnext/erpnext/public/js/setup_wizard.js +32,Non Profit (beta),非營利（測試版）
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +167,Accumulated Depreciation as on,作為累計折舊
-DocType: Employee Tax Exemption Category,Employee Tax Exemption Category,員工免稅類別
-DocType: Sales Invoice,C-Form Applicable,C-表格適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +419,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
-DocType: Support Search Source,Post Route String,郵政路線字符串
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,倉庫是強制性的
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +72,Failed to create website,無法創建網站
-DocType: Soil Analysis,Mg/K,鎂/ K
-DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +989,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
-DocType: Program,Program Abbreviation,計劃縮寫
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +407,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
-DocType: Warranty Claim,Resolved By,議決
-apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js +32,Schedule Discharge,附表卸貨
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: You can not assign itself as parent account,科目{0}：你不能指定自己為上層科目
-DocType: Purchase Invoice Item,Price List Rate,價格列表費率
-apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,創建客戶報價
-apps/erpnext/erpnext/public/js/controllers/transaction.js +885,Service Stop Date cannot be after Service End Date,服務停止日期不能在服務結束日期之後
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
-apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清單（BOM）
-DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
-apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.js +25,Assessment Result,評價結果
-DocType: Employee Transfer,Employee Transfer,員工轉移
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小時
-DocType: Project,Expected Start Date,預計開始日期
-DocType: Purchase Invoice,04-Correction in Invoice,04-發票糾正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1041,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
-DocType: Payment Request,Party Details,黨詳細
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,變體詳細信息報告
-DocType: Setup Progress Action,Setup Progress Action,設置進度動作
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +48,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/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,取消訂閱
-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 +40,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
-DocType: Payment Entry,Receive,接受
-DocType: Employee Benefit Application Detail,Earning Component,收入組件
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,語錄：
-DocType: Contract,Partially Fulfilled,部分實現
-DocType: Maintenance Visit,Fully Completed,全面完成
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
-DocType: Employee,Educational Qualification,學歷
-DocType: Workstation,Operating Costs,運營成本
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +487,Currency for {0} must be {1},貨幣{0}必須{1}
-DocType: Asset,Disposal Date,處置日期
-DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工，如果他們沒有假期。回复摘要將在午夜被發送。
-DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
-apps/erpnext/erpnext/stock/doctype/item/item.py +541,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,CWIP Account,CWIP科目
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培訓反饋
-apps/erpnext/erpnext/config/accounts.py +184,Tax Withholding rates to be applied on transactions.,稅收預扣稅率適用於交易。
-DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供應商記分卡標準
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
-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
-DocType: Cash Flow Mapper,Section Footer,章節頁腳
-apps/erpnext/erpnext/stock/doctype/item/item.js +359,Add / Edit Prices,新增 / 編輯價格
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +19,Employee Promotion cannot be submitted before Promotion Date ,員工晉升不能在晉升日期前提交
-DocType: Salary Component,Is Flexible Benefit,是靈活的好處
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +85,Chart of Cost Centers,成本中心的圖
-DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,在取消訂閱或將訂閱標記為未付之前，發票日期之後的天數已過
-DocType: Clinical Procedure Template,Sample Collection,樣品收集
-,Requested Items To Be Ordered,將要採購的需求項目
-DocType: Price List,Price List Name,價格列表名稱
-DocType: Delivery Stop,Dispatch Information,發貨信息
-DocType: Blanket Order,Manufacturing,製造
-,Ordered Items To Be Delivered,未交貨的訂購項目
-DocType: Account,Income,收入
-DocType: Industry Type,Industry Type,行業類型
-apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,出事了！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +174,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
-DocType: Bank Statement Settings,Transaction Data Mapping,交易數據映射
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +280,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
-DocType: Salary Component,Is Tax Applicable,是否適用稅務？
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{0}不存在
-DocType: Purchase Invoice Item,Amount (Company Currency),金額（公司貨幣）
-DocType: Agriculture Analysis Criteria,Agriculture User,農業用戶
-apps/erpnext/erpnext/stock/stock_ledger.py +386,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
-DocType: Fee Schedule,Student Category,學生組
-DocType: Announcement,Student,學生
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +98,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,倉庫中不提供開始操作的庫存數量。你想記錄庫存轉移嗎？
-DocType: Shipping Rule,Shipping Rule Type,運輸規則類型
-apps/erpnext/erpnext/utilities/user_progress.py +239,Go to Rooms,去房間
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +259,"Company, Payment Account, From Date and To Date is mandatory",公司，付款帳戶，從日期和日期是強制性的
-DocType: Company,Budget Detail,預算案詳情
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +79,Please enter message before sending,在發送前，請填寫留言
-DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供應商重複
-apps/erpnext/erpnext/config/accounts.py +543,Point-of-Sale Profile,簡介銷售點的
-apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}應該是0到100之間的一個值
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},從{1}到{2}的{0}付款
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,無抵押貸款
-DocType: Cost Center,Cost Center Name,成本中心名稱
-DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
-DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +34,Total Paid Amt,數金額金額
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
-DocType: Purchase Receipt Item,Received and Accepted,收貨及允收
-,GST Itemised Sales Register,消費稅商品銷售登記冊
-DocType: Staffing Plan,Staffing Plan Details,人員配置計劃詳情
-,Serial No Service Contract Expiry,序號服務合同到期
-DocType: Employee Health Insurance,Employee Health Insurance,員工健康保險
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +331,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幫助
-DocType: Student Group Creation Tool,Student Group Creation Tool,學生組創建工具
-DocType: Item,Variant Based On,基於變異對
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
-DocType: Loyalty Point Entry,Loyalty Program Tier,忠誠度計劃層
-apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,您的供應商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
-DocType: Request for Quotation Item,Supplier Part No,供應商部件號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +395,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總'不能扣除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +379,Received From,從......收到
-DocType: Lead,Converted,轉換
-DocType: Item,Has Serial No,有序列號
-DocType: Employee,Date of Issue,發行日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根據購買設置，如果需要購買記錄==“是”，則為了創建採購發票，用戶需要首先為項目{0}創建採購憑證
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +173,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
-DocType: Global Defaults,Default Distance Unit,默認距離單位
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +224,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
-DocType: Issue,Content Type,內容類型
-DocType: Asset,Assets,資產
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,電腦
-DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
-DocType: Subscription,Current Invoice End Date,當前發票結束日期
-DocType: Payment Term,Due Date Based On,到期日基於
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,請在“銷售設置”中設置默認客戶組和領域
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +355,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,項：{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,You are not authorized to set Frozen value,您無權設定值凍結
-DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,Employee {0} is on Leave on {1},員工{0}暫停{1}
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,沒有為日記帳分錄選擇還款
-DocType: Payment Reconciliation,From Invoice Date,從發票日期
-DocType: Healthcare Settings,Laboratory Settings,實驗室設置
-DocType: Clinical Procedure,Service Unit,服務單位
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,成功設置供應商
-DocType: Leave Encashment,Leave Encashment,離開兌現
-apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,它有什麼作用？
-apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py +47,Tasks have been created for managing the {0} disease (on row {1}),為管理{0}疾病創建了任務（在第{1}行）
-DocType: Crop,Byproducts,副產品
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +84,To Warehouse,到倉庫
-apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +26,All Student Admissions,所有學生入學
-,Average Commission Rate,平均佣金比率
-DocType: Share Balance,No of Shares,股份數目
-DocType: Taxable Salary Slab,To Amount,金額
-apps/erpnext/erpnext/stock/doctype/item/item.py +479,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,選擇狀態
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能標記為未來的日期
-DocType: Support Search Source,Post Description Key,發布說明密鑰
-DocType: Pricing Rule,Pricing Rule Help,定價規則說明
-DocType: Fee Schedule,Total Amount per Student,學生總數
-DocType: Opportunity,Sales Stage,銷售階段
-DocType: Purchase Taxes and Charges,Account Head,帳戶頭
-DocType: Company,HRA Component,HRA組件
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Electrical,電子的
-apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的組織的其餘部分用戶。您還可以添加邀請客戶到您的門戶網站通過從聯繫人中添加它們
-DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-DocType: Grant Application,Requested Amount,請求金額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +46,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: Item,Customer Code,客戶代碼
-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 +437,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
-DocType: Vital Signs,Coated,塗
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用壽命後的預期值必須小於總採購額
-DocType: GoCardless Settings,GoCardless Settings,GoCardless設置
-DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
-DocType: Certified Consultant,Certification Validity,認證有效性
-apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
-DocType: Shopping Cart Settings,Display Settings,顯示設置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,庫存資產
-DocType: Restaurant,Active Menu,活動菜單
-DocType: Target Detail,Target Qty,目標數量
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},反對貸款：{0}
-DocType: Shopping Cart Settings,Checkout Settings,結帳設定
-DocType: Student Attendance,Present,現在
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送貨單{0}不能提交
-DocType: Notification Control,Sales Invoice Message,銷售發票訊息
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉科目{0}的類型必須是負債/權益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
-DocType: Production Plan Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +822,Item {0} is disabled,項目{0}無效
-DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1021,BOM does not contain any stock item,BOM不包含任何庫存項目
-DocType: Chapter,Chapter Head,章主管
-DocType: Payment Term,Month(s) after the end of the invoice month,發票月份結束後的月份
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +66,Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪酬結構應該有靈活的福利組成來分配福利金額
-apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,專案活動／任務。
-DocType: Vital Signs,Very Coated,非常塗層
-DocType: Salary Component,Only Tax Impact (Cannot Claim But Part of Taxable Income),只有稅收影響（不能索取但應稅收入的一部分）
-DocType: Vehicle Log,Refuelling Details,加油詳情
-apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,實驗結果日期時間不能在測試日期時間之前
-DocType: POS Profile,Allow user to edit Discount,允許用戶編輯折扣
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +65,Get customers from,從中獲取客戶
-DocType: Purchase Invoice Item,Include Exploded Items,包含爆炸物品
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
-DocType: Shipping Rule,Restrict to Countries,限製到國家
-DocType: Amazon MWS Settings,Synch Taxes and Charges,同步稅和費用
-DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-DocType: Sales Invoice Timesheet,Billing Hours,結算時間
-DocType: Project,Total Sales Amount (via Sales Order),總銷售額（通過銷售訂單）
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +529,Default BOM for {0} not found,默認BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +545,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: Share Transfer,To Folio No,對開本No
-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}是非活動學生
-DocType: Employee,Health Details,健康細節
-DocType: Leave Encashment,Encashable days,可以忍受的日子
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +30,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +30,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
-DocType: Grant Application,Assessment Manager,評估經理
-DocType: Payment Entry,Allocate Payment Amount,分配付款金額
-DocType: Subscription Plan,Subscription Plan,訂閱計劃
-DocType: Employee External Work History,Salary,薪水
-DocType: Serial No,Delivery Document Type,交付文件類型
-DocType: Item Variant Settings,Do not update variants on save,不要在保存時更新變體
-DocType: Email Digest,Receivables,應收帳款
-DocType: Lead Source,Lead Source,主導來源
-DocType: Customer,Additional information regarding the customer.,對於客戶的其他訊息。
-DocType: Quality Inspection Reading,Reading 5,閱讀5
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +237,"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} 與 {2} 關聯, 但當事方科目為 {3}"
-DocType: Bank Statement Settings Item,Bank Header,銀行標題
-apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,查看實驗室測試
-DocType: Hub Users,Hub Users,Hub用戶
-DocType: Purchase Invoice,Y,ÿ
-DocType: Maintenance Visit,Maintenance Date,維修日期
-DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新年的開始日期或結束日期與{0}重疊。為了避免請將公司
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +137,Please mention the Lead Name in Lead {0},請提及潛在客戶名稱{0}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
-DocType: Item,"Example: ABCD.#####
+Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
+Attribute,屬性
+Current Count,當前計數
+Please specify from/to range,請從指定/至範圍
+Opening {0} Invoice created,打開{0}已創建發票
+Under AMC,在AMC,
+Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
+Default settings for selling transactions.,銷售交易的預設設定。
+Guardian Of ,守護者
+Threshold,閾
+Current BOM,當前BOM表
+Balance (Dr - Cr),平衡（Dr - Cr）
+Add Serial No,添加序列號
+Available Qty at Source Warehouse,源倉庫可用數量
+Warranty,保證
+Debit Note Issued,借記發行說明
+Filter based on Cost Center is only applicable if Budget Against is selected as Cost Center,基於成本中心的過濾僅適用於選擇Budget Against作為成本中心的情況
+"Search by item code, serial number, batch no or barcode",按項目代碼，序列號，批號或條碼進行搜索
+Warehouses,倉庫
+{0} asset cannot be transferred,{0}資產不得轉讓
+Hotel Room Pricing,酒店房間價格
+"Can not mark Inpatient Record Discharged, there are Unbilled Invoices {0}",無法標記出院的住院病歷，有未開單的發票{0}
+This Item is a Variant of {0} (Template).,此項目是{0}（模板）的變體。
+per hour,每小時
+Purchasing,購買
+Customer LPO,客戶LPO,
+"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",對於基於批次的學生組，學生批次將由課程註冊中的每位學生進行驗證。
+Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
+Loan,貸款
+Expense Claim Advance,費用索賠預付款
+Report Preference,報告偏好
+Volunteer information.,志願者信息。
+Project Manager,專案經理
+Quoted Item Comparison,項目報價比較
+Overlap in scoring between {0} and {1},{0}和{1}之間的得分重疊
+Dispatch,調度
+Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
+Net Asset value as on,淨資產值作為
+Produce,生產
+Default Taxes and Charges,默認稅費
+Receivable,應收帳款
+Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
+Material Consumption for Manufacture,材料消耗製造
+Alternative Item Code,替代項目代碼
+Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
+Select Items to Manufacture,選擇項目，以製造
+Delivery Stop,交貨停止
+"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
+Material Issue,發料
+Qualification,合格
+Item Price,商品價格
+Soap & Detergent,肥皂和洗滌劑
+Show Items,顯示項目
+From Time cannot be greater than To Time.,從時間不能超過結束時間大。
+Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶？
+Billing Interval,計費間隔
+Motion Picture & Video,電影和視頻
+Ordered,已訂購
+Actual start date and actual end date is mandatory,實際開始日期和實際結束日期是強制性的
+Component,零件
+Row {0}: {1} must be greater than 0,行{0}：{1}必須大於0,
+Assessment Criteria Group,評估標準組
+Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
+Enable Deferred Revenue,啟用延期收入
+Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
+Warehouse Name,倉庫名稱
+Actual start date must be less than actual end date,實際開始日期必須小於實際結束日期
+Select Transaction,選擇交易
+Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
+Write Off Entry,核銷進入
+Rate Of Materials Based On,材料成本基於
+"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",如果啟用，則在學期註冊工具中，字段學術期限將是強制性的。
+Support Analtyics,支援分析
+Uncheck all,取消所有
+Terms and Conditions,條款和條件
+Booked Fixed Asset,預訂的固定資產
+To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
+"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
+Applies to Company,適用於公司
+Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交庫存輸入{0}存在
+Update latest price in all BOMs,更新所有BOM的最新價格
+Medical Record,醫療記錄
+Vehicle,車輛
+In Words,大寫
+Enter the name of the bank or lending institution before submittting.,在提交之前輸入銀行或貸款機構的名稱。
+{0} must be submitted,必須提交{0}
+Item Groups,項目組
+For Production,對於生產
+payment_url,payment_url,
+Balance In Account Currency,科目貨幣餘額
+Please add a Temporary Opening account in Chart of Accounts,請在會計科目表中添加一個臨時開戶科目
+Customer Primary Contact,客戶主要聯繫人
+View Task,查看任務
+Opp/Lead %,Opp / Lead％
+Opp/Lead %,Opp / Lead％
+Bank Account Info,銀行科目信息
+Bank Guarantee Type,銀行擔保類型
+Invoice Portion,發票部分
+Asset Depreciations and Balances,資產折舊和平衡
+Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
+{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0}沒有醫療從業者時間表。將其添加到Healthcare Practitioner master中
+Get Advances Received,取得預先付款
+Add/Remove Recipients,添加／刪除收件人
+"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
+Amount of TDS Deducted,扣除TDS的金額
+Include Subcontracted Items,包括轉包物料
+Shortage Qty,短缺數量
+Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+Repay from Salary,從工資償還
+Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
+Salary Slip,工資單
+Lost Quotation,遺失報價
+Student Batches,學生批
+Margin Rate or Amount,保證金稅率或稅額
+'To Date' is required,“至日期”是必需填寫的
+"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
+Task weight cannot be negative,任務權重不能為負
+Sales Order Item,銷售訂單項目
+Payment Days,付款日
+Convert Item Description to Clean HTML,將項目描述轉換為清理HTML,
+Deduct Tax For Unclaimed Employee Benefits,扣除未領取僱員福利的稅
+Total Interest Amount,利息總額
+Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
+Manage cost of operations,管理作業成本
+Stale Days,陳舊的日子
+Arrival Datetime,到達日期時間
+"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.",當任何選取的交易都是“已提交”時，郵件會自動自動打開，發送電子郵件到相關的“聯絡人”通知相關交易，並用該交易作為附件。用戶可決定是否發送電子郵件。
+Billing Zipcode,計費郵編
+Global Settings,全局設置
+Assessment Result Detail,評價結果詳細
+Employee Education,員工教育
+Duplicate item group found in the item group table,在項目組表中找到重複的項目組
+It is needed to fetch Item Details.,需要獲取項目細節。
+Fertilizer Name,肥料名稱
+Net Pay,淨收費
+Account,帳戶
+Serial No {0} has already been received,已收到序號{0}
+Requested Items To Be Transferred,將要轉倉的需求項目
+Vehicle Log,車輛登錄
+Action if Accumulated Monthly Budget Exceeded on Actual,累計每月預算超出實際的行動
+Create Separate Payment Entry Against Benefit Claim,針對福利申請創建單獨的付款條目
+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）
+Sales Team Details,銷售團隊詳細
+Delete permanently?,永久刪除？
+Total Claimed Amount,總索賠額
+Potential opportunities for selling.,潛在的銷售機會。
+Folio no.,Folio no。
+Invalid {0},無效的{0}
+Email Digest,電子郵件摘要
+Billing Address Name,帳單地址名稱
+Department Stores,百貨
+Item Delivery Date,物品交貨日期
+Sales Update Frequency,銷售更新頻率
+Material Requested,要求的材料
+PIN,銷
+Reserved Qty for sub contract,分包合同的保留數量
+Patinet Service Unit,Patinet服務單位
+Base Change Amount (Company Currency),基地漲跌額（公司幣種）
+No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
+Save the document first.,首先保存文檔。
+Only {0} in stock for item {1},物品{1}的庫存僅為{0}
+Chargeable,收費
+Change Abbreviation,更改縮寫
+Fulfilment Details,履行細節
+Activities,活動
+Expense Date,犧牲日期
+No of Months,沒有幾個月
+Max Discount (%),最大折讓（％）
+Credit Days cannot be a negative number,信用日不能是負數
+Service Stop Date,服務停止日期
+Last Order Amount,最後訂單金額
+e.g Adjustments for:,例如調整：
+" {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} 留樣品是基於批次, 請檢查是否有批次不保留專案的樣品"
+Yet to appear,尚未出現
+Email Sent To,電子郵件發送給
+Job Card Item,工作卡項目
+Allow Cost Center In Entry of Balance Sheet Account,允許成本中心輸入資產負債表科目
+Merge with Existing Account,與現有科目合併
+All items have already been transferred for this Work Order.,所有項目已經為此工作單轉移。
+"Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。
+Manufacturing User,製造業用戶
+Raw Materials Supplied,提供供應商原物料
+Payment Plan,付款計劃
+Enable purchase of items via the website,通過網站啟用購買項目
+Currency of the price list {0} must be {1} or {2},價目表{0}的貨幣必須是{1}或{2}
+Subscription Management,訂閱管理
+Appraisal Template,評估模板
+To Pin Code,要密碼
+Ternary Plot,三元劇情
+Check this to enable a scheduled Daily synchronization routine via scheduler,選中此選項可通過調度程序啟用計劃的每日同步例程
+Item Classification,項目分類
+License Number,許可證號
+Business Development Manager,業務發展經理
+Maintenance Visit Purpose,維護訪問目的
+Invoice Patient Registration,發票患者登記
+Period,期間
+General Ledger,總帳
+To Fiscal Year,到財政年度
+View Leads,查看訊息
+Attribute Value,屬性值
+Expected Amount,預期金額
+Create Multiple,創建多個
+Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
+Employee {0} of grade {1} have no default leave policy,{1}級員工{0}沒有默認離開政策
+Salary Detail,薪酬詳細
+Please select {0} first,請先選擇{0}
+Added {0} users,添加了{0}個用戶
+"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",在多層程序的情況下，客戶將根據其花費自動分配到相關層
+Physician,醫師
+Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
+"Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, UOM, Qty and Dates.",物料價格根據價格表，供應商/客戶，貨幣，物料，UOM，數量和日期多次出現。
+{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0}（{1}）不能大於計畫數量 {3} 在工作訂單中（{2}）
+Name of Applicant,申請人名稱
+Time Sheet for manufacturing.,時間表製造。
+Subtotal,小計
+Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,庫存交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
+GoCardless SEPA Mandate,GoCardless SEPA授權
+Charges,收費
+Get Items For Work Order,獲取工作訂單的物品
+Default Amount,預設數量
+Warehouse not found in the system,倉庫系統中未找到
+Quality Inspection Reading,質量檢驗閱讀
+`Freeze Stocks Older Than` should be smaller than %d days.,`凍結庫存早於`應該是少於％d天。
+Purchase Tax Template,購置稅模板
+Set a sales goal you'd like to achieve for your company.,為您的公司設定您想要實現的銷售目標。
+Healthcare Services,醫療服務
+Project wise Stock Tracking,項目明智的庫存跟踪
+Regional,區域性
+Laboratory,實驗室
+UOM Category,UOM類別
+Actual Qty (at source/target),實際的數量（於 來源/目標）
+Ref Code,參考代碼
+Customer Group is Required in POS Profile,POS Profile中需要客戶組
+Payroll Settings,薪資設置
+Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
+POS Settings,POS設置
+Place Order,下單
+New Purchase Orders,新的採購訂單
+Root cannot have a parent cost center,root不能有一個父成本中心
+Select Brand...,選擇品牌...
+Non Profit (beta),非營利（測試版）
+Accumulated Depreciation as on,作為累計折舊
+Employee Tax Exemption Category,員工免稅類別
+C-Form Applicable,C-表格適用
+Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+Post Route String,郵政路線字符串
+Warehouse is mandatory,倉庫是強制性的
+Failed to create website,無法創建網站
+Mg/K,鎂/ K,
+UOM Conversion Detail,計量單位換算詳細
+Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
+Program Abbreviation,計劃縮寫
+Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
+Resolved By,議決
+Schedule Discharge,附表卸貨
+Cheques and Deposits incorrectly cleared,支票及存款不正確清除
+Account {0}: You can not assign itself as parent account,科目{0}：你不能指定自己為上層科目
+Price List Rate,價格列表費率
+Create customer quotes,創建客戶報價
+Service Stop Date cannot be after Service End Date,服務停止日期不能在服務結束日期之後
+"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
+Bill of Materials (BOM),材料清單（BOM）
+Average time taken by the supplier to deliver,採取供應商的平均時間交付
+Assessment Result,評價結果
+Employee Transfer,員工轉移
+Hours,小時
+Expected Start Date,預計開始日期
+04-Correction in Invoice,04-發票糾正
+Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
+Party Details,黨詳細
+Variant Details Report,變體詳細信息報告
+Setup Progress Action,設置進度動作
+Buying Price List,買價格表
+Remove item if charges is not applicable to that item,刪除項目，如果收費並不適用於該項目
+Cancel Subscription,取消訂閱
+Please select Maintenance Status as Completed or remove Completion Date,請選擇維護狀態為已完成或刪除完成日期
+Default Payment Terms Template,默認付款條款模板
+Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
+Receive,接受
+Earning Component,收入組件
+Quotations: ,語錄：
+Partially Fulfilled,部分實現
+Fully Completed,全面完成
+{0}% Complete,{0}％完成
+Educational Qualification,學歷
+Operating Costs,運營成本
+Currency for {0} must be {1},貨幣{0}必須{1}
+Disposal Date,處置日期
+"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工，如果他們沒有假期。回复摘要將在午夜被發送。
+Employee Leave Approver,員工請假審批
+Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
+CWIP Account,CWIP科目
+Training Feedback,培訓反饋
+Tax Withholding rates to be applied on transactions.,稅收預扣稅率適用於交易。
+Supplier Scorecard Criteria,供應商記分卡標準
+Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+Course is mandatory in row {0},當然是行強制性{0}
+To date cannot be before from date,無效的主名稱
+Prevdoc DocType,Prevdoc的DocType,
+Section Footer,章節頁腳
+Add / Edit Prices,新增 / 編輯價格
+Employee Promotion cannot be submitted before Promotion Date ,員工晉升不能在晉升日期前提交
+Is Flexible Benefit,是靈活的好處
+Chart of Cost Centers,成本中心的圖
+Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,在取消訂閱或將訂閱標記為未付之前，發票日期之後的天數已過
+Sample Collection,樣品收集
+Requested Items To Be Ordered,將要採購的需求項目
+Price List Name,價格列表名稱
+Dispatch Information,發貨信息
+Manufacturing,製造
+Ordered Items To Be Delivered,未交貨的訂購項目
+Income,收入
+Industry Type,行業類型
+Something went wrong!,出事了！
+Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
+Transaction Data Mapping,交易數據映射
+Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+Is Tax Applicable,是否適用稅務？
+Fiscal Year {0} does not exist,會計年度{0}不存在
+Amount (Company Currency),金額（公司貨幣）
+Agriculture User,農業用戶
+{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
+Student Category,學生組
+Student,學生
+Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,倉庫中不提供開始操作的庫存數量。你想記錄庫存轉移嗎？
+Shipping Rule Type,運輸規則類型
+Go to Rooms,去房間
+"Company, Payment Account, From Date and To Date is mandatory",公司，付款帳戶，從日期和日期是強制性的
+Budget Detail,預算案詳情
+Please enter message before sending,在發送前，請填寫留言
+DUPLICATE FOR SUPPLIER,供應商重複
+Point-of-Sale Profile,簡介銷售點的
+{0} should be a value between 0 and 100,{0}應該是0到100之間的一個值
+Payment of {0} from {1} to {2},從{1}到{2}的{0}付款
+Unsecured Loans,無抵押貸款
+Cost Center Name,成本中心名稱
+Max working hours against Timesheet,最大工作時間針對時間表
+Scheduled Date,預定日期
+Total Paid Amt,數金額金額
+Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
+Received and Accepted,收貨及允收
+GST Itemised Sales Register,消費稅商品銷售登記冊
+Staffing Plan Details,人員配置計劃詳情
+Serial No Service Contract Expiry,序號服務合同到期
+Employee Health Insurance,員工健康保險
+You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一科目
+Adults' pulse rate is anywhere between 50 and 80 beats per minute.,成年人的脈率在每分鐘50到80次之間。
+Help HTML,HTML幫助
+Student Group Creation Tool,學生組創建工具
+Variant Based On,基於變異對
+Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
+Loyalty Program Tier,忠誠度計劃層
+Your Suppliers,您的供應商
+Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
+Supplier Part No,供應商部件號
+Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總'不能扣除
+Received From,從......收到
+Converted,轉換
+Has Serial No,有序列號
+Date of Issue,發行日期
+"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根據購買設置，如果需要購買記錄==“是”，則為了創建採購發票，用戶需要首先為項目{0}創建採購憑證
+Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+Default Distance Unit,默認距離單位
+Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
+Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+Content Type,內容類型
+Assets,資產
+Computer,電腦
+List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
+Current Invoice End Date,當前發票結束日期
+Due Date Based On,到期日基於
+Please set default customer group and territory in Selling Settings,請在“銷售設置”中設置默認客戶組和領域
+Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
+Item: {0} does not exist in the system,項：{0}不存在於系統中
+You are not authorized to set Frozen value,您無權設定值凍結
+Get Unreconciled Entries,獲取未調節項
+Employee {0} is on Leave on {1},員工{0}暫停{1}
+No repayments selected for Journal Entry,沒有為日記帳分錄選擇還款
+From Invoice Date,從發票日期
+Laboratory Settings,實驗室設置
+Service Unit,服務單位
+Successfully Set Supplier,成功設置供應商
+Leave Encashment,離開兌現
+What does it do?,它有什麼作用？
+Tasks have been created for managing the {0} disease (on row {1}),為管理{0}疾病創建了任務（在第{1}行）
+Byproducts,副產品
+To Warehouse,到倉庫
+All Student Admissions,所有學生入學
+Average Commission Rate,平均佣金比率
+No of Shares,股份數目
+To Amount,金額
+'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+Select Status,選擇狀態
+Attendance can not be marked for future dates,考勤不能標記為未來的日期
+Post Description Key,發布說明密鑰
+Pricing Rule Help,定價規則說明
+Total Amount per Student,學生總數
+Sales Stage,銷售階段
+Account Head,帳戶頭
+HRA Component,HRA組件
+Electrical,電子的
+Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的組織的其餘部分用戶。您還可以添加邀請客戶到您的門戶網站通過從聯繫人中添加它們
+Total Value Difference (Out - In),總價值差（輸出 - ）
+Requested Amount,請求金額
+Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+User ID not set for Employee {0},用戶ID不為員工設置{0}
+Vehicle Value,汽車衡
+Detected Diseases,檢測到的疾病
+Default Source Warehouse,預設來源倉庫
+Customer Code,客戶代碼
+Last Completion Date,最後完成日期
+Days Since Last Order,天自上次訂購
+Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+Coated,塗
+Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用壽命後的預期值必須小於總採購額
+GoCardless Settings,GoCardless設置
+Leave Block List Name,休假區塊清單名稱
+Certification Validity,認證有效性
+Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
+Display Settings,顯示設置
+Stock Assets,庫存資產
+Active Menu,活動菜單
+Target Qty,目標數量
+Against Loan: {0},反對貸款：{0}
+Checkout Settings,結帳設定
+Present,現在
+Delivery Note {0} must not be submitted,送貨單{0}不能提交
+Sales Invoice Message,銷售發票訊息
+Closing Account {0} must be of type Liability / Equity,關閉科目{0}的類型必須是負債/權益
+Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
+Ordered Qty,訂購數量
+Item {0} is disabled,項目{0}無效
+Stock Frozen Upto,存貨凍結到...為止
+BOM does not contain any stock item,BOM不包含任何庫存項目
+Chapter Head,章主管
+Month(s) after the end of the invoice month,發票月份結束後的月份
+Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪酬結構應該有靈活的福利組成來分配福利金額
+Project activity / task.,專案活動／任務。
+Very Coated,非常塗層
+Only Tax Impact (Cannot Claim But Part of Taxable Income),只有稅收影響（不能索取但應稅收入的一部分）
+Refuelling Details,加油詳情
+Lab result datetime cannot be before testing datetime,實驗結果日期時間不能在測試日期時間之前
+Allow user to edit Discount,允許用戶編輯折扣
+Get customers from,從中獲取客戶
+Include Exploded Items,包含爆炸物品
+"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
+Discount must be less than 100,折扣必須小於100,
+Restrict to Countries,限製到國家
+Synch Taxes and Charges,同步稅和費用
+Write Off Amount (Company Currency),核銷金額（公司貨幣）
+Billing Hours,結算時間
+Total Sales Amount (via Sales Order),總銷售額（通過銷售訂單）
+Default BOM for {0} not found,默認BOM {0}未找到
+Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+Tap items to add them here,點擊項目將其添加到此處
+Program Enrollment,招生計劃
+To Folio No,對開本No,
+Landed Cost Voucher,到岸成本憑證
+Please set {0},請設置{0}
+{0} - {1} is inactive student,{0} - {1}是非活動學生
+{0} - {1} is inactive student,{0} - {1}是非活動學生
+Health Details,健康細節
+Encashable days,可以忍受的日子
+To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
+To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
+Assessment Manager,評估經理
+Allocate Payment Amount,分配付款金額
+Subscription Plan,訂閱計劃
+Salary,薪水
+Delivery Document Type,交付文件類型
+Do not update variants on save,不要在保存時更新變體
+Receivables,應收帳款
+Lead Source,主導來源
+Additional information regarding the customer.,對於客戶的其他訊息。
+Reading 5,閱讀5,
+"{0} {1} is associated with {2}, but Party Account is {3}","{0} {1} 與 {2} 關聯, 但當事方科目為 {3}"
+Bank Header,銀行標題
+View Lab Tests,查看實驗室測試
+Hub Users,Hub用戶
+Y,ÿ
+Maintenance Date,維修日期
+Rejected Serial No,拒絕序列號
+Year start date or end date is overlapping with {0}. To avoid please set company,新年的開始日期或結束日期與{0}重疊。為了避免請將公司
+Please mention the Lead Name in Lead {0},請提及潛在客戶名稱{0}
+Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
+"Example: ABCD.#####
If 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.","例如：ABCD #####
如果串聯設定並且序列號沒有在交易中提到，然後自動序列號將在此基礎上創建的系列。如果你總是想明確提到序號為這個項目。留空。"
-DocType: Upload Attendance,Upload Attendance,上傳考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +648,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +35,Ageing Range 2,老齡範圍2
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Installing presets,安裝預置
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +113,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,員工{0}沒有最大福利金額
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1211,Select Items based on Delivery Date,根據交付日期選擇項目
-DocType: Grant Application,Has any past Grant Record,有過去的贈款記錄嗎？
-,Sales Analytics,銷售分析
-,Prospects Engaged But Not Converted,展望未成熟
-,Prospects Engaged But Not Converted,展望未成熟
-DocType: Manufacturing Settings,Manufacturing Settings,製造設定
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設定電子郵件
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1手機號碼
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +135,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
-DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
-apps/erpnext/erpnext/templates/pages/help.html +56,See all open tickets,查看所有打開的門票
-apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js +21,Healthcare Service Unit Tree,醫療服務單位樹
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +273,Product,產品
-DocType: Products Settings,Home Page is Products,首頁是產品頁
-,Asset Depreciation Ledger,資產減值總帳
-DocType: Salary Structure,Leave Encashment Amount Per Day,每天離開沖泡量
-DocType: Loyalty Program Collection,For how much spent = 1 Loyalty Point,花費多少= 1忠誠點
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,Tax Rule Conflicts with {0},稅收規範衝突{0}
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新帳號名稱
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
-DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
-DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房間預訂
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +388,Customer Service,顧客服務
-DocType: BOM,Thumbnail,縮略圖
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +383,No contacts with email IDs found.,找不到與電子郵件ID的聯繫人。
-DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
-DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},員工{0}的最高福利金額超過{1}
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +102,Total allocated leaves are more than days in the period,分配的總葉多天的期限
-DocType: Linked Soil Analysis,Linked Soil Analysis,連接的土壤分析
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
-DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
-apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +83,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",{0}重疊的時間表，是否要在滑動重疊的插槽後繼續？
-apps/erpnext/erpnext/config/accounts.py +256,Default settings for accounting transactions.,會計交易的預設設定。
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.js +8,Grant Leaves,格蘭特葉子
-DocType: Restaurant,Default Tax Template,默認稅收模板
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +71,{0} Students have been enrolled,{0}學生已被註冊
-DocType: Fees,Student Details,學生細節
-DocType: Purchase Invoice Item,Stock Qty,庫存數量
-DocType: Purchase Invoice Item,Stock Qty,庫存數量
-DocType: QuickBooks Migrator,Default Shipping Account,默認運輸科目
-DocType: Loan,Repayment Period in Months,在月還款期
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,錯誤：沒有有效的身份證？
-DocType: Naming Series,Update Series Number,更新序列號
-DocType: Account,Equity,公平
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“損益”科目類型{2}不允許進入開
-DocType: Job Offer,Printing Details,印刷詳情
-DocType: Task,Closing Date,截止日期
-DocType: Sales Order Item,Produced Quantity,生產的產品數量
-DocType: Item Price,Quantity that must be bought or sold per UOM,每個UOM必須購買或出售的數量
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +89,Engineer,工程師
-DocType: Employee Tax Exemption Category,Max Amount,最大金額
-DocType: Journal Entry,Total Amount Currency,總金額幣種
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Item Code required at Row No {0},於列{0}需要產品編號
-DocType: GST Account,SGST Account,SGST科目
-apps/erpnext/erpnext/utilities/user_progress.py +154,Go to Items,轉到項目
-DocType: Sales Partner,Partner Type,合作夥伴類型
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +72,Actual,實際
-DocType: Restaurant Menu,Restaurant Manager,餐廳經理
-DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
-apps/erpnext/erpnext/config/projects.py +46,Timesheet for tasks.,時間表的任務。
-DocType: Purchase Invoice,Against Expense Account,對費用科目
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +287,Installation Note {0} has already been submitted,安裝注意{0}已提交
-DocType: Bank Reconciliation,Get Payment Entries,獲取付款項
-DocType: Quotation Item,Against Docname,對Docname
-DocType: SMS Center,All Employee (Active),所有員工（活動）
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
-DocType: Woocommerce Settings,Woocommerce Server URL,Woocommerce服務器URL
-DocType: Item Reorder,Re-Order Level,重新排序級別
-DocType: Shopify Tax Account,Shopify Tax/Shipping Title,Shopify稅/運輸標題
-apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,甘特圖
-DocType: Crop Cycle,Cycle Type,循環類型
-DocType: Employee,Applicable Holiday List,適用假期表
-DocType: Training Event,Employee Emails,員工電子郵件
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +67,Series Updated,系列更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Report Type is mandatory,報告類型是強制性的
-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,首先作出回應
-DocType: Website Item Group,Cross Listing of Item in multiple groups,在多組項目的交叉上市
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
-DocType: Projects Settings,Ignore User Time Overlap,忽略用戶時間重疊
-DocType: Accounting Period,Accounting Period,會計期間
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +113,Clearance Date updated,間隙更新日期
-DocType: Stock Settings,Batch Identification,批次標識
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +132,Successfully Reconciled,不甘心成功
-DocType: Request for Quotation Supplier,Download PDF,下載PDF
-DocType: Work Order,Planned End Date,計劃的結束日期
-DocType: Shareholder,Hidden list maintaining the list of contacts linked to Shareholder,隱藏列表維護鏈接到股東的聯繫人列表
-DocType: Exchange Rate Revaluation Account,Current Exchange Rate,當前匯率
-DocType: Item,"Sales, Purchase, Accounting Defaults",銷售，採購，會計違約
-apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,捐助者類型信息。
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +192,{0} on Leave on {1},{0}離開{1}
-DocType: Request for Quotation,Supplier Detail,供應商詳細
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Error in formula or condition: {0},誤差在式或條件：{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +119,Invoiced Amount,發票金額
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,標準重量必須達100％
-apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,出勤
-apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,庫存產品
-DocType: Sales Invoice,Update Billed Amount in Sales Order,更新銷售訂單中的結算金額
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取，則該列表將被加到每個應被應用到的部門。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +689,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
-apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,稅務模板購買交易。
-,Item Prices,產品價格
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存，就會顯示出來。
-DocType: Holiday List,Add to Holidays,加入假期
-DocType: Woocommerce Settings,Endpoint,端點
-DocType: Period Closing Voucher,Period Closing Voucher,期末券
-DocType: Patient Encounter,Review Details,評論細節
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +186,The shareholder does not belong to this company,股東不屬於這家公司
-DocType: Dosage Form,Dosage Form,劑型
-apps/erpnext/erpnext/config/selling.py +67,Price List master.,價格表主檔
-DocType: Task,Review Date,評論日期
-DocType: BOM,Allow Alternative Item,允許替代項目
-DocType: Company,Series for Asset Depreciation Entry (Journal Entry),資產折舊條目系列（期刊條目）
-DocType: Membership,Member Since,成員自
-DocType: Purchase Invoice,Advance Payments,預付款
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1754,Please select Healthcare Service,請選擇醫療保健服務
-DocType: Purchase Taxes and Charges,On Net Total,在總淨
-apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
-DocType: Restaurant Reservation,Waitlisted,輪候
-DocType: Employee Tax Exemption Declaration Category,Exemption Category,豁免類別
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
-DocType: Vehicle Service,Clutch Plate,離合器壓盤
-DocType: Company,Round Off Account,四捨五入科目
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Administrative Expenses,行政開支
-apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,諮詢
-DocType: Subscription Plan,Based on price list,基於價格表
-DocType: Customer Group,Parent Customer Group,母客戶群組
-DocType: Vehicle Service,Change,更改
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +898,Subscription,訂閱
-DocType: Purchase Invoice,Contact Email,聯絡電郵
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,費用創作待定
-DocType: Appraisal Goal,Score Earned,得分
-DocType: Asset Category,Asset Category Name,資產類別名稱
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,集團或Ledger ，借方或貸方，是特等科目
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新銷售人員的姓名
-DocType: Packing Slip,Gross Weight UOM,毛重計量單位
-DocType: Employee Transfer,Create New Employee Id,創建新的員工ID
-apps/erpnext/erpnext/public/js/hub/components/item_publish_dialog.js +26,Set Details,設置細節
-DocType: Travel Itinerary,Travel From,旅行從
-DocType: Asset Maintenance Task,Preventive Maintenance,預防性的維護
-DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +158,Please enter serial numbers for serialized item ,請輸入序列號序列號
-DocType: Bin,Reserved Qty for Production,預留數量生產
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
-DocType: Asset,Frequency of Depreciation (Months),折舊率（月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +542,Credit Account,信用科目
-DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +58,Show zero values,顯示零值
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
-DocType: Lab Test,Test Group,測試組
-DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付帳款
-DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-DocType: Company,Company Logo,公司標誌
-apps/erpnext/erpnext/stock/doctype/item/item.py +787,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
-DocType: QuickBooks Migrator,Default Warehouse,預設倉庫
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +55,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
-DocType: Shopping Cart Settings,Show Price,顯示價格
-DocType: Healthcare Settings,Patient Registration,病人登記
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Please enter parent cost center,請輸入父成本中心
-DocType: Delivery Note,Print Without Amount,列印表單時不印金額
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +92,Depreciation Date,折舊日期
-,Work Orders in Progress,工作訂單正在進行中
-DocType: Issue,Support Team,支持團隊
-apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),到期（天數）
-DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
-DocType: Student Attendance Tool,Batch,批量
-DocType: Support Search Source,Query Route String,查詢路由字符串
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1172,Update rate as per last purchase,根據上次購買更新率
-DocType: Donor,Donor Type,捐助者類型
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Auto repeat document updated,自動重複文件更新
-apps/erpnext/erpnext/stock/doctype/item/item.js +29,Balance,餘額
-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/exchange_rate_revaluation/exchange_rate_revaluation.py +151,Party Type and Party is mandatory for {0} account,{0}科目的參與方以及類型為必填
-DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
-DocType: GST Settings,GST Summary,消費稅總結
-apps/erpnext/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +16,Please enable default incoming account before creating Daily Work Summary Group,請在創建日常工作摘要組之前啟用默認傳入科目
-DocType: Assessment Result,Total Score,總得分
-DocType: Crop Cycle,ISO 8601 standard,ISO 8601標準
-DocType: Journal Entry,Debit Note,繳費單
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1517,You can only redeem max {0} points in this order.,您只能按此順序兌換最多{0}個積分。
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,請輸入API消費者密碼
-DocType: Stock Entry,As per Stock UOM,按庫存計量單位
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
-DocType: Student Log,Achievement,成就
-DocType: Asset,Insurer,保險公司
-DocType: Batch,Source Document Type,源文檔類型
-DocType: Batch,Source Document Type,源文檔類型
-apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,按照課程時間表創建
-DocType: Employee Onboarding,Employee Onboarding,員工入職
-DocType: Journal Entry,Total Debit,借方總額
-DocType: Travel Request Costing,Sponsored Amount,贊助金額
-DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +380,Please select Patient,請選擇患者
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,銷售人員
-DocType: Hotel Room Package,Amenities,設施
-DocType: QuickBooks Migrator,Undeposited Funds Account,未存入資金科目
-apps/erpnext/erpnext/config/accounts.py +201,Budget and Cost Center,預算和成本中心
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,不允許多種默認付款方式
-DocType: Sales Invoice,Loyalty Points Redemption,忠誠積分兌換
-,Appointment Analytics,預約分析
-DocType: Lead,Blog Subscriber,網誌訂閱者
-DocType: Guardian,Alternate Number,備用號碼
-apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
-DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,現金流量映射科目
-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: Opening Invoice Creation Tool,Create Missing Party,創建失踪派對
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +85,Total Budget,預算總額
-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,如果您每年製作學生團體，請留空
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中，則總數。工作日將包括節假日，這將縮短每天的工資的價值
-apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",使用當前密鑰的應用程序將無法訪問，您確定嗎？
-DocType: Purchase Invoice,Total Advance,預付款總計
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +78,Change Template Code,更改模板代碼
-apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,該期限結束日期不能超過期限開始日期。請更正日期，然後再試一次。
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價計數
-DocType: Bank Statement Transaction Entry,Bank Statement,銀行對帳單
-DocType: Employee Benefit Claim,Max Amount Eligible,最高金額合格
-,BOM Stock Report,BOM庫存報告
-DocType: Stock Reconciliation Item,Quantity Difference,數量差異
-DocType: Opportunity Item,Basic Rate,基礎匯率
-DocType: GL Entry,Credit Amount,信貸金額
-DocType: Cheque Print Template,Signatory Position,簽署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Set as Lost,設為失落
-DocType: Timesheet,Total Billable Hours,總計費時間
-DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,用戶必須支付此訂閱生成的發票的天數
-DocType: Employee Benefit Application Detail,Employee Benefit Application Detail,員工福利申請明細
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收貨注意事項
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,這是基於對這個顧客的交易。詳情請參閱以下時間表
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}：分配金額{1}必須小於或等於輸入付款金額{2}
-DocType: Program Enrollment Tool,New Academic Term,新學期
-,Course wise Assessment Report,課程明智的評估報告
-DocType: Purchase Invoice,Availed ITC State/UT Tax,有效的ITC州/ UT稅
-DocType: Tax Rule,Tax Rule,稅務規則
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
-apps/erpnext/erpnext/hub_node/api.py +49,Please login as another user to register on Marketplace,請以另一個用戶身份登錄以在Marketplace上註冊
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,在工作站的工作時間以外計畫時間日誌。
-apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,在排隊的客戶
-DocType: Driver,Issuing Date,發行日期
-DocType: Procedure Prescription,Appointment Booked,預約預約
-DocType: Student,Nationality,國籍
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +108,Submit this Work Order for further processing.,提交此工單以進一步處理。
-,Items To Be Requested,需求項目
-DocType: Company,Company Info,公司資訊
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1399,Select or add new customer,選擇或添加新客戶
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +177,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: Payment Request,Payment Request Type,付款申請類型
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendance,出席人數
-DocType: Fiscal Year,Year Start Date,年結開始日期
-DocType: Additional Salary,Employee Name,員工姓名
-DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐廳訂單錄入項目
-DocType: Purchase Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,不能轉換到群組科目，因為科目類型選擇的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +276,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
-apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠誠度積分無限期到期，請將到期時間保持為空或0。
-DocType: Asset Maintenance Team,Maintenance Team Members,維護團隊成員
-DocType: Loyalty Point Entry,Purchase Amount,購買金額
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +251,"Cannot deliver Serial No {0} of item {1} as it is reserved \
+Upload Attendance,上傳考勤
+BOM and Manufacturing Quantity are required,BOM和生產量是必需的
+Ageing Range 2,老齡範圍2,
+Installing presets,安裝預置
+No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
+Employee {0} has no maximum benefit amount,員工{0}沒有最大福利金額
+Select Items based on Delivery Date,根據交付日期選擇項目
+Has any past Grant Record,有過去的贈款記錄嗎？
+Sales Analytics,銷售分析
+Prospects Engaged But Not Converted,展望未成熟
+Prospects Engaged But Not Converted,展望未成熟
+Manufacturing Settings,製造設定
+Setting up Email,設定電子郵件
+Guardian1 Mobile No,Guardian1手機號碼
+Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
+Stock Entry Detail,存貨分錄明細
+See all open tickets,查看所有打開的門票
+Healthcare Service Unit Tree,醫療服務單位樹
+Product,產品
+Home Page is Products,首頁是產品頁
+Asset Depreciation Ledger,資產減值總帳
+Leave Encashment Amount Per Day,每天離開沖泡量
+For how much spent = 1 Loyalty Point,花費多少= 1忠誠點
+Tax Rule Conflicts with {0},稅收規範衝突{0}
+New Account Name,新帳號名稱
+Raw Materials Supplied Cost,原料供應成本
+Settings for Selling Module,設置銷售模塊
+Hotel Room Reservation,酒店房間預訂
+Customer Service,顧客服務
+Thumbnail,縮略圖
+No contacts with email IDs found.,找不到與電子郵件ID的聯繫人。
+Item Customer Detail,項目客戶詳細
+Prompt for Email on Submission of,提示電子郵件的提交
+Maximum benefit amount of employee {0} exceeds {1},員工{0}的最高福利金額超過{1}
+Total allocated leaves are more than days in the period,分配的總葉多天的期限
+Linked Soil Analysis,連接的土壤分析
+Item {0} must be a stock Item,項{0}必須是一個缺貨登記
+Default Work In Progress Warehouse,預設在製品倉庫
+"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",{0}重疊的時間表，是否要在滑動重疊的插槽後繼續？
+Default settings for accounting transactions.,會計交易的預設設定。
+Grant Leaves,格蘭特葉子
+Default Tax Template,默認稅收模板
+{0} Students have been enrolled,{0}學生已被註冊
+Student Details,學生細節
+Stock Qty,庫存數量
+Stock Qty,庫存數量
+Default Shipping Account,默認運輸科目
+Error: Not a valid id?,錯誤：沒有有效的身份證？
+Update Series Number,更新序列號
+Equity,公平
+{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“損益”科目類型{2}不允許進入開
+Printing Details,印刷詳情
+Closing Date,截止日期
+Produced Quantity,生產的產品數量
+Quantity that must be bought or sold per UOM,每個UOM必須購買或出售的數量
+Engineer,工程師
+Max Amount,最大金額
+Total Amount Currency,總金額幣種
+Search Sub Assemblies,搜索子組件
+Item Code required at Row No {0},於列{0}需要產品編號
+SGST Account,SGST科目
+Go to Items,轉到項目
+Partner Type,合作夥伴類型
+Actual,實際
+Restaurant Manager,餐廳經理
+Customerwise Discount,Customerwise折扣
+Timesheet for tasks.,時間表的任務。
+Against Expense Account,對費用科目
+Installation Note {0} has already been submitted,安裝注意{0}已提交
+Get Payment Entries,獲取付款項
+Against Docname,對Docname,
+All Employee (Active),所有員工（活動）
+View Now,立即觀看
+Woocommerce Server URL,Woocommerce服務器URL,
+Re-Order Level,重新排序級別
+Shopify Tax/Shipping Title,Shopify稅/運輸標題
+Gantt Chart,甘特圖
+Cycle Type,循環類型
+Applicable Holiday List,適用假期表
+Employee Emails,員工電子郵件
+Series Updated,系列更新
+Report Type is mandatory,報告類型是強制性的
+Serial Number Series,序列號系列
+Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的庫存項目{0}行{1}
+Retail & Wholesale,零售及批發
+First Responded On,首先作出回應
+Cross Listing of Item in multiple groups,在多組項目的交叉上市
+Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+Ignore User Time Overlap,忽略用戶時間重疊
+Accounting Period,會計期間
+Clearance Date updated,間隙更新日期
+Batch Identification,批次標識
+Successfully Reconciled,不甘心成功
+Download PDF,下載PDF,
+Planned End Date,計劃的結束日期
+Hidden list maintaining the list of contacts linked to Shareholder,隱藏列表維護鏈接到股東的聯繫人列表
+Current Exchange Rate,當前匯率
+"Sales, Purchase, Accounting Defaults",銷售，採購，會計違約
+Donor Type information.,捐助者類型信息。
+{0} on Leave on {1},{0}離開{1}
+Supplier Detail,供應商詳細
+Error in formula or condition: {0},誤差在式或條件：{0}
+Invoiced Amount,發票金額
+Criteria weights must add up to 100%,標準重量必須達100％
+Attendance,出勤
+Stock Items,庫存產品
+Update Billed Amount in Sales Order,更新銷售訂單中的結算金額
+"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取，則該列表將被加到每個應被應用到的部門。
+Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+Tax template for buying transactions.,稅務模板購買交易。
+Item Prices,產品價格
+In Words will be visible once you save the Purchase Order.,採購訂單一被儲存，就會顯示出來。
+Add to Holidays,加入假期
+Endpoint,端點
+Period Closing Voucher,期末券
+Review Details,評論細節
+The shareholder does not belong to this company,股東不屬於這家公司
+Dosage Form,劑型
+Price List master.,價格表主檔
+Review Date,評論日期
+Allow Alternative Item,允許替代項目
+Series for Asset Depreciation Entry (Journal Entry),資產折舊條目系列（期刊條目）
+Member Since,成員自
+Advance Payments,預付款
+Please select Healthcare Service,請選擇醫療保健服務
+On Net Total,在總淨
+Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
+Waitlisted,輪候
+Exemption Category,豁免類別
+Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+Clutch Plate,離合器壓盤
+Round Off Account,四捨五入科目
+Administrative Expenses,行政開支
+Consulting,諮詢
+Based on price list,基於價格表
+Parent Customer Group,母客戶群組
+Change,更改
+Subscription,訂閱
+Contact Email,聯絡電郵
+Fee Creation Pending,費用創作待定
+Score Earned,得分
+Asset Category Name,資產類別名稱
+This is a root territory and cannot be edited.,集團或Ledger ，借方或貸方，是特等科目
+New Sales Person Name,新銷售人員的姓名
+Gross Weight UOM,毛重計量單位
+Create New Employee Id,創建新的員工ID,
+Set Details,設置細節
+Travel From,旅行從
+Preventive Maintenance,預防性的維護
+Against Sales Invoice,對銷售發票
+Please enter serial numbers for serialized item ,請輸入序列號序列號
+Reserved Qty for Production,預留數量生產
+Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
+Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
+Frequency of Depreciation (Months),折舊率（月）
+Credit Account,信用科目
+Landed Cost Item,到岸成本項目
+Show zero values,顯示零值
+Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
+Test Group,測試組
+Receivable / Payable Account,應收/應付帳款
+Against Sales Order Item,對銷售訂單項目
+Company Logo,公司標誌
+Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+Default Warehouse,預設倉庫
+Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
+Show Price,顯示價格
+Patient Registration,病人登記
+Please enter parent cost center,請輸入父成本中心
+Print Without Amount,列印表單時不印金額
+Depreciation Date,折舊日期
+Work Orders in Progress,工作訂單正在進行中
+Support Team,支持團隊
+Expiry (In Days),到期（天數）
+Total Score (Out of 5),總分（滿分5分）
+Batch,批量
+Query Route String,查詢路由字符串
+Update rate as per last purchase,根據上次購買更新率
+Donor Type,捐助者類型
+Auto repeat document updated,自動重複文件更新
+Balance,餘額
+Please select the Company,請選擇公司
+Seating Capacity,座位數
+Lab Test Groups,實驗室測試組
+Party Type and Party is mandatory for {0} account,{0}科目的參與方以及類型為必填
+Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
+GST Summary,消費稅總結
+Please enable default incoming account before creating Daily Work Summary Group,請在創建日常工作摘要組之前啟用默認傳入科目
+Total Score,總得分
+ISO 8601 standard,ISO 8601標準
+Debit Note,繳費單
+You can only redeem max {0} points in this order.,您只能按此順序兌換最多{0}個積分。
+Please enter API Consumer Secret,請輸入API消費者密碼
+As per Stock UOM,按庫存計量單位
+Not Expired,沒有過期
+Achievement,成就
+Insurer,保險公司
+Source Document Type,源文檔類型
+Source Document Type,源文檔類型
+Following course schedules were created,按照課程時間表創建
+Employee Onboarding,員工入職
+Total Debit,借方總額
+Sponsored Amount,贊助金額
+Default Finished Goods Warehouse,預設成品倉庫
+Please select Patient,請選擇患者
+Sales Person,銷售人員
+Amenities,設施
+Undeposited Funds Account,未存入資金科目
+Budget and Cost Center,預算和成本中心
+Multiple default mode of payment is not allowed,不允許多種默認付款方式
+Loyalty Points Redemption,忠誠積分兌換
+Appointment Analytics,預約分析
+Blog Subscriber,網誌訂閱者
+Alternate Number,備用號碼
+Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
+Cash Flow Mapping Accounts,現金流量映射科目
+ Group Roll No,組卷號
+Manufacturing Date,生產日期
+Fee Creation Failed,費用創作失敗
+Create Missing Party,創建失踪派對
+Total Budget,預算總額
+Leave blank if you make students groups per year,如果您每年製作學生團體，請留空
+Leave blank if you make students groups per year,如果您每年製作學生團體，請留空
+"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中，則總數。工作日將包括節假日，這將縮短每天的工資的價值
+"Apps using current key won't be able to access, are you sure?",使用當前密鑰的應用程序將無法訪問，您確定嗎？
+Total Advance,預付款總計
+Change Template Code,更改模板代碼
+The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,該期限結束日期不能超過期限開始日期。請更正日期，然後再試一次。
+Quot Count,報價
+Quot Count,報價計數
+Bank Statement,銀行對帳單
+Max Amount Eligible,最高金額合格
+BOM Stock Report,BOM庫存報告
+Quantity Difference,數量差異
+Basic Rate,基礎匯率
+Credit Amount,信貸金額
+Signatory Position,簽署的位置
+Set as Lost,設為失落
+Total Billable Hours,總計費時間
+Number of days that the subscriber has to pay invoices generated by this subscription,用戶必須支付此訂閱生成的發票的天數
+Employee Benefit Application Detail,員工福利申請明細
+Payment Receipt Note,付款收貨注意事項
+This is based on transactions against this Customer. See timeline below for details,這是基於對這個顧客的交易。詳情請參閱以下時間表
+Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}：分配金額{1}必須小於或等於輸入付款金額{2}
+New Academic Term,新學期
+Course wise Assessment Report,課程明智的評估報告
+Availed ITC State/UT Tax,有效的ITC州/ UT稅
+Tax Rule,稅務規則
+Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
+Please login as another user to register on Marketplace,請以另一個用戶身份登錄以在Marketplace上註冊
+Plan time logs outside Workstation Working Hours.,在工作站的工作時間以外計畫時間日誌。
+Customers in Queue,在排隊的客戶
+Issuing Date,發行日期
+Appointment Booked,預約預約
+Nationality,國籍
+Submit this Work Order for further processing.,提交此工單以進一步處理。
+Items To Be Requested,需求項目
+Company Info,公司資訊
+Select or add new customer,選擇或添加新客戶
+Cost center is required to book an expense claim,成本中心需要預訂費用報銷
+Application of Funds (Assets),基金中的應用（資產）
+This is based on the attendance of this Employee,這是基於該員工的考勤
+Payment Request Type,付款申請類型
+Mark Attendance,出席人數
+Year Start Date,年結開始日期
+Employee Name,員工姓名
+Restaurant Order Entry Item,餐廳訂單錄入項目
+Rounded Total (Company Currency),整數總計（公司貨幣）
+Cannot covert to Group because Account Type is selected.,不能轉換到群組科目，因為科目類型選擇的。
+{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
+Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
+"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠誠度積分無限期到期，請將到期時間保持為空或0。
+Maintenance Team Members,維護團隊成員
+Purchase Amount,購買金額
+"Cannot deliver Serial No {0} of item {1} as it is reserved \
to fullfill Sales Order {2}",無法交付項目{1}的序列號{0}，因為它已保留\以滿足銷售訂單{2}
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供應商報價{0}創建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,結束年份不能啟動年前
-DocType: Employee Benefit Application,Employee Benefits,員工福利
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
-DocType: Work Order,Manufactured Qty,生產數量
-apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +79,The shares don't exist with the {0},這些份額不存在於{0}
-DocType: Sales Partner Type,Sales Partner Type,銷售夥伴類型
-apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,已創建發票
-DocType: Asset,Out of Order,亂序
-DocType: Purchase Receipt Item,Accepted Quantity,允收數量
-DocType: Projects Settings,Ignore Workstation Time Overlap,忽略工作站時間重疊
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +302,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,選擇批號
-apps/erpnext/erpnext/config/accounts.py +14,Bills raised to Customers.,客戶提出的賬單。
-DocType: Healthcare Settings,Invoice Appointments Automatically,自動發票約會
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-DocType: Salary Component,Variable Based On Taxable Salary,基於應納稅工資的變量
-DocType: Company,Basic Component,基本組件
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +578,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
-DocType: Patient Service Unit,Medical Administrator,醫療管理員
-DocType: Assessment Plan,Schedule,時間表
-DocType: Account,Parent Account,上層科目
-DocType: Quality Inspection Reading,Reading 3,閱讀3
-DocType: Stock Entry,Source Warehouse Address,來源倉庫地址
-DocType: GL Entry,Voucher Type,憑證類型
-DocType: Amazon MWS Settings,Max Retry Limit,最大重試限制
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1731,Price List not found or disabled,價格表未找到或被禁用
-DocType: Student Applicant,Approved,批准
-apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +15,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +349,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
-DocType: Marketplace Settings,Last Sync On,上次同步開啟
-DocType: Guardian,Guardian,監護人
-apps/erpnext/erpnext/support/doctype/issue/issue.js +48,All communications including and above this shall be moved into the new Issue,包括及以上的所有通信均應移至新發行中
-DocType: Salary Detail,Tax on additional salary,額外工資稅
-DocType: Item Alternative,Item Alternative,項目選擇
-DocType: Healthcare Settings,Default income accounts to be used if not set in Healthcare Practitioner to book Appointment charges.,如果未在醫生執業者中設置預約費用，則使用默認收入帳戶。
-DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,創建缺少的客戶或供應商。
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
-DocType: Payroll Entry,Salary Slips Created,工資單創建
-DocType: Inpatient Record,Expected Discharge,預期解僱
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +594,Del,刪除
-DocType: Selling Settings,Campaign Naming By,活動命名由
-DocType: Employee,Current Address Is,當前地址是
-apps/erpnext/erpnext/utilities/user_progress.py +51,Monthly Sales Target (,每月銷售目標（
-DocType: Travel Request,Identification Document Number,身份證明文件號碼
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
-DocType: Sales Invoice,Customer GSTIN,客戶GSTIN
-DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,在現場檢測到的疾病清單。當選擇它會自動添加一個任務清單處理疾病
-apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js +30,This is a root healthcare service unit and cannot be edited.,這是根醫療保健服務單位，不能編輯。
-DocType: Asset Repair,Repair Status,維修狀態
-apps/erpnext/erpnext/public/js/event.js +31,Add Sales Partners,添加銷售合作夥伴
-apps/erpnext/erpnext/config/accounts.py +45,Accounting journal entries.,會計日記帳分錄。
-DocType: Travel Request,Travel Request,旅行要求
-DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,請選擇員工記錄第一。
-apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +52,Attendance not submitted for {0} as it is a Holiday.,由於是假期，因此未出席{0}的考勤。
-DocType: POS Profile,Account for Change Amount,帳戶漲跌額
-DocType: QuickBooks Migrator,Connecting to QuickBooks,連接到QuickBooks
-DocType: Exchange Rate Revaluation,Total Gain/Loss,總收益/損失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,公司發票無效公司。
-DocType: Purchase Invoice,input service,輸入服務
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
-DocType: Employee Promotion,Employee Promotion,員工晉升
-DocType: Maintenance Team Member,Maintenance Team Member,維護團隊成員
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +16,Course Code: ,課程編號：
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,請輸入您的費用科目
-DocType: Account,Stock,庫存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1128,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
-DocType: Employee,Current Address,當前地址
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設定的一個變體，除非明確指定
-DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
-DocType: Assessment Group,Assessment Group,評估小組
-apps/erpnext/erpnext/config/stock.py +332,Batch Inventory,批量庫存
-DocType: Supplier,GST Transporter ID,消費稅轉運ID
-DocType: Procedure Prescription,Procedure Name,程序名稱
-DocType: Employee,Contract End Date,合同結束日期
-DocType: Amazon MWS Settings,Seller ID,賣家ID
-DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
-DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,銀行對賬單交易分錄
-DocType: Sales Invoice Item,Discount and Margin,折扣和保證金
-DocType: Lab Test,Prescription,處方
-DocType: Company,Default Deferred Revenue Account,默認遞延收入科目
-DocType: Project,Second Email,第二封郵件
-DocType: Budget,Action if Annual Budget Exceeded on Actual,年度預算超出實際的行動
-DocType: Pricing Rule,Min Qty,最小數量
-DocType: Production Plan Item,Planned Qty,計劃數量
-DocType: Company,Date of Incorporation,註冊成立日期
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,總稅收
-apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +40,Last Purchase Price,上次購買價格
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +284,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
-DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
-DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
-DocType: Delivery Note,Air,空氣
-apps/erpnext/erpnext/education/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超過年度開始日期。請更正日期，然後再試一次。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,{0} is not in Optional Holiday List,{0}不在可選節日列表中
-DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
-DocType: BOM,Scrap Items,廢物品
-DocType: Job Card,Actual Start Date,實際開始日期
-DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Work Orders.,生成材料請求（MRP）和工作訂單。
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +62,Set default mode of payment,設置默認付款方式
-DocType: BOM,With Operations,加入作業
-DocType: Support Search Source,Post Route Key List,發布路由密鑰列表
-apps/erpnext/erpnext/accounts/party.py +288,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付科目幣種{0}。
-DocType: Asset,Is Existing Asset,是對現有資產
-DocType: Salary Component,Statistical Component,統計組成部分
-DocType: Salary Component,Statistical Component,統計組成部分
-DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
-DocType: Purchase Invoice,Without Payment of Tax,不繳納稅款
-DocType: BOM Operation,BOM Operation,BOM的操作
-DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
-DocType: Item,Has Expiry Date,有過期日期
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +367,Transfer Asset,轉讓資產
-DocType: POS Profile,POS Profile,POS簡介
-DocType: Training Event,Event Name,事件名稱
-DocType: Healthcare Practitioner,Phone (Office),電話（辦公室）
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +21,"Cannot Submit, Employees left to mark attendance",無法提交，僱員留下來標記出席
-DocType: Inpatient Record,Admission,入場
-apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},招生{0}
-apps/erpnext/erpnext/config/accounts.py +225,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
-DocType: Supplier Scorecard Scoring Variable,Variable Name,變量名
-apps/erpnext/erpnext/stock/get_item_details.py +163,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
-DocType: Purchase Invoice Item,Deferred Expense,遞延費用
-apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +26,From Date {0} cannot be before employee's joining Date {1},起始日期{0}不能在員工加入日期之前{1}
-DocType: Asset,Asset Category,資產類別
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,Net pay cannot be negative,淨工資不能為負
-DocType: Purchase Order,Advance Paid,提前支付
-DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,銷售訂單超額生產百分比
-DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +951,Material to Supplier,材料到供應商
-DocType: Production Plan,Material Request Planning,物料請求計劃
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +708,Excise Invoice,消費稅發票
-apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現％不止一次
-DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
-DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Current Liabilities,流動負債
-apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,計時器超出了指定的小時數
-apps/erpnext/erpnext/config/selling.py +303,Send mass SMS to your contacts,發送群發短信到您的聯絡人
-DocType: Inpatient Record,A Positive,積極的
-DocType: Program,Program Name,程序名稱
-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 +89,"{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: Loan,Loan Type,貸款類型
-DocType: Scheduling Tool,Scheduling Tool,調度工具
-DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +766,Syntax error in condition: {0},條件中的語法錯誤：{0}
-DocType: Employee Education,Major/Optional Subjects,大/選修課
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +121,Please Set Supplier Group in Buying Settings.,請設置供應商組購買設置。
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,"Total flexible benefit component amount {0} should not be less \
+Supplier Quotation {0} created,供應商報價{0}創建
+End Year cannot be before Start Year,結束年份不能啟動年前
+Employee Benefits,員工福利
+Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+Manufactured Qty,生產數量
+The shares don't exist with the {0},這些份額不存在於{0}
+Sales Partner Type,銷售夥伴類型
+Invoice Created,已創建發票
+Out of Order,亂序
+Accepted Quantity,允收數量
+Ignore Workstation Time Overlap,忽略工作站時間重疊
+Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
+Select Batch Numbers,選擇批號
+Bills raised to Customers.,客戶提出的賬單。
+Invoice Appointments Automatically,自動發票約會
+Project Id,項目編號
+Variable Based On Taxable Salary,基於應納稅工資的變量
+Basic Component,基本組件
+Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
+Medical Administrator,醫療管理員
+Schedule,時間表
+Parent Account,上層科目
+Reading 3,閱讀3,
+Source Warehouse Address,來源倉庫地址
+Voucher Type,憑證類型
+Max Retry Limit,最大重試限制
+Price List not found or disabled,價格表未找到或被禁用
+Price,價格
+Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+Last Sync On,上次同步開啟
+Guardian,監護人
+All communications including and above this shall be moved into the new Issue,包括及以上的所有通信均應移至新發行中
+Tax on additional salary,額外工資稅
+Item Alternative,項目選擇
+Default income accounts to be used if not set in Healthcare Practitioner to book Appointment charges.,如果未在醫生執業者中設置預約費用，則使用默認收入帳戶。
+Create missing customer or supplier.,創建缺少的客戶或供應商。
+Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
+Salary Slips Created,工資單創建
+Expected Discharge,預期解僱
+Del,刪除
+Campaign Naming By,活動命名由
+Current Address Is,當前地址是
+Monthly Sales Target (,每月銷售目標（
+Identification Document Number,身份證明文件號碼
+"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
+Customer GSTIN,客戶GSTIN,
+List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,在現場檢測到的疾病清單。當選擇它會自動添加一個任務清單處理疾病
+This is a root healthcare service unit and cannot be edited.,這是根醫療保健服務單位，不能編輯。
+Repair Status,維修狀態
+Add Sales Partners,添加銷售合作夥伴
+Accounting journal entries.,會計日記帳分錄。
+Travel Request,旅行要求
+Available Qty at From Warehouse,可用數量從倉庫
+Please select Employee Record first.,請選擇員工記錄第一。
+Attendance not submitted for {0} as it is a Holiday.,由於是假期，因此未出席{0}的考勤。
+Account for Change Amount,帳戶漲跌額
+Connecting to QuickBooks,連接到QuickBooks,
+Total Gain/Loss,總收益/損失
+Invalid Company for Inter Company Invoice.,公司發票無效公司。
+input service,輸入服務
+Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
+Employee Promotion,員工晉升
+Maintenance Team Member,維護團隊成員
+Course Code: ,課程編號：
+Please enter Expense Account,請輸入您的費用科目
+Stock,庫存
+"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
+Current Address,當前地址
+"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設定的一個變體，除非明確指定
+Purchase / Manufacture Details,採購／製造詳細資訊
+Assessment Group,評估小組
+Batch Inventory,批量庫存
+GST Transporter ID,消費稅轉運ID,
+Procedure Name,程序名稱
+Contract End Date,合同結束日期
+Seller ID,賣家ID,
+Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
+Bank Statement Transaction Entry,銀行對賬單交易分錄
+Discount and Margin,折扣和保證金
+Prescription,處方
+Default Deferred Revenue Account,默認遞延收入科目
+Second Email,第二封郵件
+Action if Annual Budget Exceeded on Actual,年度預算超出實際的行動
+Min Qty,最小數量
+Planned Qty,計劃數量
+Date of Incorporation,註冊成立日期
+Total Tax,總稅收
+Last Purchase Price,上次購買價格
+For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
+Default Target Warehouse,預設目標倉庫
+Net Total (Company Currency),總淨值（公司貨幣）
+Air,空氣
+The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超過年度開始日期。請更正日期，然後再試一次。
+{0} is not in Optional Holiday List,{0}不在可選節日列表中
+Purchase Receipt Message,採購入庫單訊息
+Scrap Items,廢物品
+Actual Start Date,實際開始日期
+% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
+Generate Material Requests (MRP) and Work Orders.,生成材料請求（MRP）和工作訂單。
+Set default mode of payment,設置默認付款方式
+With Operations,加入作業
+Post Route Key List,發布路由密鑰列表
+Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付科目幣種{0}。
+Is Existing Asset,是對現有資產
+Statistical Component,統計組成部分
+Statistical Component,統計組成部分
+If different than customer address,如果與客戶地址不同
+Without Payment of Tax,不繳納稅款
+BOM Operation,BOM的操作
+On Previous Row Amount,在上一行金額
+Has Expiry Date,有過期日期
+Transfer Asset,轉讓資產
+POS Profile,POS簡介
+Event Name,事件名稱
+Phone (Office),電話（辦公室）
+"Cannot Submit, Employees left to mark attendance",無法提交，僱員留下來標記出席
+Admission,入場
+Admissions for {0},招生{0}
+"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
+Variable Name,變量名
+"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
+Deferred Expense,遞延費用
+From Date {0} cannot be before employee's joining Date {1},起始日期{0}不能在員工加入日期之前{1}
+Asset Category,資產類別
+Net pay cannot be negative,淨工資不能為負
+Advance Paid,提前支付
+Overproduction Percentage For Sales Order,銷售訂單超額生產百分比
+Item Tax,產品稅
+Material to Supplier,材料到供應商
+Material Request Planning,物料請求計劃
+Excise Invoice,消費稅發票
+Treshold {0}% appears more than once,Treshold {0}出現％不止一次
+Employees Email Id,員工的電子郵件ID,
+Marked Attendance,明顯考勤
+Current Liabilities,流動負債
+Timer exceeded the given hours.,計時器超出了指定的小時數
+Send mass SMS to your contacts,發送群發短信到您的聯絡人
+A Positive,積極的
+Program Name,程序名稱
+Consider Tax or Charge for,考慮稅收或收費
+Driving License Category,駕駛執照類別
+Actual Qty is mandatory,實際數量是強制性
+"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，而採購訂單應謹慎提供給供應商。
+Asset Maintenance Team,資產維護團隊
+Scheduling Tool,調度工具
+Item to be manufactured or repacked,產品被製造或重新包裝
+Syntax error in condition: {0},條件中的語法錯誤：{0}
+Major/Optional Subjects,大/選修課
+Please Set Supplier Group in Buying Settings.,請設置供應商組購買設置。
+"Total flexible benefit component amount {0} should not be less \
than max benefits {1}",靈活福利組件總額{0}不應低於最大福利{1}
-DocType: Sales Invoice Item,Drop Ship,直接發運給客戶
-DocType: Driver,Suspended,暫停
-DocType: Training Event,Attendees,與會者
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
-DocType: Academic Term,Term End Date,期限結束日期
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
-DocType: Item Group,General Settings,一般設定
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
-DocType: Taxable Salary Slab,Percent Deduction,扣除百分比
-DocType: Stock Entry,Repack,重新包裝
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在繼續之前，您必須儲存表單
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +125,Please select the Company first,請先選擇公司
-DocType: Item Attribute,Numeric Values,數字值
-apps/erpnext/erpnext/public/js/setup_wizard.js +56,Attach Logo,附加標誌
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +51,Stock Levels,庫存水平
-DocType: Customer,Commission Rate,佣金比率
-apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +241,Successfully created payment entries,成功創建付款條目
-apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,為{1}創建{0}記分卡：
-apps/erpnext/erpnext/stock/doctype/item/item.js +590,Make Variant,在Variant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一，收費和內部轉賬
-DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首選地區
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,車是空的
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +430,"Item {0} has no Serial No. Only serilialized items \
+Drop Ship,直接發運給客戶
+Suspended,暫停
+Attendees,與會者
+"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
+Term End Date,期限結束日期
+Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
+General Settings,一般設定
+From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
+Percent Deduction,扣除百分比
+Repack,重新包裝
+You must Save the form before proceeding,在繼續之前，您必須儲存表單
+Please select the Company first,請先選擇公司
+Numeric Values,數字值
+Attach Logo,附加標誌
+Stock Levels,庫存水平
+Commission Rate,佣金比率
+Successfully created payment entries,成功創建付款條目
+Created {0} scorecards for {1} between: ,為{1}創建{0}記分卡：
+Make Variant,在Variant,
+"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一，收費和內部轉賬
+Preferred Area for Lodging,住宿的首選地區
+Cart is Empty,車是空的
+"Item {0} has no Serial No. Only serilialized items \
can have delivery based on Serial No",項目{0}沒有序列號只有serilialized items \可以根據序列號進行交付
-DocType: Work Order,Actual Operating Cost,實際運行成本
-DocType: Payment Entry,Cheque/Reference No,支票/參考編號
-DocType: Soil Texture,Clay Loam,粘土Loam
-apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root cannot be edited.,root不能被編輯。
-DocType: Item,Units of Measure,測量的單位
-DocType: Supplier,Default Tax Withholding Config,預設稅款預扣配置
-DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
-DocType: Sales Invoice,Customer's Purchase Order Date,客戶的採購訂單日期
-DocType: Asset,Default Finance Book,默認金融書
-DocType: Shopping Cart Settings,Show Public Attachments,顯示公共附件
-apps/erpnext/erpnext/public/js/hub/components/item_publish_dialog.js +3,Edit Publishing Details,編輯發布細節
-DocType: Packing Slip,Package Weight Details,包裝重量詳情
-DocType: Leave Type,Is Compensatory,是有補償的
-DocType: Restaurant Reservation,Reservation Time,預訂時間
-DocType: Payment Gateway Account,Payment Gateway Account,網路支付閘道科目
-DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成後重定向用戶選擇的頁面。
-DocType: Company,Existing Company,現有的公司
-DocType: Healthcare Settings,Result Emailed,電子郵件結果
-apps/erpnext/erpnext/controllers/buying_controller.py +101,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",稅項類別已更改為“合計”，因為所有物品均為非庫存物品
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +35,To date can not be equal or less than from date,迄今為止不能等於或少於日期
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,沒什麼可改變的
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,請選擇一個csv文件
-DocType: Holiday List,Total Holidays,總假期
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Missing email template for dispatch. Please set one in Delivery Settings.,缺少發送的電子郵件模板。請在“傳遞設置”中設置一個。
-DocType: Student Leave Application,Mark as Present,標記為現
-DocType: Supplier Scorecard,Indicator Color,指示燈顏色
-DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
-apps/erpnext/erpnext/controllers/buying_controller.py +691,Row #{0}: Reqd by Date cannot be before Transaction Date,行號{0}：按日期請求不能在交易日期之前
-apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色產品
-apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,選擇序列號
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +99,Designer,設計師
-apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,條款及細則範本
-DocType: Delivery Trip,Delivery Details,交貨細節
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
-DocType: Program,Program Code,程序代碼
-DocType: Terms and Conditions,Terms and Conditions Help,條款和條件幫助
-,Item-wise Purchase Register,項目明智的購買登記
-DocType: Loyalty Point Entry,Expiry Date,到期時間
-DocType: Healthcare Settings,Employee name and designation in print,員工姓名和印刷品名稱
-,accounts-browser,科目瀏覽器
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +381,Please select Category first,請先選擇分類
-apps/erpnext/erpnext/config/projects.py +13,Project master.,專案主持。
-apps/erpnext/erpnext/controllers/status_updater.py +215,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允許對賬單或過度訂貨，庫存設置或更新項目“津貼”。
-DocType: Contract,Contract Terms,合同條款
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +89,Maximum benefit amount of component {0} exceeds {1},組件{0}的最大受益金額超過{1}
-DocType: Payment Term,Credit Days,信貸天
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +140,Please select Patient to get Lab Tests,請選擇患者以獲得實驗室測試
-apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,讓學生批
-DocType: BOM Explosion Item,Allow Transfer for Manufacture,允許轉移製造
-DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +997,Get Items from BOM,從物料清單取得項目
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
-DocType: Cash Flow Mapping,Is Income Tax Expense,是所得稅費用
-apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,您的訂單已發貨！
-apps/erpnext/erpnext/controllers/accounts_controller.py +693,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,庫存摘要
-apps/erpnext/erpnext/config/assets.py +62,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
-DocType: Employee Benefit Application,Remaining Benefits (Yearly),剩餘福利（每年）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +873,Bill of Materials,材料清單
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：參與方類型和參與方需要應收/應付科目{1}
-DocType: Employee,Leave Policy,離開政策
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +865,Update Items,更新項目
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,參考日期
-DocType: Employee,Reason for Leaving,離職原因
-DocType: BOM Operation,Operating Cost(Company Currency),營業成本（公司貨幣）
-DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
-DocType: Item,Shelf Life In Days,保質期天數
-DocType: GL Entry,Is Opening,是開幕
-DocType: Department,Expense Approvers,費用審批人
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +228,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
-DocType: Journal Entry,Subscription Section,認購科
-apps/erpnext/erpnext/accounts/doctype/account/account.py +238,Account {0} does not exist,科目{0}不存在
-DocType: Training Event,Training Program,培訓計劃
-DocType: Account,Cash,現金
-DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
+Actual Operating Cost,實際運行成本
+Cheque/Reference No,支票/參考編號
+Clay Loam,粘土Loam,
+Root cannot be edited.,root不能被編輯。
+Units of Measure,測量的單位
+Default Tax Withholding Config,預設稅款預扣配置
+Allow Production on Holidays,允許假日生產
+Customer's Purchase Order Date,客戶的採購訂單日期
+Default Finance Book,默認金融書
+Show Public Attachments,顯示公共附件
+Edit Publishing Details,編輯發布細節
+Package Weight Details,包裝重量詳情
+Is Compensatory,是有補償的
+Reservation Time,預訂時間
+Payment Gateway Account,網路支付閘道科目
+After payment completion redirect user to selected page.,支付完成後重定向用戶選擇的頁面。
+Existing Company,現有的公司
+Result Emailed,電子郵件結果
+"Tax Category has been changed to ""Total"" because all the Items are non-stock items",稅項類別已更改為“合計”，因為所有物品均為非庫存物品
+To date can not be equal or less than from date,迄今為止不能等於或少於日期
+Nothing to change,沒什麼可改變的
+Please select a csv file,請選擇一個csv文件
+Total Holidays,總假期
+Missing email template for dispatch. Please set one in Delivery Settings.,缺少發送的電子郵件模板。請在“傳遞設置”中設置一個。
+Mark as Present,標記為現
+Indicator Color,指示燈顏色
+To Receive and Bill,準備收料及接收發票
+Row #{0}: Reqd by Date cannot be before Transaction Date,行號{0}：按日期請求不能在交易日期之前
+Featured Products,特色產品
+Select Serial No,選擇序列號
+Designer,設計師
+Terms and Conditions Template,條款及細則範本
+Delivery Details,交貨細節
+Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+Program Code,程序代碼
+Terms and Conditions Help,條款和條件幫助
+Item-wise Purchase Register,項目明智的購買登記
+Expiry Date,到期時間
+Employee name and designation in print,員工姓名和印刷品名稱
+accounts-browser,科目瀏覽器
+Please select Category first,請先選擇分類
+Project master.,專案主持。
+"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允許對賬單或過度訂貨，庫存設置或更新項目“津貼”。
+Contract Terms,合同條款
+Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
+Maximum benefit amount of component {0} exceeds {1},組件{0}的最大受益金額超過{1}
+Credit Days,信貸天
+Please select Patient to get Lab Tests,請選擇患者以獲得實驗室測試
+Make Student Batch,讓學生批
+Allow Transfer for Manufacture,允許轉移製造
+Is Carry Forward,是弘揚
+Get Items from BOM,從物料清單取得項目
+Lead Time Days,交貨期天
+Is Income Tax Expense,是所得稅費用
+Your order is out for delivery!,您的訂單已發貨！
+Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
+Check this if the Student is residing at the Institute's Hostel.,如果學生住在學院的旅館，請檢查。
+Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
+Stock Summary,庫存摘要
+Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
+Remaining Benefits (Yearly),剩餘福利（每年）
+Bill of Materials,材料清單
+Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：參與方類型和參與方需要應收/應付科目{1}
+Leave Policy,離開政策
+Update Items,更新項目
+Ref Date,參考日期
+Reason for Leaving,離職原因
+Operating Cost(Company Currency),營業成本（公司貨幣）
+Shelf Life In Days,保質期天數
+Is Opening,是開幕
+Expense Approvers,費用審批人
+Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
+Subscription Section,認購科
+Account {0} does not exist,科目{0}不存在
+Training Program,培訓計劃
+Cash,現金
+Short biography for website and other publications.,網站和其他出版物的短的傳記。
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 035b3c5..7af5ed1 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -232,8 +232,6 @@
"Applicable if the company is SpA, SApA or SRL",如果公司是SpA，SApA或SRL，则适用,
Applicable if the company is a limited liability company,适用于公司是有限责任公司的情况,
Applicable if the company is an Individual or a Proprietorship,适用于公司是个人或独资企业的情况,
-Applicant,申请人,
-Applicant Type,申请人类型,
Application of Funds (Assets),资金(资产)申请,
Application period cannot be across two allocation records,申请期限不能跨越两个分配记录,
Application period cannot be outside leave allocation period,申请期间须在休假分配周期内,
@@ -1471,10 +1469,6 @@
List of available Shareholders with folio numbers,包含folio号码的可用股东名单,
Loading Payment System,加载支付系统,
Loan,贷款,
-Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0},
-Loan Application,申请贷款,
-Loan Management,贷款管理,
-Loan Repayment,偿还借款,
Loan Start Date and Loan Period are mandatory to save the Invoice Discounting,贷款开始日期和贷款期限是保存发票折扣的必要条件,
Loans (Liabilities),借款（负债）,
Loans and Advances (Assets),贷款及垫款（资产）,
@@ -1611,7 +1605,6 @@
Monday,星期一,
Monthly,每月,
Monthly Distribution,月度分布,
-Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大,
More,更多,
More Information,更多信息,
More than one selection for {0} not allowed,不允许对{0}进行多次选择,
@@ -1884,11 +1877,9 @@
Pay {0} {1},支付{0} {1},
Payable,应付,
Payable Account,应付科目,
-Payable Amount,应付金额,
Payment,付款,
Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。请检查您的GoCardless科目以了解更多信息,
Payment Confirmation,付款确认,
-Payment Date,付款日期,
Payment Days,付款天数,
Payment Document,付款单据,
Payment Due Date,付款到期日,
@@ -1982,7 +1973,6 @@
Please enter Purchase Receipt first,请先输入采购收货单号,
Please enter Receipt Document,请输入收据凭证,
Please enter Reference date,参考日期请输入,
-Please enter Repayment Periods,请输入还款期,
Please enter Reqd by Date,请输入按日期请求,
Please enter Woocommerce Server URL,请输入Woocommerce服务器网址,
Please enter Write Off Account,请输入销帐科目,
@@ -1994,7 +1984,6 @@
Please enter parent cost center,请输入父成本中心,
Please enter quantity for Item {0},请输入物料{0}数量,
Please enter relieving date.,请输入离职日期。,
-Please enter repayment Amount,请输入还款金额,
Please enter valid Financial Year Start and End Dates,请输入有效的财务年度开始和结束日期,
Please enter valid email address,请输入有效的电子邮件地址,
Please enter {0} first,请先输入{0},
@@ -2160,7 +2149,6 @@
Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。,
Primary Address Details,主要地址信息,
Primary Contact Details,主要联系方式,
-Principal Amount,本金,
Print Format,打印格式,
Print IRS 1099 Forms,打印IRS 1099表格,
Print Report Card,打印报表卡,
@@ -2550,7 +2538,6 @@
Sample Collection,样品收集,
Sample quantity {0} cannot be more than received quantity {1},采样数量{0}不能超过接收数量{1},
Sanctioned,核准,
-Sanctioned Amount,已核准金额,
Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,核准金额不能大于行{0}的申报额。,
Sand,砂,
Saturday,星期六,
@@ -3540,7 +3527,6 @@
{0} already has a Parent Procedure {1}.,{0}已有父程序{1}。,
API,应用程序界面,
Annual,全年,
-Approved,已批准,
Change,变化,
Contact Email,联络人电邮,
Export Type,导出类型,
@@ -3570,7 +3556,6 @@
Account Value,账户价值,
Account is mandatory to get payment entries,必须输入帐户才能获得付款条目,
Account is not set for the dashboard chart {0},没有为仪表板图表{0}设置帐户,
-Account {0} does not belong to company {1},科目{0}不属于公司{1},
Account {0} does not exists in the dashboard chart {1},帐户{0}在仪表板图表{1}中不存在,
Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,帐户： <b>{0}</b>是资金正在进行中，日记帐分录无法更新,
Account: {0} is not permitted under Payment Entry,帐户：付款条目下不允许{0},
@@ -3581,7 +3566,6 @@
Activity,活动,
Add / Manage Email Accounts.,添加/管理电子邮件帐户。,
Add Child,添加子项,
-Add Loan Security,添加贷款安全,
Add Multiple,添加多个,
Add Participants,添加参与者,
Add to Featured Item,添加到特色商品,
@@ -3592,15 +3576,12 @@
Address Line 1,地址行1,
Addresses,地址,
Admission End Date should be greater than Admission Start Date.,入学结束日期应大于入学开始日期。,
-Against Loan,反对贷款,
-Against Loan:,反对贷款：,
All,所有,
All bank transactions have been created,已创建所有银行交易,
All the depreciations has been booked,所有折旧已被预订,
Allocation Expired!,分配已过期！,
Allow Resetting Service Level Agreement from Support Settings.,允许从支持设置重置服务水平协议。,
Amount of {0} is required for Loan closure,结清贷款需要{0}的金额,
-Amount paid cannot be zero,支付的金额不能为零,
Applied Coupon Code,应用的优惠券代码,
Apply Coupon Code,申请优惠券代码,
Appointment Booking,预约预约,
@@ -3648,7 +3629,6 @@
Cannot Calculate Arrival Time as Driver Address is Missing.,由于缺少驱动程序地址，无法计算到达时间。,
Cannot Optimize Route as Driver Address is Missing.,由于缺少驱动程序地址，无法优化路由。,
Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,无法完成任务{0}，因为其相关任务{1}尚未完成/取消。,
-Cannot create loan until application is approved,在申请获得批准之前无法创建贷款,
Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。,
"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",第{1}行中的项目{0}的出价不能超过{2}。要允许超额计费，请在“帐户设置”中设置配额,
"Capacity Planning Error, planned start time can not be same as end time",容量规划错误，计划的开始时间不能与结束时间相同,
@@ -3811,20 +3791,9 @@
Less Than Amount,少于金额,
Liabilities,负债,
Loading...,载入中...,
-Loan Amount exceeds maximum loan amount of {0} as per proposed securities,根据建议的证券，贷款额超过最高贷款额{0},
Loan Applications from customers and employees.,客户和员工的贷款申请。,
-Loan Disbursement,贷款支出,
Loan Processes,贷款流程,
-Loan Security,贷款担保,
-Loan Security Pledge,贷款担保,
-Loan Security Pledge Created : {0},已创建的贷款安全承诺：{0},
-Loan Security Price,贷款担保价,
-Loan Security Price overlapping with {0},贷款证券价格与{0}重叠,
-Loan Security Unpledge,贷款担保,
-Loan Security Value,贷款担保价值,
Loan Type for interest and penalty rates,利率和罚款率的贷款类型,
-Loan amount cannot be greater than {0},贷款金额不能大于{0},
-Loan is mandatory,贷款是强制性的,
Loans,贷款,
Loans provided to customers and employees.,提供给客户和员工的贷款。,
Location,位置,
@@ -3893,7 +3862,6 @@
Pay,支付,
Payment Document Type,付款单据类型,
Payment Name,付款名称,
-Penalty Amount,罚款金额,
Pending,有待,
Performance,性能,
Period based On,期间基于,
@@ -3915,10 +3883,8 @@
Please login as a Marketplace User to edit this item.,请以市场用户身份登录以编辑此项目。,
Please login as a Marketplace User to report this item.,请以市场用户身份登录以报告此项目。,
Please select <b>Template Type</b> to download template,请选择<b>模板类型</b>以下载模板,
-Please select Applicant Type first,请先选择申请人类型,
Please select Customer first,请先选择客户,
Please select Item Code first,请先选择商品代码,
-Please select Loan Type for company {0},请为公司{0}选择贷款类型,
Please select a Delivery Note,请选择送货单,
Please select a Sales Person for item: {0},请为以下项目选择销售人员：{0},
Please select another payment method. Stripe does not support transactions in currency '{0}',请选择其他付款方式。 Stripe不支持货币“{0}”的交易,
@@ -3934,8 +3900,6 @@
Please setup a default bank account for company {0},请为公司{0}设置默认银行帐户,
Please specify,请注明,
Please specify a {0},请指定一个{0},lead
-Pledge Status,质押状态,
-Pledge Time,承诺时间,
Printing,打印,
Priority,优先,
Priority has been changed to {0}.,优先级已更改为{0}。,
@@ -3943,7 +3907,6 @@
Processing XML Files,处理XML文件,
Profitability,盈利能力,
Project,项目,
-Proposed Pledges are mandatory for secured Loans,建议抵押是抵押贷款的强制性要求,
Provide the academic year and set the starting and ending date.,提供学年并设置开始和结束日期。,
Public token is missing for this bank,此银行缺少公共令牌,
Publish,发布,
@@ -3959,7 +3922,6 @@
Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,购买收据没有任何启用了保留样本的项目。,
Purchase Return,采购退货,
Qty of Finished Goods Item,成品数量,
-Qty or Amount is mandatroy for loan security,数量或金额是贷款担保的强制要求,
Quality Inspection required for Item {0} to submit,要提交项目{0}所需的质量检验,
Quantity to Manufacture,制造数量,
Quantity to Manufacture can not be zero for the operation {0},操作{0}的制造数量不能为零,
@@ -3980,8 +3942,6 @@
Relieving Date must be greater than or equal to Date of Joining,取消日期必须大于或等于加入日期,
Rename,重命名,
Rename Not Allowed,重命名不允许,
-Repayment Method is mandatory for term loans,定期贷款必须采用还款方法,
-Repayment Start Date is mandatory for term loans,定期贷款的还款开始日期是必填项,
Report Item,报告项目,
Report this Item,举报此项目,
Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,分包的预留数量：制造分包项目的原材料数量。,
@@ -4014,8 +3974,6 @@
Row({0}): {1} is already discounted in {2},行（{0}）：{1}已在{2}中打折,
Rows Added in {0},{0}中添加的行数,
Rows Removed in {0},在{0}中删除的行,
-Sanctioned Amount limit crossed for {0} {1},越过了{0} {1}的认可金额限制,
-Sanctioned Loan Amount already exists for {0} against company {1},{0}对公司{1}的批准贷款额已存在,
Save,保存,
Save Item,保存项目,
Saved Items,保存的物品,
@@ -4134,7 +4092,6 @@
User {0} is disabled,用户{0}已禁用,
Users and Permissions,用户和权限,
Vacancies cannot be lower than the current openings,职位空缺不能低于目前的职位空缺,
-Valid From Time must be lesser than Valid Upto Time.,有效起始时间必须小于有效起始时间。,
Valuation Rate required for Item {0} at row {1},第{1}行的第{0}项所需的估价率,
Values Out Of Sync,值不同步,
Vehicle Type is required if Mode of Transport is Road,如果运输方式为道路，则需要车辆类型,
@@ -4210,7 +4167,6 @@
Add to Cart,加入购物车,
Days Since Last Order,自上次订购以来的天数,
In Stock,库存,
-Loan Amount is mandatory,贷款金额是强制性的,
Mode Of Payment,付款方式,
No students Found,找不到学生,
Not in Stock,仓库无货,
@@ -4239,7 +4195,6 @@
Group by,分组基于,
In stock,有现货,
Item name,物料名称,
-Loan amount is mandatory,贷款金额是强制性的,
Minimum Qty,最低数量,
More details,更多信息,
Nature of Supplies,供应的性质,
@@ -4408,9 +4363,6 @@
Total Completed Qty,完成总数量,
Qty to Manufacture,生产数量,
Repay From Salary can be selected only for term loans,只能为定期贷款选择“从工资还款”,
-No valid Loan Security Price found for {0},找不到{0}的有效贷款担保价格,
-Loan Account and Payment Account cannot be same,贷款帐户和付款帐户不能相同,
-Loan Security Pledge can only be created for secured loans,只能为有抵押贷款创建贷款安全承诺,
Social Media Campaigns,社交媒体活动,
From Date can not be greater than To Date,起始日期不能大于截止日期,
Please set a Customer linked to the Patient,请设置与患者链接的客户,
@@ -6436,7 +6388,6 @@
HR User,HR用户,
Appointment Letter,预约信,
Job Applicant,求职者,
-Applicant Name,申请人姓名,
Appointment Date,约会日期,
Appointment Letter Template,预约信模板,
Body,身体,
@@ -7058,99 +7009,12 @@
Sync in Progress,同步进行中,
Hub Seller Name,集线器卖家名称,
Custom Data,自定义数据,
-Member,会员,
-Partially Disbursed,部分已支付,
-Loan Closure Requested,请求关闭贷款,
Repay From Salary,从工资偿还,
-Loan Details,贷款信息,
-Loan Type,贷款类型,
-Loan Amount,贷款额度,
-Is Secured Loan,有抵押贷款,
-Rate of Interest (%) / Year,利息（％）/年的速率,
-Disbursement Date,支付日期,
-Disbursed Amount,支付额,
-Is Term Loan,是定期贷款,
-Repayment Method,还款方式,
-Repay Fixed Amount per Period,偿还每期固定金额,
-Repay Over Number of Periods,偿还期的超过数,
-Repayment Period in Months,在月还款期,
-Monthly Repayment Amount,每月还款额,
-Repayment Start Date,还款开始日期,
-Loan Security Details,贷款安全明细,
-Maximum Loan Value,最高贷款额,
-Account Info,科目信息,
-Loan Account,贷款科目,
-Interest Income Account,利息收入科目,
-Penalty Income Account,罚款收入帐户,
-Repayment Schedule,还款计划,
-Total Payable Amount,合计应付额,
-Total Principal Paid,本金合计,
-Total Interest Payable,合计应付利息,
-Total Amount Paid,总金额支付,
-Loan Manager,贷款经理,
-Loan Info,贷款信息,
-Rate of Interest,利率,
-Proposed Pledges,拟议认捐,
-Maximum Loan Amount,最高贷款额度,
-Repayment Info,还款信息,
-Total Payable Interest,合计应付利息,
-Against Loan ,反对贷款,
-Loan Interest Accrual,贷款利息计提,
-Amounts,金额,
-Pending Principal Amount,本金待定,
-Payable Principal Amount,应付本金,
-Paid Principal Amount,支付本金,
-Paid Interest Amount,已付利息金额,
-Process Loan Interest Accrual,流程贷款利息计提,
-Repayment Schedule Name,还款时间表名称,
Regular Payment,定期付款,
Loan Closure,贷款结清,
-Payment Details,付款信息,
-Interest Payable,应付利息,
-Amount Paid,已支付的款项,
-Principal Amount Paid,本金支付,
-Repayment Details,还款明细,
-Loan Repayment Detail,贷款还款明细,
-Loan Security Name,贷款证券名称,
-Unit Of Measure,测量单位,
-Loan Security Code,贷款安全守则,
-Loan Security Type,贷款担保类型,
-Haircut %,理发％,
-Loan Details,贷款明细,
-Unpledged,无抵押,
-Pledged,已抵押,
-Partially Pledged,部分抵押,
-Securities,有价证券,
-Total Security Value,总安全价值,
-Loan Security Shortfall,贷款安全缺口,
-Loan ,贷款,
-Shortfall Time,短缺时间,
-America/New_York,美国/纽约,
-Shortfall Amount,不足额,
-Security Value ,安全价值,
-Process Loan Security Shortfall,流程贷款安全漏洞,
-Loan To Value Ratio,贷款价值比,
-Unpledge Time,未承诺时间,
-Loan Name,贷款名称,
Rate of Interest (%) Yearly,利息率的比例（％）年,
-Penalty Interest Rate (%) Per Day,每日罚息（％）,
-Penalty Interest Rate is levied on the pending interest amount on a daily basis in case of delayed repayment ,如果延迟还款，则每日对未付利息征收罚款利率,
-Grace Period in Days,天宽限期,
-No. of days from due date until which penalty won't be charged in case of delay in loan repayment,从到期日起算的天数，直到延迟偿还贷款不收取罚款,
-Pledge,保证,
-Post Haircut Amount,剪发数量,
-Process Type,工艺类型,
-Update Time,更新时间,
-Proposed Pledge,建议的质押,
-Total Payment,总付款,
-Balance Loan Amount,贷款额余额,
-Is Accrued,应计,
Salary Slip Loan,工资单贷款,
Loan Repayment Entry,贷款还款录入,
-Sanctioned Loan Amount,认可贷款额,
-Sanctioned Amount Limit,批准的金额限制,
-Unpledge,不承诺,
-Haircut,理发,
MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-,
Generate Schedule,生成工时单,
Schedules,计划任务,
@@ -7478,15 +7342,15 @@
Project will be accessible on the website to these users,这些用户可在网站上访问该项目,
Copied From,复制自,
Start and End Dates,开始和结束日期,
-Actual Time (in Hours),实际时间（以小时为单位）,
+Actual Time in Hours (via Timesheet),实际时间（以小时为单位）,
Costing and Billing,成本核算和计费,
-Total Costing Amount (via Timesheets),总成本金额（通过工时单）,
-Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）,
+Total Costing Amount (via Timesheet),总成本金额（通过工时单）,
+Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）,
Total Purchase Cost (via Purchase Invoice),总采购成本（通过采购费用清单）,
Total Sales Amount (via Sales Order),总销售额（通过销售订单）,
-Total Billable Amount (via Timesheets),总可计费用金额（通过工时单）,
-Total Billed Amount (via Sales Invoices),总账单金额（通过销售费用清单）,
-Total Consumed Material Cost (via Stock Entry),总物料消耗成本（通过手工库存移动）,
+Total Billable Amount (via Timesheet),总可计费用金额（通过工时单）,
+Total Billed Amount (via Sales Invoice),总账单金额（通过销售费用清单）,
+Total Consumed Material Cost (via Stock Entry),总物料消耗成本（通过手工库存移动）,
Gross Margin,毛利,
Gross Margin %,毛利率％,
Monitor Progress,监控进度,
@@ -7520,12 +7384,10 @@
Dependencies,依赖,
Dependent Tasks,相关任务,
Depends on Tasks,前置任务,
-Actual Start Date (via Time Sheet),实际开始日期（通过工时单）,
-Actual Time (in hours),实际时间（小时）,
-Actual End Date (via Time Sheet),实际结束日期（通过工时单）,
-Total Costing Amount (via Time Sheet),总成本计算量（通过工时单）,
+Actual Start Date (via Timesheet),实际开始日期（通过工时单）,
+Actual Time in Hours (via Timesheet),实际时间（小时）,
+Actual End Date (via Timesheet),实际结束日期（通过工时单）,
Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）,
-Total Billing Amount (via Time Sheet),总开票金额（通过工时单）,
Review Date,评论日期,
Closing Date,结算日期,
Task Depends On,前置任务,
@@ -7886,7 +7748,6 @@
Update Series,更新系列,
Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。,
Prefix,字首,
-Current Value,当前值,
This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数,
Update Series Number,更新序列号,
Quotation Lost Reason,报价遗失原因,
@@ -8517,8 +8378,6 @@
Itemwise Recommended Reorder Level,建议的物料重订货点,
Lead Details,商机信息,
Lead Owner Efficiency,线索负责人效率,
-Loan Repayment and Closure,偿还和结清贷款,
-Loan Security Status,贷款安全状态,
Lost Opportunity,失去的机会,
Maintenance Schedules,维护计划,
Material Requests for which Supplier Quotations are not created,无供应商报价的材料申请,
@@ -8609,7 +8468,6 @@
Counts Targeted: {0},目标计数：{0},
Payment Account is mandatory,付款帐户是必填项,
"If checked, the full amount will be deducted from taxable income before calculating income tax without any declaration or proof submission.",如果选中此复选框，则在计算所得税前将从所有应纳税所得额中扣除全部金额，而无需进行任何声明或提交证明。,
-Disbursement Details,支付明细,
Material Request Warehouse,物料请求仓库,
Select warehouse for material requests,选择物料需求仓库,
Transfer Materials For Warehouse {0},仓库{0}的转移物料,
@@ -8997,9 +8855,6 @@
Repay unclaimed amount from salary,从工资中偿还无人认领的金额,
Deduction from salary,从工资中扣除,
Expired Leaves,过期的叶子,
-Reference No,参考编号,
-Haircut percentage is the percentage difference between market value of the Loan Security and the value ascribed to that Loan Security when used as collateral for that loan.,减价百分比是贷款抵押品的市场价值与该贷款抵押品的价值之间的百分比差异。,
-Loan To Value Ratio expresses the ratio of the loan amount to the value of the security pledged. A loan security shortfall will be triggered if this falls below the specified value for any loan ,贷款价值比表示贷款金额与所抵押担保物价值之比。如果低于任何贷款的指定值，就会触发贷款抵押短缺,
If this is not checked the loan by default will be considered as a Demand Loan,如果未选中此选项，则默认情况下该贷款将被视为需求贷款,
This account is used for booking loan repayments from the borrower and also disbursing loans to the borrower,此帐户用于预订借款人的还款，也用于向借款人发放贷款,
This account is capital account which is used to allocate capital for loan disbursal account ,该帐户是资本帐户，用于为贷款支付帐户分配资本,
@@ -9463,13 +9318,6 @@
Operation {0} does not belong to the work order {1},操作{0}不属于工作订单{1},
Print UOM after Quantity,数量后打印UOM,
Set default {0} account for perpetual inventory for non stock items,为非库存项目的永久库存设置默认的{0}帐户,
-Loan Security {0} added multiple times,贷款安全性{0}已多次添加,
-Loan Securities with different LTV ratio cannot be pledged against one loan,不同LTV比率的贷款证券不能以一项贷款作为抵押,
-Qty or Amount is mandatory for loan security!,数量或金额对于贷款担保是必不可少的！,
-Only submittted unpledge requests can be approved,只有已提交的未承诺请求可以被批准,
-Interest Amount or Principal Amount is mandatory,利息金额或本金金额是强制性的,
-Disbursed Amount cannot be greater than {0},支出金额不能大于{0},
-Row {0}: Loan Security {1} added multiple times,第{0}行：多次添加了贷款安全性{1},
Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save,第＃{0}行：子项不应是产品捆绑包。请删除项目{1}并保存,
Credit limit reached for customer {0},客户{0}已达到信用额度,
Could not auto create Customer due to the following missing mandatory field(s):,由于缺少以下必填字段，因此无法自动创建客户：,
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index ef49670..54eb86a 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -6967,15 +6967,15 @@
Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問,
Copied From,複製自,
Start and End Dates,開始和結束日期,
-Actual Time (in Hours),實際時間（以小時為單位）,
+Actual Time in Hours (via Timesheet),實際時間（以小時為單位）,
Costing and Billing,成本核算和計費,
-Total Costing Amount (via Timesheets),總成本金額（通過時間表）,
-Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）,
+Total Costing Amount (via Timesheet),總成本金額（通過時間表）,
+Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）,
Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）,
Total Sales Amount (via Sales Order),總銷售額（通過銷售訂單）,
-Total Billable Amount (via Timesheets),總計費用金額（通過時間表）,
-Total Billed Amount (via Sales Invoices),總開票金額（通過銷售發票）,
-Total Consumed Material Cost (via Stock Entry),總消耗材料成本（通過股票輸入）,
+Total Billable Amount (via Timesheet),總計費用金額（通過時間表）,
+Total Billed Amount (via Sales Invoice),總開票金額（通過銷售發票）,
+Total Consumed Material Cost (via Stock Entry),總消耗材料成本（通過股票輸入）,
Gross Margin,毛利率,
Monitor Progress,監視進度,
Collect Progress,收集進度,
@@ -7006,12 +7006,10 @@
Dependencies,依賴,
Dependent Tasks,相關任務,
Depends on Tasks,取決於任務,
-Actual Start Date (via Time Sheet),實際開始日期（通過時間表）,
-Actual Time (in hours),實際時間（小時）,
-Actual End Date (via Time Sheet),實際結束日期（通過時間表）,
-Total Costing Amount (via Time Sheet),總成本計算量（通過時間表）,
+Actual Start Date (via Timesheet),實際開始日期（通過時間表）,
+Actual Time in Hours (via Timesheet),實際時間（小時）,
+Actual End Date (via Timesheet),實際結束日期（通過時間表）,
Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）,
-Total Billing Amount (via Time Sheet),總開票金額（通過時間表）,
Review Date,評論日期,
Closing Date,截止日期,
Task Depends On,任務取決於,
diff --git a/erpnext/utilities/bulk_transaction.py b/erpnext/utilities/bulk_transaction.py
index c1579b3..5e57b31 100644
--- a/erpnext/utilities/bulk_transaction.py
+++ b/erpnext/utilities/bulk_transaction.py
@@ -69,7 +69,7 @@
"Sales Order": {
"Sales Invoice": sales_order.make_sales_invoice,
"Delivery Note": sales_order.make_delivery_note,
- "Advance Payment": payment_entry.get_payment_entry,
+ "Payment Entry": payment_entry.get_payment_entry,
},
"Sales Invoice": {
"Delivery Note": sales_invoice.make_delivery_note,
@@ -86,11 +86,11 @@
"Supplier Quotation": {
"Purchase Order": supplier_quotation.make_purchase_order,
"Purchase Invoice": supplier_quotation.make_purchase_invoice,
- "Advance Payment": payment_entry.get_payment_entry,
},
"Purchase Order": {
"Purchase Invoice": purchase_order.make_purchase_invoice,
"Purchase Receipt": purchase_order.make_purchase_receipt,
+ "Payment Entry": payment_entry.get_payment_entry,
},
"Purchase Invoice": {
"Purchase Receipt": purchase_invoice.make_purchase_receipt,
@@ -98,12 +98,13 @@
},
"Purchase Receipt": {"Purchase Invoice": purchase_receipt.make_purchase_invoice},
}
- if to_doctype in ["Advance Payment", "Payment Entry"]:
+ if to_doctype in ["Payment Entry"]:
obj = mapper[from_doctype][to_doctype](from_doctype, doc_name)
else:
obj = mapper[from_doctype][to_doctype](doc_name)
obj.flags.ignore_validate = True
+ obj.set_title_field()
obj.insert(ignore_mandatory=True)
diff --git a/erpnext/accounts/doctype/cash_flow_mapper/__init__.py b/erpnext/utilities/doctype/portal_user/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/cash_flow_mapper/__init__.py
copy to erpnext/utilities/doctype/portal_user/__init__.py
diff --git a/erpnext/utilities/doctype/portal_user/portal_user.json b/erpnext/utilities/doctype/portal_user/portal_user.json
new file mode 100644
index 0000000..361166c
--- /dev/null
+++ b/erpnext/utilities/doctype/portal_user/portal_user.json
@@ -0,0 +1,34 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2023-06-20 14:01:35.362233",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "user"
+ ],
+ "fields": [
+ {
+ "fieldname": "user",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "User",
+ "options": "User",
+ "reqd": 1,
+ "search_index": 1
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2023-06-26 14:15:34.695605",
+ "modified_by": "Administrator",
+ "module": "Utilities",
+ "name": "Portal User",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/portal_user/portal_user.py b/erpnext/utilities/doctype/portal_user/portal_user.py
new file mode 100644
index 0000000..2e0064d
--- /dev/null
+++ b/erpnext/utilities/doctype/portal_user/portal_user.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class PortalUser(Document):
+ pass
diff --git a/erpnext/utilities/hierarchy_chart.py b/erpnext/utilities/hierarchy_chart.py
deleted file mode 100644
index 4bf4353..0000000
--- a/erpnext/utilities/hierarchy_chart.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-
-import frappe
-from frappe import _
-
-
-@frappe.whitelist()
-def get_all_nodes(method, company):
- """Recursively gets all data from nodes"""
- method = frappe.get_attr(method)
-
- if method not in frappe.whitelisted:
- frappe.throw(_("Not Permitted"), frappe.PermissionError)
-
- root_nodes = method(company=company)
- result = []
- nodes_to_expand = []
-
- for root in root_nodes:
- data = method(root.id, company)
- result.append(dict(parent=root.id, parent_name=root.name, data=data))
- nodes_to_expand.extend(
- [{"id": d.get("id"), "name": d.get("name")} for d in data if d.get("expandable")]
- )
-
- while nodes_to_expand:
- parent = nodes_to_expand.pop(0)
- data = method(parent.get("id"), company)
- result.append(dict(parent=parent.get("id"), parent_name=parent.get("name"), data=data))
- for d in data:
- if d.get("expandable"):
- nodes_to_expand.append({"id": d.get("id"), "name": d.get("name")})
-
- return result
diff --git a/erpnext/utilities/workspace/utilities/utilities.json b/erpnext/utilities/workspace/utilities/utilities.json
deleted file mode 100644
index 5b81e03..0000000
--- a/erpnext/utilities/workspace/utilities/utilities.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "charts": [],
- "content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Video\",\"col\":4}}]",
- "creation": "2020-09-10 12:21:22.335307",
- "docstatus": 0,
- "doctype": "Workspace",
- "for_user": "",
- "hide_custom": 0,
- "idx": 0,
- "label": "Utilities",
- "links": [
- {
- "hidden": 0,
- "is_query_report": 0,
- "label": "Video",
- "link_count": 0,
- "onboard": 0,
- "type": "Card Break"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Video",
- "link_count": 0,
- "link_to": "Video",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- },
- {
- "dependencies": "",
- "hidden": 0,
- "is_query_report": 0,
- "label": "Video Settings",
- "link_count": 0,
- "link_to": "Video Settings",
- "link_type": "DocType",
- "onboard": 0,
- "type": "Link"
- }
- ],
- "modified": "2022-01-13 17:50:10.067510",
- "modified_by": "Administrator",
- "module": "Utilities",
- "name": "Utilities",
- "owner": "user@erpnext.com",
- "parent_page": "",
- "public": 1,
- "restrict_to_domain": "",
- "roles": [],
- "sequence_id": 30.0,
- "shortcuts": [],
- "title": "Utilities"
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 6c11e9d..4e686f7 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
},
"devDependencies": {},
"dependencies": {
- "html2canvas": "^1.1.4",
"onscan.js": "^1.5.2"
}
}
diff --git a/pyproject.toml b/pyproject.toml
index 0718e5b..012ffb1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,9 +9,10 @@
dynamic = ["version"]
dependencies = [
# Core dependencies
- "pycountry~=20.7.3",
- "Unidecode~=1.2.0",
+ "pycountry~=22.3.5",
+ "Unidecode~=1.3.6",
"barcodenumber~=0.5.0",
+ "rapidfuzz~=2.15.0",
# integration dependencies
"gocardless-pro~=1.22.0",
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 29fa1c7..0000000
--- a/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# TODO: Remove this file when v15.0.0 is released
-from setuptools import setup
-
-name = "erpnext"
-
-setup()
diff --git a/yarn.lock b/yarn.lock
index 8e5d1bd..fa1b1d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,25 +2,6 @@
# yarn lockfile v1
-base64-arraybuffer@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
- integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==
-
-css-line-break@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
- integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==
- dependencies:
- base64-arraybuffer "^0.2.0"
-
-html2canvas@^1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.1.4.tgz#53ae91cd26e9e9e623c56533cccb2e3f57c8124c"
- integrity sha512-uHgQDwrXsRmFdnlOVFvHin9R7mdjjZvoBoXxicPR+NnucngkaLa5zIDW9fzMkiip0jSffyTyWedE8iVogYOeWg==
- dependencies:
- css-line-break "1.1.1"
-
onscan.js@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/onscan.js/-/onscan.js-1.5.2.tgz#14ed636e5f4c3f0a78bacbf9a505dad3140ee341"